deep_cloneable 1.5.1 → 1.5.2

data/.travis.yml

@@ -0,0 +1,10 @@
+rvm:
+  - 1.8.7
+  - 1.9.2
+  - 1.9.3
+  - 2.0.0
+  
+gemfile:
+  - gemfiles/3.0.gemfile
+  - gemfiles/3.1.gemfile
+  - gemfiles/3.2.gemfile  

data/Appraisals

@@ -0,0 +1,11 @@
+appraise '3.0' do
+  gem 'activerecord', '~> 3.0'
+end
+
+appraise '3.1' do
+  gem 'activerecord', '~> 3.1'
+end
+
+appraise '3.2' do
+  gem 'activerecord', '~> 3.2'
+end

data/Gemfile

@@ -1,11 +1,8 @@
 source 'http://rubygems.org'
 
-gem 'activerecord', '>= 3.1'
+gem 'appraisal'
+gem 'activerecord', '>= 3.2'
+gem 'jeweler'
+gem 'sqlite3'
 
-group :development do
-  gem 'jeweler'
-end
-
-group :test do
-  gem 'sqlite3'
-end
+# gem 'debugger'

data/Gemfile.lock

@@ -1,38 +1,42 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    activemodel (3.2.12)
-      activesupport (= 3.2.12)
+    activemodel (3.2.13)
+      activesupport (= 3.2.13)
       builder (~> 3.0.0)
-    activerecord (3.2.12)
-      activemodel (= 3.2.12)
-      activesupport (= 3.2.12)
+    activerecord (3.2.13)
+      activemodel (= 3.2.13)
+      activesupport (= 3.2.13)
       arel (~> 3.0.2)
       tzinfo (~> 0.3.29)
-    activesupport (3.2.12)
-      i18n (~> 0.6)
+    activesupport (3.2.13)
+      i18n (= 0.6.1)
       multi_json (~> 1.0)
+    appraisal (0.5.2)
+      bundler
+      rake
     arel (3.0.2)
     builder (3.0.4)
     git (1.2.5)
-    i18n (0.6.4)
+    i18n (0.6.1)
     jeweler (1.8.4)
       bundler (~> 1.0)
       git (>= 1.2.5)
       rake
       rdoc
-    json (1.7.7)
-    multi_json (1.6.1)
-    rake (10.0.3)
-    rdoc (4.0.0)
+    json (1.8.0)
+    multi_json (1.7.3)
+    rake (10.0.4)
+    rdoc (4.0.1)
       json (~> 1.4)
     sqlite3 (1.3.7)
-    tzinfo (0.3.36)
+    tzinfo (0.3.37)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  activerecord (>= 3.1)
+  activerecord (>= 3.2)
+  appraisal
   jeweler
   sqlite3

data/README.rdoc

@@ -1,12 +1,14 @@
 = Deep_cloneable
 
