deep_cloneable 2.2.2 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a6f91e67baa2dd1118f4ab807655791d72e9f69e
-  data.tar.gz: 3cd1a98dd2828ab747e267f8f749b8fc41b4cc79
+  metadata.gz: 2965ed86adcfda63e876533015e4a55e4fb0316f
+  data.tar.gz: 6d9ef9a44e135ecf9baa769e721e25c62b4f893c
 SHA512:
-  metadata.gz: 2a23f55f760ec9de1b06fc1f2fe09f4fa28224c0a545e3607b185129c8625e7344a6e3c5de5e400bc2caedf5b39ccaa890a5e5fcddda5cceea47b2b88fad4910
-  data.tar.gz: 490a16bde06aaa25654aa0264214f5b7474d7233c7681da4acaef0073a45fd1ecbe14814fb1cbbd219b2647b5d4c914f3dee919d33c361dc0cfcb2eeb0a7ace1
+  metadata.gz: e11fe1537382bc8fe904aa02f0dd33b205bc926093d383f6ef7a0023509c279e430f04732f5707c62ef077b7de86516f66d935e90055e4fd1b8a1b2f6612bb93
+  data.tar.gz: c2b879a4b1885214c647c632ace3f8ba895b0c13ac12d34bed2c2bb9ccf776060a1add719a6a1219a9fbe7c4b3a4b30dcb33149466bda4fefec4b2b3f66c2eb0

data/Gemfile.lock

@@ -26,43 +26,47 @@ GEM
     faraday (0.9.2)
       multipart-post (>= 1.2, < 3)
     git (1.2.9.1)
-    github_api (0.14.0)
+    github_api (0.16.0)
       addressable (~> 2.4.0)
       descendants_tracker (~> 0.0.4)
       faraday (~> 0.8, < 0.10)
       hashie (>= 3.4)
-      oauth2
-    hashie (3.4.4)
+      mime-types (>= 1.16, < 3.0)
+      oauth2 (~> 1.0)
+    hashie (3.5.5)
     highline (1.6.21)
     i18n (0.6.11)
-    jeweler (2.1.1)
+    jeweler (2.3.6)
       builder
-      bundler (>= 1.0)
+      bundler (>= 1)
       git (>= 1.2.5)
-      github_api
+      github_api (~> 0.16.0)
       highline (>= 1.6.15)
       nokogiri (>= 1.5.10)
+      psych (~> 2.2)
       rake
       rdoc
-      semver
+      semver2
     json (1.8.3)
-    jwt (1.5.1)
+    jwt (1.5.6)
+    mime-types (2.99.3)
     minitest (5.9.0)
     multi_json (1.12.1)
-    multi_xml (0.5.5)
+    multi_xml (0.6.0)
     multipart-post (2.0.0)
     nokogiri (1.5.11)
-    oauth2 (1.1.0)
-      faraday (>= 0.8, < 0.10)
-      jwt (~> 1.0, < 1.5.2)
+    oauth2 (1.4.0)
+      faraday (>= 0.8, < 0.13)
+      jwt (~> 1.0)
       multi_json (~> 1.3)
       multi_xml (~> 0.5)
       rack (>= 1.2, < 3)
+    psych (2.2.4)
     rack (1.6.4)
     rake (10.5.0)
     rdoc (4.2.2)
       json (~> 1.4)
-    semver (1.0.1)
+    semver2 (3.4.2)
     sqlite3 (1.3.11)
     thor (0.19.1)
     thread_safe (0.3.5)
@@ -87,4 +91,4 @@ DEPENDENCIES
   sqlite3
 
 BUNDLED WITH
-   1.11.2
+   1.14.6

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2016 Reinier de Lange
+Copyright (c) 2017 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/VERSION

@@ -1 +1 @@
-2.2.2
+2.3.0

data/deep_cloneable.gemspec

@@ -2,18 +2,18 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: deep_cloneable 2.2.2 ruby lib
+# stub: deep_cloneable 2.3.0 ruby lib
 
 Gem::Specification.new do |s|
-  s.name = "deep_cloneable".freeze
-  s.version = "2.2.2"
+  s.name = "deep_cloneable"
+  s.version = "2.3.0"
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
-  s.require_paths = ["lib".freeze]
-  s.authors = ["Reinier de Lange".freeze]
-  s.date = "2016-10-10"
-  s.description = "Extends the functionality of ActiveRecord::Base#dup to perform a deep clone that includes user specified associations. ".freeze
-  s.email = "r.j.delange@nedforce.nl".freeze
+  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.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 = [
     "LICENSE",
     "readme.md"
@@ -49,21 +49,21 @@ Gem::Specification.new do |s|
     "test/test_deep_cloneable.rb",
     "test/test_helper.rb"
   ]
