couchrest_model 1.1.0.beta2 → 1.1.0.beta3

data/spec/couchrest/dirty_spec.rb

@@ -0,0 +1,355 @@
+require File.expand_path("../../spec_helper", __FILE__)
+
+require File.join(FIXTURE_PATH, 'more', 'cat')
+require File.join(FIXTURE_PATH, 'more', 'article')
+require File.join(FIXTURE_PATH, 'more', 'course')
+require File.join(FIXTURE_PATH, 'more', 'card')
+require File.join(FIXTURE_PATH, 'base')
+
+class WithCastedModelMixin < Hash
+  include CouchRest::Model::CastedModel
+  property :name
+  property :details, Object, :default => {}
+  property :casted_attribute, WithCastedModelMixin
+end 
+
+class DummyModel < CouchRest::Model::Base
+  use_database DB
+
+  property :casted_attribute, WithCastedModelMixin
+  property :title, :default => 'Sample Title'
+  property :details,     Object,   :default => { 'color' => 'blue' }
+  property :keywords,    [String], :default => ['default-keyword']
+  property :sub_models do
+    property :title
+  end
+end
+
+describe "Dirty" do
+
+  describe "changes" do
+
+    it "should return changes on an attribute" do
+      @card = Card.new(:first_name => "matt")
+      @card.first_name = "andrew"
+      @card.first_name_changed?.should be_true
+      @card.changes.should == { "first_name" => ["matt", "andrew"] }
+    end
+
+  end
+
+  describe "save" do
+
+    it "should not save unchanged records" do
+      card_id = Card.create!(:first_name => "matt").id
+      @card = Card.find(card_id)
+      @card.database.should_not_receive(:save_doc)
+      @card.save
+    end
+
+    it "should save changed records" do
+      card_id = Card.create!(:first_name => "matt").id
+      @card = Card.find(card_id)
+      @card.first_name = "andrew"
+      @card.database.should_receive(:save_doc).and_return({"ok" => true})
+      @card.save
+    end
+
+  end
+
+  describe "changed?" do
+
+    # match activerecord behaviour
+    it "should report no changes on a new object with no attributes set" do
+      @card = Card.new
+      @card.changed?.should be_false
+    end
+
+    it "should report no changes on a hash property with a default value" do
+      @obj = DummyModel.new
+      @obj.details.changed?.should be_false
+    end
+
+=begin
+    # match activerecord behaviour
+    # not currently working - not too important
+    it "should report changes on a new object with attributes set" do
+      @card = Card.new(:first_name => "matt")
+      @card.changed?.should be_true
+    end
+=end
+
+    it "should report no changes on objects fetched from the database" do
+      card_id = Card.create!(:first_name => "matt").id
+      @card = Card.find(card_id)
+      @card.changed?.should be_false
+    end
+
+    it "should report changes if the record is modified" do
+      @card = Card.new
+      @card.first_name = "andrew"
+      @card.changed?.should be_true
+      @card.first_name_changed?.should be_true
+    end
+
+    it "should report no changes for unmodified records" do
+      card_id = Card.create!(:first_name => "matt").id
+      @card = Card.find(card_id)
+      @card.first_name = "matt"
+      @card.changed?.should be_false
+      @card.first_name_changed?.should be_false
+    end
+
+    it "should report no changes after a new record has been saved" do
+      @card = Card.new(:first_name => "matt")
+      @card.save!
+      @card.changed?.should be_false
+    end
+
+    it "should report no changes after a record has been saved" do
+      card_id = Card.create!(:first_name => "matt").id
+      @card = Card.find(card_id)
+      @card.first_name = "andrew"
+      @card.save!
+      @card.changed?.should be_false
+    end
+
+    # test changing list properties
+
+    it "should report changes if a list property is modified" do
+      cat_id = Cat.create!(:name => "Felix", :toys => [{:name => "Mouse"}]).id
+      @cat = Cat.find(cat_id)
+      @cat.toys = [{:name => "Feather"}]
+      @cat.changed?.should be_true
+    end
+
+    it "should report no changes if a list property is unmodified" do
+      cat_id = Cat.create!(:name => "Felix", :toys => [{:name => "Mouse"}]).id
+      @cat = Cat.find(cat_id)
+      @cat.toys = [{:name => "Mouse"}]  # same as original list
+      @cat.changed?.should be_false
+    end
+
+    # attachments
+
+    it "should report changes if an attachment is added" do
+      cat_id = Cat.create!(:name => "Felix", :toys => [{:name => "Mouse"}]).id
+      @file = File.open(FIXTURE_PATH + '/attachments/test.html')
+      @cat = Cat.find(cat_id)
+      @cat.create_attachment(:file => @file, :name => "my_attachment")
+      @cat.changed?.should be_true
+    end
+
+    it "should report changes if an attachment is deleted" do
+      @cat = Cat.create!(:name => "Felix", :toys => [{:name => "Mouse"}])
+      @file = File.open(FIXTURE_PATH + '/attachments/test.html')
+      @attachment_name = "my_attachment"
+      @cat.create_attachment(:file => @file, :name => @attachment_name)
+      @cat.save
+      @cat = Cat.find(@cat.id)
+      @cat.delete_attachment(@attachment_name)
+      @cat.changed?.should be_true
+    end
+
+    # casted models
+
+    it "should report changes to casted models" do
+      @cat = Cat.create!(:name => "Felix", :favorite_toy => { :name => "Mouse" })
+      @cat = Cat.find(@cat.id)
+      @cat.favorite_toy['name'] = 'Feather'
+      @cat.changed?.should be_true
+    end
+
+    # casted arrays
+
+    def test_casted_array(change_expected)
+      obj = DummyModel.create!
+      obj = DummyModel.get(obj.id)
+      array = obj.keywords
+      yield array, obj
+      if change_expected
+        obj.changed?.should be_true
+      else
+        obj.changed?.should be_false
+      end
+    end
+
+    def should_change_array
+      test_casted_array(true) { |a,b| yield a,b }
+    end
+
+    def should_not_change_array
+      test_casted_array(false) { |a,b| yield a,b }
+    end
+
+    it "should report changes if an array index is modified" do
+      should_change_array do |array, obj|
+        array[0] = "keyword"
+      end
+    end
+
+    it "should report no changes if an array index is unmodified" do
+      should_not_change_array do |array, obj|
+        array[0] = array[0]
+      end
+    end
+
+    it "should report changes if an array is appended with <<" do
+      should_change_array do |array, obj|
+        array << 'keyword'
+      end
+    end
+
+    it "should report changes if an array is popped" do
+      should_change_array do |array, obj|
+        array.pop
+      end
+    end
+
+    it "should report no changes if an empty array is popped" do
+      should_not_change_array do |array, obj|
+        array.clear
+        obj.save!  # clears changes
+        array.pop
+      end
+    end
+
+    it "should report changes if an array is pushed" do
+      should_change_array do |array, obj|
+        array.push("keyword")
+      end
+    end
+
+    it "should report changes if an array is shifted" do
+      should_change_array do |array, obj|
+        array.shift
+      end
+    end
+
+    it "should report no changes if an empty array is shifted" do
+      should_not_change_array do |array, obj|
+        array.clear
+        obj.save!  # clears changes
+        array.shift
+      end
+    end
+
+    it "should report changes if an array is unshifted" do
+      should_change_array do |array, obj|
+        array.unshift("keyword")
+      end
+    end
+
+    it "should report changes if an array is cleared" do
+      should_change_array do |array, obj|
+        array.clear
+      end
+    end
+
+    # Object, {}  (casted hash)
+
+    def test_casted_hash(change_expected)
+      obj = DummyModel.create!
+      obj = DummyModel.get(obj.id)
+      hash = obj.details
+      yield hash, obj
+      if change_expected
+        obj.changed?.should be_true
+      else
+        obj.changed?.should be_false
+      end
+    end
+
+    def should_change_hash
+      test_casted_hash(true) { |a,b| yield a,b }
+    end
+
+    def should_not_change_hash
+      test_casted_hash(false) { |a,b| yield a,b }
+    end
+
+    it "should report changes if a hash is modified" do
+      should_change_hash do |hash, obj|
+        hash['color'] = 'orange'
+      end
+    end
+
+    it "should report no changes if a hash is unmodified" do
+      should_not_change_hash do |hash, obj|
+        hash['color'] = hash['color']
+      end
+    end
+
+    it "should report changes when deleting from a hash" do
+      should_change_hash do |hash, obj|
+        hash.delete('color')
+      end
+    end
+
+    it "should report no changes when deleting a non existent key from a hash" do
+      should_not_change_hash do |hash, obj|
+        hash.delete('non-existent-key')
+      end
+    end
+
+    it "should report changes when clearing a hash" do
+      should_change_hash do |hash, obj|
+        hash.clear
+      end
+    end
+
+    it "should report changes when merging changes to a hash" do
+      should_change_hash do |hash, obj|
+        hash.merge!('foo' => 'bar')
+      end
+    end
+
+    it "should report no changes when merging no changes to a hash" do
+      should_not_change_hash do |hash, obj|
+        hash.merge!('color' => hash['color'])
+      end
+    end
+
+    it "should report changes when replacing hash content" do
+      should_change_hash do |hash, obj|
+        hash.replace('foo' => 'bar')
+      end
+    end
+
+    it "should report no changes when replacing hash content with same content" do
+      should_not_change_hash do |hash, obj|
+        hash.replace(hash)
+      end
+    end
+
+    it "should report changes when removing records with delete_if" do
+      should_change_hash do |hash, obj|
+        hash.delete_if { true }
+      end
+    end
+
+    it "should report no changes when removing no records with delete_if" do
+      should_not_change_hash do |hash, obj|
+        hash.delete_if { false }
+      end
+    end
+
+    if {}.respond_to?(:keep_if)
+
+      it "should report changes when removing records with keep_if" do
+        should_change_hash do |hash, obj|
+          hash.keep_if { false }
+        end
+      end
+
+      it "should report no changes when removing no records with keep_if" do
+        should_not_change_hash do |hash, obj|
+          hash.keep_if { true }
+        end
+      end
+
+    end
+
+  end
+
+end

