deep_cloneable 1.6.0 → 1.6.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    OWRkNjEzMTlmOTg4YzcwNTUwYjk1ZDA0MDFkODBkNWQxZGViN2Y0ZQ==
+    NGNlZTg5YzA1YjhiNmFmZjI4ZDBjZTIxYmJkYTZjYjZhZjE5MWQzNA==
   data.tar.gz: !binary |-
-    YmVhZWE1YmEwMjE1NmYwMTEwNTU3NmY1YzhlZjQ3NjJmNDRjNmVjNw==
+    ZTNiYjYzMmI2YmMzOGY1NGEyNWE4ZmMzZWExNTE3NjJmYzc0ZjJkMQ==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    NWE2ZDU4ZjI5ZWM4NzFlYmU3MGFiMjRiOThjMmQ5NGY5NTc2ODI3NjFhNTMx
-    YTE1NmYxMDFiZGU2Mzg1YTQxODllYzczOWEzMDNmYWEwMjdlNjE4MDU0ZDhm
-    MWVkYzU0YmUyYTE3YWI4MzFkZTk4NDI4MTQ1OGVhZmQxYzJkNmU=
+    ODQ0NDJiMzkwMzY5YzNlYmMyNjc1NTlmZTIxOWNiMDcyNjg1NWJiOGYyMGJh
+    N2I4NDY3YWNiZmRhNjkyNTExMDMwYzBlNWZhMTEyODk0ZmM0ZGNkZDMzZmQw
+    MDIzYjI3OTdlYmEyOWMzNWRmZTQzZjU3NTU0NDc2MjI0NTk4NGE=
   data.tar.gz: !binary |-
-    NmQzZjZmOGM4MDI5NWZkN2Y2MWE2NmJhMTVkMzkyNjUxZWE5MDE0Y2QyYzEy
-    ZjNlNDMzNWRiYmFkNTY4NmUyYmFjZmIwNThlMDM3ODcwZTEyN2Y1NjRmNDBl
-    ODUwNDk4MDUxYjBlMTMwYmIzYThmYTI4NDE2NWUyMjk1MWJmNTI=
+    YzhkMmVkYWQxYjk1MDhhMTU0MTlmNjNjNGI4NTZiNTc2M2FiZWVjOGVkNTZh
+    NDI3NGU0YjUzMjFkNzZlNWRjMmY0ODhlZmI0MzBjZjM0M2YzNjczZjQzZWY0
+    ZGVjNGU0OGEzYWQ1MDYxM2E1Njc5ZDU4Y2NlYzA2OTY2OWFjY2I=

data/.travis.yml

@@ -3,15 +3,20 @@ rvm:
   - 1.9.2
   - 1.9.3
   - 2.0.0
-  
+
 gemfile:
   - gemfiles/3.1.gemfile
   - gemfiles/3.2.gemfile
   - gemfiles/4.0.gemfile
-  
+  - gemfiles/4.1.gemfile
+
 matrix:
   exclude:
     - rvm: 1.8.7
-      gemfile: gemfiles/4.0.gemfile    
+      gemfile: gemfiles/4.0.gemfile
+    - rvm: 1.8.7
+      gemfile: gemfiles/4.1.gemfile
+    - rvm: 1.9.2
+      gemfile: gemfiles/4.0.gemfile
     - rvm: 1.9.2
-      gemfile: gemfiles/4.0.gemfile
+      gemfile: gemfiles/4.1.gemfile

data/Appraisals

@@ -8,4 +8,8 @@ end
 
 appraise '4.0' do
   gem 'activerecord', '~> 4.0.0'
+end
+
+appraise '4.1' do
+  gem 'activerecord', '~> 4.1.0'
 end

data/Gemfile

@@ -1,7 +1,7 @@
 source 'http://rubygems.org'
 
+gem 'minitest', :group => :test
 gem 'activerecord', '>= 3.1.0'
-
 gem 'activesupport', '>= 3.1.0', :group => :test
 gem 'appraisal', :group => :test
 gem 'sqlite3', :group => :test

data/Gemfile.lock

