Merge branch 'reduce_when_needed' of git://github.com/balinterdi/rela…

…xdb into balinterdi/reduce_when_neede

lib/relaxdb/all_delegator.rb

@@ -16,7 +16,7 @@ def initialize(class_name, params)
 
     def __getobj__
       unless @objs
-        @objs = RelaxDB.view "#{@class_name}_all", @params
+        @objs = RelaxDB.view "#{@class_name}_all", @params.merge(:reduce => false)
       end
       @objs
     end

lib/relaxdb/document.rb

@@ -538,11 +538,11 @@ def self.view_by *atts
         define_method by_name do |*params|
           view_name = "#{self.name}_#{by_name}"
           if params.empty?
-            res = RelaxDB.view view_name, opts
+            res = RelaxDB.view view_name, opts.merge(:reduce => false)
           elsif params[0].is_a? Hash
-            res = RelaxDB.view view_name, opts.merge(params[0])
+            res = RelaxDB.view view_name, opts.merge(params[0].merge(:reduce => false))
           else
-            res = RelaxDB.view(view_name, :key => params[0]).first
+            res = RelaxDB.view(view_name, :key => params[0], :reduce => false).first
           end            
         end
       end

lib/relaxdb/query.rb

@@ -25,7 +25,10 @@ class Query
     def initialize(view_name, params = {})
       # CouchDB defaults reduce to true when a reduce func is present
       # but returning the map view is typically more useful
-      reduce(false)
+      # only adding the reduce parameter if explicitly required
+      # since views with no reduce function give an error if the reduce param is set, see
+      #  http://mail-archives.apache.org/mod_mbox/couchdb-dev/200906.mbox/%3C189019856.1245587047338.JavaMail.jira@brutus%3E
+      reduce(params[:reduce]) unless params[:reduce].nil?
 
       @view_name = view_name
       params.each { |k, v| send(k, v) }