+{<img src="https://travis-ci.org/moiristo/deep_cloneable.png?branch=master" alt="Build Status" />}[https://travis-ci.org/moiristo/deep_cloneable]
+
 This gem gives every ActiveRecord::Base object the possibility to do a deep clone. It is a rails3 upgrade of the deep_cloning plugin (http://github.com/openminds/deep_cloning).
 
 == Requirements
 
-* Ruby 1.8.7, 1.9, 2.0.0
+* Ruby 1.8.7, 1.9.3, 2.0.0
 
-* Activerecord 3.1, 3.2
+* Activerecord 3.0 (when using _dup_), 3.1, 3.2
 
 * Rails 2.x/3.0 users, please check out the 'rails2.x-3.0' branch.
 
@@ -14,7 +16,7 @@ This gem gives every ActiveRecord::Base object the possibility to do a deep clon
 
 * In your Gemfile:
 
-  gem 'deep_cloneable', '~> 1.5.0'
+  gem 'deep_cloneable', '~> 1.5.2'
 
 == Example
  
@@ -71,6 +73,8 @@ If this is not an option for you, it is also possible to populate the dictionary
 * fractious
 * Georges Gabereau
 * Christophe Belpaire
+* Kevin Carter
+* fokcep
 
 == Note on Patches/Pull Requests
  

data/Rakefile

@@ -1,5 +1,6 @@
 require 'rubygems'
-require 'rake'
+require 'bundler/setup'
+require 'appraisal'
 
 begin
   require 'jeweler'

data/VERSION

@@ -1 +1 @@
-1.5.1
+1.5.2

data/deep_cloneable.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "deep_cloneable"
-  s.version = "1.5.1"
+  s.version = "1.5.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Reinier de Lange"]
-  s.date = "2013-03-06"
+  s.date = "2013-06-10"
   s.description = "Extends the functionality of ActiveRecord::Base#clone to perform a deep clone that includes user specified associations. "
   s.email = "r.j.delange@nedforce.nl"
   s.extra_rdoc_files = [
@@ -18,6 +18,8 @@ Gem::Specification.new do |s|
   ]
   s.files = [
     ".document",
+    ".travis.yml",
+    "Appraisals",
     "Gemfile",
     "Gemfile.lock",
     "LICENSE",
@@ -25,6 +27,12 @@ Gem::Specification.new do |s|
     "Rakefile",
     "VERSION",
     "deep_cloneable.gemspec",
+    "gemfiles/3.0.gemfile",
+    "gemfiles/3.0.gemfile.lock",
+    "gemfiles/3.1.gemfile",
+    "gemfiles/3.1.gemfile.lock",
+    "gemfiles/3.2.gemfile",
+    "gemfiles/3.2.gemfile.lock",
     "init.rb",
     "lib/deep_cloneable.rb",
     "test/database.yml",
@@ -35,22 +43,28 @@ Gem::Specification.new do |s|
   ]
   s.homepage = "http://github.com/moiristo/deep_cloneable"
   s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.24"
+  s.rubygems_version = "1.8.25"
   s.summary = "This gem gives every ActiveRecord::Base object the possibility to do a deep clone."
 
   if s.respond_to? :specification_version then
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<activerecord>, [">= 3.1"])
-      s.add_development_dependency(%q<jeweler>, [">= 0"])
+      s.add_runtime_dependency(%q<appraisal>, [">= 0"])
+      s.add_runtime_dependency(%q<activerecord>, [">= 3.2"])
+      s.add_runtime_dependency(%q<jeweler>, [">= 0"])
+      s.add_runtime_dependency(%q<sqlite3>, [">= 0"])
     else
-      s.add_dependency(%q<activerecord>, [">= 3.1"])
+      s.add_dependency(%q<appraisal>, [">= 0"])
+      s.add_dependency(%q<activerecord>, [">= 3.2"])
       s.add_dependency(%q<jeweler>, [">= 0"])
+      s.add_dependency(%q<sqlite3>, [">= 0"])
     end
   else
-    s.add_dependency(%q<activerecord>, [">= 3.1"])
+    s.add_dependency(%q<appraisal>, [">= 0"])
+    s.add_dependency(%q<activerecord>, [">= 3.2"])
     s.add_dependency(%q<jeweler>, [">= 0"])
+    s.add_dependency(%q<sqlite3>, [">= 0"])
   end
 end
 

data/gemfiles/3.0.gemfile

@@ -0,0 +1,9 @@
+# This file was generated by Appraisal
+
+source "http://rubygems.org"
+
+gem "appraisal"
+gem "jeweler"
+gem "sqlite3"
+gem "activerecord", "~> 3.0"
+

data/gemfiles/3.0.gemfile.lock

@@ -0,0 +1,42 @@
+GEM
+  remote: http://rubygems.org/
+  specs:
+    activemodel (3.2.13)
+      activesupport (= 3.2.13)
+      builder (~> 3.0.0)
+    activerecord (3.2.13)
+      activemodel (= 3.2.13)
+      activesupport (= 3.2.13)
+      arel (~> 3.0.2)
+      tzinfo (~> 0.3.29)
+    activesupport (3.2.13)
+      i18n (= 0.6.1)
+      multi_json (~> 1.0)
+    appraisal (0.5.2)
+      bundler
+      rake
+    arel (3.0.2)
+    builder (3.0.4)
+    git (1.2.5)
+    i18n (0.6.1)
+    jeweler (1.8.4)
+      bundler (~> 1.0)
+      git (>= 1.2.5)
+      rake
+      rdoc
+    json (1.8.0)
+    multi_json (1.7.3)
+    rake (10.0.4)
+    rdoc (4.0.1)
+      json (~> 1.4)
+    sqlite3 (1.3.7)
+    tzinfo (0.3.37)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  activerecord (~> 3.0)
+  appraisal
+  jeweler
+  sqlite3