@@ -78,5 +78,6 @@ DEPENDENCIES
   activesupport (>= 3.1.0)
   appraisal
   jeweler
+  minitest
   rdoc (>= 2.4.2)
   sqlite3

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2013 Reinier de Lange
+Copyright (c) 2014 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

@@ -8,7 +8,7 @@ This gem gives every ActiveRecord::Base object the possibility to do a deep clon
 
 * Ruby 1.8.7, 1.9.3, 2.0.0
 
-* Activerecord 3.1, 3.2, 4.0
+* Activerecord 3.1, 3.2, 4.0, 4.1
 
 * Rails 2.x/3.0 users, please check out the 'rails2.x-3.0' branch.
 
@@ -16,10 +16,10 @@ This gem gives every ActiveRecord::Base object the possibility to do a deep clon
 
 * In your Gemfile:
 
-  gem 'deep_cloneable', '~> 1.6.0'
+  gem 'deep_cloneable', '~> 1.6.1'
 
 == Example
- 
+
 === Cloning one single association
    pirate.dup :include => :mateys
 
@@ -34,10 +34,10 @@ This gem gives every ActiveRecord::Base object the possibility to do a deep clon
 
 === 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.dup :include => [:mateys, {:treasures => [:matey, :gold_pieces]}], :use_dictionary => true    
+  pirate.dup :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:
 
@@ -46,35 +46,35 @@ If this is not an option for you, it is also possible to populate the dictionary
   pirate.dup :include => [:mateys, {:treasures => [:matey, :gold_pieces]}], :dictionary => dict
 
 When an object isn't found in the dictionary, it will be populated. By passing in an empty dictionary you can populate it automatically and reuse it in subsequent dups to avoid creating multiples of the same object where you have overlapping associations.
-  
+
 === Cloning a model without an attribute
    pirate.dup :except => :name
- 
+
 === Cloning a model without multiple attributes
    pirate.dup :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.dup :include => :parrot, :except => [:name, { :parrot => [:name] }]
 
 === Cloning with a block
    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
 
 === Cloning a model with only explicitly assigned attribute
    pirate.dup :only => :name
-   
+
 === Cloning a model with only multiple explicitly assigned attributes
-   pirate.dup :only => [:name, :nick_name]  
+   pirate.dup :only => [:name, :nick_name]
 
-=== Cloning a model with explicitly assigned attributes or nested multiple attributes   
+=== Cloning a model with explicitly assigned attributes or nested multiple attributes
    pirate.dup :include => :parrot, :only => [:name, { :parrot => [:name] }]
 
 == Note on Patches/Pull Requests
- 
+
 * Fork the project.
 * Make your feature addition or bug fix.
 * Add tests for it. This is important so I don't break it in a
@@ -85,4 +85,4 @@ When an object isn't found in the dictionary, it will be populated. By passing i
 
 == Copyright
 
-Copyright (c) 2013 Reinier de Lange. See LICENSE for details.
+Copyright (c) 2014 Reinier de Lange. See LICENSE for details.

data/VERSION

@@ -1 +1 @@
-1.6.0
+1.6.1