data/spec/couchrest/property_spec.rb

@@ -55,6 +55,9 @@ describe "Model properties" do
     card.calias.name.should == ["Aimonetti"]
   end
 
+  it "should raise error if property name coincides with model type key" do
+    lambda { Person.property(Person.model_type_key) }.should raise_error(/already used/)
+  end
 
   it "should be auto timestamped" do
     @card.created_at.should be_nil
@@ -354,10 +357,10 @@ describe "Property Class" do
       property.cast(parent, ["2010-06-01", "2010-06-02"]).class.should eql(CouchRest::Model::CastedArray)
     end
 
-    it "should not set a CastedArray on array of Strings" do
+    it "should set a CastedArray on array of Strings" do
       property = CouchRest::Model::Property.new(:test, [String])
       parent = mock("FooObject")
-      property.cast(parent, ["2010-06-01", "2010-06-02"]).class.should_not eql(CouchRest::Model::CastedArray)
+      property.cast(parent, ["2010-06-01", "2010-06-02"]).class.should eql(CouchRest::Model::CastedArray)
     end
 
     it "should raise and error if value is array when type is not" do

data/spec/couchrest/proxyable_spec.rb

@@ -233,17 +233,6 @@ describe "Proxyable" do
         @obj.design_doc
       end
 
-      describe "#refresh_design_doc" do
-        it "should be proxied without database arg" do
-          Cat.should_receive(:refresh_design_doc).with('database')
-          @obj.refresh_design_doc
-        end
-        it "should be proxied with database arg" do
-          Cat.should_receive(:refresh_design_doc).with('db')
-          @obj.refresh_design_doc('db')
-        end
-      end
-
       describe "#save_design_doc" do
         it "should be proxied without args" do
           Cat.should_receive(:save_design_doc).with('database')

