deep_cloneable 1.2.4 → 1.3.0

data/README.rdoc

@@ -4,7 +4,7 @@ This gem gives every ActiveRecord::Base object the possibility to do a deep clon
 
 == Requirements
 
-* Activerecord, tested with Rails 3.
+* Activerecord, tested with AR 3 & 3.1.
 
 == Installation
  
@@ -60,6 +60,12 @@ If this is not an option for you, it is also possible to populate the dictionary
 === Cloning a model without an attribute or nested multiple attributes   
    pirate.clone :include => :parrot, :except => [:name, { :parrot => [:name] }]
 
+== Contributors
+
+* Michael He
+* Indrek Juhkam
+* Mart Karu
+
 == Note on Patches/Pull Requests
  
 * Fork the project.
@@ -72,4 +78,4 @@ If this is not an option for you, it is also possible to populate the dictionary
 
 == Copyright
 
-Copyright (c) 2010 Reinier de Lange. See LICENSE for details.
+Copyright (c) 2011 Reinier de Lange. See LICENSE for details.

data/VERSION

@@ -1 +1 @@
-1.2.4
+1.3.0

data/deep_cloneable.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{deep_cloneable}
-  s.version = "1.2.4"
+  s.version = "1.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Reinier de Lange"]
-  s.date = %q{2011-06-15}
+  s.date = %q{2011-07-11}
   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/lib/deep_cloneable.rb

@@ -1,5 +1,7 @@
 class ActiveRecord::Base
   module DeepCloneable
+    @@rails31 = ActiveRecord::VERSION::MAJOR >= 3 && ActiveRecord::VERSION::MINOR > 0
+    
     # clones an ActiveRecord model. 
     # if passed the :include option, it will deep clone the given associations
     # if passed the :except option, it won't clone the given attributes
@@ -40,7 +42,9 @@ class ActiveRecord::Base
     # ==== Cloning a model without an attribute or nested multiple attributes   
     #    pirate.clone :include => :parrot, :except => [:name, { :parrot => [:name] }]
     # 
-    def clone(options = {})
+    define_method (@@rails31 ? :dup : :clone) do |*args|
+      options = args[0] || {}
+      
       dict = options[:dictionary]
       dict ||= {} if options.delete(:use_dictionary)
       
@@ -77,15 +81,17 @@ class ActiveRecord::Base
                     
           cloned_object = case association_reflection.macro
             when :belongs_to, :has_one
-              self.send(association) && self.send(association).clone(opts)
+              self.send(association) && self.send(association).send(__method__, opts)
             when :has_many, :has_and_belongs_to_many
-              reverse_association_name = association_reflection.klass.reflect_on_all_associations.detect do |a| 
-                a.primary_key_name.to_s == association_reflection.primary_key_name.to_s
+              primary_key_name = (@@rails31 ? association_reflection.foreign_key : association_reflection.primary_key_name).to_s
+              
+              reverse_association_name = association_reflection.klass.reflect_on_all_associations.detect do |a|
+                  a.send(@@rails31 ? :foreign_key : :primary_key_name).to_s == primary_key_name
               end.try(:name)
               
               self.send(association).collect do |obj| 
-                tmp = obj.clone(opts)
-                tmp.send("#{association_reflection.primary_key_name.to_s}=", nil)                
+                tmp = obj.send(__method__, opts)
+                tmp.send("#{primary_key_name}=", nil)                
                 tmp.send("#{reverse_association_name.to_s}=", kopy) if reverse_association_name
                 tmp
               end

data/test/test_deep_cloneable.rb

@@ -2,8 +2,10 @@ require File.dirname(__FILE__) + '/test_helper'
 
 class TestDeepCloneable < Test::Unit::TestCase
   load_schema
+  
+  @@clone_method = ActiveRecord::VERSION::MAJOR >= 3 && ActiveRecord::VERSION::MINOR > 0 ? :dup : :clone  
 
