tenacity 0.5.5 → 0.5.6

data/THANKS.md

@@ -6,6 +6,7 @@ following people have contributed to the project by reporting problems,
 suggesting improvements, or submitting changes.
 
  * [danielgranat](http://github.com/danielgranat)
+ * [raphaelcm](http://github.com/raphaelcm)
  
 Patches are welcome. The primary source for this software project is [on Github](http://github.com/jwood/tenacity)
 

data/history.txt

@@ -1,3 +1,9 @@
+== 0.5.6
+
+* Bug fixes
+
+  * Fixed a few issues with regards to how ActiveRecord::Base.save behaves (raphaelcm)
+
 == 0.5.5
 
 * Bug fixes

data/lib/tenacity/associate_proxy.rb

@@ -23,11 +23,11 @@ module Tenacity
       @target.inspect
     end
 
-    def save
+    def save(*args)
       if @association.readonly?
         raise ReadOnlyError
       else
-        @target._t_save_if_dirty
+        @target._t_save_if_dirty(*args)
       end
     end
 

data/lib/tenacity/orm_ext/activerecord.rb

@@ -112,8 +112,8 @@ module Tenacity
           self
         end
 
-        def _t_save_if_dirty
-          changed? ? save : false
+        def _t_save_if_dirty(*args)
+          changed? ? save(*args) : true
         end
       end
 

data/lib/tenacity/orm_ext/couchrest.rb

@@ -145,8 +145,8 @@ module Tenacity
           self
         end
 
-        def _t_save_if_dirty
-          save
+        def _t_save_if_dirty(*args)
+          save(*args)
         end
       end
 

data/lib/tenacity/orm_ext/datamapper.rb

@@ -138,8 +138,8 @@ module Tenacity
           self.class._t_find(self.id)
         end
 
-        def _t_save_if_dirty
-          dirty? ? save : false
+        def _t_save_if_dirty(*args)
+          dirty? ? save(*args) : true
         end
 
         private

data/lib/tenacity/orm_ext/mongo_mapper.rb

@@ -111,8 +111,8 @@ module Tenacity
           self
         end
 
-        def _t_save_if_dirty
-          changed? ? save : false
+        def _t_save_if_dirty(*args)
+          changed? ? save(*args) : true
         end
       end
 

data/lib/tenacity/orm_ext/mongoid.rb

@@ -113,8 +113,8 @@ module Tenacity
           self
         end
 
-        def _t_save_if_dirty
-          changed? ? save : false
+        def _t_save_if_dirty(*args)
+          changed? ? save(*args) : true
         end
       end
 

data/lib/tenacity/orm_ext/ripple.rb

@@ -139,8 +139,8 @@ module Tenacity
           self
         end
 
-        def _t_save_if_dirty
-          changed? ? save : false
+        def _t_save_if_dirty(*args)
+          changed? ? save(*args) : true
         end
 
         def save

data/lib/tenacity/orm_ext/sequel.rb

@@ -147,8 +147,8 @@ module Tenacity
           self
         end
 
-        def _t_save_if_dirty
-          !changed_columns.empty? ? save : false
+        def _t_save_if_dirty(*args)
+          !changed_columns.empty? ? save(*args) : true
         end
       end
 

data/lib/tenacity/orm_ext/toystore.rb

@@ -109,8 +109,8 @@ module Tenacity
           self
         end
 
-        def _t_save_if_dirty
-          changed? ? save : false
+        def _t_save_if_dirty(*args)
+          changed? ? save(*args) : true
         end
       end
     end

data/lib/tenacity/version.rb

@@ -1,3 +1,3 @@
 module Tenacity
-  VERSION = "0.5.5"
+  VERSION = "0.5.6"
 end

data/tenacity.gemspec

@@ -18,35 +18,36 @@ Gem::Specification.new do |s|
 
   s.add_runtime_dependency "activesupport", ">= 2.3"
 
-  s.add_development_dependency "bundler", "~> 1.0.0"
-  s.add_development_dependency "rake", "~> 0.8.7"
-  s.add_development_dependency "rcov", "~> 0.9.9"
-  s.add_development_dependency "shoulda", "~> 2.11.3"
-  s.add_development_dependency "mocha", "~> 0.9.10"
-  s.add_development_dependency "yard", "~> 0.6.4"
+  s.add_development_dependency "bundler", ">= 1.0.0"
+  s.add_development_dependency "rake", ">= 0.8.7"
+  s.add_development_dependency "rcov", "0.9.9"
+  s.add_development_dependency "shoulda", "2.11.3"
+  s.add_development_dependency "mocha", "0.9.10"
+  s.add_development_dependency "yard", "0.6.4"
 
   # Relational DBs
-  s.add_development_dependency "sqlite3-ruby", "~> 1.3.1"
-  s.add_development_dependency "activerecord", "~> 3.0.0"
-  s.add_development_dependency "datamapper", "~> 1.0.2"
-  s.add_development_dependency "dm-sqlite-adapter", "~> 1.0.2"
-  s.add_development_dependency "sequel", "~> 3.19.0"
+  s.add_development_dependency "sqlite3-ruby", "1.3.1"
+  s.add_development_dependency "activerecord", "3.0.7"
+  s.add_development_dependency "datamapper", "1.0.2"
+  s.add_development_dependency "dm-sqlite-adapter", "1.0.2"
+  s.add_development_dependency "sequel", "3.19.0"
 
   # MongoDB
-  s.add_development_dependency "mongo_mapper", "~> 0.9.0"
-  s.add_development_dependency "bson_ext", "~> 1.3.0"
-  s.add_development_dependency "mongoid", "~> 2.0.0"
+  s.add_development_dependency "mongo_mapper", "0.9.0"
+  s.add_development_dependency "mongo", "1.6.2"
+  s.add_development_dependency "bson_ext", "1.6.2"
+  s.add_development_dependency "mongoid", "2.0.0"
 
   # CouchDB
-  s.add_development_dependency "couchrest", "~> 1.0.0"
-  s.add_development_dependency "couchrest_model", "~> 1.0.0"
+  s.add_development_dependency "couchrest", "1.0.2"
+  s.add_development_dependency "couchrest_model", "1.0.0"
 
   # Riak
-  s.add_development_dependency "ripple", "~> 0.9.2"
+  s.add_development_dependency "ripple", "0.9.2"
 
   # Multiple
-  s.add_development_dependency "toystore", "~> 0.8.0"
-  s.add_development_dependency "adapter-mongo", "~> 0.5.2"
+  s.add_development_dependency "toystore", "0.8.0"
+  s.add_development_dependency "adapter-mongo", "0.5.4"
 
   s.files        = `git ls-files`.split("\n")
   s.executables  = `git ls-files`.split("\n").map{|f| f =~ /^bin\/(.*)/ ? $1 : nil}.compact

data/test/fixtures/active_record_organization.rb

@@ -0,0 +1,5 @@
+class ActiveRecordOrganization < ActiveRecord::Base
+  include Tenacity
+  
+  has_many :active_record_users
+end

data/test/fixtures/active_record_user.rb

@@ -0,0 +1,5 @@
+class ActiveRecordUser < ActiveRecord::Base
+  include Tenacity
+  
+  belongs_to :active_record_organization, :autosave => true
+end

data/test/fixtures/mongoid_campus_hub.rb

@@ -0,0 +1,9 @@
+require_mongoid do
+  class MongoidCampusHub
+    include Mongoid::Document
+    include Mongoid::Timestamps
+    include Tenacity
+
+    t_belongs_to :active_record_organization
+  end
+end

data/test/helpers/active_record_test_helper.rb

@@ -29,6 +29,13 @@ ActiveRecord::Schema.define :version => 0 do
   create_table :active_record_object_with_string_ids, :force => true, :id => false do |t|
     t.string :id, :limit => 36, :primary => true
   end
+  
+  create_table :active_record_users, :force => true do |t|
+    t.integer :active_record_organization_id
+  end
+  
+  create_table :active_record_organizations, :force => true do |t|
+  end
 
   create_table :active_record_has_one_targets, :force => true do |t|
     t.integer :active_record_object_id

data/test/orm_ext/activerecord_test.rb

@@ -98,9 +98,15 @@ class ActiveRecordTest < Test::Unit::TestCase
       assert object._t_save_if_dirty
     end
 
+    should "return true for save if valid object is not dirty" do
+      object = ActiveRecordObject.create
+      assert object.save
+    end
+
     should "not save the object if it is not dirty" do
       object = ActiveRecordObject.create
-      assert !object._t_save_if_dirty
+      ActiveRecordObject.any_instance.stubs(:save).raises(RuntimeError.new("should not have called this"))
+      assert object._t_save_if_dirty
     end
 
     should "be able to successfully determine the id type" do
@@ -110,6 +116,19 @@ class ActiveRecordTest < Test::Unit::TestCase
       class ActiveRecordObjectWithNoTable < ActiveRecord::Base; include Tenacity; end
       assert_equal Integer, ActiveRecordObjectWithNoTable._t_id_type
     end
+
+    require_mongoid do
+      should "successfully save if belongs_to another AR object which is assigned from a mongoid object" do
+        org = ActiveRecordOrganization.create
+        campus_hub = MongoidCampusHub.create
+        campus_hub.active_record_organization = org
+        campus_hub.save!
+        user = ActiveRecordUser.new
+        user.active_record_organization = campus_hub.active_record_organization
+        assert user.save
+        assert user.active_record_organization.save(:validate => false)
+      end
+    end
   end
 
   private

data/test/orm_ext/datamapper_test.rb

@@ -89,9 +89,15 @@ class DataMapperTest < Test::Unit::TestCase
       assert object._t_save_if_dirty
     end
 
+    should "return true for save if valid object is not dirty" do
+      object = DataMapperObject.create
+      assert object.save
+    end
+
     should "not save the object if it is not dirty" do
       object = DataMapperObject.create
-      assert !object._t_save_if_dirty
+      DataMapperObject.any_instance.stubs(:save).raises(RuntimeError.new("should not have called this"))
+      assert object._t_save_if_dirty
     end
 
     should "be able to successfully determine the id type" do

data/test/orm_ext/mongo_mapper_test.rb

@@ -99,9 +99,15 @@ class MongoMapperTest < Test::Unit::TestCase
       assert object._t_save_if_dirty
     end
 
+    should "return true for save if valid object is not dirty" do
+      object = MongoMapperObject.create
+      assert object.save
+    end
+
     should "not save the object if it is not dirty" do
       object = MongoMapperObject.create
-      assert !object._t_save_if_dirty
+      MongoMapperObject.any_instance.stubs(:save).raises(RuntimeError.new("should not have called this"))
+      assert object._t_save_if_dirty
     end
   end
 

data/test/orm_ext/mongoid_test.rb

@@ -100,9 +100,15 @@ require_mongoid do
         assert object._t_save_if_dirty
       end
 
+      should "return true for save if valid object is not dirty" do
+        object = MongoidObject.create
+        assert object.save
+      end
+      
       should "not save the object if it is not dirty" do
         object = MongoidObject.create
-        assert !object._t_save_if_dirty
+        MongoidObject.any_instance.stubs(:save).raises(RuntimeError.new("should not have called this"))
+        assert object._t_save_if_dirty
       end
     end
 

data/test/orm_ext/ripple_test.rb

@@ -139,9 +139,15 @@ if ENV['LONG'] == 'true'
           assert object._t_save_if_dirty
         end
 
+        should "return true for save if valid object is not dirty" do
+          object = RippleObject.create
+          assert object.save
+        end
+        
         should "not save the object if it is not dirty" do
           object = RippleObject.create
-          assert !object._t_save_if_dirty
+          RippleObject.any_instance.stubs(:save).raises(RuntimeError.new("should not have called this"))
+          assert object._t_save_if_dirty
         end
       end
 

data/test/orm_ext/sequel_test.rb

@@ -99,9 +99,15 @@ class SequelTest < Test::Unit::TestCase
       assert object._t_save_if_dirty
     end
 
+    should "return true for save if valid object is not dirty" do
+      object = SequelObject.create
+      assert object.save
+    end
+    
     should "not save the object if it is not dirty" do
       object = SequelObject.create
-      assert !object._t_save_if_dirty
+      SequelObject.any_instance.stubs(:save).raises(RuntimeError.new("should not have called this"))
+      assert object._t_save_if_dirty
     end
 
     should "be able to successfully determine the id type" do

data/test/orm_ext/toystore_test.rb

@@ -101,9 +101,15 @@ require_toystore do
         assert object._t_save_if_dirty
       end
 
+      should "return true for save if valid object is not dirty" do
+        object = ToystoreObject.create
+        assert object.save
+      end
+      
       should "not save the object if it is not dirty" do
         object = ToystoreObject.create
-        assert !object._t_save_if_dirty
+        ToystoreObject.any_instance.stubs(:save).raises(RuntimeError.new("should not have called this"))
+        assert object._t_save_if_dirty
       end
     end
 

data/test/test_helper.rb

@@ -35,7 +35,7 @@ def setup_fixtures
       filename =~ /.*\/(.*)\.rb/
       clazz = Kernel.const_get($1.camelcase)
       if clazz.respond_to?(:delete_all)
-        clazz.delete_all
+        clazz.delete_all rescue true
       elsif clazz.respond_to?(:db)
         clazz.db["delete from #{clazz.table_name}"].delete
       elsif clazz.respond_to?(:destroy!)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tenacity
 version: !ruby/object:Gem::Version
-  version: 0.5.5
+  version: 0.5.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-06 00:00:00.000000000Z
+date: 2012-04-24 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &2156358940 !ruby/object:Gem::Requirement
+  requirement: &2166038440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,216 +21,227 @@ dependencies:
         version: '2.3'
   type: :runtime
   prerelease: false
-  version_requirements: *2156358940
+  version_requirements: *2166038440
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &2156355320 !ruby/object:Gem::Requirement
+  requirement: &2166037340 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *2156355320
+  version_requirements: *2166037340
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2156353760 !ruby/object:Gem::Requirement
+  requirement: &2166036260 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.8.7
   type: :development
   prerelease: false
-  version_requirements: *2156353760
+  version_requirements: *2166036260
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &2156339720 !ruby/object:Gem::Requirement
+  requirement: &2166035700 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - =
       - !ruby/object:Gem::Version
         version: 0.9.9
   type: :development
   prerelease: false
-  version_requirements: *2156339720
+  version_requirements: *2166035700
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &2156338680 !ruby/object:Gem::Requirement
+  requirement: &2166035160 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - =
       - !ruby/object:Gem::Version
         version: 2.11.3
   type: :development
   prerelease: false
-  version_requirements: *2156338680
+  version_requirements: *2166035160
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &2156337580 !ruby/object:Gem::Requirement
+  requirement: &2166034420 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - =
       - !ruby/object:Gem::Version
         version: 0.9.10
   type: :development
   prerelease: false
-  version_requirements: *2156337580
+  version_requirements: *2166034420
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &2156336420 !ruby/object:Gem::Requirement
+  requirement: &2166033900 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - =
       - !ruby/object:Gem::Version
         version: 0.6.4
   type: :development
   prerelease: false
-  version_requirements: *2156336420
+  version_requirements: *2166033900
 - !ruby/object:Gem::Dependency
   name: sqlite3-ruby
-  requirement: &2156335080 !ruby/object:Gem::Requirement
+  requirement: &2166026620 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - =
       - !ruby/object:Gem::Version
         version: 1.3.1
   type: :development
   prerelease: false
-  version_requirements: *2156335080
+  version_requirements: *2166026620
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &2156333400 !ruby/object:Gem::Requirement
+  requirement: &2166025660 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - =
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 3.0.7
   type: :development
   prerelease: false
-  version_requirements: *2156333400
+  version_requirements: *2166025660
 - !ruby/object:Gem::Dependency
   name: datamapper
-  requirement: &2156325060 !ruby/object:Gem::Requirement
+  requirement: &2166024660 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - =
       - !ruby/object:Gem::Version
         version: 1.0.2
   type: :development
   prerelease: false
-  version_requirements: *2156325060
+  version_requirements: *2166024660
 - !ruby/object:Gem::Dependency
   name: dm-sqlite-adapter
-  requirement: &2156316080 !ruby/object:Gem::Requirement
+  requirement: &2166023980 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - =
       - !ruby/object:Gem::Version
         version: 1.0.2
   type: :development
   prerelease: false
-  version_requirements: *2156316080
+  version_requirements: *2166023980
 - !ruby/object:Gem::Dependency
   name: sequel
-  requirement: &2156314280 !ruby/object:Gem::Requirement
+  requirement: &2166023360 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - =
       - !ruby/object:Gem::Version
         version: 3.19.0
   type: :development
   prerelease: false
-  version_requirements: *2156314280
+  version_requirements: *2166023360
 - !ruby/object:Gem::Dependency
   name: mongo_mapper
-  requirement: &2156313060 !ruby/object:Gem::Requirement
+  requirement: &2166022540 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - =
       - !ruby/object:Gem::Version
         version: 0.9.0
   type: :development
   prerelease: false
-  version_requirements: *2156313060
+  version_requirements: *2166022540
+- !ruby/object:Gem::Dependency
+  name: mongo
+  requirement: &2166021980 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - =
+      - !ruby/object:Gem::Version
+        version: 1.6.2
+  type: :development
+  prerelease: false
+  version_requirements: *2166021980
 - !ruby/object:Gem::Dependency
   name: bson_ext
-  requirement: &2156311420 !ruby/object:Gem::Requirement
+  requirement: &2166021220 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - =
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: 1.6.2
   type: :development
   prerelease: false
-  version_requirements: *2156311420
+  version_requirements: *2166021220
 - !ruby/object:Gem::Dependency
   name: mongoid
-  requirement: &2156293240 !ruby/object:Gem::Requirement
+  requirement: &2166020340 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - =
       - !ruby/object:Gem::Version
         version: 2.0.0
   type: :development
   prerelease: false
-  version_requirements: *2156293240
+  version_requirements: *2166020340
 - !ruby/object:Gem::Dependency
   name: couchrest
-  requirement: &2156291780 !ruby/object:Gem::Requirement
+  requirement: &2166019620 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - =
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.0.2
   type: :development
   prerelease: false
-  version_requirements: *2156291780
+  version_requirements: *2166019620
 - !ruby/object:Gem::Dependency
   name: couchrest_model
-  requirement: &2156290520 !ruby/object:Gem::Requirement
+  requirement: &2166018920 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - =
       - !ruby/object:Gem::Version
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *2156290520
+  version_requirements: *2166018920
 - !ruby/object:Gem::Dependency
   name: ripple
-  requirement: &2156288920 !ruby/object:Gem::Requirement
+  requirement: &2166006820 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - =
       - !ruby/object:Gem::Version
         version: 0.9.2
   type: :development
   prerelease: false
-  version_requirements: *2156288920
+  version_requirements: *2166006820
 - !ruby/object:Gem::Dependency
   name: toystore
-  requirement: &2156286980 !ruby/object:Gem::Requirement
+  requirement: &2166006240 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - =
       - !ruby/object:Gem::Version
         version: 0.8.0
   type: :development
   prerelease: false
-  version_requirements: *2156286980
+  version_requirements: *2166006240
 - !ruby/object:Gem::Dependency
   name: adapter-mongo
-  requirement: &2156284020 !ruby/object:Gem::Requirement
+  requirement: &2166005580 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - =
       - !ruby/object:Gem::Version
-        version: 0.5.2
+        version: 0.5.4
   type: :development
   prerelease: false
-  version_requirements: *2156284020
+  version_requirements: *2166005580
 description: Tenacity provides a database client independent way of specifying simple
   relationships between models backed by different databases.
 email:
@@ -283,6 +294,8 @@ files:
 - test/fixtures/active_record_nut.rb
 - test/fixtures/active_record_object.rb
 - test/fixtures/active_record_object_with_string_id.rb
+- test/fixtures/active_record_organization.rb
+- test/fixtures/active_record_user.rb
 - test/fixtures/couch_rest_door.rb
 - test/fixtures/couch_rest_has_many_target.rb
 - test/fixtures/couch_rest_has_one_target.rb
@@ -307,6 +320,7 @@ files:
 - test/fixtures/mongo_mapper_vent.rb
 - test/fixtures/mongo_mapper_wheel.rb
 - test/fixtures/mongo_mapper_windows.rb
+- test/fixtures/mongoid_campus_hub.rb
 - test/fixtures/mongoid_has_many_target.rb
 - test/fixtures/mongoid_has_one_target.rb
 - test/fixtures/mongoid_object.rb
@@ -353,7 +367,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3771239550566841949
+      hash: -2311103628650336274
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: