deac/couchrest_model
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

BUGFIX: attribute protection

Browse source 
Fixes bug where documents recreated from the database were
being stripped of their protected attributes when instantiated

Signed-off-by: Marcos Tapajos <tapajos@Tapajos-MacBook.local>
This commit is contained in:
Will Leinweber 2009-12-04 01:58:07 -06:00
parent 5707d89290
commit d41c7c96da
5 changed files with 84 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lib/couchrest/mixins/collection.rb
View file

@ -183,7 +183,7 @@ module CouchRest
if @container_class.nil?
results
else
results['rows'].collect { |row| @container_class.new(row['doc']) } unless results['rows'].nil?
results['rows'].collect { |row| @container_class.create_from_database(row['doc']) } unless results['rows'].nil?
end
end

8
lib/couchrest/mixins/document_queries.rb
View file

@ -51,11 +51,9 @@ module CouchRest
# db<Database>:: optional option to pass a custom database to use
def get(id, db = database)
begin
doc = db.get id
get!(id, db)
rescue
nil
else
new(doc)
end
end
@ -72,11 +70,11 @@ module CouchRest
# db<Database>:: optional option to pass a custom database to use
def get!(id, db = database)
doc = db.get id
new(doc)
create_from_database(doc)
end
end
end
end
end
end

6
lib/couchrest/mixins/views.rb
View file

@ -137,13 +137,13 @@ module CouchRest
collection_proxy_for(design_doc, name, opts.merge({:include_docs => true}))
else
view = fetch_view db, name, opts.merge({:include_docs => true}), &block
view['rows'].collect{|r|new(r['doc'])} if view['rows']
view['rows'].collect{|r|create_from_database(r['doc'])} if view['rows']
end
rescue
# fallback for old versions of couchdb that don't
# have include_docs support
view = fetch_view(db, name, opts, &block)
view['rows'].collect{|r|new(db.get(r['id']))} if view['rows']
view['rows'].collect{|r|create_from_database(db.get(r['id']))} if view['rows']
end
end
end
@ -170,4 +170,4 @@ module CouchRest
end
end
end
end