deep_cloneable 1.4.1 → 1.5.1

data/Gemfile

@@ -1,6 +1,6 @@
 source 'http://rubygems.org'
 
-gem 'rails'
+gem 'activerecord', '>= 3.1'
 
 group :development do
   gem 'jeweler'
@@ -8,4 +8,4 @@ end
 
 group :test do
   gem 'sqlite3'
-end
+end

data/Gemfile.lock

@@ -1,94 +1,38 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    actionmailer (3.2.2)
-      actionpack (= 3.2.2)
-      mail (~> 2.4.0)
-    actionpack (3.2.2)
-      activemodel (= 3.2.2)
-      activesupport (= 3.2.2)
+    activemodel (3.2.12)
+      activesupport (= 3.2.12)
       builder (~> 3.0.0)
-      erubis (~> 2.7.0)
-      journey (~> 1.0.1)
-      rack (~> 1.4.0)
-      rack-cache (~> 1.1)
-      rack-test (~> 0.6.1)
-      sprockets (~> 2.1.2)
-    activemodel (3.2.2)
-      activesupport (= 3.2.2)
-      builder (~> 3.0.0)
-    activerecord (3.2.2)
-      activemodel (= 3.2.2)
-      activesupport (= 3.2.2)
+    activerecord (3.2.12)
+      activemodel (= 3.2.12)
+      activesupport (= 3.2.12)
       arel (~> 3.0.2)
       tzinfo (~> 0.3.29)
-    activeresource (3.2.2)
-      activemodel (= 3.2.2)
-      activesupport (= 3.2.2)
-    activesupport (3.2.2)
+    activesupport (3.2.12)
       i18n (~> 0.6)
       multi_json (~> 1.0)
     arel (3.0.2)
-    builder (3.0.0)
-    erubis (2.7.0)
+    builder (3.0.4)
     git (1.2.5)
-    hike (1.2.1)
-    i18n (0.6.0)
-    jeweler (1.8.3)
+    i18n (0.6.4)
+    jeweler (1.8.4)
       bundler (~> 1.0)
       git (>= 1.2.5)
       rake
       rdoc
-    journey (1.0.3)
-    json (1.6.6)
-    mail (2.4.4)
-      i18n (>= 0.4.0)
-      mime-types (~> 1.16)
-      treetop (~> 1.4.8)
-    mime-types (1.18)
-    multi_json (1.2.0)
-    polyglot (0.3.3)
-    rack (1.4.1)
-    rack-cache (1.2)
-      rack (>= 0.4)
-    rack-ssl (1.3.2)
-      rack
-    rack-test (0.6.1)
-      rack (>= 1.0)
-    rails (3.2.2)
-      actionmailer (= 3.2.2)
-      actionpack (= 3.2.2)
-      activerecord (= 3.2.2)
-      activeresource (= 3.2.2)
-      activesupport (= 3.2.2)
-      bundler (~> 1.0)
-      railties (= 3.2.2)
-    railties (3.2.2)
-      actionpack (= 3.2.2)
-      activesupport (= 3.2.2)
-      rack-ssl (~> 1.3.2)
-      rake (>= 0.8.7)
-      rdoc (~> 3.4)
-      thor (~> 0.14.6)
-    rake (0.9.2.2)
-    rdoc (3.12)
+    json (1.7.7)
+    multi_json (1.6.1)
+    rake (10.0.3)
+    rdoc (4.0.0)
       json (~> 1.4)
-    sprockets (2.1.2)
-      hike (~> 1.2)
-      rack (~> 1.0)
-      tilt (~> 1.1, != 1.3.0)
-    sqlite3 (1.3.5)
-    thor (0.14.6)
-    tilt (1.3.3)
-    treetop (1.4.10)
-      polyglot
-      polyglot (>= 0.3.1)
-    tzinfo (0.3.32)
+    sqlite3 (1.3.7)
+    tzinfo (0.3.36)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
+  activerecord (>= 3.1)
   jeweler
-  rails
   sqlite3

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2010 Reinier de Lange
+Copyright (c) 2013 Reinier de Lange
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.rdoc

@@ -4,6 +4,8 @@ This gem gives every ActiveRecord::Base object the possibility to do a deep clon
 
 == Requirements
 
+* Ruby 1.8.7, 1.9, 2.0.0
+
 * Activerecord 3.1, 3.2
 
 * Rails 2.x/3.0 users, please check out the 'rails2.x-3.0' branch.
@@ -12,7 +14,7 @@ This gem gives every ActiveRecord::Base object the possibility to do a deep clon
 
 * In your Gemfile:
 
-  gem 'deep_cloneable', '~> 1.4.0'
+  gem 'deep_cloneable', '~> 1.5.0'
 
 == Example
  
