deep_cloneable 2.3.0 → 2.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2965ed86adcfda63e876533015e4a55e4fb0316f
-  data.tar.gz: 6d9ef9a44e135ecf9baa769e721e25c62b4f893c
+  metadata.gz: 66564e7a8d80a1e53865df29962c198d806cfa1a
+  data.tar.gz: 7c8225b19e4b29d9dd060114f9b3bd48844dc0f8
 SHA512:
-  metadata.gz: e11fe1537382bc8fe904aa02f0dd33b205bc926093d383f6ef7a0023509c279e430f04732f5707c62ef077b7de86516f66d935e90055e4fd1b8a1b2f6612bb93
-  data.tar.gz: c2b879a4b1885214c647c632ace3f8ba895b0c13ac12d34bed2c2bb9ccf776060a1add719a6a1219a9fbe7c4b3a4b30dcb33149466bda4fefec4b2b3f66c2eb0
+  metadata.gz: 96879e01a3bf45576bff535d91c143c62bd2512761083035651fb369df0269257e597ac0b675922c5a5c3b91881079e27940bea432c969fb795bc663cf6297f3
+  data.tar.gz: 71a1f902e51e6087e0c2ed6413d1b0d6975d321360abfe467dc6a11aa9b15ba5f413991ebe593eed45eaa7b8c9fbb43eaba69efea86deb3b0cb2357ea02fd732

data/VERSION

@@ -1 +1 @@
-2.3.0
+2.3.1

data/deep_cloneable.gemspec

@@ -2,16 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: deep_cloneable 2.3.0 ruby lib
+# stub: deep_cloneable 2.3.1 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "deep_cloneable"
-  s.version = "2.3.0"
+  s.version = "2.3.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
   s.authors = ["Reinier de Lange"]
-  s.date = "2017-06-14"
+  s.date = "2017-10-02"
   s.description = "Extends the functionality of ActiveRecord::Base#dup to perform a deep clone that includes user specified associations. "
   s.email = "r.j.delange@nedforce.nl"
   s.extra_rdoc_files = [

data/lib/deep_cloneable.rb

@@ -48,9 +48,11 @@ class ActiveRecord::Base
           end
 
           if conditions_or_deep_associations.kind_of?(Hash)
+            conditions_or_deep_associations = conditions_or_deep_associations.dup
             conditions[:if]     = conditions_or_deep_associations.delete(:if)     if conditions_or_deep_associations[:if]
             conditions[:unless] = conditions_or_deep_associations.delete(:unless) if conditions_or_deep_associations[:unless]
           elsif conditions_or_deep_associations.kind_of?(Array)
+            conditions_or_deep_associations = conditions_or_deep_associations.dup
             conditions_or_deep_associations.delete_if {|entry| conditions.merge!(entry) if entry.is_a?(Hash) && (entry.key?(:if) || entry.key?(:unless)) }
           end
 
@@ -176,7 +178,7 @@ class ActiveRecord::Base
     def evaluate_conditions object, conditions
       (conditions[:if] && conditions[:if].call(object)) || (conditions[:unless] && !conditions[:unless].call(object))
     end
-    
+
     def normalized_includes_list includes
       list = []
       Array(includes).each do |item|
@@ -186,7 +188,7 @@ class ActiveRecord::Base
           list << item
         end
       end
-      
+
       list
     end
 

data/readme.md

@@ -110,6 +110,8 @@ pirate.deep_clone include: :parrot do |original, kopy|
 end
 ```
 
+*Note*: The block is invoked before attributes are excluded.
+
 *Note*: Using `deep_clone` with a block will also pass the associated objects that are being cloned to the block, so be sure to check whether the object actually responds to your method of choice.
 
 ### Cloning models with files associated through Carrierwave

data/test/models.rb

@@ -127,3 +127,16 @@ class Contractor < ActiveRecord::Base
   belongs_to :building
   has_and_belongs_to_many :apartments
 end
+
+class User < ActiveRecord::Base
+  has_many :orders
+end
+
+class Order < ActiveRecord::Base
+  belongs_to :user
+  has_many :products
+end
+
+class Product < ActiveRecord::Base
+  belongs_to :order
+end

data/test/schema.rb

@@ -129,4 +129,18 @@ ActiveRecord::Schema.define(:version => 1) do
     t.column :apartment_id, :integer
     t.column :contractor_id, :integer
   end
+
+  create_table :users, :force => true do |t|
+    t.column :name, :string
+    t.column :contractor_id, :integer
+  end
+
+  create_table :orders, :force => true do |t|
+    t.column :user_id, :integer
+  end
+
+  create_table :products, :force => true do |t|
+    t.column :name, :string
+    t.column :order_id, :integer
+  end
 end

data/test/test_deep_cloneable.rb

@@ -126,7 +126,7 @@ class TestDeepCloneable < MiniTest::Unit::TestCase
     assert_equal 1, deep_clone.gold_pieces.size
     assert_equal 1, deep_clone.mateys.size
   end
-  
+
   def test_multiple_and_deep_include_association_with_array_and_multikey_hash
     deep_clone = @jack.deep_clone(:include => [:parrot, {:treasures => :gold_pieces, :mateys => {}}])
     assert deep_clone.new_record?
@@ -134,7 +134,7 @@ class TestDeepCloneable < MiniTest::Unit::TestCase
     assert_equal 1, deep_clone.treasures.size
     assert_equal 1, deep_clone.gold_pieces.size
     assert_equal 1, deep_clone.mateys.size
-  end  
+  end
 
   def test_with_belongs_to_relation
     deep_clone = @jack.deep_clone(:include => :parrot)
@@ -421,6 +421,27 @@ class TestDeepCloneable < MiniTest::Unit::TestCase
     assert_equal 1, deep_clone.pirates.size
   end
 
+  def test_should_reject_copies_if_conditionals_are_passed_with_nested_many_to_many_associations
+    @user = User.create :name => 'Jack'
+    @order1 = Order.create
+    @order2 = Order.create
+    @product1 = Product.create  :name => 'Paper'
+    @product2 = Product.create  :name => 'Ink'
+    @order2.products << [@product1, @product2]
+    @user.orders << [@order1, @order2]
+
+    deep_clone = @user.deep_clone(:include => [:orders => [:products => [{ :unless => lambda {|product| product.name == 'Ink' }}]]])
+
+    assert deep_clone.new_record?
+    assert deep_clone.save
+    assert_equal 1, deep_clone.orders.second.products.size
+
+    deep_clone = @user.deep_clone(:include => [:orders => [:products => [{ :if => lambda {|product| product.name == 'Ink'}}]]])
+    assert deep_clone.new_record?
+    assert deep_clone.save
+    assert_equal 1, deep_clone.orders.second.products.size
+  end
+
   def test_should_find_in_dict_for_habtm
     apt = Apartment.create(:number => "101")
     contractor = Contractor.create(:name => "contractor", :apartments => [apt])
@@ -451,5 +472,5 @@ class TestDeepCloneable < MiniTest::Unit::TestCase
     assert_nil deep_clone.name
     refute deep_clone.name_changed?
   end
-  
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: deep_cloneable
 version: !ruby/object:Gem::Version
-  version: 2.3.0
+  version: 2.3.1
 platform: ruby
 authors:
 - Reinier de Lange
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-14 00:00:00.000000000 Z
+date: 2017-10-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord