tenacity 0.5.1 → 0.5.2

data/EXTEND.rdoc

@@ -1,7 +1,7 @@
 For Tenacity to interact with a database client, the client needs to be extended
 to support the methods listed below.  Beyond that, no additional configuration
-or code is necessary.  Tenacity communicates with the client using these methods
-only, so as long as they have been implemented and are available on the model
+or code is necessary.  Tenacity communicates with the client using only these
+methods, so as long as they have been implemented and are available on the model
 object, Tenacity will be able to manage the object's relationships.
 
 
@@ -16,7 +16,7 @@ lib/tenacity/association.rb.
 
   _t_id_type
 
-The type to use when storing instances of this class in a database.
+The type to use when storing ids from instances of this class in a database.
 Usually String or Integer.
 
   _t_find(id)
@@ -90,3 +90,10 @@ when the after the object has been deleted.
 Reload the object from the database, overwriting the objects properties with
 the data fetched from the database.  Returns the instance of the class (self).
 
+  _t_save_if_dirty
+
+Save the object to the database only if the object has changed.  This is solely
+for performance.  If the client library does not support dirty tracking, this
+method can simply save the object.  Returns the result of the save operation
+if the object was saved, or false if the object was not saved.
+

data/Gemfile

@@ -1,4 +1,3 @@
-source "http://rubygems.org"
-source :gemcutter
+source :rubygems
 
 gemspec

data/README.rdoc

@@ -32,7 +32,7 @@ much the same way, supporting many of the same options.
     t_belongs_to :car
   end
 
-  class Dashboard < CouchRest::ExtendedDocument
+  class Dashboard < CouchRest::Model::Base
     include Tenacity
     use_database MY_COUCHDB_DATABASE
 
@@ -83,7 +83,7 @@ much the same way, supporting many of the same options.
 == Supported Database Clients
 
 * ActiveRecord
-* CouchRest (CouchModel and ExtendedDocument)
+* CouchRest (CouchRest::Model and ExtendedDocument)
 * DataMapper
 * MongoMapper
 * Mongoid
@@ -107,6 +107,7 @@ See EXTEND.rdoc for information on extending Tenacity to work with other databas
 * Start a feature/bugfix branch
 * Commit and push until you are happy with your contribution
 * Make sure to add tests for it. This is important so I don't break it in a future version unintentionally.
+* Run the tests in ruby 1.8.7 and 1.9.2 on the master and active_support_2_x branches
 * Please try not to mess with the Rakefile, version, or history. If you want to have your own version, or is otherwise necessary, that is fine, but please isolate to its own commit so I can cherry-pick around it.
 
 

data/Rakefile

@@ -38,6 +38,12 @@ task :long_test do
   Rake::Task["test"].invoke
 end
 
+# Usage: rake 'single_test["test/association_features/belongs_to_test.rb", "/memoize the association/"]'
+desc "Run a single test"
+task :single_test, [:test_file, :test_name] do |test, args|
+ system "ruby -I'lib:lib:test:test/fixtures' #{args['test_file']} -n #{args['test_name']}"
+end
+
 Rcov::RcovTask.new do |test|
   test.libs << 'test' << 'test/fixtures'
   test.pattern = 'test/**/*_test.rb'

data/history.txt

@@ -1,3 +1,14 @@
+== 0.5.2
+
+* Bug fixes
+
+  * Changed relational DB clients to evaluate the schema to determine the type
+    of the primary key, instead of just assuming it is an Integer
+
+* Minor enhancements
+
+  * Performance optimizations
+
 == 0.5.1
 
 * Bug fixes

data/lib/tenacity/associate_proxy.rb

@@ -27,7 +27,7 @@ module Tenacity
       if @association.readonly?
         raise ReadOnlyError
       else
-        @target.save
+        @target._t_save_if_dirty
       end
     end
 

data/lib/tenacity/associates_proxy.rb

@@ -19,18 +19,18 @@ module Tenacity
     end
 
     def <<(object)
-      object.save unless @parent.id.nil?
+      object._t_save_if_dirty unless @parent.id.nil?
       @target << AssociateProxy.new(object, @association)
     end
 
     def push(*objects)