-  def setup
+  def setup    
     @jack  = Pirate.create(:name => 'Jack Sparrow', :nick_name => 'Captain Jack', :age => 30)
     @polly = Parrot.create(:name => 'Polly', :pirate => @jack)
     @john = Matey.create(:name => 'John', :pirate => @jack)
@@ -12,109 +14,109 @@ class TestDeepCloneable < Test::Unit::TestCase
     @ship = BattleShip.create(:name => 'Black Pearl', :pirates => [@jack])
   end
 
-  def test_single_clone_exception
-    clone = @jack.clone(:except => :name)
-    assert clone.save
-    assert_equal @jack.name, @jack.clone.name # Old behaviour
-    assert_nil clone.name
-    assert_equal @jack.nick_name, clone.nick_name
+  def test_single_dup_exception
+    dup = @jack.send(@@clone_method, :except => :name)
+    assert dup.save
+    assert_equal @jack.name, @jack.send(@@clone_method).name # Old behaviour
+    assert_nil dup.name
+    assert_equal @jack.nick_name, dup.nick_name
   end
 
-  def test_multiple_clone_exception
-    clone = @jack.clone(:except => [:name, :nick_name])
-    assert clone.save
-    assert_nil clone.name
-    assert_equal 'no nickname', clone.nick_name
-    assert_equal @jack.age, clone.age
+  def test_multiple_dup_exception
+    dup = @jack.send(@@clone_method, :except => [:name, :nick_name])
+    assert dup.save
+    assert_nil dup.name
+    assert_equal 'no nickname', dup.nick_name
+    assert_equal @jack.age, dup.age
   end
 
   def test_single_include_association
-    clone = @jack.clone(:include => :mateys)
-    assert clone.save
-    assert_equal 1, clone.mateys.size
+    dup = @jack.send(@@clone_method, :include => :mateys)
+    assert dup.save
+    assert_equal 1, dup.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
+    dup = @jack.send(@@clone_method, :include => :ship)
+    assert dup.save
+    assert_not_nil dup.ship
+    assert_not_equal @jack.ship, dup.ship
   end
 
   def test_single_include_has_many_polymorphic_association
-    clone = @ship.clone(:include => :pirates)
-    assert clone.save
-    assert clone.pirates.any?
+    dup = @ship.send(@@clone_method, :include => :pirates)
+    assert dup.save
+    assert dup.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
+    dup = @jack.send(@@clone_method, :include => [:mateys, :treasures])
+    assert dup.save
+    assert_equal 1, dup.mateys.size
+    assert_equal 1, dup.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
+    dup = @jack.send(@@clone_method, :include => {:treasures => :gold_pieces})
+    assert dup.save
+    assert_equal 1, dup.treasures.size
+    assert_equal 1, dup.gold_pieces.size
   end
 
   def test_include_association_assignments
-    clone = @jack.clone(:include => :treasures)
+    dup = @jack.send(@@clone_method, :include => :treasures)
 
-    clone.treasures.each do |treasure|
-      assert_equal clone, treasure.pirate
+    dup.treasures.each do |treasure|
+      assert_equal dup, treasure.pirate
     end
   end
 
   def test_multiple_and_deep_include_association
-    clone = @jack.clone(:include => {:treasures => :gold_pieces, :mateys => {}})
-    assert clone.save
-    assert_equal 1, clone.treasures.size
-    assert_equal 1, clone.gold_pieces.size
-    assert_equal 1, clone.mateys.size
+    dup = @jack.send(@@clone_method, :include => {:treasures => :gold_pieces, :mateys => {}})
+    assert dup.save
+    assert_equal 1, dup.treasures.size
+    assert_equal 1, dup.gold_pieces.size
+    assert_equal 1, dup.mateys.size
   end
 
   def test_multiple_and_deep_include_association_with_array