data/deep_cloneable.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "deep_cloneable"
-  s.version = "1.6.0"
+  s.version = "1.6.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Reinier de Lange"]
-  s.date = "2013-11-05"
+  s.date = "2014-04-18"
   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 = [
@@ -33,6 +33,8 @@ Gem::Specification.new do |s|
     "gemfiles/3.2.gemfile.lock",
     "gemfiles/4.0.gemfile",
     "gemfiles/4.0.gemfile.lock",
+    "gemfiles/4.1.gemfile",
+    "gemfiles/4.1.gemfile.lock",
     "init.rb",
     "lib/deep_cloneable.rb",
     "test/database.yml",

data/gemfiles/3.1.gemfile

@@ -2,6 +2,7 @@
 
 source "http://rubygems.org"
 
+gem "minitest", :group=>:test
 gem "activesupport", ">= 3.1.0", :group=>:test
 gem "appraisal", :group=>:test
 gem "sqlite3", :group=>:test

data/gemfiles/3.1.gemfile.lock

@@ -19,6 +19,7 @@ GEM
     builder (3.0.4)
     i18n (0.6.4)
     json (1.8.0)
+    minitest (4.7.5)
     multi_json (1.7.9)
     rake (10.1.0)
     rdoc (4.0.1)
@@ -33,5 +34,6 @@ DEPENDENCIES
   activerecord (~> 3.1.0)
   activesupport (>= 3.1.0)
   appraisal
+  minitest
   rdoc (>= 2.4.2)
   sqlite3

data/gemfiles/3.2.gemfile

@@ -2,6 +2,7 @@
 
 source "http://rubygems.org"
 
+gem "minitest", :group=>:test
 gem "activesupport", ">= 3.1.0", :group=>:test
 gem "appraisal", :group=>:test
 gem "sqlite3", :group=>:test

data/gemfiles/3.2.gemfile.lock

@@ -19,6 +19,7 @@ GEM
     builder (3.0.4)
     i18n (0.6.4)
     json (1.8.0)
+    minitest (4.7.5)
     multi_json (1.7.9)
     rake (10.1.0)
     rdoc (4.0.1)
@@ -33,5 +34,6 @@ DEPENDENCIES
   activerecord (~> 3.2.0)
   activesupport (>= 3.1.0)
   appraisal
+  minitest
   rdoc (>= 2.4.2)
   sqlite3

data/gemfiles/4.0.gemfile

@@ -2,6 +2,7 @@
 
 source "http://rubygems.org"
 
+gem "minitest", :group=>:test
 gem "activesupport", ">= 3.1.0", :group=>:test
 gem "appraisal", :group=>:test
 gem "sqlite3", :group=>:test

data/gemfiles/4.0.gemfile.lock

@@ -41,5 +41,6 @@ DEPENDENCIES
   activerecord (~> 4.0.0)
   activesupport (>= 3.1.0)
   appraisal
+  minitest
   rdoc (>= 2.4.2)
   sqlite3

data/gemfiles/4.1.gemfile

@@ -0,0 +1,11 @@
+# This file was generated by Appraisal
+
+source "http://rubygems.org"
+
+gem "minitest", :group=>:test
+gem "activesupport", ">= 3.1.0", :group=>:test
+gem "appraisal", :group=>:test
+gem "sqlite3", :group=>:test
+gem "rdoc", ">= 2.4.2", :group=>:test
+gem "activerecord", "~> 4.1.0"
+

data/gemfiles/4.1.gemfile.lock

@@ -0,0 +1,44 @@
+GEM
+  remote: http://rubygems.org/
+  specs:
+    activemodel (4.1.0)
+      activesupport (= 4.1.0)
+      builder (~> 3.1)
+    activerecord (4.1.0)
+      activemodel (= 4.1.0)
+      activesupport (= 4.1.0)
+      arel (~> 5.0.0)
+    activesupport (4.1.0)
+      i18n (~> 0.6, >= 0.6.9)
+      json (~> 1.7, >= 1.7.7)
+      minitest (~> 5.1)
+      thread_safe (~> 0.1)
+      tzinfo (~> 1.1)
+    appraisal (1.0.0)
+      bundler
+      rake
+      thor (>= 0.14.0)
+    arel (5.0.1.20140414130214)
+    builder (3.2.2)
+    i18n (0.6.9)
+    json (1.8.1)
+    minitest (5.3.3)
+    rake (10.3.0)
+    rdoc (4.1.1)
+      json (~> 1.4)
+    sqlite3 (1.3.9)
+    thor (0.19.1)
+    thread_safe (0.3.3)
+    tzinfo (1.1.0)
+      thread_safe (~> 0.1)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  activerecord (~> 4.1.0)
+  activesupport (>= 3.1.0)
+  appraisal
+  minitest
+  rdoc (>= 2.4.2)
+  sqlite3

data/lib/deep_cloneable.rb

@@ -1,6 +1,6 @@
 class ActiveRecord::Base
   module DeepCloneable
-    
+
     if ActiveRecord::VERSION::MAJOR < 4
       ActiveRecord::Base.class_eval do
         protected :initialize_dup
@@ -79,7 +79,7 @@ class ActiveRecord::Base
           end
 
           cloned_object = send(
-            "dup_#{association_reflection.macro}_#{association_reflection.class.name.demodulize.underscore.gsub('_reflection', '')}", 
+            "dup_#{association_reflection.macro}_#{association_reflection.class.name.demodulize.underscore.gsub('_reflection', '')}",
             { :reflection => association_reflection, :association => association, :copy => kopy, :dup_options => dup_options },
             &block
           )
@@ -90,17 +90,17 @@ 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  
-  
+    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
 
@@ -113,32 +113,32 @@ class ActiveRecord::Base
         tmp.send("#{primary_key_name}=", nil)
         tmp.send("#{reverse_association_name.to_s}=", options[:copy]) if reverse_association_name
         tmp
-      end      
+      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), 
+        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), 
+        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.send(reverse_association_name).target << options[:copy] if reverse_association_name
         obj
