deep_cloneable 1.2.1 → 1.2.2

data/VERSION

@@ -1 +1 @@
-1.2.1
+1.2.2

data/deep_cloneable.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{deep_cloneable}
-  s.version = "1.2.1"
+  s.version = "1.2.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Reinier de Lange"]
-  s.date = %q{2011-02-07}
+  s.date = %q{2011-02-21}
   s.description = %q{Extends the functionality of ActiveRecord::Base#clone to perform a deep clone that includes user specified associations. }
   s.email = %q{r.j.delange@nedforce.nl}
   s.extra_rdoc_files = [

data/init.rb

@@ -1 +1 @@
-require 'deep_cloneable'
+require 'deep_cloneable'

data/lib/deep_cloneable.rb

@@ -77,14 +77,9 @@ class ActiveRecord::Base
             when :belongs_to, :has_one
               self.send(association) && self.send(association).clone(opts)
             when :has_many, :has_and_belongs_to_many
-              if association_reflection.options[:as]
-                fk = association_reflection.options[:as].to_s + "_id"
-              else
-                fk = association_reflection.options[:foreign_key] || self.class.to_s.underscore + "_id"
-              end
               self.send(association).collect do |obj| 
                 tmp = obj.clone(opts)
-                tmp.send("#{fk}=", kopy)
+                tmp.send("#{association_reflection.primary_key_name}=", kopy)
                 tmp
               end
             end

data/test/schema.rb

@@ -29,4 +29,13 @@ ActiveRecord::Schema.define(:version => 1) do
   create_table :battle_ships, :force => true do |t|
     t.column :name, :string
   end  
+  
+  create_table :pigs, :force => true do |t|
+    t.column :name, :string
+    t.column :human_id, :integer
+  end
+  
+  create_table :humen, :force => true do |t|
+    t.column :name, :string
+  end
 end

data/test/test_deep_cloneable.rb

@@ -19,7 +19,7 @@ class TestDeepCloneable < Test::Unit::TestCase
     assert_nil clone.name
     assert_equal @jack.nick_name, clone.nick_name
   end
-  
+
   def test_multiple_clone_exception
     clone = @jack.clone(:except => [:name, :nick_name])
     assert clone.save
@@ -27,40 +27,40 @@ class TestDeepCloneable < Test::Unit::TestCase
     assert_equal 'no nickname', clone.nick_name
     assert_equal @jack.age, clone.age
   end
-  
+
   def test_single_include_association
     clone = @jack.clone(:include => :mateys)
     assert clone.save
     assert_equal 1, clone.mateys.size
   end
-  
+
   def test_single_include_belongs_to_polymorphic_association
     clone = @jack.clone(:include => :ship)
     assert clone.save
     assert_not_nil clone.ship
     assert_not_equal @jack.ship, clone.ship
   end
-  
-  def test_single_include_has_many_polymorphic_association    
+
+  def test_single_include_has_many_polymorphic_association
     clone = @ship.clone(:include => :pirates)
     assert clone.save
-    assert clone.pirates.any?    
-  end  
-  
+    assert clone.pirates.any?
+  end
+
   def test_multiple_include_association
     clone = @jack.clone(:include => [:mateys, :treasures])
     assert clone.save
     assert_equal 1, clone.mateys.size
     assert_equal 1, clone.treasures.size
   end
-  
+
   def test_deep_include_association
     clone = @jack.clone(:include => {:treasures => :gold_pieces})
     assert clone.save
     assert_equal 1, clone.treasures.size
     assert_equal 1, clone.gold_pieces.size
   end
-  
+
   def test_multiple_and_deep_include_association
     clone = @jack.clone(:include => {:treasures => :gold_pieces, :mateys => {}})
     assert clone.save
@@ -68,7 +68,7 @@ class TestDeepCloneable < Test::Unit::TestCase
     assert_equal 1, clone.gold_pieces.size
     assert_equal 1, clone.mateys.size
   end
-  
+
   def test_multiple_and_deep_include_association_with_array
     clone = @jack.clone(:include => [{:treasures => :gold_pieces}, :mateys])
     assert clone.save
@@ -76,21 +76,21 @@ class TestDeepCloneable < Test::Unit::TestCase
     assert_equal 1, clone.gold_pieces.size
     assert_equal 1, clone.mateys.size
   end
-  
+
   def test_with_belongs_to_relation
     clone = @jack.clone(:include => :parrot)
     assert clone.save
     assert_not_equal clone.parrot, @jack.parrot
   end
-  
+
   def test_should_pass_nested_exceptions
     clone = @jack.clone(:include => :parrot, :except => [:name, { :parrot => [:name] }])
     assert clone.save
     assert_not_equal clone.parrot, @jack.parrot
     assert_not_nil @jack.parrot.name
-    assert_nil clone.parrot.name    
+    assert_nil clone.parrot.name
   end
-  
+
   def test_should_not_double_clone_when_using_dictionary
     current_matey_count = Matey.count
     clone = @jack.clone(:include => [:mateys, { :treasures => :matey }], :use_dictionary => true)
@@ -98,16 +98,34 @@ class TestDeepCloneable < Test::Unit::TestCase
 
     assert_equal current_matey_count + 1, Matey.count
   end
-  
+
   def test_should_not_double_clone_when_using_manual_dictionary
     current_matey_count = Matey.count
-    
+
     dict = { :mateys => {} }
     @jack.mateys.each{|m| dict[:mateys][m] = m.clone }
-      
+
     clone = @jack.clone(:include => [:mateys, { :treasures => :matey }], :dictionary => dict)
     clone.save!
 
     assert_equal current_matey_count + 1, Matey.count
-  end  
+  end
+
+  def test_should_support_ar_class_under_module
+    @human = Animal::Human.create :name => "Michael"
+    @pig = Animal::Pig.create :human => @human, :name => 'big pig'
+
+    clone_human = @human.clone :include => [:pigs]
+    assert clone_human.save
+    assert_equal 1, clone_human.pigs.count
+    
+    @human2 = Animal::Human.create :name => "John"
+    @pig2 = @human2.pigs.create :name => 'small pig'
+    
+    clone_human_2 = @human.clone :include => [:pigs]
+    assert clone_human_2.save
+    assert_equal 1, clone_human_2.pigs.count
+  end
+  
+  
 end

data/test/test_helper.rb

@@ -7,9 +7,17 @@ $LOAD_PATH.unshift(File.dirname(__FILE__))
 
 Gem.activate 'activerecord'
 require 'active_record'
-require 'active_record/fixtures'
 require File.dirname(__FILE__) + '/../init.rb'
 
+module Animal
+  class Human < ActiveRecord::Base
+    has_many :pigs
+  end
+  class Pig < ActiveRecord::Base
+    belongs_to :human
+  end
+end
+
 class GoldPiece < ActiveRecord::Base;   belongs_to :treasure  end
 class Matey < ActiveRecord::Base;       belongs_to :pirate    end
 class Parrot < ActiveRecord::Base;      belongs_to :pirate    end
@@ -17,7 +25,7 @@ class BattleShip < ActiveRecord::Base;  has_many   :pirates, :as => :ship end
 
 class Pirate < ActiveRecord::Base
   belongs_to :ship, :polymorphic => true
-  
+
   has_many :mateys
   has_many :treasures
   has_many :gold_pieces, :through => :treasures
@@ -25,7 +33,7 @@ class Pirate < ActiveRecord::Base
 end
 
 class Treasure < ActiveRecord::Base
-  belongs_to :pirate  
+  belongs_to :pirate
   belongs_to :matey
   has_many :gold_pieces
 end
@@ -52,4 +60,4 @@ def load_schema
   end
   ActiveRecord::Base.establish_connection(config[db_adapter])
   load(File.dirname(__FILE__) + "/schema.rb")
-end 
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: deep_cloneable
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 27
   prerelease: false
   segments: 
   - 1
   - 2
-  - 1
-  version: 1.2.1
+  - 2
+  version: 1.2.2
 platform: ruby
 authors: 
 - Reinier de Lange
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-07 00:00:00 +01:00
+date: 2011-02-21 00:00:00 +01:00
 default_executable: 
 dependencies: []