data/gemfiles/3.1.gemfile

@@ -0,0 +1,9 @@
+# This file was generated by Appraisal
+
+source "http://rubygems.org"
+
+gem "appraisal"
+gem "jeweler"
+gem "sqlite3"
+gem "activerecord", "~> 3.1"
+

data/gemfiles/3.1.gemfile.lock

@@ -0,0 +1,42 @@
+GEM
+  remote: http://rubygems.org/
+  specs:
+    activemodel (3.2.13)
+      activesupport (= 3.2.13)
+      builder (~> 3.0.0)
+    activerecord (3.2.13)
+      activemodel (= 3.2.13)
+      activesupport (= 3.2.13)
+      arel (~> 3.0.2)
+      tzinfo (~> 0.3.29)
+    activesupport (3.2.13)
+      i18n (= 0.6.1)
+      multi_json (~> 1.0)
+    appraisal (0.5.2)
+      bundler
+      rake
+    arel (3.0.2)
+    builder (3.0.4)
+    git (1.2.5)
+    i18n (0.6.1)
+    jeweler (1.8.4)
+      bundler (~> 1.0)
+      git (>= 1.2.5)
+      rake
+      rdoc
+    json (1.8.0)
+    multi_json (1.7.3)
+    rake (10.0.4)
+    rdoc (4.0.1)
+      json (~> 1.4)
+    sqlite3 (1.3.7)
+    tzinfo (0.3.37)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  activerecord (~> 3.1)
+  appraisal
+  jeweler
+  sqlite3

data/gemfiles/3.2.gemfile

@@ -0,0 +1,9 @@
+# This file was generated by Appraisal
+
+source "http://rubygems.org"
+
+gem "appraisal"
+gem "jeweler"
+gem "sqlite3"
+gem "activerecord", "~> 3.2"
+

data/gemfiles/3.2.gemfile.lock

@@ -0,0 +1,42 @@
+GEM
+  remote: http://rubygems.org/
+  specs:
+    activemodel (3.2.13)
+      activesupport (= 3.2.13)
+      builder (~> 3.0.0)
+    activerecord (3.2.13)
+      activemodel (= 3.2.13)
+      activesupport (= 3.2.13)
+      arel (~> 3.0.2)
+      tzinfo (~> 0.3.29)
+    activesupport (3.2.13)
+      i18n (= 0.6.1)
+      multi_json (~> 1.0)
+    appraisal (0.5.2)
+      bundler
+      rake
+    arel (3.0.2)
+    builder (3.0.4)
+    git (1.2.5)
+    i18n (0.6.1)
+    jeweler (1.8.4)
+      bundler (~> 1.0)
+      git (>= 1.2.5)
+      rake
+      rdoc
+    json (1.8.0)
+    multi_json (1.7.3)
+    rake (10.0.4)
+    rdoc (4.0.1)
+      json (~> 1.4)
+    sqlite3 (1.3.7)
+    tzinfo (0.3.37)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  activerecord (~> 3.2)
+  appraisal
+  jeweler
+  sqlite3

data/lib/deep_cloneable.rb

@@ -3,12 +3,12 @@ class ActiveRecord::Base
     # ActiveRecord::Base has its own dup method for Ruby 1.8.7. We have to
     # redefine it and put it in a module so that we can override it in a
     # module and call the original with super().
-    if !Object.respond_to? :initialize_dup, true
+    unless Object.respond_to?(:initialize_dup, true)
       ActiveRecord::Base.class_eval do
         module Dup
           def dup
             copy = super
-            copy.initialize_dup(self)
+            copy.send(:initialize_dup, self)
             copy
           end
         end
