tenacity 0.5.2 → 0.5.3

data/THANKS.md

@@ -0,0 +1,11 @@
+Tenacity THANKS
+===============
+
+Tenacity was originally developed by [John Wood](http://github.com/jwood).  The
+following people have contributed to the project by reporting problems,
+suggesting improvements, or submitting changes.
+
+ * [danielgranat](http://github.com/danielgranat)
+ 
+Patches are welcome. The primary source for this software project is [on Github](http://github.com/jwood/tenacity)
+

data/history.txt

@@ -1,3 +1,10 @@
+== 0.5.3
+
+* Bug fixes
+
+  * Modified ORM extensions to use a default id type if the id type could not
+    be determined (was causing ActiveRecord migrations to fail)
+
 == 0.5.2
 
 * Bug fixes

data/lib/tenacity/associations/belongs_to.rb

@@ -6,9 +6,9 @@ module Tenacity
         associate_id = self.send(association.foreign_key)
         if associate_id != nil && associate_id.to_s.strip != ''
           if association.dependent == :destroy
-            association.associate_class._t_delete(associate_id)
+            delete_or_destroy_belongs_to_associate(association, associate_id)
           elsif association.dependent == :delete
-            association.associate_class._t_delete(associate_id, false)
+            delete_or_destroy_belongs_to_associate(association, associate_id, false)
           end
         end
       end
@@ -27,6 +27,10 @@ module Tenacity
         associate
       end
 
+      def delete_or_destroy_belongs_to_associate(association, associate_id, run_callbacks=true)
+        association.associate_class._t_delete(associate_id, run_callbacks)
+      end
+
       module ClassMethods #:nodoc:
         def initialize_belongs_to_association(association)
           _t_initialize_belongs_to_association(association) if self.respond_to?(:_t_initialize_belongs_to_association)

data/lib/tenacity/associations/has_many.rb

@@ -10,14 +10,11 @@ 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)) }
+            delete_or_destroy_has_many_associates(association, associates)
           elsif association.dependent == :delete_all
-            associates.each { |associate| association.associate_class._t_delete(_t_serialize(associate.id), false) }
+            delete_or_destroy_has_many_associates(association, associates, false)
           elsif association.dependent == :nullify
-            associates.each do |associate|
-              associate.send "#{association.foreign_key(self.class)}=", nil
-              associate._t_save_if_dirty
-            end
+            nullify_foreign_keys_for_has_many_associates(association, associates)
           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(',')})!")
           end
@@ -77,6 +74,17 @@ module Tenacity
         end
       end
 
+      def delete_or_destroy_has_many_associates(association, associates, run_callbacks=true)
+        associates.each { |associate| association.associate_class._t_delete(_t_serialize(associate.id), run_callbacks) }
+      end
+
+      def nullify_foreign_keys_for_has_many_associates(association, associates)
+        associates.each do |associate|
+          associate.send "#{association.foreign_key(self.class)}=", nil
+          associate._t_save_if_dirty
+        end
+      end
+
       module ClassMethods #:nodoc:
         def initialize_has_many_association(association)
           _t_initialize_has_many_association(association) if self.respond_to?(:_t_initialize_has_many_association)

data/lib/tenacity/associations/has_one.rb

@@ -6,12 +6,11 @@ module Tenacity
         associate = has_one_associate(association)
         unless associate.nil?
           if association.dependent == :destroy
-            association.associate_class._t_delete(_t_serialize(associate.id))
+            delete_or_destroy_has_one_associate(association, associate)
           elsif association.dependent == :delete
-            association.associate_class._t_delete(_t_serialize(associate.id), false)
+            delete_or_destroy_has_one_associate(association, associate, false)
           elsif association.dependent == :nullify
-            associate.send "#{association.foreign_key(self.class)}=", nil
-            associate._t_save_if_dirty
+            nullify_foreign_key_for_has_one_associate(association, associate)
           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
@@ -32,6 +31,15 @@ module Tenacity
         associate
       end
 