-  s.homepage = "http://github.com/moiristo/deep_cloneable".freeze
-  s.licenses = ["MIT".freeze]
-  s.rubygems_version = "2.6.4".freeze
-  s.summary = "This gem gives every ActiveRecord::Base object the possibility to do a deep clone.".freeze
+  s.homepage = "http://github.com/moiristo/deep_cloneable"
+  s.licenses = ["MIT"]
+  s.rubygems_version = "2.4.8"
+  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 = 4
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<activerecord>.freeze, ["< 5.2.0", ">= 3.1.0"])
+      s.add_runtime_dependency(%q<activerecord>, ["< 5.2.0", ">= 3.1.0"])
     else
-      s.add_dependency(%q<activerecord>.freeze, ["< 5.2.0", ">= 3.1.0"])
+      s.add_dependency(%q<activerecord>, ["< 5.2.0", ">= 3.1.0"])
     end
   else
-    s.add_dependency(%q<activerecord>.freeze, ["< 5.2.0", ">= 3.1.0"])
+    s.add_dependency(%q<activerecord>, ["< 5.2.0", ">= 3.1.0"])
   end
 end
 

data/lib/deep_cloneable.rb

@@ -39,7 +39,7 @@ class ActiveRecord::Base
       end
 
       if options[:include]
-        Array(options[:include]).each do |association, conditions_or_deep_associations|
+        normalized_includes_list(options[:include]).each do |association, conditions_or_deep_associations|
           conditions = {}
 
           if association.kind_of? Hash
@@ -54,34 +54,37 @@ class ActiveRecord::Base
             conditions_or_deep_associations.delete_if {|entry| conditions.merge!(entry) if entry.is_a?(Hash) && (entry.key?(:if) || entry.key?(:unless)) }
           end
 