@@ -57,7 +57,7 @@ class ActiveRecord::Base
     # ==== Cloning a model without an attribute or nested multiple attributes
     #    pirate.clone :include => :parrot, :except => [:name, { :parrot => [:name] }]
     #
-    define_method :dup do |*args, &block|
+    def dup *args, &block
       options = args[0] || {}
 
       dict = options[:dictionary]
@@ -89,9 +89,9 @@ class ActiveRecord::Base
             association = association.keys.first
           end
 
-          opts = deep_associations.blank? ? {} : {:include => deep_associations}
-          opts.merge!(:except => deep_exceptions[association]) if deep_exceptions[association]
-          opts.merge!(:dictionary => dict) if dict
+          dup_options = deep_associations.blank? ? {} : {:include => deep_associations}
+          dup_options.merge!(:except => deep_exceptions[association]) if deep_exceptions[association]
+          dup_options.merge!(:dictionary => dict) if dict
 
           association_reflection = self.class.reflect_on_association(association)
           raise AssociationNotFoundException.new("#{self.class}##{association}") if association_reflection.nil?
@@ -106,34 +106,11 @@ class ActiveRecord::Base
             end
           end
 
-          cloned_object = case association_reflection.macro
-            when :belongs_to, :has_one
-              self.send(association) && self.send(association).send(__method__, opts, &block)
-            when :has_many
-              primary_key_name = association_reflection.foreign_key.to_s
-
-              reverse_association_name = association_reflection.klass.reflect_on_all_associations.detect do |a|
-                a.foreign_key.to_s == primary_key_name
-              end.try(:name)
-
-              self.send(association).collect do |obj|
-                tmp = obj.send(__method__, opts, &block)
-                tmp.send("#{primary_key_name}=", nil)
-                tmp.send("#{reverse_association_name.to_s}=", kopy) if reverse_association_name
-                tmp
-              end
-            when :has_and_belongs_to_many
-              primary_key_name = association_reflection.foreign_key.to_s
-
-              reverse_association_name = association_reflection.klass.reflect_on_all_associations.detect do |a|
-                (a.macro == :has_and_belongs_to_many) && (a.association_foreign_key.to_s == primary_key_name)
-              end.try(:name)
-
-              self.send(association).collect do |obj|
-                obj.send(reverse_association_name).target << kopy
-                obj
-              end
-          end
+          cloned_object = send(
+            "dup_#{association_reflection.macro}_#{association_reflection.class.name.demodulize.underscore.gsub('_reflection', '')}", 
+            { :reflection => association_reflection, :association => association, :copy => kopy, :dup_options => dup_options },
+            &block
+          )
 
           kopy.send("#{association}=", cloned_object)
         end
@@ -141,7 +118,55 @@ class ActiveRecord::Base
 
       return kopy
     end
-
+    
+  private
+  
+    def dup_belongs_to_association options, &block
+      self.send(options[:association]) && self.send(options[:association]).dup(options[:dup_options], &block)
+    end  
+  
+    def dup_has_one_association options, &block
+      dup_belongs_to_association options, &block
+    end
+    
+    def dup_has_many_association options, &block
+      primary_key_name = options[:reflection].foreign_key.to_s
+
+      reverse_association_name = options[:reflection].klass.reflect_on_all_associations.detect do |reflection|
+        reflection.foreign_key.to_s == primary_key_name && reflection != options[:reflection]
+      end.try(:name)
+
+      self.send(options[:association]).collect do |obj|
+        tmp = obj.dup(options[:dup_options], &block)
+        tmp.send("#{primary_key_name}=", nil)
+        tmp.send("#{reverse_association_name.to_s}=", options[:copy]) if reverse_association_name
+        tmp
+      end      
+    end
+        
+    def dup_has_many_through options, &block
+      dup_join_association(
+        options.merge(:macro => :has_many, :primary_key_name => options[:reflection].through_reflection.foreign_key.to_s), 
+        &block)
+    end
+    
+    def dup_has_and_belongs_to_many_association options, &block
+      dup_join_association(
+        options.merge(:macro => :has_and_belongs_to_many, :primary_key_name => options[:reflection].foreign_key.to_s), 
+        &block)
+    end
+    
+    def dup_join_association options, &block
+      reverse_association_name = options[:reflection].klass.reflect_on_all_associations.detect do |reflection|
+        (reflection.macro == options[:macro]) && (reflection.association_foreign_key.to_s == options[:primary_key_name])
+      end.try(:name)
+
+      self.send(options[:association]).collect do |obj|
+        obj.send(reverse_association_name).target << options[:copy]
+        obj
+      end       
+    end
+    
     class AssociationNotFoundException < StandardError; end
   end
 

data/test/models.rb

@@ -62,3 +62,23 @@ class ParentWithValidation < ActiveRecord::Base
   has_many :children, :class_name => 'ChildWithValidation'
   validates :name, :presence => true
 end
+
+class Part < ActiveRecord::Base
+  # belongs_to :parent_part, :class_name => 'Part' 
+  has_many :child_parts, :class_name => 'Part', :foreign_key => 'parent_part_id'
+end
+
+class Student < ActiveRecord::Base
+  has_many :student_assignments, :dependent => :destroy
+  has_many :subjects, :through => :student_assignments
+end 
+
+class Subject < ActiveRecord::Base
+  has_many :student_assignments, :dependent => :destroy
+  has_many :students, :through => :student_assignments
+end
+
+class StudentAssignment < ActiveRecord::Base
+  belongs_to :subject
+  belongs_to :student  
+end

data/test/schema.rb

@@ -71,4 +71,21 @@ ActiveRecord::Schema.define(:version => 1) do
     t.column :parent_with_validation_id, :integer
   end
 
+  create_table :parts, :force => true do |t|
+    t.column :name, :string
+    t.column :parent_part_id, :integer
+  end
+  
+  create_table :students, :force => true do |t|
+    t.column :name, :string
+  end  
+
+  create_table :subjects, :force => true do |t|
+    t.column :name, :string
+  end
+
+  create_table :student_assignments, :force => true do |t|
+    t.column :student_id, :integer
+    t.column :subject_id, :integer    
+  end  
 end

data/test/test_deep_cloneable.rb

@@ -3,8 +3,6 @@ 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
     @jack  = Pirate.create(:name => 'Jack Sparrow', :nick_name => 'Captain Jack', :age => 30)
     @polly = Parrot.create(:name => 'Polly', :pirate => @jack)
@@ -15,16 +13,16 @@ class TestDeepCloneable < Test::Unit::TestCase
   end
 
   def test_single_dup_exception
-    dup = @jack.send(@@clone_method, :except => :name)
+    dup = @jack.dup(:except => :name)
     assert dup.new_record?
     assert dup.save
-    assert_equal @jack.name, @jack.send(@@clone_method).name # Old behaviour
+    assert_equal @jack.name, @jack.dup.name
     assert_nil dup.name
     assert_equal @jack.nick_name, dup.nick_name
   end
 
   def test_multiple_dup_exception
-    dup = @jack.send(@@clone_method, :except => [:name, :nick_name])
+    dup = @jack.dup(:except => [:name, :nick_name])
     assert dup.new_record?
     assert dup.save
     assert_nil dup.name
@@ -33,14 +31,14 @@ class TestDeepCloneable < Test::Unit::TestCase
   end
 
   def test_single_include_association
-    dup = @jack.send(@@clone_method, :include => :mateys)
+    dup = @jack.dup(:include => :mateys)
     assert dup.new_record?
     assert dup.save
     assert_equal 1, dup.mateys.size
   end
 
   def test_single_include_belongs_to_polymorphic_association
-    dup = @jack.send(@@clone_method, :include => :ship)
+    dup = @jack.dup(:include => :ship)
     assert dup.new_record?
     assert dup.save
     assert_not_nil dup.ship
@@ -48,14 +46,14 @@ class TestDeepCloneable < Test::Unit::TestCase
   end
 
   def test_single_include_has_many_polymorphic_association
-    dup = @ship.send(@@clone_method, :include => :pirates)
+    dup = @ship.dup(:include => :pirates)
     assert dup.new_record?
     assert dup.save
     assert dup.pirates.any?
   end
 
   def test_multiple_include_association