-      objects.each { |object| object.save } unless @parent.id.nil?
+      objects.each { |object| object._t_save_if_dirty } unless @parent.id.nil?
       proxies = objects.map { |object| AssociateProxy.new(object, @association) }
       @target.push(*proxies)
     end
 
     def concat(objects)
-      objects.each { |object| object.save } unless @parent.id.nil?
+      objects.each { |object| object._t_save_if_dirty } unless @parent.id.nil?
       proxies = objects.map { |object| AssociateProxy.new(object, @association) }
       @target.concat(proxies)
     end
@@ -53,7 +53,7 @@ module Tenacity
 
     def remove_associates_from_parent
       @parent._t_remove_associates(@association)
-      @parent.save
+      @parent._t_save_if_dirty
     end
 
     def method_missing(method, *args)

data/lib/tenacity/associations/has_many.rb

@@ -10,13 +10,13 @@ module Tenacity
         associates = has_many_associates(association)
         unless associates.nil? || associates.empty?
           if association.dependent == :destroy
-            associates.each { |associate| association.associate_class._t_delete([_t_serialize(associate.id)]) }
+            associates.each { |associate| association.associate_class._t_delete(_t_serialize(associate.id)) }
           elsif association.dependent == :delete_all
-            associates.each { |associate| association.associate_class._t_delete([_t_serialize(associate.id)], false) }
+            associates.each { |associate| association.associate_class._t_delete(_t_serialize(associate.id), false) }
           elsif association.dependent == :nullify
             associates.each do |associate|
               associate.send "#{association.foreign_key(self.class)}=", nil
-              associate.save
+              associate._t_save_if_dirty
             end
           elsif association.foreign_key_constraints_enabled?
             raise ObjectIdInUseError.new("Unable to delete #{self.class} with id of #{self.id} because its id is being referenced by instances of #{associates.first.class}(id: #{associates.map(&:id).join(',')})!")
@@ -60,7 +60,7 @@ module Tenacity
 
       def save_without_callback
         @perform_save_associates_callback = false
-        save
+        _t_save_if_dirty
       ensure
         @perform_save_associates_callback = true
       end
@@ -95,16 +95,15 @@ module Tenacity
           # be fetched here, before we clear them out in the database.
           old_associates.first
 
-          _t_clear_old_associations(record, association)
+          _t_clear_old_associations(record, association, old_associates)
 
           associates = (record.instance_variable_get(record._t_ivar_name(association))) || []
           establish_relationship_in_target_objects(record, association, associates)
           destroy_orphaned_associates(association, old_associates, associates)
         end
 
-        def _t_clear_old_associations(record, association)
+        def _t_clear_old_associations(record, association, old_associates)
           property_name = association.foreign_key(record.class)
-          old_associates = get_current_associates(record, association)
           old_associates.each do |old_associate|
             old_associate.send("#{property_name}=", nil)
             save_associate(old_associate)
@@ -112,7 +111,7 @@ module Tenacity
         end
 
         def save_associate(associate)
-          associate.respond_to?(:_t_save_without_callback) ? associate._t_save_without_callback : associate.save
+          associate.respond_to?(:_t_save_without_callback) ? associate._t_save_without_callback : associate._t_save_if_dirty
         end
 
         def get_current_associates(record, association)

data/lib/tenacity/associations/has_one.rb

@@ -6,12 +6,12 @@ module Tenacity
         associate = has_one_associate(association)
         unless associate.nil?
           if association.dependent == :destroy
-            association.associate_class._t_delete([_t_serialize(associate.id)])
+            association.associate_class._t_delete(_t_serialize(associate.id))
           elsif association.dependent == :delete
-            association.associate_class._t_delete([_t_serialize(associate.id)], false)
+            association.associate_class._t_delete(_t_serialize(associate.id), false)
           elsif association.dependent == :nullify
             associate.send "#{association.foreign_key(self.class)}=", nil
-            associate.save
+            associate._t_save_if_dirty
           elsif association.foreign_key_constraints_enabled?
             raise ObjectIdInUseError.new("Unable to delete #{self.class} with id of #{self.id} because its id is being referenced by an instance of #{associate.class}(id: #{associate.id})!")
           end
