deep_cloneable 1.4.0 → 1.4.1

data/Gemfile

@@ -1,9 +1,10 @@
 source 'http://rubygems.org'
 
-gemspec
-
 gem 'rails'
-gem 'jeweler'
+
+group :development do
+  gem 'jeweler'
+end
 
 group :test do
   gem 'sqlite3'

data/Gemfile.lock

@@ -1,8 +1,3 @@
-PATH
-  remote: .
-  specs:
-    deep_cloneable (1.3.1)
-
 GEM
   remote: http://rubygems.org/
   specs:
@@ -94,7 +89,6 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  deep_cloneable!
   jeweler
   rails
   sqlite3

data/README.rdoc

@@ -12,7 +12,7 @@ This gem gives every ActiveRecord::Base object the possibility to do a deep clon
 
 * In your Gemfile:
 
-  gem 'deep_cloneable', '~> 1.3.1'
+  gem 'deep_cloneable', '~> 1.4.0'
 
 == Example
  
@@ -62,6 +62,8 @@ If this is not an option for you, it is also possible to populate the dictionary
 * Mart Karu
 * Rolf Timmermans
 * Ilya Kuzmin
+* zozi
+* fractious
 
 == Note on Patches/Pull Requests
  

data/VERSION

@@ -1 +1 @@
-1.4.0
+1.4.1

data/deep_cloneable.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "deep_cloneable"
-  s.version = "1.4.0"
+  s.version = "1.4.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Reinier de Lange"]
-  s.date = "2012-04-02"
+  s.date = "2012-07-23"
   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 = [
@@ -28,6 +28,7 @@ Gem::Specification.new do |s|
     "init.rb",
     "lib/deep_cloneable.rb",
     "test/database.yml",
+    "test/models.rb",
     "test/schema.rb",
     "test/test_deep_cloneable.rb",
     "test/test_helper.rb"
@@ -41,16 +42,13 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<deep_cloneable>, [">= 0"])
       s.add_runtime_dependency(%q<rails>, [">= 0"])
-      s.add_runtime_dependency(%q<jeweler>, [">= 0"])
+      s.add_development_dependency(%q<jeweler>, [">= 0"])
     else
-      s.add_dependency(%q<deep_cloneable>, [">= 0"])
       s.add_dependency(%q<rails>, [">= 0"])
       s.add_dependency(%q<jeweler>, [">= 0"])
     end
   else
-    s.add_dependency(%q<deep_cloneable>, [">= 0"])
     s.add_dependency(%q<rails>, [">= 0"])
     s.add_dependency(%q<jeweler>, [">= 0"])
   end

data/lib/deep_cloneable.rb

@@ -101,7 +101,7 @@ class ActiveRecord::Base
           cloned_object = case association_reflection.macro
             when :belongs_to, :has_one
               self.send(association) && self.send(association).send(__method__, opts, &block)
-            when :has_many, :has_and_belongs_to_many
+            when :has_many
               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|
@@ -114,7 +114,19 @@ class ActiveRecord::Base
                 tmp.send("#{reverse_association_name.to_s}=", kopy) if reverse_association_name
                 tmp
               end
-            end
+            when :has_and_belongs_to_many
+              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.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
+          
           kopy.send("#{association}=", cloned_object)
         end
       end

data/test/models.rb

@@ -0,0 +1,53 @@
+module Animal
+  class Human < ActiveRecord::Base
+    has_many :pigs
+    
+    has_many :ownerships    
+    has_many :chickens, :through => :ownerships
+  end
+  class Pig < ActiveRecord::Base
+    belongs_to :human
+  end
+      
+  class Chicken < ActiveRecord::Base
+    has_many :ownerships
+    has_many :humans, :through => :ownerships
+  end  
+  
+  class Ownership < ActiveRecord::Base
+    belongs_to :human
+    belongs_to :chicken
+    
+    validates_uniqueness_of :chicken_id, :scope => :human_id
+  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; attr_accessor :cloned_from_id end
+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, :foreign_key => 'owner'
+  has_many :gold_pieces, :through => :treasures
+  has_one :parrot
+
+  attr_accessor :cloned_from_id
+end
+
+class Treasure < ActiveRecord::Base
+  belongs_to :pirate, :foreign_key => :owner
+  belongs_to :matey
+  has_many :gold_pieces
+end
+
+class Person < ActiveRecord::Base
+  has_and_belongs_to_many :cars
+end
+
+class Car < ActiveRecord::Base
+  has_and_belongs_to_many :people
+end

