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

couchrest query params passed through by_xxxx views

Browse source
This commit is contained in:
Chris Anderson 2008-09-29 17:46:33 -07:00
parent f408dfceb6
commit 4a1de8c1ba
2 changed files with 14 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
lib/couchrest/core/model.rb
View file

@ -148,18 +148,18 @@ module CouchRest
@@design_doc_fresh = false
self.meta_class.instance_eval do
define_method method_name do |args|
args ||= {}
define_method method_name do |*args|
opts = args[0] || {}
unless @@design_doc_fresh
refresh_design_doc
end
raw = args.delete(:raw)
raw = opts.delete(:raw)
view_name = "#{type}/#{method_name}"
if raw
fetch_view(view_name)
fetch_view(view_name, opts)
else
view = fetch_view(view_name)
view = fetch_view(view_name, opts)
# TODO this can be optimized once the include-docs patch is applied
view['rows'].collect{|r|new(database.get(r['id']))}
end
@ -169,10 +169,10 @@ module CouchRest
private
def fetch_view view_name
def fetch_view view_name, opts
retryable = true
begin
database.view(view_name)
database.view(view_name, opts)
# the design doc could have been deleted by a rouge process
rescue RestClient::ResourceNotFound => e
if retryable

8
spec/couchrest/core/model_spec.rb
View file

@ -236,7 +236,13 @@ describe CouchRest::Model do
end
it "should sort correctly" do
articles = Article.by_user_id_and_date
# articles.should == 'x'
articles.collect{|a|a.doc['user_id']}.should == ['aaron', 'aaron', 'quentin', 'quentin']
articles[1].title.should == 'not junk'
end
it "should be queryable with couchrest options" do
articles = Article.by_user_id_and_date :count => 1, :startkey => 'quentin'
articles.length.should == 1
articles[0].title.should == "even more interesting"
end
end
end