@@ -28,7 +28,7 @@ module Tenacity
       def set_has_one_associate(association, associate)
         associate.send "#{association.foreign_key(self.class)}=", _t_serialize(self.id, association)
         associate.send "#{association.polymorphic_type}=", self.class.to_s if association.polymorphic?
-        associate.save unless association.autosave == false
+        associate._t_save_if_dirty unless association.autosave == false
         associate
       end
 

data/lib/tenacity/class_methods.rb

@@ -417,7 +417,7 @@ module Tenacity
         object_id.to_s
       elsif object_id.nil?
         nil
-      elsif [Fixnum].include?(object_id.class)
+      elsif [Fixnum, Integer].include?(object_id.class)
         object_id
       else
         object_id.to_s

data/lib/tenacity/errors.rb

@@ -1,17 +1,13 @@
 module Tenacity
   # Generic Tenacity exception class.
-  class TenacityError < StandardError
-  end
+  class TenacityError < StandardError; end
 
   # Raised on attempt to update an associate that is instantiated as read only.
-  class ReadOnlyError < TenacityError
-  end
+  class ReadOnlyError < TenacityError; end
 
   # Raised when one of the objects specified in the relationship does not exist in the database
-  class ObjectDoesNotExistError < TenacityError
-  end
+  class ObjectDoesNotExistError < TenacityError; end
 
   # Rasied when an attempt is made to delete an object whose id is in use by an association
-  class ObjectIdInUseError < TenacityError
-  end
+  class ObjectIdInUseError < TenacityError; end
 end

data/lib/tenacity/instance_methods.rb

@@ -35,7 +35,7 @@ module Tenacity
     private
 
     def autosave_save_or_destroy(associate)
-      associate.marked_for_destruction? ? autosave_destroy(associate) : associate.save
+      associate.marked_for_destruction? ? autosave_destroy(associate) : associate._t_save_if_dirty
     end
 
     def autosave_destroy(associate)
@@ -48,7 +48,7 @@ module Tenacity
         has_one_associate = associate.has_one_associate(association)
         if has_one_associate
           has_one_associate.send "#{association.foreign_key(associate.class)}=", nil
-          has_one_associate.save
+          has_one_associate._t_save_if_dirty
         end
       end
     end

data/lib/tenacity/orm_ext/activerecord.rb

@@ -49,7 +49,7 @@ module Tenacity
         include Tenacity::OrmExt::Helpers
 
         def _t_id_type
-          Integer
+          @_t_id_type_clazz ||= Kernel.const_get(columns.find{ |x| x.primary }.type.to_s.capitalize)
         end
 
         def _t_find(id)
@@ -107,6 +107,10 @@ module Tenacity
           reload
           self
         end
+
+        def _t_save_if_dirty
+          changed? ? save : false
+        end
       end
 
     end

data/lib/tenacity/orm_ext/couchrest.rb

@@ -144,6 +144,10 @@ module Tenacity
           end
           self
         end
+
+        def _t_save_if_dirty
+          save
+        end
       end
 
     end

data/lib/tenacity/orm_ext/datamapper.rb

@@ -49,7 +49,7 @@ module Tenacity
         include Tenacity::OrmExt::Helpers
 
         def _t_id_type
-          Integer
+          @_t_id_type_clazz ||= properties.find{ |x| x.key? }.primitive
         end
 
         def _t_find(id)
@@ -134,6 +134,10 @@ module Tenacity
           self.class._t_find(self.id)
         end
 
+        def _t_save_if_dirty
+          dirty? ? save : false
+        end
+
         private
 
         def taint!

data/lib/tenacity/orm_ext/helpers.rb

@@ -5,10 +5,10 @@ module Tenacity
       def id_class_for(association)
         if association.polymorphic?
           String
-        elsif association.type == :belongs_to
-          association.source._t_id_type
-        else
+        elsif association.type == :t_belongs_to
           association.associate_class._t_id_type
+        else
+          raise "Unable to determine id class for type: #{association.type}, source: #{association.source}, target: #{association.associate_class}"
         end
       end
 

data/lib/tenacity/orm_ext/mongo_mapper.rb

@@ -110,6 +110,10 @@ module Tenacity
           end
           self
         end