-      end       
+      end
     end
-    
+
     class AssociationNotFoundException < StandardError; end
   end
 

data/test/models.rb

@@ -53,6 +53,10 @@ class Car < ActiveRecord::Base
   has_and_belongs_to_many :people
 end
 
+class Coin < ActiveRecord::Base
+  has_and_belongs_to_many :people
+end
+
 class ChildWithValidation < ActiveRecord::Base
   belongs_to :parent, :class_name => 'ParentWithValidation'
   validates :name, :presence => true
@@ -64,14 +68,14 @@ class ParentWithValidation < ActiveRecord::Base
 end
 
 class Part < ActiveRecord::Base
-  # belongs_to :parent_part, :class_name => 'Part' 
+  # 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 
+end
 
 class Subject < ActiveRecord::Base
   has_many :student_assignments, :dependent => :destroy
@@ -80,5 +84,5 @@ end
 
 class StudentAssignment < ActiveRecord::Base
   belongs_to :subject
-  belongs_to :student  
+  belongs_to :student
 end

data/test/schema.rb

@@ -54,6 +54,10 @@ ActiveRecord::Schema.define(:version => 1) do
     t.column :name, :string
   end
 
+  create_table :coins, :force => true do |t|
+    t.column :value, :integer
+  end
+
   create_table :people, :force => true do |t|
     t.column :name, :string
   end
@@ -63,6 +67,11 @@ ActiveRecord::Schema.define(:version => 1) do
     t.column :person_id, :integer
   end
 
+  create_table :coins_people, :id => false, :force => true do |t|
+    t.column :coin_id, :integer
+    t.column :person_id, :integer
+  end
+
   create_table :parent_with_validations, :force => true do |t|
     t.column :name, :string
   end
@@ -76,10 +85,10 @@ ActiveRecord::Schema.define(:version => 1) do
     t.column :name, :string
     t.column :parent_part_id, :integer
   end
-  
+
   create_table :students, :force => true do |t|
     t.column :name, :string
-  end  
+  end
 
   create_table :subjects, :force => true do |t|
     t.column :name, :string
@@ -87,6 +96,6 @@ ActiveRecord::Schema.define(:version => 1) do
 
   create_table :student_assignments, :force => true do |t|
     t.column :student_id, :integer
-    t.column :subject_id, :integer    
-  end  
+    t.column :subject_id, :integer
+  end
 end

data/test/test_deep_cloneable.rb

@@ -1,6 +1,6 @@
 require File.dirname(__FILE__) + '/test_helper'
 
-class TestDeepCloneable < Test::Unit::TestCase
+class TestDeepCloneable < MiniTest::Unit::TestCase
 
   def setup
     @jack  = Pirate.create(:name => 'Jack Sparrow', :nick_name => 'Captain Jack', :age => 30)
@@ -62,8 +62,8 @@ class TestDeepCloneable < Test::Unit::TestCase
     dup = @jack.dup(:include => :ship)
     assert dup.new_record?
     assert dup.save
-    assert_not_nil dup.ship
-    assert_not_equal @jack.ship, dup.ship
+    refute_nil dup.ship
+    refute_equal @jack.ship, dup.ship
   end
 
   def test_single_include_has_many_polymorphic_association