+      def delete_or_destroy_has_one_associate(association, associate, run_callbacks=true)
+        association.associate_class._t_delete(_t_serialize(associate.id), run_callbacks)
+      end
+
+      def nullify_foreign_key_for_has_one_associate(association, associate)
+        associate.send "#{association.foreign_key(self.class)}=", nil
+        associate._t_save_if_dirty
+      end
+
       module ClassMethods #:nodoc:
         def initialize_has_one_association(association)
           _t_initialize_has_one_association(association) if respond_to?(:_t_initialize_has_one_association)

data/lib/tenacity/instance_methods.rb

@@ -6,17 +6,11 @@ module Tenacity
     end
 
     def _t_save_autosave_associations
-      associations = self.class._tenacity_associations
-      self.class._tenacity_associations.select { |a| a.autosave == true }.each do |association|
+      autosave_associations.each do |association|
         if association.type == :t_has_one || association.type == :t_belongs_to
-          associate = instance_variable_get(_t_ivar_name(association))
-          autosave_save_or_destroy(associate) unless associate.nil?
+          autosave_has_one_or_belongs_to(association)
         elsif association.type == :t_has_many
-          associates = instance_variable_get(_t_ivar_name(association))
-          unless associates.nil?
-            associates.each { |associate| autosave_save_or_destroy(associate) }
-            instance_variable_set(_t_ivar_name(association), associates.reject { |associate| associate.marked_for_destruction? })
-          end
+          autosave_has_many(association)
         end
       end
     end
@@ -34,6 +28,23 @@ module Tenacity
 
     private
 
+    def autosave_associations
+      self.class._tenacity_associations.select { |a| a.autosave == true }
+    end
+
+    def autosave_has_one_or_belongs_to(association)
+      associate = instance_variable_get(_t_ivar_name(association))
+      autosave_save_or_destroy(associate) unless associate.nil?
+    end
+
+    def autosave_has_many(association)
+      associates = instance_variable_get(_t_ivar_name(association))
+      unless associates.nil?
+        associates.each { |associate| autosave_save_or_destroy(associate) }
+        instance_variable_set(_t_ivar_name(association), associates.reject { |associate| associate.marked_for_destruction? })
+      end
+    end
+
     def autosave_save_or_destroy(associate)
       associate.marked_for_destruction? ? autosave_destroy(associate) : associate._t_save_if_dirty
     end

data/lib/tenacity/orm_ext/activerecord.rb

@@ -49,7 +49,11 @@ module Tenacity
         include Tenacity::OrmExt::Helpers
 
         def _t_id_type
-          @_t_id_type_clazz ||= Kernel.const_get(columns.find{ |x| x.primary }.type.to_s.capitalize)
+          @_t_id_type_clazz ||= begin
+                                  Kernel.const_get(columns.find{ |x| x.primary }.type.to_s.capitalize)
+                                rescue
+                                  Integer
+                                end
         end
 
         def _t_find(id)

data/lib/tenacity/orm_ext/datamapper.rb

@@ -49,7 +49,11 @@ module Tenacity
         include Tenacity::OrmExt::Helpers
 
         def _t_id_type
-          @_t_id_type_clazz ||= properties.find{ |x| x.key? }.primitive
+          @_t_id_type_clazz ||= begin
+                                  properties.find{ |x| x.key? }.primitive
+                                rescue
+                                  Integer
+                                end
         end
 
         def _t_find(id)

data/lib/tenacity/orm_ext/ripple.rb

@@ -232,10 +232,10 @@ module Tenacity
 
         def store_id_in_associate_index(associate_id, bucket)
           unless associate_id.nil?
-            if bucket.exist?(associate_id)
+            begin
               object = bucket.get(associate_id)
               object.data << self.id unless object.data.include?(self.id)
-            else
+            rescue Riak::FailedRequest
               object = bucket.new(associate_id)
               object.data = [self.id]
             end

data/lib/tenacity/orm_ext/sequel.rb

@@ -55,7 +55,11 @@ module Tenacity
         attr_accessor :_t_belongs_to_associations
 
         def _t_id_type
