couchrest_model 1.1.0.beta → 1.1.0.beta2

data/lib/couchrest/model/validations/uniqueness.rb

@@ -14,25 +14,36 @@ module CouchRest
         end
 
         def validate_each(document, attribute, value)
-          view_name = options[:view].nil? ? "by_#{attribute}" : options[:view]
-          model = document.model_proxy || @model
+          keys = [attribute]
+          unless options[:scope].nil?
+            keys = (options[:scope].is_a?(Array) ? options[:scope] : [options[:scope]]) + keys
+          end
+          values = keys.map{|k| document.send(k)}
+          values = values.first if values.length == 1
+
+          view_name = options[:view].nil? ? "by_#{keys.join('_and_')}" : options[:view]
+
+          model = (document.respond_to?(:model_proxy) && document.model_proxy ? document.model_proxy : @model)
           # Determine the base of the search
           base = options[:proxy].nil? ? model : document.instance_eval(options[:proxy])
 
           if base.respond_to?(:has_view?) && !base.has_view?(view_name)
             raise "View #{document.class.name}.#{options[:view]} does not exist!" unless options[:view].nil?
-            model.view_by attribute
+            keys << {:allow_nil => true}
+            model.view_by(*keys)
           end
 
-          docs = base.view(view_name, :key => value, :limit => 2, :include_docs => false)['rows']
-          return if docs.empty?
+          rows = base.view(view_name, :key => values, :limit => 2, :include_docs => false)['rows']
+          return if rows.empty?
 
           unless document.new?
-            return if docs.find{|doc| doc['id'] == document.id}
+            return if rows.find{|row| row['id'] == document.id}
           end
-          
-          if docs.length > 0
-            document.errors.add(attribute, :taken, options.merge(:value => value))
+
+          if rows.length > 0
+            opts = options.merge(:value => value)
+            opts.delete(:scope) # Has meaning with I18n!
+            document.errors.add(attribute, :taken, opts)
           end
         end
 

data/lib/couchrest/model/views.rb

@@ -100,7 +100,7 @@ module CouchRest
           query = query.dup # Modifications made on copy!
           db = query.delete(:database) || database
           refresh_design_doc(db)
-          query[:raw] = true if query[:reduce]        
+          query[:raw] = true if query[:reduce]
           raw = query.delete(:raw)
           fetch_view_with_docs(db, name, query, raw, &block)
         end

data/lib/couchrest_model.rb

@@ -46,7 +46,9 @@ require "couchrest/model/designs/view"
 
 # Monkey patches applied to couchrest
 require "couchrest/model/support/couchrest"
-require "couchrest/model/support/hash"
+# Core Extensions
+require "couchrest/model/core_extensions/hash"
+require "couchrest/model/core_extensions/time_parsing"
 
 # Base libraries
 require "couchrest/model/casted_model"

data/spec/couchrest/assocations_spec.rb

@@ -5,6 +5,35 @@ require File.join(FIXTURE_PATH, 'more', 'sale_invoice')
 
 describe "Assocations" do
 
+  describe ".merge_belongs_to_association_options" do
+    before :all do
+      def SaleInvoice.merge_assoc_opts(*args)
+        merge_belongs_to_association_options(*args)
+      end
+    end
+
+    it "should return a default set of options" do
+      o = SaleInvoice.merge_assoc_opts(:cat)
+      o[:foreign_key].should eql('cat_id')
+      o[:class_name].should eql('Cat')
+      o[:proxy_name].should eql('cats')
+      o[:proxy].should eql('Cat') # same as class name
+    end
+
+    it "should merge with provided options" do
+      o = SaleInvoice.merge_assoc_opts(:cat, :foreign_key => 'somecat_id', :proxy => 'some_cats')
+      o[:foreign_key].should eql('somecat_id')
+      o[:proxy].should eql('some_cats')
+    end
+
+    it "should generate a proxy string if proxied" do
+      SaleInvoice.stub!(:proxy_owner_method).twice.and_return('company')
+      o = SaleInvoice.merge_assoc_opts(:cat)
+      o[:proxy].should eql('self.company.cats')
+    end
+    
+  end
+
   describe "of type belongs to" do
 
     before :each do
@@ -43,14 +72,6 @@ describe "Assocations" do
       @invoice.client
     end
 
