couchrest_model 2.1.0.rc1 → 2.2.0.beta1

data/spec/unit/utils/migrate_spec.rb

@@ -13,8 +13,8 @@ describe CouchRest::Model::Utils::Migrate do
     end
     it "should detect if Rails is available and require models" do
       Rails = double()
-      Rails.stub(:root).and_return("")
-      Dir.should_receive(:[]).with("app/models/**/*.rb").and_return(['failed_require'])
+      allow(Rails).to receive(:root).and_return("")
+      expect(Dir).to receive(:[]).with("app/models/**/*.rb").and_return(['failed_require'])
       # we can't double require, so just expect an error
       expect {
         @module.load_all_models

data/spec/unit/validations_spec.rb

@@ -10,25 +10,25 @@ describe CouchRest::Model::Validations do
       end
 
       it "should create a new view if none defined before performing" do
-        WithUniqueValidation.design_doc.has_view?(:by_title).should be_true
+        expect(WithUniqueValidation.design_doc.has_view?(:by_title)).to be_truthy
       end
 
       it "should validate a new unique document" do
         @obj = WithUniqueValidation.create(:title => 'title 4')
-        @obj.new?.should_not be_true
-        @obj.should be_valid
+        expect(@obj.new?).not_to be_truthy
+        expect(@obj).to be_valid
       end
 
       it "should not validate a non-unique document" do
         @obj = WithUniqueValidation.create(:title => 'title 1')
-        @obj.should_not be_valid
-        @obj.errors[:title].should == ["has already been taken"]
+        expect(@obj).not_to be_valid
+        expect(@obj.errors[:title]).to eq(["has already been taken"])
       end
 
       it "should save already created document" do
         @obj = @objs.first
-        @obj.save.should_not be_false
-        @obj.should be_valid
+        expect(@obj.save).not_to be_falsey
+        expect(@obj).to be_valid
       end
 
 
@@ -36,27 +36,27 @@ describe CouchRest::Model::Validations do
         # validates_uniqueness_of :code, :view => 'all'
         WithUniqueValidationView.create(:title => 'title 1', :code => '1234')
         @obj = WithUniqueValidationView.new(:title => 'title 5', :code => '1234')
-        @obj.should_not be_valid
+        expect(@obj).not_to be_valid
       end
 
       it "should raise an error if specified view does not exist" do
         WithUniqueValidationView.validates_uniqueness_of :title, :view => 'fooobar'
         @obj = WithUniqueValidationView.new(:title => 'title 2', :code => '12345')
-        lambda {
+        expect {
           @obj.valid?
-        }.should raise_error
+        }.to raise_error(/WithUniqueValidationView.fooobar does not exist for validation/)
       end
 
       it "should not try to create a defined view" do
         WithUniqueValidationView.validates_uniqueness_of :title, :view => 'fooobar'
-        WithUniqueValidationView.design_doc.has_view?('fooobar').should be_false
-        WithUniqueValidationView.design_doc.has_view?('by_title').should be_false
+        expect(WithUniqueValidationView.design_doc.has_view?('fooobar')).to be_falsey
+        expect(WithUniqueValidationView.design_doc.has_view?('by_title')).to be_falsey
       end
 
 
       it "should not try to create new view when already defined" do
         @obj = @objs[1]
-        @obj.class.design_doc.should_not_receive('create_view')
+        expect(@obj.class.design_doc).not_to receive('create_view')
         @obj.valid?
       end
     end
@@ -64,24 +64,24 @@ describe CouchRest::Model::Validations do
     context "with a proxy parameter" do
 
       it "should create a new view despite proxy" do
-        WithUniqueValidationProxy.design_doc.has_view?(:by_title).should be_true
+        expect(WithUniqueValidationProxy.design_doc.has_view?(:by_title)).to be_truthy
       end
 
       it "should be used" do
         @obj = WithUniqueValidationProxy.new(:title => 'test 6')
-        proxy = @obj.should_receive('proxy').and_return(@obj.class)
-        @obj.valid?.should be_true
+        proxy = expect(@obj).to receive('proxy').and_return(@obj.class)
+        expect(@obj.valid?).to be_truthy
       end
 
       it "should allow specific view" do
         @obj = WithUniqueValidationProxy.new(:title => 'test 7')
-        @obj.class.should_not_receive('by_title')
+        expect(@obj.class).not_to receive('by_title')
         view = double('View')
-        view.stub(:rows).and_return([])
+        allow(view).to receive(:rows).and_return([])
         proxy = double('Proxy')
-        proxy.should_receive('by_title').and_return(view)
-        proxy.should_receive('respond_to?').with('by_title').and_return(true)
-        @obj.should_receive('proxy').and_return(proxy)
+        expect(proxy).to receive('by_title').and_return(view)
+        expect(proxy).to receive('respond_to?').with('by_title').and_return(true)
+        expect(@obj).to receive('proxy').and_return(proxy)
         @obj.valid?
       end
     end
@@ -89,11 +89,11 @@ describe CouchRest::Model::Validations do
     context "when proxied" do
       it "should lookup the model_proxy" do
         view = double('View')
-        view.stub(:rows).and_return([])
+        allow(view).to receive(:rows).and_return([])
         mp = double(:ModelProxy)
-        mp.should_receive(:by_title).and_return(view)
+        expect(mp).to receive(:by_title).and_return(view)
         @obj = WithUniqueValidation.new(:title => 'test 8')
-        @obj.stub(:model_proxy).twice.and_return(mp)
+        allow(@obj).to receive(:model_proxy).twice.and_return(mp)
         @obj.valid?
       end
     end
@@ -110,29 +110,29 @@ describe CouchRest::Model::Validations do
 
       it "should validate unique document" do
         @obj = WithScopedUniqueValidation.create(:title => 'title 4', :parent_id => 1)
-        @obj.should be_valid
+        expect(@obj).to be_valid
       end
 
       it "should validate unique document outside of scope" do
         @obj = WithScopedUniqueValidation.create(:title => 'title 1', :parent_id => 2)
-        @obj.should be_valid
+        expect(@obj).to be_valid
       end
 
       it "should validate non-unique document" do
         @obj = WithScopedUniqueValidation.create(:title => 'title 1', :parent_id => 1)
-        @obj.should_not be_valid
-        @obj.errors[:title].should == ["has already been taken"]
+        expect(@obj).not_to be_valid
+        expect(@obj.errors[:title]).to eq(["has already been taken"])
       end
 
       it "should validate unique document will nil scope" do
         @obj = WithScopedUniqueValidation.create(:title => 'title 4', :parent_id => nil)
-        @obj.should be_valid
+        expect(@obj).to be_valid
       end
 
       it "should validate non-unique document with nil scope" do
         @obj = WithScopedUniqueValidation.create(:title => 'title 1', :parent_id => nil)
-        @obj.should_not be_valid
-        @obj.errors[:title].should == ["has already been taken"]
+        expect(@obj).not_to be_valid
+        expect(@obj.errors[:title]).to eq(["has already been taken"])
       end
 
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: couchrest_model
 version: !ruby/object:Gem::Version
-  version: 2.1.0.rc1
+  version: 2.2.0.beta1
 platform: ruby
 authors:
 - J. Chris Anderson
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-06 00:00:00.000000000 Z
+date: 2016-08-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: couchrest
@@ -32,16 +32,16 @@ dependencies:
   name: activemodel
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: 4.0.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: 4.0.2
 - !ruby/object:Gem::Dependency
   name: tzinfo
   requirement: !ruby/object:Gem::Requirement
@@ -56,20 +56,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.3.22
+- !ruby/object:Gem::Dependency
+  name: hashdiff
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.3'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.3'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.14.1
+        version: 3.5.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.14.1
+        version: 3.5.0
 - !ruby/object:Gem::Dependency
   name: rack-test
   requirement: !ruby/object:Gem::Requirement
@@ -175,6 +189,8 @@ files:
 - ".rspec"
 - ".travis.yml"
 - Gemfile
+- Gemfile.activesupport-4.x
+- Gemfile.activesupport-5.x
 - LICENSE
 - README.md
 - Rakefile
@@ -192,7 +208,6 @@ files:
 - 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/configuration.rb
 - lib/couchrest/model/connection.rb
 - lib/couchrest/model/core_extensions/hash.rb
@@ -267,7 +282,7 @@ files:
 - spec/unit/casted_spec.rb
 - spec/unit/configuration_spec.rb
 - spec/unit/connection_spec.rb
-- spec/unit/core_extensions/time_parsing.rb
+- spec/unit/core_extensions/time_parsing_spec.rb
 - spec/unit/design_spec.rb
 - spec/unit/designs/design_mapper_spec.rb
 - spec/unit/designs/migrations_spec.rb
@@ -306,7 +321,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Extends the CouchRest Document class for advanced modelling.
@@ -349,7 +364,7 @@ test_files:
 - spec/unit/casted_spec.rb
 - spec/unit/configuration_spec.rb
 - spec/unit/connection_spec.rb
-- spec/unit/core_extensions/time_parsing.rb
+- spec/unit/core_extensions/time_parsing_spec.rb
 - spec/unit/design_spec.rb
 - spec/unit/designs/design_mapper_spec.rb
 - spec/unit/designs/migrations_spec.rb

data/lib/couchrest/model/casted_hash.rb

@@ -1,84 +0,0 @@
-#
-# Wrapper around Hash so that the casted_by attribute is set.
-
-module CouchRest::Model
-  class CastedHash < Hash
-    include CouchRest::Model::CastedBy
-    include CouchRest::Model::Dirty
-    attr_accessor :casted_by_property
-
-    def self.[](hash, property, parent = nil)
-      obj = super(hash)
-      obj.casted_by_property = property
-      obj.casted_by = parent unless parent.nil?
-      obj
-    end
-
-    # needed for dirty
-    def attributes
-      self
-    end
-
-    def []= key, obj
-      couchrest_attribute_will_change!(key) if use_dirty? && obj != self[key]
-      super(key, obj)
-    end
-
-    def delete(key)
-      couchrest_attribute_will_change!(key) if use_dirty? && include?(key)
-      super(key)
-    end
-
-    def merge!(other_hash)
-      if use_dirty? && other_hash && other_hash.kind_of?(Hash)
-        other_hash.keys.each do |key|
-          if self[key] != other_hash[key] || !include?(key)
-            couchrest_attribute_will_change!(key)
-          end
-        end
-      end
-      super(other_hash)
-    end
-
-    def replace(other_hash)
-      if use_dirty? && other_hash && other_hash.kind_of?(Hash)
-        # new keys and changed keys
-        other_hash.keys.each do |key|
-          if self[key] != other_hash[key] || !include?(key) 
-            couchrest_attribute_will_change!(key) 
-          end
-        end
-        # old keys
-        old_keys = self.keys.reject { |key| other_hash.include?(key) }
-        old_keys.each { |key| couchrest_attribute_will_change!(key) }
-      end
-
-      super(other_hash)
-    end
-
-    def clear
-      self.keys.each { |key| couchrest_attribute_will_change!(key) } if use_dirty?
-      super
-    end
-
-    def delete_if
-      if use_dirty? && block_given?
-        self.keys.each do |key|
-          couchrest_attribute_will_change!(key) if yield key, self[key]
-        end
-      end
-      super
-    end
-
-    # ruby 1.9 
-    def keep_if
-      if use_dirty? && block_given?
-        self.keys.each do |key|
-          couchrest_attribute_will_change!(key) if !yield key, self[key]
-        end
-      end
-      super
-    end
-
-  end
-end