-    clone = @jack.clone(:include => [{:treasures => :gold_pieces}, :mateys])
-    assert clone.save
-    assert_equal 1, clone.treasures.size
-    assert_equal 1, clone.gold_pieces.size
-    assert_equal 1, clone.mateys.size
+    dup = @jack.send(@@clone_method, :include => [{:treasures => :gold_pieces}, :mateys])
+    assert dup.save
+    assert_equal 1, dup.treasures.size
+    assert_equal 1, dup.gold_pieces.size
+    assert_equal 1, dup.mateys.size
   end
 
   def test_with_belongs_to_relation
-    clone = @jack.clone(:include => :parrot)
-    assert clone.save
-    assert_not_equal clone.parrot, @jack.parrot
+    dup = @jack.send(@@clone_method, :include => :parrot)
+    assert dup.save
+    assert_not_equal dup.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
+    dup = @jack.send(@@clone_method, :include => :parrot, :except => [:name, { :parrot => [:name] }])
+    assert dup.save
+    assert_not_equal dup.parrot, @jack.parrot
     assert_not_nil @jack.parrot.name
-    assert_nil clone.parrot.name
+    assert_nil dup.parrot.name
   end
 
-  def test_should_not_double_clone_when_using_dictionary
+  def test_should_not_double_dup_when_using_dictionary
     current_matey_count = Matey.count
-    clone = @jack.clone(:include => [:mateys, { :treasures => :matey }], :use_dictionary => true)
-    clone.save!
+    dup = @jack.send(@@clone_method, :include => [:mateys, { :treasures => :matey }], :use_dictionary => true)
+    dup.save!
 
     assert_equal current_matey_count + 1, Matey.count
   end
 
-  def test_should_not_double_clone_when_using_manual_dictionary
+  def test_should_not_double_dup_when_using_manual_dictionary
     current_matey_count = Matey.count
 
     dict = { :mateys => {} }
-    @jack.mateys.each{|m| dict[:mateys][m] = m.clone }
+    @jack.mateys.each{|m| dict[:mateys][m] = m.send(@@clone_method) }
 
-    clone = @jack.clone(:include => [:mateys, { :treasures => :matey }], :dictionary => dict)
-    clone.save!
+    dup = @jack.send(@@clone_method, :include => [:mateys, { :treasures => :matey }], :dictionary => dict)
+    dup.save!
 
     assert_equal current_matey_count + 1, Matey.count
   end
@@ -123,19 +125,19 @@ class TestDeepCloneable < Test::Unit::TestCase
     @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
+    dup_human = @human.send(@@clone_method, :include => [:pigs])
+    assert dup_human.save
+    assert_equal 1, dup_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
+    dup_human_2 = @human.send(@@clone_method, :include => [:pigs])
+    assert dup_human_2.save
+    assert_equal 1, dup_human_2.pigs.count
   end 
   
-  def test_should_clone_many_to_many_associations
+  def test_should_dup_many_to_many_associations
     @human = Animal::Human.create :name => "Michael" 
     @human2 = Animal::Human.create :name => "Jack"        
     @chicken1 = Animal::Chicken.create :name => 'Chick1'
@@ -143,9 +145,9 @@ class TestDeepCloneable < Test::Unit::TestCase
     @human.chickens << [@chicken1, @chicken2]
     @human2.chickens << [@chicken1, @chicken2]    
     
-    clone_human = @human.clone :include => :ownerships
-    assert clone_human.save
-    assert_equal 2, clone_human.chickens.count    
+    dup_human = @human.send(@@clone_method, :include => :ownerships)
+    assert dup_human.save
+    assert_equal 2, dup_human.chickens.count    
   end 
   
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: deep_cloneable
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 27
   prerelease: 
   segments: 
   - 1
-  - 2
-  - 4
-  version: 1.2.4
+  - 3
+  - 0
+  version: 1.3.0
 platform: ruby
 authors: 
 - Reinier de Lange
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-15 00:00:00 +02:00
+date: 2011-07-11 00:00:00 +02:00
 default_executable: 
 dependencies: []