data/test/schema.rb

@@ -47,6 +47,19 @@ ActiveRecord::Schema.define(:version => 1) do
   create_table :ownerships, :force => true do |t|
     t.column :human_id, :integer
     t.column :chicken_id, :integer    
-  end  
+  end
+  
+  create_table :cars, :force => true do |t|
+    t.column :name, :string
+  end
+
+  create_table :people, :force => true do |t|
+    t.column :name, :string
+  end
+
+  create_table :cars_people, :id => false, :force => true do |t|
+    t.column :car_id, :integer
+    t.column :person_id, :integer
+  end   
   
 end

data/test/test_deep_cloneable.rb

@@ -16,6 +16,7 @@ class TestDeepCloneable < Test::Unit::TestCase
 
   def test_single_dup_exception
     dup = @jack.send(@@clone_method, :except => :name)
+    assert dup.new_record?
     assert dup.save
     assert_equal @jack.name, @jack.send(@@clone_method).name # Old behaviour
     assert_nil dup.name
@@ -24,6 +25,7 @@ class TestDeepCloneable < Test::Unit::TestCase
 
   def test_multiple_dup_exception
     dup = @jack.send(@@clone_method, :except => [:name, :nick_name])
+    assert dup.new_record?
     assert dup.save
     assert_nil dup.name
     assert_equal 'no nickname', dup.nick_name
@@ -32,12 +34,14 @@ class TestDeepCloneable < Test::Unit::TestCase
 
   def test_single_include_association
     dup = @jack.send(@@clone_method, :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)
+    assert dup.new_record?
     assert dup.save
     assert_not_nil dup.ship
     assert_not_equal @jack.ship, dup.ship
@@ -45,12 +49,14 @@ class TestDeepCloneable < Test::Unit::TestCase
 
   def test_single_include_has_many_polymorphic_association
     dup = @ship.send(@@clone_method, :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])
+    assert dup.new_record?
     assert dup.save
     assert_equal 1, dup.mateys.size
     assert_equal 1, dup.treasures.size
@@ -58,6 +64,7 @@ class TestDeepCloneable < Test::Unit::TestCase
 
   def test_deep_include_association
     dup = @jack.send(@@clone_method, :include => {:treasures => :gold_pieces})
+    assert dup.new_record?
     assert dup.save
     assert_equal 1, dup.treasures.size
     assert_equal 1, dup.gold_pieces.size
@@ -65,6 +72,7 @@ class TestDeepCloneable < Test::Unit::TestCase
 
   def test_include_association_assignments
     dup = @jack.send(@@clone_method, :include => :treasures)
+    assert dup.new_record?
 
     dup.treasures.each do |treasure|
       assert_equal dup, treasure.pirate
@@ -73,6 +81,7 @@ class TestDeepCloneable < Test::Unit::TestCase
 
   def test_multiple_and_deep_include_association
     dup = @jack.send(@@clone_method, :include => {:treasures => :gold_pieces, :mateys => {}})
+    assert dup.new_record?
     assert dup.save
     assert_equal 1, dup.treasures.size
     assert_equal 1, dup.gold_pieces.size
@@ -81,6 +90,7 @@ class TestDeepCloneable < Test::Unit::TestCase
 
   def test_multiple_and_deep_include_association_with_array
     dup = @jack.send(@@clone_method, :include => [{:treasures => :gold_pieces}, :mateys])
+    assert dup.new_record?
     assert dup.save
     assert_equal 1, dup.treasures.size
     assert_equal 1, dup.gold_pieces.size
@@ -89,12 +99,14 @@ class TestDeepCloneable < Test::Unit::TestCase
 
   def test_with_belongs_to_relation
     dup = @jack.send(@@clone_method, :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] }])
+    assert dup.new_record?
     assert dup.save
     assert_not_equal dup.parrot, @jack.parrot
     assert_not_nil @jack.parrot.name
@@ -104,6 +116,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)
+    assert dup.new_record?
     dup.save!
 
     assert_equal current_matey_count + 1, Matey.count
@@ -116,6 +129,7 @@ class TestDeepCloneable < Test::Unit::TestCase
     @jack.mateys.each{|m| dict[:mateys][m] = m.send(@@clone_method) }
 
     dup = @jack.send(@@clone_method, :include => [:mateys, { :treasures => :matey }], :dictionary => dict)