-    dup = @jack.send(@@clone_method, :include => [:mateys, :treasures])
+    dup = @jack.dup(:include => [:mateys, :treasures])
     assert dup.new_record?
     assert dup.save
     assert_equal 1, dup.mateys.size
@@ -63,7 +61,7 @@ class TestDeepCloneable < Test::Unit::TestCase
   end
 
   def test_deep_include_association
-    dup = @jack.send(@@clone_method, :include => {:treasures => :gold_pieces})
+    dup = @jack.dup(:include => {:treasures => :gold_pieces})
     assert dup.new_record?
     assert dup.save
     assert_equal 1, dup.treasures.size
@@ -71,7 +69,7 @@ class TestDeepCloneable < Test::Unit::TestCase
   end
 
   def test_include_association_assignments
-    dup = @jack.send(@@clone_method, :include => :treasures)
+    dup = @jack.dup(:include => :treasures)
     assert dup.new_record?
 
     dup.treasures.each do |treasure|
@@ -80,7 +78,7 @@ class TestDeepCloneable < Test::Unit::TestCase
   end
 
   def test_multiple_and_deep_include_association
-    dup = @jack.send(@@clone_method, :include => {:treasures => :gold_pieces, :mateys => {}})
+    dup = @jack.dup(:include => {:treasures => :gold_pieces, :mateys => {}})
     assert dup.new_record?
     assert dup.save
     assert_equal 1, dup.treasures.size
@@ -89,7 +87,7 @@ class TestDeepCloneable < Test::Unit::TestCase
   end
 
   def test_multiple_and_deep_include_association_with_array
-    dup = @jack.send(@@clone_method, :include => [{:treasures => :gold_pieces}, :mateys])
+    dup = @jack.dup(:include => [{:treasures => :gold_pieces}, :mateys])
     assert dup.new_record?
     assert dup.save
     assert_equal 1, dup.treasures.size
@@ -98,14 +96,14 @@ class TestDeepCloneable < Test::Unit::TestCase
   end
 
   def test_with_belongs_to_relation
-    dup = @jack.send(@@clone_method, :include => :parrot)
+    dup = @jack.dup(:include => :parrot)
     assert dup.new_record?
     assert dup.save
     assert_not_equal dup.parrot, @jack.parrot
   end
 
   def test_should_pass_nested_exceptions
-    dup = @jack.send(@@clone_method, :include => :parrot, :except => [:name, { :parrot => [:name] }])
+    dup = @jack.dup(:include => :parrot, :except => [:name, { :parrot => [:name] }])
     assert dup.new_record?
     assert dup.save
     assert_not_equal dup.parrot, @jack.parrot
@@ -115,7 +113,7 @@ class TestDeepCloneable < Test::Unit::TestCase
 
   def test_should_not_double_dup_when_using_dictionary
     current_matey_count = Matey.count
-    dup = @jack.send(@@clone_method, :include => [:mateys, { :treasures => :matey }], :use_dictionary => true)
+    dup = @jack.dup(:include => [:mateys, { :treasures => :matey }], :use_dictionary => true)
     assert dup.new_record?
     dup.save!
 
@@ -126,9 +124,9 @@ class TestDeepCloneable < Test::Unit::TestCase
     current_matey_count = Matey.count
 
     dict = { :mateys => {} }
-    @jack.mateys.each{|m| dict[:mateys][m] = m.send(@@clone_method) }
+    @jack.mateys.each{|m| dict[:mateys][m] = m.dup }
 
-    dup = @jack.send(@@clone_method, :include => [:mateys, { :treasures => :matey }], :dictionary => dict)
+    dup = @jack.dup(:include => [:mateys, { :treasures => :matey }], :dictionary => dict)
     assert dup.new_record?
     dup.save!
 
@@ -139,7 +137,7 @@ class TestDeepCloneable < Test::Unit::TestCase
     @human = Animal::Human.create :name => "Michael"
     @pig = Animal::Pig.create :human => @human, :name => 'big pig'
 