data/spec/couchrest/subclass_spec.rb

@@ -61,37 +61,27 @@ describe "Subclassing a Model" do
     validated_fields.should_not include(:extension_code)
     validated_fields.should_not include(:job_title) 
   end
-  
+
   it "should inherit default property values" do
     @card.bg_color.should == '#ccc'
   end
-  
+
   it "should be able to overwrite a default property" do
     DesignBusinessCard.new.bg_color.should == '#eee'
   end
-  
+
   it "should have a design doc slug based on the subclass name" do
-    Course.refresh_design_doc
     OnlineCourse.design_doc_slug.should =~ /^OnlineCourse/
   end
-  
-  it "should have its own design_doc_fresh" do
-    Animal.refresh_design_doc
-    Dog.send(:design_doc_fresh, Dog.database).should_not == true
-    Dog.refresh_design_doc
-    Dog.send(:design_doc_fresh, Dog.database).should == true
-  end
-  
+
   it "should not add views to the parent's design_doc" do
     Course.design_doc['views'].keys.should_not include('by_url')
   end
-  
+
   it "should not add the parent's views to its design doc" do
-    Course.refresh_design_doc
-    OnlineCourse.refresh_design_doc
     OnlineCourse.design_doc['views'].keys.should_not include('by_title')
   end