@@ -54,7 +56,10 @@ If this is not an option for you, it is also possible to populate the dictionary
    pirate.dup :include => :parrot do |original, kopy|
      kopy.cloned_from_id = original.id if kopy.respond_to?(:cloned_from_id)
    end
-
+   
+=== Cloning without validations
+   pirate.dup :include => {:treasures => :gold_pieces}, :validate => false
+   
 == Contributors
 
 * Michael He
@@ -64,6 +69,8 @@ If this is not an option for you, it is also possible to populate the dictionary
 * Ilya Kuzmin
 * zozi
 * fractious
+* Georges Gabereau
+* Christophe Belpaire
 
 == Note on Patches/Pull Requests
  
@@ -77,4 +84,4 @@ If this is not an option for you, it is also possible to populate the dictionary
 
 == Copyright
 
-Copyright (c) 2012 Reinier de Lange. See LICENSE for details.
+Copyright (c) 2013 Reinier de Lange. See LICENSE for details.

data/Rakefile

@@ -39,7 +39,7 @@ end
 
 task :default => :test
 
-require 'rake/rdoctask'
+require 'rdoc/task'
 Rake::RDocTask.new do |rdoc|
   version = File.exist?('VERSION') ? File.read('VERSION') : ""
 

data/VERSION

@@ -1 +1 @@
-1.4.1
+1.5.1

data/deep_cloneable.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "deep_cloneable"
-  s.version = "1.4.1"
+  s.version = "1.5.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Reinier de Lange"]
-  s.date = "2012-07-23"
+  s.date = "2013-03-06"
   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 = [
@@ -35,21 +35,21 @@ Gem::Specification.new do |s|
   ]
   s.homepage = "http://github.com/moiristo/deep_cloneable"
   s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.21"
+  s.rubygems_version = "1.8.24"
   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<rails>, [">= 0"])
+      s.add_runtime_dependency(%q<activerecord>, [">= 3.1"])
       s.add_development_dependency(%q<jeweler>, [">= 0"])
     else
-      s.add_dependency(%q<rails>, [">= 0"])
+      s.add_dependency(%q<activerecord>, [">= 3.1"])
       s.add_dependency(%q<jeweler>, [">= 0"])
     end
   else
-    s.add_dependency(%q<rails>, [">= 0"])
+    s.add_dependency(%q<activerecord>, [">= 3.1"])
     s.add_dependency(%q<jeweler>, [">= 0"])
   end
 end

data/lib/deep_cloneable.rb

@@ -1,11 +1,9 @@
 class ActiveRecord::Base
   module DeepCloneable
-    @@rails31 = ActiveRecord::VERSION::MAJOR >= 3 && ActiveRecord::VERSION::MINOR > 0
-
     # 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 @@rails31 and !Object.respond_to? :initialize_dup
+    if !Object.respond_to? :initialize_dup, true
       ActiveRecord::Base.class_eval do
         module Dup
           def dup
@@ -14,57 +12,57 @@ class ActiveRecord::Base
             copy
           end
         end
-        remove_method :dup
+        remove_possible_method :dup
         include Dup
       end
     end
 
-    # clones an ActiveRecord model. 
+    # 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
     #
     # === Usage:
-    # 
+    #
     # ==== Cloning one single association
     #    pirate.clone :include => :mateys
-    # 
+    #
     # ==== Cloning multiple associations
     #    pirate.clone :include => [:mateys, :treasures]
-    # 
+    #
     # ==== Cloning really deep
     #    pirate.clone :include => {:treasures => :gold_pieces}
-    # 
+    #
     # ==== Cloning really deep with multiple associations
     #    pirate.clone :include => [:mateys, {:treasures => :gold_pieces}]
     #
     # ==== Cloning really deep with multiple associations and a dictionary
     #
-    # A dictionary ensures that models are not cloned multiple times when it is associated to nested models. 
+    # A dictionary ensures that models are not cloned multiple times when it is associated to nested models.
     # When using a dictionary, ensure recurring associations are cloned first:
     #
-    #    pirate.clone :include => [:mateys, {:treasures => [:matey, :gold_pieces], :use_dictionary => true }]    
+    #    pirate.clone :include => [:mateys, {:treasures => [:matey, :gold_pieces], :use_dictionary => true }]
     #
     # If this is not an option for you, it is also possible to populate the dictionary manually in advance:
     #
     #    dict = { :mateys => {} }
     #    pirate.mateys.each{|m| dict[:mateys][m] = m.clone }
-    #    pirate.clone :include => [:mateys, {:treasures => [:matey, :gold_pieces], :dictionary => dict }]    
-    #   
+    #    pirate.clone :include => [:mateys, {:treasures => [:matey, :gold_pieces], :dictionary => dict }]
+    #
     # ==== Cloning a model without an attribute
     #    pirate.clone :except => :name