-          @_t_id_type_clazz ||= Kernel.const_get(db_schema.values.find{ |x| x[:primary_key] == true }[:type].to_s.capitalize)
+          @_t_id_type_clazz ||= begin
+                                  Kernel.const_get(db_schema.values.find{ |x| x[:primary_key] == true }[:type].to_s.capitalize)
+                                rescue
+                                  Integer
+                                end
         end
 
         def _t_find(id)

data/lib/tenacity/version.rb

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

data/test/orm_ext/activerecord_test.rb

@@ -106,6 +106,9 @@ class ActiveRecordTest < Test::Unit::TestCase
     should "be able to successfully determine the id type" do
       assert_equal Integer, ActiveRecordObject._t_id_type
       assert_equal String, ActiveRecordObjectWithStringId._t_id_type
+
+      class ActiveRecordObjectWithNoTable < ActiveRecord::Base; include Tenacity; end
+      assert_equal Integer, ActiveRecordObjectWithNoTable._t_id_type
     end
   end
 

data/test/orm_ext/datamapper_test.rb

@@ -97,6 +97,9 @@ class DataMapperTest < Test::Unit::TestCase
     should "be able to successfully determine the id type" do
       assert_equal Integer, DataMapperObject._t_id_type
       assert_equal String, DataMapperObjectWithStringId._t_id_type
+
+      class DataMapperObjectWithNoTable; include DataMapper::Resource; include Tenacity; end
+      assert_equal Integer, DataMapperObjectWithNoTable._t_id_type
     end
 
     context "that works with t_has_many associations" do

data/test/orm_ext/sequel_test.rb

@@ -107,6 +107,9 @@ class SequelTest < Test::Unit::TestCase
     should "be able to successfully determine the id type" do
       assert_equal Integer, SequelObject._t_id_type
       assert_equal String, SequelObjectWithStringId._t_id_type
+
+      class SequelObjectWithNoTable < Sequel::Model; include Tenacity; end
+      assert_equal Integer, SequelObjectWithNoTable._t_id_type
     end
   end
 

metadata

@@ -1,8 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: tenacity
 version: !ruby/object:Gem::Version 
+  hash: 13
   prerelease: 
-  version: 0.5.2
+  segments: 
+  - 0
+  - 5
+  - 3
+  version: 0.5.3
 platform: ruby
 authors: 
 - John Wood
@@ -10,228 +15,327 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-15 00:00:00 -05:00
+date: 2011-11-18 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: activesupport
+  prerelease: false
+  type: :runtime
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 5
+        segments: 
+        - 2
+        - 3
         version: "2.3"
-  type: :runtime
-  prerelease: false
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: bundler
+  prerelease: false
+  type: :development
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 23
+        segments: 
+        - 1
+        - 0
+        - 0
         version: 1.0.0
-  type: :development
-  prerelease: false
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: rake
+  prerelease: false
+  type: :development
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 49
+        segments: 
+        - 0
+        - 8
+        - 7
         version: 0.8.7
-  type: :development
-  prerelease: false
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: rcov
+  prerelease: false
+  type: :development
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 41
+        segments: 
+        - 0
+        - 9
+        - 9
         version: 0.9.9
-  type: :development
-  prerelease: false
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: shoulda
+  prerelease: false
+  type: :development
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 37
+        segments: 
+        - 2
+        - 11
+        - 3
         version: 2.11.3
-  type: :development
-  prerelease: false
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   name: mocha
+  prerelease: false
+  type: :development
   requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 47
+        segments: 
+        - 0
+        - 9
+        - 10
         version: 0.9.10
-  type: :development
-  prerelease: false
   version_requirements: *id006
 - !ruby/object:Gem::Dependency 
   name: yard
+  prerelease: false
+  type: :development
   requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 15
+        segments: 
+        - 0
+        - 6
+        - 4
         version: 0.6.4
-  type: :development
-  prerelease: false
   version_requirements: *id007
 - !ruby/object:Gem::Dependency 
   name: sqlite3-ruby
+  prerelease: false
+  type: :development
   requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 25
+        segments: 
+        - 1
+        - 3
+        - 1
         version: 1.3.1
-  type: :development
-  prerelease: false
   version_requirements: *id008
 - !ruby/object:Gem::Dependency 
   name: activerecord
