paulcarey-relaxdb 0.3.4 → 0.3.5

data/README.textile

@@ -1,7 +1,8 @@
 h3. What's New?
 
 * 2009-08-15
-** A few minor tweaks and patches push the version to 0.3.4, compatible with CouchDB 0.9.1.
+** A few tweaks, patches and fixes push the version to 0.3.5, compatible with CouchDB 0.9.1 and the 0.10 branch.
+** The Rails error_messages_for helper is now supported. Thanks to "Balint Erdi":http://github.com/balinterdi.
 * 2009-05-27
 ** Added minimal support for data migrations. Although CouchDB's nature removes the necessity for migrations, certain knowledge that all objects possess a particular property can simplify client logic. This desire for simplification is the rationale behind this change.
 * 2009-04-19 

data/Rakefile

@@ -4,7 +4,7 @@ require 'spec/rake/spectask'
 
 PLUGIN = "relaxdb"
 NAME = "relaxdb"
-GEM_VERSION = "0.3.4"
+GEM_VERSION = "0.3.5"
 AUTHOR = "Paul Carey"
 EMAIL = "paul.p.carey@gmail.com"
 HOMEPAGE = "http://github.com/paulcarey/relaxdb/"

data/lib/relaxdb/all_delegator.rb

@@ -16,7 +16,7 @@ module RelaxDB
     
     def __getobj__
       unless @objs
-        @objs = RelaxDB.view "#{@class_name}_all", @params
+        @objs = RelaxDB.rf_view "#{@class_name}_all", @params
       end
       @objs
     end

data/lib/relaxdb/document.rb

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

data/lib/relaxdb/extlib.rb

@@ -1,15 +1,24 @@
 class Errors < Hash
   alias_method :on, :[]
+  alias_method :count, :size
+
+  def full_messages
+    full_messages = []
+    each_key do |attr|
+      full_messages << attr.to_s + ": " + self[attr]
+    end
+    full_messages
+  end
 end
 
 class Time
-  
+
   # Ensure that all Times are stored as UTC
-  # Times in the following format may be passed directly to 
+  # Times in the following format may be passed directly to
   # Date.new in a JavaScript runtime
   def to_json
     utc
     %Q("#{strftime "%Y/%m/%d %H:%M:%S +0000"}")
   end
-  
+
 end

data/lib/relaxdb/paginator.rb

@@ -80,7 +80,7 @@ module RelaxDB
       end
       params[:limit] = 1
             
-      RelaxDB.view(view_name, params).offset
+      RelaxDB.rf_view(view_name, params).offset
     end
     
   end

data/lib/relaxdb/query.rb

@@ -7,7 +7,8 @@ module RelaxDB
   class Query
     
     # keys is not included in the standard param as it is significantly different from the others
-    @@params = %w(key startkey startkey_docid endkey endkey_docid limit update descending skip group group_level reduce include_docs)
+    @@params = %w(key startkey startkey_docid endkey endkey_docid limit update 
+      descending skip group group_level reduce include_docs batch)
     
     @@params.each do |param|
       define_method(param.to_sym) do |*val|
@@ -22,13 +23,9 @@ module RelaxDB
       end
     end
         
-    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)
-      
+    def initialize view_name, params = {}      
       @view_name = view_name
-      params.each { |k, v| send(k, v) }
+      params.each { |k, v| send k, v }
     end
     
     def keys(keys=nil)

data/lib/relaxdb/relaxdb.rb

@@ -145,6 +145,22 @@ module RelaxDB
       
       res
     end
+    
+    #
+    # CouchDB defaults reduce to true when a reduce func is present.
+    # RelaxDB used to indiscriminately set reduce=false, allowing clients to override
+    # if desired. However, as of CouchDB 0.10, such behaviour results in 
+    #   {"error":"query_parse_error","reason":"Invalid URL parameter `reduce` for map view."} 
+    # View https://issues.apache.org/jira/browse/COUCHDB-383#action_12722350
+    # 
+    # This method is an internal workaround for this change to CouchDB and may
+    # be removed if a future change allows for a better solution e.g. map=true 
+    # or a _map endpoint
+    #
+    def rf_view view_name, params
+      params[:reduce] = false
+      view view_name, params
+    end
           
     def view(view_name, params = {})
       q = Query.new(view_name, params)
@@ -185,7 +201,8 @@ module RelaxDB
       raise paginate_params.error_msg if paginate_params.invalid? 
       
       paginator = Paginator.new(paginate_params, page_params)
-                  
+
+      atts[:reduce] = false
       query = Query.new(view_name, atts)
       query.merge(paginate_params)
       

data/spec/query_spec.rb

@@ -24,55 +24,55 @@ describe RelaxDB::Query do
     
     it "should list design document and view name and default reduce to false" do
       q = RelaxDB::Query.new("mount")
-      q.view_path.should == "_design//_view/mount?reduce=false"
+      q.view_path.should == "_design//_view/mount"
     end
     
     it "should contain URL and JSON encoded key when the key has been set" do
       q = RelaxDB::Query.new("")
       q.key("olympus")
-      q.view_path.should == "_design//_view/?key=%22olympus%22&reduce=false"
+      q.view_path.should == "_design//_view/?key=%22olympus%22"
     end
     
     it "should honour startkey, endkey and limit" do
       q = RelaxDB::Query.new("")
       q.startkey(["olympus"]).endkey(["vesuvius", 3600]).limit(100)
-      q.view_path.should == "_design//_view/?startkey=%5B%22olympus%22%5D&endkey=%5B%22vesuvius%22%2C3600%5D&limit=100&reduce=false"
+      q.view_path.should == "_design//_view/?startkey=%5B%22olympus%22%5D&endkey=%5B%22vesuvius%22%2C3600%5D&limit=100"
     end
         
     it "should specify a null key if key was set to nil" do
       q = RelaxDB::Query.new("")
       q.key(nil)
-      q.view_path.should == "_design//_view/?key=null&reduce=false"
+      q.view_path.should == "_design//_view/?key=null"
     end
 
     it "should specify a null startkey if startkey was set to nil" do
       q = RelaxDB::Query.new("")
       q.startkey(nil)
-      q.view_path.should == "_design//_view/?startkey=null&reduce=false"
+      q.view_path.should == "_design//_view/?startkey=null"
     end
 
     it "should specify a null endkey if endkey was set to nil" do
       q = RelaxDB::Query.new("")
       q.endkey(nil)
-      q.view_path.should == "_design//_view/?endkey=null&reduce=false"
+      q.view_path.should == "_design//_view/?endkey=null"
     end
     
     it "should not JSON encode the startkey_docid" do
       q = RelaxDB::Query.new("")
       q.startkey_docid("foo")
-      q.view_path.should == "_design//_view/?startkey_docid=foo&reduce=false"
+      q.view_path.should == "_design//_view/?startkey_docid=foo"
     end
 
     it "should not JSON encode the endkey_docid" do
       q = RelaxDB::Query.new("")
       q.endkey_docid("foo")
-      q.view_path.should == "_design//_view/?endkey_docid=foo&reduce=false"
+      q.view_path.should == "_design//_view/?endkey_docid=foo"
     end
     
     it "should not include design or view if it starts with a _" do
       q = RelaxDB::Query.new "_"
       # q.view_path.should == "_"
-      q.view_path.should == "_?reduce=false"
+      q.view_path.should == "_"
     end
     
   end  

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: paulcarey-relaxdb
 version: !ruby/object:Gem::Version 
-  version: 0.3.4
+  version: 0.3.5
 platform: ruby
 authors: 
 - Paul Carey