couchrest_model 2.0.0.beta2 → 2.0.0

data/spec/unit/assocations_spec.rb

@@ -75,6 +75,13 @@ describe "Assocations" do
       @invoice.client_id.should be_nil
     end
 
+    it "should allow replacement of object after updating key" do
+      @invoice.client = @client
+      @invoice.client.should eql(@client)
+      @invoice.client_id = nil
+      @invoice.client.should be_nil
+    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

data/spec/unit/base_spec.rb

@@ -469,6 +469,7 @@ describe "Model Base" do
     
     it "should define the updated_at and created_at getters and set the values" do
       @obj.save
+      json = @obj.to_json
       obj = WithDefaultValues.get(@obj.id)
       obj.should be_an_instance_of(WithDefaultValues)
       obj.created_at.should be_an_instance_of(Time)
@@ -487,7 +488,8 @@ describe "Model Base" do
     it "should set the time on create" do
       (Time.now - @art.created_at).should < 2
       foundart = Article.get @art.id
-      foundart.created_at.should == foundart.updated_at
+      # Use string for comparison to cope with microsecond differences
+      foundart.created_at.to_s.should == foundart.updated_at.to_s
     end
     it "should set the time on update" do
       @art.title = "new title"  # only saved if @art.changed? == true

data/spec/unit/{designs/design_spec.rb → design_spec.rb}

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe CouchRest::Model::Designs::Design do
+describe CouchRest::Model::Design do
 
   before :all do
     reset_test_db!
@@ -26,7 +26,7 @@ describe CouchRest::Model::Designs::Design do
   describe "class methods" do
 
     before :all do
-      @klass = CouchRest::Model::Designs::Design
+      @klass = CouchRest::Model::Design
     end
 
     describe ".method_name" do
@@ -46,7 +46,7 @@ describe CouchRest::Model::Designs::Design do
     before :each do
       @model = mock("ModelExample")
       @model.stub(:to_s).and_return("ModelExample")
-      @obj = CouchRest::Model::Designs::Design.new(@model)
+      @obj = CouchRest::Model::Design.new(@model)
     end
 
 
@@ -68,13 +68,13 @@ describe CouchRest::Model::Designs::Design do
     describe "initialisation with prefix" do
 
       it "should associate model and set method name" do
-        @obj = CouchRest::Model::Designs::Design.new(@model, 'stats')
+        @obj = CouchRest::Model::Design.new(@model, 'stats')
         @obj.model.should eql(@model)
         @obj.method_name.should eql("stats_design_doc")
       end
 
       it "should generate correct id with prefix" do
-        @obj = CouchRest::Model::Designs::Design.new(@model, 'stats')
+        @obj = CouchRest::Model::Design.new(@model, 'stats')
         @obj['_id'].should eql("_design/ModelExample_stats")
       end
 
@@ -358,7 +358,7 @@ describe CouchRest::Model::Designs::Design do
 
     it "should calculate checksum for complex model" do
       #Article.design_doc.checksum.should eql('70dff8caea143bf40fad09adf0701104')
-      Article.design_doc.checksum.should eql('0f25a2d9f86e31ebd61b29863a41d5ed')
+      Article.design_doc.checksum.should eql('81f6553c44ecc3fe12a39331b0cdee46')
     end
 
     it "should cache the generated checksum value" do

data/spec/unit/designs/design_mapper_spec.rb