+  prerelease: false
+  type: :development
   requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 3
+        - 0
+        - 0
         version: 3.0.0
-  type: :development
-  prerelease: false
   version_requirements: *id009
 - !ruby/object:Gem::Dependency 
   name: datamapper
+  prerelease: false
+  type: :development
   requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 19
+        segments: 
+        - 1
+        - 0
+        - 2
         version: 1.0.2
-  type: :development
-  prerelease: false
   version_requirements: *id010
 - !ruby/object:Gem::Dependency 
   name: dm-sqlite-adapter
+  prerelease: false
+  type: :development
   requirement: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 19
+        segments: 
+        - 1
+        - 0
+        - 2
         version: 1.0.2
-  type: :development
-  prerelease: false
   version_requirements: *id011
 - !ruby/object:Gem::Dependency 
   name: sequel
+  prerelease: false
+  type: :development
   requirement: &id012 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 75
+        segments: 
+        - 3
+        - 19
+        - 0
         version: 3.19.0
-  type: :development
-  prerelease: false
   version_requirements: *id012
 - !ruby/object:Gem::Dependency 
   name: mongo_mapper
+  prerelease: false
+  type: :development
   requirement: &id013 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 59
+        segments: 
+        - 0
+        - 9
+        - 0
         version: 0.9.0
-  type: :development
-  prerelease: false
   version_requirements: *id013
 - !ruby/object:Gem::Dependency 
   name: bson_ext
+  prerelease: false
+  type: :development
   requirement: &id014 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 27
+        segments: 
+        - 1
+        - 3
+        - 0
         version: 1.3.0
-  type: :development
-  prerelease: false
   version_requirements: *id014
 - !ruby/object:Gem::Dependency 
   name: mongoid
+  prerelease: false
+  type: :development
   requirement: &id015 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 15
+        segments: 
+        - 2
+        - 0
+        - 0
         version: 2.0.0
-  type: :development
-  prerelease: false
   version_requirements: *id015
 - !ruby/object:Gem::Dependency 
   name: couchrest
+  prerelease: false
+  type: :development
   requirement: &id016 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 23
+        segments: 
+        - 1
+        - 0
+        - 0
         version: 1.0.0
-  type: :development
-  prerelease: false
   version_requirements: *id016
 - !ruby/object:Gem::Dependency 
   name: couchrest_model
+  prerelease: false
+  type: :development
   requirement: &id017 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 23
+        segments: 
+        - 1
+        - 0
+        - 0
         version: 1.0.0
-  type: :development
-  prerelease: false
   version_requirements: *id017
 - !ruby/object:Gem::Dependency 
   name: ripple
+  prerelease: false
+  type: :development
   requirement: &id018 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 63
+        segments: 
+        - 0
+        - 9
+        - 2
         version: 0.9.2
-  type: :development
-  prerelease: false
   version_requirements: *id018
 - !ruby/object:Gem::Dependency 
   name: toystore
+  prerelease: false
+  type: :development
   requirement: &id019 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 63
+        segments: 
+        - 0
+        - 8
+        - 0
         version: 0.8.0
-  type: :development
-  prerelease: false
   version_requirements: *id019
 - !ruby/object:Gem::Dependency 
   name: adapter-mongo
+  prerelease: false
+  type: :development
   requirement: &id020 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 15
+        segments: 
+        - 0
+        - 5
+        - 2
         version: 0.5.2
-  type: :development
-  prerelease: false
   version_requirements: *id020
 description: Tenacity provides a database client independent way of specifying simple relationships between models backed by different databases.
 email: 
@@ -249,6 +353,7 @@ files:
 - LICENSE.txt
 - README.rdoc
 - Rakefile
+- THANKS.md
 - history.txt
 - lib/tenacity.rb
 - lib/tenacity/associate_proxy.rb
@@ -355,7 +460,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -2063505334017830292
+      hash: 3
       segments: 
       - 0
       version: "0"
@@ -364,6 +469,11 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 23
+      segments: 
+      - 1
+      - 3
+      - 6
       version: 1.3.6
 requirements: []