-    #  
+    #
     # ==== Cloning a model without multiple attributes
     #    pirate.clone :except => [:name, :nick_name]
-    #    
-    # ==== Cloning a model without an attribute or nested multiple attributes   
+    #
+    # ==== Cloning a model without an attribute or nested multiple attributes
     #    pirate.clone :include => :parrot, :except => [:name, { :parrot => [:name] }]
-    # 
-    define_method (@@rails31 ? :dup : :clone) do |*args, &block|
+    #
+    define_method :dup do |*args, &block|
       options = args[0] || {}
-      
+
       dict = options[:dictionary]
       dict ||= {} if options.delete(:use_dictionary)
-      
+
       kopy = unless dict
         super()
       else
@@ -83,40 +81,50 @@ class ActiveRecord::Base
         end
         deep_exceptions = exceptions.select{|e| e.kind_of?(Hash) }.inject({}){|m,h| m.merge(h) }
       end
-    
+
       if options[:include]
         Array(options[:include]).each do |association, deep_associations|
           if (association.kind_of? Hash)
             deep_associations = association[association.keys.first]
             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
-        
+
           association_reflection = self.class.reflect_on_association(association)
           raise AssociationNotFoundException.new("#{self.class}##{association}") if association_reflection.nil?
-                    
+
+          if options[:validate] == false
+            kopy.instance_eval do
+              # Force :validate => false on all saves.
+              def perform_validations(options={})
+                options[:validate] = false
+                super(options)
+              end
+            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 = (@@rails31 ? association_reflection.foreign_key : association_reflection.primary_key_name).to_s
-              
+              primary_key_name = association_reflection.foreign_key.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
+                a.foreign_key.to_s == primary_key_name
               end.try(:name)
-              
-              self.send(association).collect do |obj| 
+
+              self.send(association).collect do |obj|
                 tmp = obj.send(__method__, opts, &block)
-                tmp.send("#{primary_key_name}=", nil)                
+                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 = (@@rails31 ? association_reflection.foreign_key : association_reflection.primary_key_name).to_s
-                            
+              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)
@@ -126,16 +134,16 @@ class ActiveRecord::Base
                 obj
               end
           end
-          
+
           kopy.send("#{association}=", cloned_object)
         end
       end
 
       return kopy
     end
-    
-    class AssociationNotFoundException < StandardError; end    
+
+    class AssociationNotFoundException < StandardError; end
   end
-  
+
   include DeepCloneable
-end
+end

data/test/models.rb

@@ -1,25 +1,26 @@
 module Animal
   class Human < ActiveRecord::Base
     has_many :pigs
-    
-    has_many :ownerships    
+
+    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  
-  
+  end
+
   class Ownership < ActiveRecord::Base
     belongs_to :human
     belongs_to :chicken
-    
+
     validates_uniqueness_of :chicken_id, :scope => :human_id
-  end  
+  end
+
 end
 
 class GoldPiece < ActiveRecord::Base;   belongs_to :treasure  end
@@ -50,4 +51,14 @@ end
 
 class Car < ActiveRecord::Base
   has_and_belongs_to_many :people
-end
+end
+
+class ChildWithValidation < ActiveRecord::Base
+  belongs_to :parent, :class_name => 'ParentWithValidation'
+  validates :name, :presence => true
+end
+
+class ParentWithValidation < ActiveRecord::Base
+  has_many :children, :class_name => 'ChildWithValidation'
+  validates :name, :presence => true
+end

data/test/schema.rb

@@ -6,49 +6,49 @@ ActiveRecord::Schema.define(:version => 1) do
     t.column :ship_id, :integer
     t.column :ship_type, :string
   end
-  
+
   create_table :parrots, :force => true do |t|
     t.column :name, :string
     t.column :pirate_id, :integer
   end
-  
+
   create_table :mateys, :force => true do |t|
     t.column :name, :string
     t.column :pirate_id, :integer
   end
-  
+
   create_table :treasures, :force => true do |t|
     t.column :found_at, :string
     t.column :owner, :integer
-    t.column :matey_id, :integer    
+    t.column :matey_id, :integer
   end
-  
+
   create_table :gold_pieces, :force => true do |t|
     t.column :treasure_id, :integer
   end
-  
+
   create_table :battle_ships, :force => true do |t|
     t.column :name, :string
-  end  
-  
+  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
-  
+
   create_table :chickens, :force => true do |t|
     t.column :name, :string
-  end  
-  
+  end
+
   create_table :ownerships, :force => true do |t|
     t.column :human_id, :integer
-    t.column :chicken_id, :integer    
+    t.column :chicken_id, :integer
   end
-  
+
   create_table :cars, :force => true do |t|
     t.column :name, :string
   end
@@ -60,6 +60,15 @@ ActiveRecord::Schema.define(:version => 1) do
   create_table :cars_people, :id => false, :force => true do |t|
     t.column :car_id, :integer
     t.column :person_id, :integer
-  end   
-  
+  end
+
+  create_table :parent_with_validations, :force => true do |t|
+    t.column :name, :string
+  end
+
+  create_table :child_with_validations, :force => true do |t|
+    t.column :name, :string
+    t.column :parent_with_validation_id, :integer
+  end
+
 end

data/test/test_deep_cloneable.rb

@@ -2,10 +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    
+  @@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)
     @john = Matey.create(:name => 'John', :pirate => @jack)
@@ -143,30 +143,30 @@ class TestDeepCloneable < Test::Unit::TestCase
     assert dup_human.new_record?
     assert dup_human.save
     assert_equal 1, dup_human.pigs.count
-    
+
     @human2 = Animal::Human.create :name => "John"
     @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 
-  
+  end
+
   def test_should_dup_many_to_many_associations
-    @human = Animal::Human.create :name => "Michael" 
-    @human2 = Animal::Human.create :name => "Jack"        
+    @human = Animal::Human.create :name => "Michael"
+    @human2 = Animal::Human.create :name => "Jack"
     @chicken1 = Animal::Chicken.create :name => 'Chick1'
-    @chicken2 = Animal::Chicken.create :name => 'Chick2'    
+    @chicken2 = Animal::Chicken.create :name => 'Chick2'
     @human.chickens << [@chicken1, @chicken2]
-    @human2.chickens << [@chicken1, @chicken2]    
-    
+    @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 
-  
+    assert_equal 2, dup_human.chickens.count
+  end
+
   def test_should_dup_with_block
     dup = @jack.send(@@clone_method, :include => :parrot) do |original, kopy|
       kopy.cloned_from_id = original.id
@@ -177,7 +177,7 @@ class TestDeepCloneable < Test::Unit::TestCase
     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"
@@ -201,5 +201,61 @@ class TestDeepCloneable < Test::Unit::TestCase
     assert_equal @person1.cars, dup_person.cars
     assert_equal 2, dup_person.cars.count
   end
-  
+
+  def test_parent_validations_run_on_save_after_clone
+    child = ChildWithValidation.create :name => 'Jimmy'
+    parent = ParentWithValidation.new :children => [child]
+    parent.save :validate => false
+
+    dup_parent = parent.dup :include => :children
+
+    assert !dup_parent.save
+    assert dup_parent.new_record?
+    assert !dup_parent.valid?
+    assert dup_parent.children.first.valid?
+    assert_equal dup_parent.errors.messages, :name => ["can't be blank"]
+  end
+
+  def test_parent_validations_dont_run_on_save_after_clone
+    child = ChildWithValidation.create :name => 'Jimmy'
+    parent = ParentWithValidation.new :children => [child]
+    parent.save :validate => false
+
+    dup_parent = parent.dup :include => :children, :validate => false
+
+    assert dup_parent.save
+    assert !dup_parent.new_record?
+    assert !dup_parent.valid?
+    assert dup_parent.children.first.valid?
+    assert_equal dup_parent.errors.messages, :name => ["can't be blank"]
+  end
+
+  def test_child_validations_run_on_save_after_clone
+    child = ChildWithValidation.new
+    child.save :validate => false
+    parent = ParentWithValidation.create :name => 'John', :children => [child]
+
+    dup_parent = parent.dup :include => :children
+
+    assert !dup_parent.save
+    assert dup_parent.new_record?
+    assert !dup_parent.valid?
+    assert !dup_parent.children.first.valid?
+    assert_equal dup_parent.errors.messages, :children => ["is invalid"]
+  end
+
+  def test_child_validations_run_on_save_after_clone
+    child = ChildWithValidation.new
+    child.save :validate => false
+    parent = ParentWithValidation.create :name => 'John', :children => [child]
+
+    dup_parent = parent.dup :include => :children, :validate => false
+
+    assert dup_parent.save
+    assert !dup_parent.new_record?
+    assert !dup_parent.valid?
+    assert !dup_parent.children.first.valid?
+    assert_equal dup_parent.errors.messages, :children => ["is invalid"]
+  end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: deep_cloneable
 version: !ruby/object:Gem::Version
-  version: 1.4.1
+  version: 1.5.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,16 +9,16 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-23 00:00:00.000000000 Z
+date: 2013-03-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rails
+  name: activerecord
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.1'
 - !ruby/object:Gem::Dependency
   name: jeweler
   requirement: !ruby/object:Gem::Requirement
@@ -81,7 +81,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3012807303620209218
+      hash: 250465939979745511
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -90,7 +90,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.21
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: This gem gives every ActiveRecord::Base object the possibility to do a deep