-  
+
   it "should have an all view with a guard clause for model == subclass name in the map function" do
     OnlineCourse.design_doc['views']['all']['map'].should =~ /if \(doc\['#{OnlineCourse.model_type_key}'\] == 'OnlineCourse'\)/
   end

data/spec/couchrest/view_spec.rb

@@ -19,11 +19,11 @@ describe "Model views" do
     # NOTE! Add more unit tests!
 
     describe "#view" do
-    
+
       it "should not alter original query" do
         options = { :database => DB }
         view = Article.view('by_date', options)
-        options[:database].should_not be_nil
+        options[:database].should eql(DB)
       end
 
     end
@@ -56,35 +56,6 @@ describe "Model views" do
         written_at += 24 * 3600
       end
     end
-    it "should have a design doc" do
-      Article.design_doc["views"]["by_date"].should_not be_nil
-    end
-    it "should save the design doc" do
-      Article.by_date #rescue nil
-      doc = Article.database.get Article.design_doc.id
-      doc['views']['by_date'].should_not be_nil
-    end
-    it "should save design doc if a view changed" do
-      Article.by_date
-      orig = Article.stored_design_doc
-      orig['views']['by_date']['map'] = "function() { }"
-      Article.database.save_doc(orig)
-      rev = Article.stored_design_doc['_rev']
-      Article.req_design_doc_refresh # prepare for re-load
-      Article.by_date
-      orig = Article.stored_design_doc
-      orig['views']['by_date']['map'].should eql(Article.design_doc['views']['by_date']['map'])
-      orig['_rev'].should_not eql(rev)
-    end
-    it "should not save design doc if not changed" do
-      Article.by_date
-      orig = Article.stored_design_doc['_rev']
-      Article.req_design_doc_refresh
-      Article.by_date
-      Article.stored_design_doc['_rev'].should eql(orig)
-    end
-
-
     it "should return the matching raw view result" do
       view = Article.by_date :raw => true
       view['rows'].length.should == 4
@@ -107,9 +78,8 @@ describe "Model views" do
       Article.view_by :title
       lambda{Article.by_title}.should_not raise_error 
     end
-   
   end
-  
+
   describe "another model with a simple view" do
     before(:all) do
       reset_test_db!
@@ -240,7 +210,6 @@ describe "Model views" do
       lambda{Unattached.all}.should raise_error
     end
     it "should query all" do
-      # Unattached.cleanup_design_docs!(@db)
       rs = Unattached.all :database => @db
       rs.length.should == 4
     end
@@ -297,19 +266,7 @@ describe "Model views" do
       u = Unattached.last :database=>@db
       u.title.should == "aaa"
     end
-    
-    it "should barf on all_design_doc_versions if no database given" do
-      lambda{Unattached.all_design_doc_versions}.should raise_error
-    end
-    it "should be able to cleanup the db/bump the revision number" do
-      # if the previous specs were not run, the model_design_doc will be blank
-      Unattached.use_database DB
-      Unattached.view_by :questions
-      Unattached.by_questions(:database => @db)
-      original_revision = Unattached.model_design_doc(@db)['_rev']
-      Unattached.save_design_doc!(@db)
-      Unattached.model_design_doc(@db)['_rev'].should_not == original_revision
-    end
+
   end
   
   describe "a model with a compound key view" do
@@ -377,7 +334,7 @@ describe "Model views" do
     before(:each) do
       reset_test_db!
       Article.by_date
-      @original_doc_rev = Article.model_design_doc['_rev']
+      @original_doc_rev = Article.stored_design_doc['_rev']
       @design_docs = Article.database.documents :startkey => "_design/", :endkey => "_design/\u9999"
     end
     it "should not create a design doc on view definition" do
@@ -386,10 +343,9 @@ describe "Model views" do
       newdocs["rows"].length.should == @design_docs["rows"].length
     end
     it "should create a new version of the design document on view access" do
-      ddocs = Article.all_design_doc_versions["rows"].length
       Article.view_by :updated_at
       Article.by_updated_at
-      @original_doc_rev.should_not == Article.model_design_doc['_rev']
+      @original_doc_rev.should_not == Article.stored_design_doc['_rev']
       Article.design_doc["views"].keys.should include("by_updated_at")
     end
   end

data/spec/fixtures/base.rb

@@ -131,7 +131,7 @@ class WithUniqueValidationView < CouchRest::Model::Base
   attr_accessor :code
   unique_id :code
   def code
-    self["_id"] ||= @code
+    @code
   end
   property :title
 

data/spec/fixtures/more/card.rb

@@ -7,10 +7,10 @@ class Card < CouchRest::Model::Base
   property :last_name,        :alias     => :family_name
   property :read_only_value,  :read_only => true
   property :cast_alias,       Person,  :alias  => :calias
+  property :fg_color,         :default   => '#000'
 
-  
   timestamps!
-  
+
   # Validation
   validates_presence_of :first_name
   

data/spec/spec_helper.rb

@@ -22,6 +22,8 @@ end
 
 def reset_test_db!
   DB.recreate! rescue nil 
+  # Reset the Design Cache
+  Thread.current[:couchrest_design_cache] = {}
   DB
 end
 

metadata

@@ -6,8 +6,8 @@ version: !ruby/object:Gem::Version
   - 1
   - 1
   - 0
-  - beta2
-  version: 1.1.0.beta2
+  - beta3
+  version: 1.1.0.beta3
 platform: ruby
 authors: 
 - J. Chris Anderson
@@ -141,12 +141,12 @@ files:
 - .gitignore
 - .rspec
 - Gemfile
-- Gemfile.lock
 - LICENSE
 - README.md
 - Rakefile
 - THANKS.md
 - VERSION
+- benchmarks/dirty.rb
 - couchrest_model.gemspec
 - history.txt
 - init.rb
@@ -155,6 +155,8 @@ files:
 - lib/couchrest/model/base.rb
 - lib/couchrest/model/callbacks.rb
 - lib/couchrest/model/casted_array.rb
+- lib/couchrest/model/casted_by.rb
+- lib/couchrest/model/casted_hash.rb
 - lib/couchrest/model/casted_model.rb
 - lib/couchrest/model/class_proxy.rb
 - lib/couchrest/model/collection.rb
@@ -164,6 +166,7 @@ files:
 - lib/couchrest/model/design_doc.rb
 - lib/couchrest/model/designs.rb
 - lib/couchrest/model/designs/view.rb
+- lib/couchrest/model/dirty.rb
 - lib/couchrest/model/document_queries.rb
 - lib/couchrest/model/errors.rb
 - lib/couchrest/model/extended_attachments.rb
@@ -172,7 +175,7 @@ files:
 - lib/couchrest/model/property.rb
 - lib/couchrest/model/property_protection.rb
 - lib/couchrest/model/proxyable.rb
-- lib/couchrest/model/support/couchrest.rb
+- lib/couchrest/model/support/couchrest_design.rb
 - lib/couchrest/model/typecast.rb
 - lib/couchrest/model/validations.rb
 - lib/couchrest/model/validations/casted_model.rb
@@ -194,8 +197,10 @@ files:
 - spec/couchrest/collection_spec.rb
 - spec/couchrest/configuration_spec.rb
 - spec/couchrest/core_extensions/time_parsing.rb
+- spec/couchrest/design_doc_spec.rb
 - spec/couchrest/designs/view_spec.rb
 - spec/couchrest/designs_spec.rb
+- spec/couchrest/dirty_spec.rb
 - spec/couchrest/inherited_spec.rb
 - spec/couchrest/persistence_spec.rb
 - spec/couchrest/property_protection_spec.rb