-    it "should raise error if class name does not exist" do
-      lambda do
-        class TestBadAssoc < CouchRest::Model::Base
-          belongs_to :test_bad_item
-        end
-      end.should raise_error(NameError, /TestBadAssoc#test_bad_item/)
-    end
-
     it "should allow override of foreign key" do
       @invoice.respond_to?(:alternate_client).should be_true
       @invoice.respond_to?("alternate_client=").should be_true
@@ -78,8 +99,8 @@ describe "Assocations" do
     end
 
     it "should create an associated property and collection proxy" do
-      @invoice.respond_to?('entry_ids')
-      @invoice.respond_to?('entry_ids=')
+      @invoice.respond_to?('entry_ids').should be_true
+      @invoice.respond_to?('entry_ids=').should be_true
       @invoice.entries.class.should eql(::CouchRest::CollectionOfProxy)
     end
 

data/spec/couchrest/core_extensions/time_parsing.rb

@@ -0,0 +1,77 @@
+# encoding: utf-8
+require File.expand_path('../../../spec_helper', __FILE__)
+
+describe "Time Parsing core extension" do
+
+  describe "Time" do
+
+    it "should respond to .parse_iso8601" do
+      Time.respond_to?("parse_iso8601").should be_true
+    end
+
+    describe ".parse_iso8601" do
+
+      describe "parsing" do
+
+        before :each do
+          # Time.parse should not be called for these tests!
+          Time.stub!(:parse).and_return(nil)
+        end
+
+        it "should parse JSON time" do
+          txt = "2011-04-01T19:05:30Z"
+          Time.parse_iso8601(txt).should eql(Time.utc(2011, 04, 01, 19, 05, 30))
+        end
+
+        it "should parse JSON time as UTC without Z" do
+          txt = "2011-04-01T19:05:30"
+          Time.parse_iso8601(txt).should eql(Time.utc(2011, 04, 01, 19, 05, 30))
+        end
+
+        it "should parse basic time as UTC" do
+          txt = "2011-04-01 19:05:30"
+          Time.parse_iso8601(txt).should eql(Time.utc(2011, 04, 01, 19, 05, 30))
+        end
+
+        it "should parse JSON time with zone" do
+          txt = "2011-04-01T19:05:30 +02:00"
+          Time.parse_iso8601(txt).should eql(Time.new(2011, 04, 01, 19, 05, 30, "+02:00"))
+        end
+
+        it "should parse JSON time with zone 2" do
+          txt = "2011-04-01T19:05:30-0200"
+          Time.parse_iso8601(txt).should eql(Time.new(2011, 04, 01, 19, 05, 30, "-02:00"))
+        end
+
+        it "should parse dodgy time with zone" do
+          txt = "2011-04-01 19:05:30 +0200"
+          Time.parse_iso8601(txt).should eql(Time.new(2011, 04, 01, 19, 05, 30, "+02:00"))
+        end
+
+        it "should parse dodgy time with zone 2" do
+          txt = "2011-04-01 19:05:30+0230"
+          Time.parse_iso8601(txt).should eql(Time.new(2011, 04, 01, 19, 05, 30, "+02:30"))
+        end
+
+        it "should parse dodgy time with zone 3" do
+          txt = "2011-04-01 19:05:30 0230"
+          Time.parse_iso8601(txt).should eql(Time.new(2011, 04, 01, 19, 05, 30, "+02:30"))
+        end
+
+      end
+
+      describe "resorting back to normal parse" do
+        before :each do
+          Time.should_receive(:parse)
+        end
+        it "should work with weird time" do
+          txt = "16/07/1981 05:04:00"
+          Time.parse_iso8601(txt)
+        end
+
+      end
+    end
+
+  end
+
+end

data/spec/couchrest/designs/view_spec.rb

@@ -7,6 +7,7 @@ class DesignViewModel < CouchRest::Model::Base
 
   design do
     view :by_name
+    view :by_just_name, :map => "function(doc) { emit(doc['name'], null); }"
   end
 end
 
@@ -32,7 +33,7 @@ describe "Design View" do
           @obj = @klass.new(DesignViewModel, {}, 'test_view')
           @obj.model.should eql(DesignViewModel)
           @obj.name.should eql('test_view')
-          @obj.query.should eql({:reduce => false})
+          @obj.query.should be_empty
         end
 
         it "should complain if there is no name" do
@@ -51,7 +52,7 @@ describe "Design View" do
         it "should copy attributes" do
           @obj.model.should eql(DesignViewModel)
           @obj.name.should eql('test_view')
-          @obj.query.should eql({:reduce => false, :foo => :bar})
+          @obj.query.should eql({:foo => :bar})
         end
 
       end
@@ -233,15 +234,6 @@ describe "Design View" do
         end
       end
 
-      describe "#keys" do
-        it "should request each row and provide key value" do
-          row = mock("Row")
-          row.should_receive(:key).twice.and_return('foo')
-          @obj.should_receive(:rows).and_return([row, row])
-          @obj.keys.should eql(['foo', 'foo'])
-        end
-      end
-
       describe "#values" do
         it "should request each row and provide value" do
           row = mock("Row")
@@ -276,21 +268,25 @@ describe "Design View" do
           @obj.should_receive(:update_query).with({:key => 'foo'})
           @obj.key('foo')
         end
-        it "should raise and error if startkey set" do
+        it "should raise error if startkey set" do
           @obj.query[:startkey] = 'bar'
           lambda { @obj.key('foo') }.should raise_error
         end
-        it "should raise and error if endkey set" do
+        it "should raise error if endkey set" do
           @obj.query[:endkey] = 'bar'
           lambda { @obj.key('foo') }.should raise_error
         end
-        it "should raise and error if both startkey and endkey set" do
+        it "should raise error if both startkey and endkey set" do
           @obj.query[:startkey] = 'bar'
           @obj.query[:endkey] = 'bar'
           lambda { @obj.key('foo') }.should raise_error
         end
+        it "should raise error if keys set" do
+          @obj.query[:keys] = 'bar'
+          lambda { @obj.key('foo') }.should raise_error
+        end
       end
-      
+
       describe "#startkey" do
         it "should update query with value" do
           @obj.should_receive(:update_query).with({:startkey => 'foo'})
@@ -298,7 +294,11 @@ describe "Design View" do
         end
         it "should raise and error if key set" do
           @obj.query[:key] = 'bar'
-          lambda { @obj.startkey('foo') }.should raise_error
+          lambda { @obj.startkey('foo') }.should raise_error(/View#startkey/)
+        end
+        it "should raise and error if keys set" do
+          @obj.query[:keys] = 'bar'
+          lambda { @obj.startkey('foo') }.should raise_error(/View#startkey/)
         end
       end
 
@@ -322,7 +322,11 @@ describe "Design View" do
         end
         it "should raise and error if key set" do
           @obj.query[:key] = 'bar'
-          lambda { @obj.endkey('foo') }.should raise_error
+          lambda { @obj.endkey('foo') }.should raise_error(/View#endkey/)
+        end
+        it "should raise and error if keys set" do
+          @obj.query[:keys] = 'bar'
+          lambda { @obj.endkey('foo') }.should raise_error(/View#endkey/)
         end
       end
 
@@ -339,6 +343,33 @@ describe "Design View" do
         end
       end
 
+      describe "#keys" do
+        it "should update the query" do
+          @obj.should_receive(:update_query).with({:keys => ['foo', 'bar']})
+          @obj.keys(['foo', 'bar'])
+        end
+        it "should raise and error if key set" do
+          @obj.query[:key] = 'bar'
+          lambda { @obj.keys('foo') }.should raise_error(/View#keys/)
+        end
+        it "should raise and error if startkey or endkey set" do
+          @obj.query[:startkey] = 'bar'
+          lambda { @obj.keys('foo') }.should raise_error(/View#keys/)
+          @obj.query.delete(:startkey)
+          @obj.query[:endkey] = 'bar'
+          lambda { @obj.keys('foo') }.should raise_error(/View#keys/)
+        end
+      end
+
+      describe "#keys (without parameters)" do
+        it "should request each row and provide key value" do
+          row = mock("Row")
+          row.should_receive(:key).twice.and_return('foo')
+          @obj.should_receive(:rows).and_return([row, row])
+          @obj.keys.should eql(['foo', 'foo'])
+        end
+      end
+
       describe "#descending" do
         it "should update query" do
           @obj.should_receive(:update_query).with({:descending => true})
@@ -700,7 +731,6 @@ describe "Design View" do
     end
 
     describe "loading documents" do
-
       it "should return first" do
         DesignViewModel.by_name.first.name.should eql("Judith")
       end
@@ -715,7 +745,6 @@ describe "Design View" do
         view.last.name.should eql("Peter")
         view.all.length.should eql(3)
       end
-
     end
 
     describe "index information" do
@@ -733,6 +762,18 @@ describe "Design View" do
       end
     end
 
+    describe "viewing" do
+      it "should load views with no reduce method" do
+        docs = DesignViewModel.by_just_name.all
+        docs.length.should eql(5)
+      end
+      it "should load documents by specific keys" do
+        docs = DesignViewModel.by_name.keys(["Judith", "Peter"]).all
+        docs[0].name.should eql("Judith")
+        docs[1].name.should eql("Peter")
+      end
+    end
+
     describe "pagination" do
       before :all do
         DesignViewModel.paginates_per 3