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

fixed a bug with ExtendedDocument not declaring any views and trying to use #all or #first

Browse source
This commit is contained in:
Matt Aimonetti 2009-03-03 16:57:59 -08:00
parent 98fb1d728d
commit 3e6dba7b66
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
lib/couchrest/mixins/design_doc.rb
View file

@ -16,6 +16,7 @@ module CouchRest
def design_doc_slug def design_doc_slug
return design_doc_slug_cache if (design_doc_slug_cache && design_doc_fresh) return design_doc_slug_cache if (design_doc_slug_cache && design_doc_fresh)
funcs = [] funcs = []
design_doc ||= Design.new(default_design_doc)
design_doc['views'].each do |name, view| design_doc['views'].each do |name, view|
funcs << "#{name}/#{view['map']}#{view['reduce']}" funcs << "#{name}/#{view['map']}#{view['reduce']}"
end end

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

@ -129,12 +129,11 @@ module CouchRest
private private
def fetch_view_with_docs(name, opts, raw=false, &block) def fetch_view_with_docs(name, opts, raw=false, &block)
if raw if raw || (opts.has_key?(:include_docs) && opts[:include_docs] == false)
fetch_view(name, opts, &block) fetch_view(name, opts, &block)
else else
begin begin
# auto load mentioned documents unless asked differently (didn't use merge! on a previous line to avoid duping the object) view = fetch_view name, opts.merge({:include_docs => true}), &block
view = fetch_view name, (opts.has_key?(:include_docs) ? opts : opts.merge({:include_docs => true})), &block
view['rows'].collect{|r|new(r['doc'])} if view['rows'] view['rows'].collect{|r|new(r['doc'])} if view['rows']
rescue rescue
# fallback for old versions of couchdb that don't # fallback for old versions of couchdb that don't