@@ -0,0 +1,124 @@
+# encoding: utf-8
+
+require 'spec_helper'
+
+describe CouchRest::Model::Designs::DesignMapper do
+
+  before :all do
+    @klass = CouchRest::Model::Designs::DesignMapper
+  end
+
+  describe 'initialize without prefix' do
+
+    before :all do
+      @object = @klass.new(DesignModel)
+    end
+
+    it "should set basic variables" do
+      @object.send(:model).should eql(DesignModel)
+      @object.send(:prefix).should be_nil
+      @object.send(:method).should eql('design_doc')
+    end
+
+    it "should add design doc to list" do
+      @object.model.design_docs.should include(@object.model.design_doc)
+    end
+
+    it "should create a design doc method" do
+      @object.model.should respond_to('design_doc')
+      @object.design_doc.should eql(@object.model.design_doc)
+    end
+
+    it "should use default for autoupdate" do
+      @object.design_doc.auto_update.should be_true
+    end
+
+  end
+
+  describe 'initialize with prefix' do
+    before :all do
+      @object = @klass.new(DesignModel, 'stats')
+    end
+
+    it "should set basics" do
+      @object.send(:model).should eql(DesignModel)
+      @object.send(:prefix).should eql('stats')
+      @object.send(:method).should eql('stats_design_doc')
+    end
+
+    it "should add design doc to list" do
+      @object.model.design_docs.should include(@object.model.stats_design_doc)
+    end
+
+    it "should not create an all method" do
+      @object.model.should_not respond_to('all')
+    end
+
+    it "should create a design doc method" do
+      @object.model.should respond_to('stats_design_doc')
+      @object.design_doc.should eql(@object.model.stats_design_doc)
+    end
+
+  end
+
+  describe "#disable_auto_update" do
+    it "should disable auto updates" do
+      @object = @klass.new(DesignModel)
+      @object.disable_auto_update
+      @object.design_doc.auto_update.should be_false
+    end
+  end
+
+  describe "#enable_auto_update" do
+    it "should enable auto updates" do
+      @object = @klass.new(DesignModel)
+      @object.enable_auto_update
+      @object.design_doc.auto_update.should be_true
+    end
+  end
+
+  describe "#model_type_key" do
+    it "should return models type key" do
+      @object = @klass.new(DesignModel)
+      @object.model_type_key.should eql(@object.model.model_type_key)
+    end
+  end
+
+  describe "#view" do
+
+    before :each do
+      @object = @klass.new(DesignModel)
+    end
+
+    it "should call create method on view" do
+      CouchRest::Model::Designs::View.should_receive(:define).with(@object.design_doc, 'test', {})
+      @object.view('test')
+    end
+
+    it "should create a method on parent model" do
+      CouchRest::Model::Designs::View.stub!(:define)
+      @object.view('test_view')
+      DesignModel.should respond_to(:test_view)
+    end
+
+    it "should create a method for view instance" do
+      @object.design_doc.should_receive(:create_view).with('test', {})
+      @object.view('test')
+    end
+  end
+
+  describe "#filter" do
+
+    before :each do
+      @object = @klass.new(DesignModel)
+    end
+
+    it "should add the provided function to the design doc" do
+      @object.filter(:important, "function(doc, req) { return doc.priority == 'high'; }")
+      DesignModel.design_doc['filters'].should_not be_empty
+      DesignModel.design_doc['filters']['important'].should_not be_blank
+    end
+  end
+
+end
+

data/spec/unit/designs/view_spec.rb

@@ -118,13 +118,25 @@ describe "Design View" do
           @design_doc['views']['by_title']['reduce'].should eql(true)
         end
 
+        it "should replace reduce symbol with string name" do
+          @klass.define(@design_doc, 'by_title', :reduce => :sum)
+          @design_doc['views']['by_title']['map'].should_not be_blank
+          @design_doc['views']['by_title']['reduce'].should eql('_sum')
+        end
+
+        it "should replace reduce symbol with string if map function present" do
+          @klass.define(@design_doc, 'by_title', :map => "function(d) { }", :reduce => :sum)
+          @design_doc['views']['by_title']['map'].should_not be_blank
+          @design_doc['views']['by_title']['reduce'].should eql('_sum')
+        end
+
         it "should auto generate mapping from name" do
           lambda { @klass.define(@design_doc, 'by_title') }.should_not raise_error
           str = @design_doc['views']['by_title']['map']
           str.should include("((doc['#{DesignViewModel.model_type_key}'] == 'DesignViewModel') && (doc['title'] != null))")
           str.should include("emit(doc['title'], 1);")
           str = @design_doc['views']['by_title']['reduce']
-          str.should include("return sum(values);")
+          str.should include("_sum")
         end
 
         it "should auto generate mapping from name with and" do
@@ -133,7 +145,12 @@ describe "Design View" do
           str.should include("(doc['title'] != null) && (doc['name'] != null)")
           str.should include("emit([doc['title'], doc['name']], 1);")
           str = @design_doc['views']['by_title_and_name']['reduce']
-          str.should include("return sum(values);")
+          str.should include("_sum")
+        end
+
+        it "should allow reduce methods as symbols" do
+          @klass.define(@design_doc, 'by_title', :reduce => :stats)
+          @design_doc['views']['by_title']['reduce'].should eql('_stats')
         end
       end
 