-          dup_options = conditions_or_deep_associations.blank? ? {} : {:include => conditions_or_deep_associations}
+          dup_options = {}
+          dup_options.merge!(:include => conditions_or_deep_associations) if conditions_or_deep_associations.present?
           dup_options.merge!(:except => deep_exceptions[association]) if deep_exceptions[association]
           dup_options.merge!(:only => deep_onlinesses[association]) if deep_onlinesses[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?
-
-          if options[:validate] == false
-            kopy.instance_eval do
-              # Force :validate => false on all saves.
-              def perform_validations(options={})
-                options[:validate] = false
-                super(options)
+          dup_options.merge!(:skip_missing_associations => options[:skip_missing_associations]) if options[:skip_missing_associations]
+
+          if association_reflection = self.class.reflect_on_association(association)
+            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
-          end
 
-          association_type = association_reflection.macro
-          association_type = "#{association_type}_through" if association_reflection.is_a?(ActiveRecord::Reflection::ThroughReflection)
+            association_type = association_reflection.macro
+            association_type = "#{association_type}_through" if association_reflection.is_a?(ActiveRecord::Reflection::ThroughReflection)
 
-          duped_object = send(
-            "dup_#{association_type}_association",
-            { :reflection => association_reflection, :association => association, :copy => kopy, :conditions => conditions, :dup_options => dup_options },
-            &block
-          )
+            duped_object = send(
+              "dup_#{association_type}_association",
+              { :reflection => association_reflection, :association => association, :copy => kopy, :conditions => conditions, :dup_options => dup_options },
+              &block
+            )
 
-          kopy.send("#{association}=", duped_object)
+            kopy.send("#{association}=", duped_object)
+          elsif !options[:skip_missing_associations]
+            raise AssociationNotFoundException.new("#{self.class}##{association}")
+          end
         end
       end
 
@@ -173,6 +176,19 @@ 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|
+        if item.is_a?(Hash) && item.size > 1
+          item.each{|key, value| list << { key => value } }
+        else
+          list << item
+        end
+      end
+      
+      list
+    end
 
     class AssociationNotFoundException < StandardError; end
 

data/readme.md

@@ -7,7 +7,7 @@ This gem gives every ActiveRecord::Base object the possibility to do a deep clon
 ## Requirements
 
 * Ruby 1.8.7, 1.9.2, 1.9.3, 2.0.0, 2.1.5, 2.2.2, 2.3.0 (tested)
-* Activerecord 3.1, 3.2, 4.0, 4.1, 4.2, 5.0.0-rc1 (tested)
+* Activerecord 3.1, 3.2, 4.0, 4.1, 4.2, 5.0.0.1 (tested)
 * Rails 2.x/3.0 users, please check out the 'rails2.x-3.0' branch
 
 ## Installation
@@ -15,7 +15,7 @@ This gem gives every ActiveRecord::Base object the possibility to do a deep clon
 * Add deep_cloneable to your Gemfile:
 
 ```ruby
-gem 'deep_cloneable', '~> 2.2.2'
+gem 'deep_cloneable', '~> 2.3.0'
 ```
 
 ## Upgrading from v1
@@ -123,6 +123,14 @@ pirate.deep_clone include: :parrot do |original, kopy|
 end
 ```
 
+### Skipping missing associations
+
+By default, deep_cloneable will throw a `ActiveRecord::Base::DeepCloneable::AssociationNotFoundException` error when an association cannot be found. You can also skip missing associations by specifying `skip_missing_associations` if needed, for example when you have associations on some (but not all) subclasses of an STI model:
+
+```ruby
+pirate.deep_clone include: [:parrot, :rum], skip_missing_associations: true
+```
+
 ### Note on Patches/Pull Requests
 
 * Fork the project.
@@ -135,4 +143,4 @@ end
 
 ### Copyright
 
-Copyright © 2016 Reinier de Lange. See LICENSE for details.
+Copyright © 2017 Reinier de Lange. See LICENSE for details.

data/test/models.rb

@@ -5,15 +5,28 @@ module Animal
     has_many :ownerships
     has_many :chickens, :through => :ownerships
   end
+
   class Pig < ActiveRecord::Base
     belongs_to :human
   end
 
-  class Chicken < ActiveRecord::Base
+  class Bird < ActiveRecord::Base
+    belongs_to :planet
+  end
+
+  class Chicken < Bird
     has_many :ownerships
     has_many :humans, :through => :ownerships
   end
 
+  class Dove < Bird
+  end
+
+  class Planet < ActiveRecord::Base
+    has_many :birds
+  end
+
+
   class Ownership < ActiveRecord::Base
     belongs_to :human
     belongs_to :chicken

data/test/schema.rb

@@ -47,10 +47,16 @@ ActiveRecord::Schema.define(:version => 1) do
     t.column :name, :string
   end
 
-  create_table :chickens, :force => true do |t|
+  create_table :planets, :force => true do |t|
     t.column :name, :string
   end
 
+  create_table :birds, :force => true do |t|
+    t.column :name, :string
+    t.column :type, :string
+    t.column :planet_id, :integer
+  end
+
   create_table :ownerships, :force => true do |t|
     t.column :human_id, :integer
     t.column :chicken_id, :integer

data/test/test_deep_cloneable.rb

@@ -126,6 +126,15 @@ 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?
+    assert deep_clone.save
+    assert_equal 1, deep_clone.treasures.size
+    assert_equal 1, deep_clone.gold_pieces.size
+    assert_equal 1, deep_clone.mateys.size
+  end  
 
   def test_with_belongs_to_relation
     deep_clone = @jack.deep_clone(:include => :parrot)
@@ -208,6 +217,21 @@ class TestDeepCloneable < MiniTest::Unit::TestCase
     assert_equal 2, deep_clone_human.chickens.count
   end
 
+  def test_should_skip_missing_associations
+    @earth = Animal::Planet.create :name => 'Earth'
+    @human = Animal::Human.create :name => "Michael"
+    @chicken = Animal::Chicken.create :name => 'Chick', :humans => [@human], :planet => @earth, :humans => [@human]
+    @dove = Animal::Dove.create :name => 'Dovey', :planet => @earth
+
+    assert_raises ActiveRecord::Base::DeepCloneable::AssociationNotFoundException do
+      @earth.deep_clone(:include => { :birds => :ownerships })
+    end
+
+    deep_clone_earth = @earth.deep_clone(:include => { :birds => :ownerships }, :skip_missing_associations => true)
+    assert_equal 2, deep_clone_earth.birds.size
+    assert deep_clone_earth.birds.detect{|bird| bird.is_a?(Animal::Chicken) }.ownerships.any?
+  end
+
   def test_should_deep_clone_with_block
     deep_clone = @jack.deep_clone(:include => :parrot) do |original, kopy|
       kopy.cloned_from_id = original.id
@@ -427,4 +451,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.2.2
+  version: 2.3.0
 platform: ruby
 authors:
 - Reinier de Lange
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-10 00:00:00.000000000 Z
+date: 2017-06-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -88,7 +88,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.4
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: This gem gives every ActiveRecord::Base object the possibility to do a deep