+
+        def _t_save_if_dirty
+          changed? ? save : false
+        end
       end
 
     end

data/lib/tenacity/orm_ext/mongoid.rb

@@ -112,6 +112,10 @@ module Tenacity
           reload
           self
         end
+
+        def _t_save_if_dirty
+          changed? ? save : false
+        end
       end
 
     end

data/lib/tenacity/orm_ext/ripple.rb

@@ -139,6 +139,10 @@ module Tenacity
           self
         end
 
+        def _t_save_if_dirty
+          changed? ? save : false
+        end
+
         def save
           before_save
           super

data/lib/tenacity/orm_ext/sequel.rb

@@ -55,7 +55,7 @@ module Tenacity
         attr_accessor :_t_belongs_to_associations
 
         def _t_id_type
-          Integer
+          @_t_id_type_clazz ||= Kernel.const_get(db_schema.values.find{ |x| x[:primary_key] == true }[:type].to_s.capitalize)
         end
 
         def _t_find(id)
@@ -142,6 +142,10 @@ module Tenacity
           reload
           self
         end
+
+        def _t_save_if_dirty
+          !changed_columns.empty? ? save : false
+        end
       end
 
     end

data/lib/tenacity/orm_ext/toystore.rb

@@ -108,6 +108,10 @@ module Tenacity
           reload
           self
         end
+
+        def _t_save_if_dirty
+          changed? ? save : false
+        end
       end
     end
   end

data/lib/tenacity/version.rb

@@ -1,3 +1,3 @@
 module Tenacity
-  VERSION = "0.5.1"
+  VERSION = "0.5.2"
 end

data/test/associations/belongs_to_test.rb

@@ -9,11 +9,11 @@ class BelongsToTest < Test::Unit::TestCase
 
         @source_class = class_for_extension(source)
         @source = @source_class.create({})
-        @target_class = class_for_extension(target, :belongs_to)
+        @target_class = class_for_extension(target, :t_belongs_to)
         @target = @target_class.create({})
 
-        @foreign_key = foreign_key_for(source, :belongs_to)
-        @foreign_key_id = foreign_key_id_for(source, :belongs_to)
+        @foreign_key = foreign_key_for(source, :t_belongs_to)
+        @foreign_key_id = foreign_key_id_for(source, :t_belongs_to)
       end
 
       should "be able to fetch the id of the associated object" do

data/test/associations/has_many_test.rb

@@ -9,13 +9,13 @@ class HasManyTest < Test::Unit::TestCase
 
         @source_class = class_for_extension(source)
         @source = @source_class.create({})
-        @target_class = class_for_extension(target, :has_many)
+        @target_class = class_for_extension(target, :t_has_many)
         @target_1 = @target_class.create({})
         @target_2 = @target_class.create({})
         @target_3 = @target_class.create({})
 
-        @foreign_key = foreign_key_for(target, :has_many)
-        @foreign_key_id = foreign_key_id_for(target, :has_many)
+        @foreign_key = foreign_key_for(target, :t_has_many)
+        @foreign_key_id = foreign_key_id_for(target, :t_has_many)
       end
 
       should "be able to set the associated objects by their ids" do
@@ -109,9 +109,9 @@ class HasManyTest < Test::Unit::TestCase
           assert_not_nil @target_class._t_find(serialize_id(@target_1))
           assert_not_nil @target_class._t_find(serialize_id(@target_2))
           assert_not_nil @target_class._t_find(serialize_id(@target_3))
-          assert_nil @target_class._t_find(serialize_id(@target_1)).send(foreign_key_id_for(target, :belongs_to))
-          assert_nil @target_class._t_find(serialize_id(@target_2)).send(foreign_key_id_for(target, :belongs_to))
-          assert_nil @target_class._t_find(serialize_id(@target_3)).send(foreign_key_id_for(target, :belongs_to))
+          assert_nil @target_class._t_find(serialize_id(@target_1)).send(foreign_key_id_for(target, :t_belongs_to))
+          assert_nil @target_class._t_find(serialize_id(@target_2)).send(foreign_key_id_for(target, :t_belongs_to))
+          assert_nil @target_class._t_find(serialize_id(@target_3)).send(foreign_key_id_for(target, :t_belongs_to))
         end
       end