@@ -120,16 +120,16 @@ class TestDeepCloneable < Test::Unit::TestCase
     dup = @jack.dup(:include => :parrot)
     assert dup.new_record?
     assert dup.save
-    assert_not_equal dup.parrot, @jack.parrot
+    refute_equal dup.parrot, @jack.parrot
   end
 
   def test_should_pass_nested_exceptions
     dup = @jack.dup(:include => :parrot, :except => [:name, { :parrot => [:name] }])
     assert dup.new_record?
     assert dup.save
-    assert_not_equal dup.parrot, @jack.parrot
+    refute_equal dup.parrot, @jack.parrot
     assert_equal dup.parrot.age, @jack.parrot.age
-    assert_not_nil @jack.parrot.name
+    refute_nil @jack.parrot.name
     assert_nil dup.parrot.name
   end
 
@@ -137,7 +137,7 @@ class TestDeepCloneable < Test::Unit::TestCase
     dup = @jack.dup(:include => :parrot, :only => [:name, { :parrot => [:name] }])
     assert dup.new_record?
     assert dup.save
-    assert_not_equal dup.parrot, @jack.parrot
+    refute_equal dup.parrot, @jack.parrot
     assert_equal dup.parrot.name, @jack.parrot.name
     assert_nil dup.parrot.age
   end
@@ -230,12 +230,23 @@ class TestDeepCloneable < Test::Unit::TestCase
     assert_equal @person1.cars, dup_person.cars
     assert_equal 2, dup_person.cars.count
   end
-  
+
+  def test_should_dup_habtm_associations_with_missing_reverse_association
+    @coin = Coin.create :value => 1
+    @person = Person.create :name => "Bill"
+    @coin.people << @person
+
+    dup = @coin.dup :include => :people
+    assert dup.new_record?
+    assert_equal [@person], @coin.people
+    assert dup.save
+  end
+
   def test_should_dup_joined_association
     subject1 = Subject.create(:name => 'subject 1')
     subject2 = Subject.create(:name => 'subject 2')
     student = Student.create(:name => 'Parent', :subjects => [subject1, subject2])
-  
+
     dup = student.dup :include => { :student_assignments => :subject }
     dup.save # Subjects will have been set after save
     assert_equal 2, dup.subjects.size
@@ -307,12 +318,12 @@ class TestDeepCloneable < Test::Unit::TestCase
     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 }

data/test/test_helper.rb

@@ -1,5 +1,6 @@
 require 'rubygems'
-require 'test/unit'
+require 'yaml'
+require 'minitest/autorun'
 #require 'pp'
 #require 'debugger'
 
@@ -7,11 +8,16 @@ $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 
 require 'active_record'
-require 'active_support/buffered_logger'
 
 def load_schema
   config = YAML::load(IO.read(File.dirname(__FILE__) + '/database.yml'))
-  ActiveRecord::Base.logger = ActiveSupport::BufferedLogger.new(File.dirname(__FILE__) + "/debug.log")
+
+  if defined?(ActiveSupport::BufferedLogger)
+    ActiveRecord::Base.logger = ActiveSupport::BufferedLogger.new(File.dirname(__FILE__) + "/debug.log")
+  else
+    ActiveRecord::Base.logger = ActiveSupport::Logger.new(File.dirname(__FILE__) + "/debug.log")
+  end
+
   db_adapter = ENV['DB']
   # no db passed, try one of these fine config-free DBs before bombing.
   db_adapter ||= begin

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: deep_cloneable
 version: !ruby/object:Gem::Version
-  version: 1.6.0
+  version: 1.6.1
 platform: ruby
 authors:
 - Reinier de Lange
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-05 00:00:00.000000000 Z
+date: 2014-04-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -49,6 +49,8 @@ files:
 - gemfiles/3.2.gemfile.lock
 - gemfiles/4.0.gemfile
 - gemfiles/4.0.gemfile.lock
+- gemfiles/4.1.gemfile
+- gemfiles/4.1.gemfile.lock
 - init.rb
 - lib/deep_cloneable.rb
 - test/database.yml