-    dup_human = @human.send(@@clone_method, :include => [:pigs])
+    dup_human = @human.dup(:include => [:pigs])
     assert dup_human.new_record?
     assert dup_human.save
     assert_equal 1, dup_human.pigs.count
@@ -147,7 +145,7 @@ class TestDeepCloneable < Test::Unit::TestCase
     @human2 = Animal::Human.create :name => "John"
     @pig2 = @human2.pigs.create :name => 'small pig'
 
-    dup_human_2 = @human.send(@@clone_method, :include => [:pigs])
+    dup_human_2 = @human.dup(:include => [:pigs])
     assert dup_human_2.new_record?
     assert dup_human_2.save
     assert_equal 1, dup_human_2.pigs.count
@@ -161,14 +159,14 @@ class TestDeepCloneable < Test::Unit::TestCase
     @human.chickens << [@chicken1, @chicken2]
     @human2.chickens << [@chicken1, @chicken2]
 
-    dup_human = @human.send(@@clone_method, :include => :ownerships)
+    dup_human = @human.dup(:include => :ownerships)
     assert dup_human.new_record?
     assert dup_human.save
     assert_equal 2, dup_human.chickens.count
   end
 
   def test_should_dup_with_block
-    dup = @jack.send(@@clone_method, :include => :parrot) do |original, kopy|
+    dup = @jack.dup(:include => :parrot) do |original, kopy|
       kopy.cloned_from_id = original.id
     end
 
@@ -258,4 +256,24 @@ class TestDeepCloneable < Test::Unit::TestCase
     assert_equal dup_parent.errors.messages, :children => ["is invalid"]
   end
 
+  def test_self_join_has_many
+    parent_part = Part.create(:name => 'Parent')
+    child1 = Part.create(:name => 'Child 1', :parent_part_id => parent_part.id)
+    child2 = Part.create(:name => 'Child 2', :parent_part_id => parent_part.id)
+
+    dup_part = parent_part.dup :include => :child_parts
+    assert dup_part.save
+    assert_equal 2, dup_part.child_parts.size
+  end
+  
+  def test_should_include_has_many_through_associations
+    subject1 = Subject.create(:name => 'subject 1')
+    subject2 = Subject.create(:name => 'subject 2')
+    student = Student.create(:name => 'Parent', :subjects => [subject1, subject2])
+  
+    dup = student.dup :include => :subjects
+    assert_equal 2, dup.subjects.size
+    assert_equal [[student, dup],[student, dup]], dup.subjects.map{|subject| subject.students }
+  end
+
 end

data/test/test_helper.rb

@@ -1,6 +1,7 @@
 require 'rubygems'
 require 'test/unit'
 require 'pp'
+# require 'debugger'
 
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 $LOAD_PATH.unshift(File.dirname(__FILE__))

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: deep_cloneable
 version: !ruby/object:Gem::Version
-  version: 1.5.1
+  version: 1.5.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,8 +9,24 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-06 00:00:00.000000000 Z
+date: 2013-06-10 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: appraisal
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
@@ -18,7 +34,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '3.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,7 +42,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '3.2'
 - !ruby/object:Gem::Dependency
   name: jeweler
   requirement: !ruby/object:Gem::Requirement
@@ -35,7 +51,23 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: sqlite3
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
@@ -53,6 +85,8 @@ extra_rdoc_files:
 - README.rdoc
 files:
 - .document
+- .travis.yml
+- Appraisals
 - Gemfile
 - Gemfile.lock
 - LICENSE
@@ -60,6 +94,12 @@ files:
 - Rakefile
 - VERSION
 - deep_cloneable.gemspec
+- gemfiles/3.0.gemfile
+- gemfiles/3.0.gemfile.lock
+- gemfiles/3.1.gemfile
+- gemfiles/3.1.gemfile.lock
+- gemfiles/3.2.gemfile
+- gemfiles/3.2.gemfile.lock
 - init.rb
 - lib/deep_cloneable.rb
 - test/database.yml
@@ -81,7 +121,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 250465939979745511
+      hash: -3147244194353225191
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -90,7 +130,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: This gem gives every ActiveRecord::Base object the possibility to do a deep