+    assert dup.new_record?
     dup.save!
 
     assert_equal current_matey_count + 1, Matey.count
@@ -126,6 +140,7 @@ class TestDeepCloneable < Test::Unit::TestCase
     @pig = Animal::Pig.create :human => @human, :name => 'big pig'
 
     dup_human = @human.send(@@clone_method, :include => [:pigs])
+    assert dup_human.new_record?
     assert dup_human.save
     assert_equal 1, dup_human.pigs.count
     
@@ -133,6 +148,7 @@ class TestDeepCloneable < Test::Unit::TestCase
     @pig2 = @human2.pigs.create :name => 'small pig'
     
     dup_human_2 = @human.send(@@clone_method, :include => [:pigs])
+    assert dup_human_2.new_record?
     assert dup_human_2.save
     assert_equal 1, dup_human_2.pigs.count
   end 
@@ -146,6 +162,7 @@ class TestDeepCloneable < Test::Unit::TestCase
     @human2.chickens << [@chicken1, @chicken2]    
     
     dup_human = @human.send(@@clone_method, :include => :ownerships)
+    assert dup_human.new_record?
     assert dup_human.save
     assert_equal 2, dup_human.chickens.count    
   end 
@@ -155,8 +172,34 @@ class TestDeepCloneable < Test::Unit::TestCase
       kopy.cloned_from_id = original.id
     end
 
+    assert dup.new_record?
     assert dup.save
     assert_equal @jack.id, dup.cloned_from_id
     assert_equal @jack.parrot.id, dup.parrot.cloned_from_id
   end
+  
+  def test_should_dup_habtm_associations
+    @person1 = Person.create :name => "Bill"
+    @person2 = Person.create :name => "Ted"
+    @car1 = Car.create :name => 'Mustang'
+    @car2 = Car.create :name => 'Camaro'
+    @person1.cars << [@car1, @car2]
+    @person2.cars << [@car1, @car2]
+
+    dup_person = @person1.dup :include => :cars
+
+    assert dup_person.new_record?
+    assert_equal [@person1, @person2, dup_person], @car1.people
+    assert_equal [@person1, @person2, dup_person], @car2.people
+
+    assert dup_person.save
+
+    # did NOT dup the Car instances
+    assert_equal 2, Car.all.count
+
+    # did dup the correct join table rows
+    assert_equal @person1.cars, dup_person.cars
+    assert_equal 2, dup_person.cars.count
+  end
+  
 end

data/test/test_helper.rb

@@ -7,52 +7,7 @@ $LOAD_PATH.unshift(File.dirname(__FILE__))
 
 require 'active_record'
 require File.dirname(__FILE__) + '/../init.rb'
-
-module Animal
-  class Human < ActiveRecord::Base
-    has_many :pigs
-    
-    has_many :ownerships    
-    has_many :chickens, :through => :ownerships
-  end
-  class Pig < ActiveRecord::Base
-    belongs_to :human
-  end
-      
-  class Chicken < ActiveRecord::Base
-    has_many :ownerships
-    has_many :humans, :through => :ownerships
-  end  
-  
-  class Ownership < ActiveRecord::Base
-    belongs_to :human
-    belongs_to :chicken
-    
-    validates_uniqueness_of :chicken_id, :scope => :human_id
-  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; attr_accessor :cloned_from_id end
-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, :foreign_key => 'owner'
-  has_many :gold_pieces, :through => :treasures
-  has_one :parrot
-
-  attr_accessor :cloned_from_id
-end
-
-class Treasure < ActiveRecord::Base
-  belongs_to :pirate, :foreign_key => :owner
-  belongs_to :matey
-  has_many :gold_pieces
-end
+require 'models'
 
 def load_schema
   config = YAML::load(IO.read(File.dirname(__FILE__) + '/database.yml'))

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: deep_cloneable
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.4.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,24 +9,8 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-02 00:00:00.000000000 Z
+date: 2012-07-23 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: deep_cloneable
-  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: rails
   requirement: !ruby/object:Gem::Requirement
@@ -51,7 +35,7 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
@@ -79,6 +63,7 @@ files:
 - init.rb
 - lib/deep_cloneable.rb
 - test/database.yml
+- test/models.rb
 - test/schema.rb
 - test/test_deep_cloneable.rb
 - test/test_helper.rb
@@ -96,7 +81,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1579513982850858765
+      hash: -3012807303620209218
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: