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

Class proxy was not setting database on result sets

Browse source
This commit is contained in:
Peter Gumeson 2009-09-09 00:08:59 -07:00 • committed by Marcos Tapajós
parent 17dac85a02
commit 6d571a7d81
2 changed files with 58 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

16
lib/couchrest/mixins/class_proxy.rb
View file

@ -56,7 +56,9 @@ module CouchRest
# Mixins::DocumentQueries
def all(opts = {}, &block)
@klass.all({:database => @database}.merge(opts), &block)
docs = @klass.all({:database => @database}.merge(opts), &block)
docs.each { |doc| doc.database = @database if doc.respond_to?(:database) } if docs
docs
end
def count(opts = {}, &block)
@ -64,11 +66,15 @@ module CouchRest
end
def first(opts = {})
@klass.first({:database => @database}.merge(opts))
doc = @klass.first({:database => @database}.merge(opts))
doc.database = @database if doc && doc.respond_to?(:database)
doc
end
def get(id)
@klass.get(id, @database)
doc = @klass.get(id, @database)
doc.database = @database if doc && doc.respond_to?(:database)
doc
end
# Mixins::Views
@ -78,7 +84,9 @@ module CouchRest
end
def view(name, query={}, &block)
@klass.view(name, {:database => @database}.merge(query), &block)
docs = @klass.view(name, {:database => @database}.merge(query), &block)
docs.each { |doc| doc.database = @database if doc.respond_to?(:database) } if docs
docs
end
def all_design_doc_versions