@@ -719,6 +736,15 @@ describe "Design View" do
           end
         end
 
+        describe "#total_pages" do
+          it "should use total_count and limit_value" do
+            @obj.should_receive(:total_count).and_return(200)
+            @obj.should_receive(:limit_value).and_return(25)
+            @obj.total_pages.should eql(8)
+          end
+        end
+
+        # `num_pages` aliases to `total_pages` for compatibility for Kaminari '< 0.14'
         describe "#num_pages" do
           it "should use total_count and limit_value" do
             @obj.should_receive(:total_count).and_return(200)
@@ -887,7 +913,7 @@ describe "Design View" do
       end
 
       it "should calculate number of pages" do
-        @view.num_pages.should eql(2)
+        @view.total_pages.should eql(2)
       end
       it "should return results from first page" do
         @view.all.first.name.should eql('Judith')
@@ -900,7 +926,7 @@ describe "Design View" do
 
       it "should allow overriding per page count" do
         @view = @view.per(10)
-        @view.num_pages.should eql(1)
+        @view.total_pages.should eql(1)
         @view.all.last.name.should eql('Vilma')
       end
     end

data/spec/unit/designs_spec.rb

@@ -1,9 +1,5 @@
 require "spec_helper"
 
-class DesignModel < CouchRest::Model::Base
-  use_database DB
-  property :name
-end
 
 describe CouchRest::Model::Designs do
 
@@ -16,7 +12,7 @@ describe CouchRest::Model::Designs do
     describe ".design" do
 
       before :each do
-        @klass = DesignModel.dup
+        @klass = DesignsModel.dup
       end
 
       describe "without block" do
@@ -36,14 +32,14 @@ describe CouchRest::Model::Designs do
           @klass.design
           blocks = @klass.instance_variable_get(:@_design_blocks)
           blocks.length.should eql(1)
-          blocks.first.should eql({:args => [nil], :block => nil})
+          blocks.first.should eql({:args => [], :block => nil})
         end
 
         it "should have added itself to a design_blocks array" do
           @klass.design
           blocks = @klass.instance_variable_get(:@_design_blocks)
           blocks.length.should eql(1)
-          blocks.first.should eql({:args => [nil], :block => nil})
+          blocks.first.should eql({:args => [], :block => nil})
         end
 
         it "should have added itself to a design_blocks array with prefix" do
@@ -69,7 +65,7 @@ describe CouchRest::Model::Designs do
         it "should have added itself to a design_blocks array" do
           blocks = @klass.instance_variable_get(:@_design_blocks)
           blocks.length.should eql(1)
-          blocks.first.should eql({:args => [nil], :block => @block})
+          blocks.first.should eql({:args => [], :block => @block})
         end
 
         it "should handle multiple designs" do
@@ -79,7 +75,7 @@ describe CouchRest::Model::Designs do
           @klass.design :stats, &@block2
           blocks = @klass.instance_variable_get(:@_design_blocks)
           blocks.length.should eql(2)
-          blocks.first.should eql({:args => [nil], :block => @block})
+          blocks.first.should eql({:args => [], :block => @block})
           blocks.last.should eql({:args => [:stats], :block => @block2})
         end
       end
@@ -115,137 +111,6 @@ describe CouchRest::Model::Designs do
     end
   end
 
-  describe "DesignMapper" do
-
-    before :all do
-      @klass = CouchRest::Model::Designs::DesignMapper
-    end
-
-    describe 'initialize without prefix' do
-
-      before :all do
-        @object = @klass.new(DesignModel)
-      end
-
-      it "should set basic variables" do
-        @object.send(:model).should eql(DesignModel)
-        @object.send(:prefix).should be_nil
-        @object.send(:method).should eql('design_doc')
-      end
-
-      it "should add design doc to list" do
-        @object.model.design_docs.should include(@object.model.design_doc)
-      end
-
-      it "should create a design doc method" do
-        @object.model.should respond_to('design_doc')
-        @object.design_doc.should eql(@object.model.design_doc)
-      end
-
-      it "should use default for autoupdate" do
-        @object.design_doc.auto_update.should be_true
-      end
-
-    end
-
-    describe 'initialize with prefix' do
-      before :all do
-        @object = @klass.new(DesignModel, 'stats')
-      end
-
-      it "should set basics" do
-        @object.send(:model).should eql(DesignModel)
-        @object.send(:prefix).should eql('stats')
-        @object.send(:method).should eql('stats_design_doc')
-      end
-
-      it "should add design doc to list" do
-        @object.model.design_docs.should include(@object.model.stats_design_doc)
-      end
-
-      it "should not create an all method" do
-        @object.model.should_not respond_to('all')
-      end
-
-      it "should create a design doc method" do
-        @object.model.should respond_to('stats_design_doc')
-        @object.design_doc.should eql(@object.model.stats_design_doc)
-      end
-
-    end
-
-    describe "#disable_auto_update" do
-      it "should disable auto updates" do
-        @object = @klass.new(DesignModel)
-        @object.disable_auto_update
-        @object.design_doc.auto_update.should be_false
-      end
-    end
-
-    describe "#enable_auto_update" do
-      it "should enable auto updates" do
-        @object = @klass.new(DesignModel)
-        @object.enable_auto_update
-        @object.design_doc.auto_update.should be_true
-      end
-    end
-
-    describe "#model_type_key" do
-      it "should return models type key" do
-        @object = @klass.new(DesignModel)
-        @object.model_type_key.should eql(@object.model.model_type_key)
-      end
-    end
-
-    describe "#view" do
-
-      before :each do
-        @object = @klass.new(DesignModel)
-      end
-
-      it "should call create method on view" do
-        CouchRest::Model::Designs::View.should_receive(:define).with(@object.design_doc, 'test', {})
-        @object.view('test')
-      end
-
-      it "should create a method on parent model" do
-        CouchRest::Model::Designs::View.stub!(:define)
-        @object.view('test_view')
-        DesignModel.should respond_to(:test_view)
-      end
-
-      it "should create a method for view instance" do
-        @object.design_doc.should_receive(:create_view).with('test', {})
-        @object.view('test')
-      end
-    end
-
-    describe "#filter" do
-
-      before :each do
-        @object = @klass.new(DesignModel)
-      end
-
-      it "should add the provided function to the design doc" do
-        @object.filter(:important, "function(doc, req) { return doc.priority == 'high'; }")
-        DesignModel.design_doc['filters'].should_not be_empty
-        DesignModel.design_doc['filters']['important'].should_not be_blank
-      end
-    end
-
-  end
-
-
-  class DesignsNoAutoUpdate < CouchRest::Model::Base
-    use_database DB
-    property :title, String
-    design do
-      disable_auto_update
-      view :by_title_fail, :by => ['title']
-      view :by_title, :reduce => true
-    end
-  end
-
   describe "Scenario testing" do
 
     describe "with auto update disabled" do

data/spec/unit/dirty_spec.rb

@@ -14,7 +14,7 @@ class DirtyModel < CouchRest::Model::Base
   property :title, :default => 'Sample Title'
   property :details,     Object,   :default => { 'color' => 'blue' }
   property :keywords,    [String], :default => ['default-keyword']
-  property :sub_models do
+  property :sub_models, :array => true do
     property :title
   end
 end
@@ -270,6 +270,20 @@ describe "Dirty" do
       end
     end
 
+    it "should report changes if item is inserted into array" do
+      should_change_array do |array, obj|
+        array.insert(0, 'keyword')
+        obj.keywords[0].should eql('keyword')
+      end
+    end
+
+    it "should report changes if items are inserted into array" do
+      should_change_array do |array, obj|
+        array.insert(1, 'keyword', 'keyword2')
+        obj.keywords[2].should eql('keyword2')
+      end
+    end
+
     it "should report changes if an array is popped" do
       should_change_array do |array, obj|
         array.pop

data/spec/unit/embeddable_spec.rb

@@ -20,10 +20,10 @@ class DummyModel < CouchRest::Model::Base
   property :casted_attribute, WithCastedModelMixin
   property :keywords,         [String]
   property :old_casted_attribute, OldFashionedMixin
-  property :sub_models do |child|
+  property :sub_models, :array => true do |child|
     child.property :title
   end
-  property :param_free_sub_models do
+  property :param_free_sub_models, :array => true do
     property :title
   end
 end