deep_cloneable 1.3.1 → 1.4.0

data/Gemfile

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

data/Gemfile.lock

@@ -0,0 +1,100 @@
+PATH
+  remote: .
+  specs:
+    deep_cloneable (1.3.1)
+
+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)
+      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)
+      arel (~> 3.0.2)
+      tzinfo (~> 0.3.29)
+    activeresource (3.2.2)
+      activemodel (= 3.2.2)
+      activesupport (= 3.2.2)
+    activesupport (3.2.2)
+      i18n (~> 0.6)
+      multi_json (~> 1.0)
+    arel (3.0.2)
+    builder (3.0.0)
+    erubis (2.7.0)
+    git (1.2.5)
+    hike (1.2.1)
+    i18n (0.6.0)
+    jeweler (1.8.3)
+      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.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)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  deep_cloneable!
+  jeweler
+  rails
+  sqlite3

data/README.rdoc

@@ -50,11 +50,18 @@ If this is not an option for you, it is also possible to populate the dictionary
 === 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
+
 == Contributors
 
 * Michael He
 * Indrek Juhkam
 * Mart Karu
+* Rolf Timmermans
+* Ilya Kuzmin
 
 == Note on Patches/Pull Requests
  

data/Rakefile

@@ -37,8 +37,6 @@ rescue LoadError
   end
 end
 
-task :test => :check_dependencies
-
 task :default => :test
 
 require 'rake/rdoctask'

data/VERSION

@@ -1 +1 @@
-1.3.1
+1.4.0

data/deep_cloneable.gemspec

@@ -4,20 +4,22 @@
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
-  s.name = %q{deep_cloneable}
-  s.version = "1.3.1"
+  s.name = "deep_cloneable"
+  s.version = "1.4.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = [%q{Reinier de Lange}]
-  s.date = %q{2012-01-26}
-  s.description = %q{Extends the functionality of ActiveRecord::Base#clone to perform a deep clone that includes user specified associations. }
-  s.email = %q{r.j.delange@nedforce.nl}
+  s.authors = ["Reinier de Lange"]
+  s.date = "2012-04-02"
+  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 = [
     "LICENSE",
     "README.rdoc"
   ]
   s.files = [
     ".document",
+    "Gemfile",
+    "Gemfile.lock",
     "LICENSE",
     "README.rdoc",
     "Rakefile",
@@ -30,18 +32,27 @@ Gem::Specification.new do |s|
     "test/test_deep_cloneable.rb",
     "test/test_helper.rb"
   ]
-  s.homepage = %q{http://github.com/moiristo/deep_cloneable}
-  s.require_paths = [%q{lib}]
-  s.rubygems_version = %q{1.8.6}
-  s.summary = %q{This gem gives every ActiveRecord::Base object the possibility to do a deep clone.}
+  s.homepage = "http://github.com/moiristo/deep_cloneable"
+  s.require_paths = ["lib"]
+  s.rubygems_version = "1.8.21"
+  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<deep_cloneable>, [">= 0"])
+      s.add_runtime_dependency(%q<rails>, [">= 0"])
+      s.add_runtime_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
 end
 

data/lib/deep_cloneable.rb

@@ -1,7 +1,24 @@
 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
+      ActiveRecord::Base.class_eval do
+        module Dup
+          def dup
+            copy = super
+            copy.initialize_dup(self)
+            copy
+          end
+        end
+        remove_method :dup
+        include Dup
+      end
+    end
+
     # 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
@@ -42,7 +59,7 @@ class ActiveRecord::Base
     # ==== 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|
+    define_method (@@rails31 ? :dup : :clone) do |*args, &block|
       options = args[0] || {}
       
       dict = options[:dictionary]
@@ -56,6 +73,8 @@ class ActiveRecord::Base
         dict[tableized_class][self] ||= super()
       end
 
+      block.call(self, kopy) if block
+
       deep_exceptions = {}
       if options[:except]
         exceptions = options[:except].nil? ? [] : [options[:except]].flatten
@@ -81,7 +100,7 @@ class ActiveRecord::Base
                     
           cloned_object = case association_reflection.macro
             when :belongs_to, :has_one
-              self.send(association) && self.send(association).send(__method__, opts)
+              self.send(association) && self.send(association).send(__method__, opts, &block)
             when :has_many, :has_and_belongs_to_many
               primary_key_name = (@@rails31 ? association_reflection.foreign_key : association_reflection.primary_key_name).to_s
               
@@ -90,7 +109,7 @@ class ActiveRecord::Base
               end.try(:name)
               
               self.send(association).collect do |obj| 
-                tmp = obj.send(__method__, opts)
+                tmp = obj.send(__method__, opts, &block)
                 tmp.send("#{primary_key_name}=", nil)                
                 tmp.send("#{reverse_association_name.to_s}=", kopy) if reverse_association_name
                 tmp

data/test/test_deep_cloneable.rb

@@ -150,4 +150,13 @@ class TestDeepCloneable < Test::Unit::TestCase
     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
+    end
+
+    assert dup.save
+    assert_equal @jack.id, dup.cloned_from_id
+    assert_equal @jack.parrot.id, dup.parrot.cloned_from_id
+  end
 end

data/test/test_helper.rb

@@ -34,7 +34,7 @@ end
 
 class GoldPiece < ActiveRecord::Base;   belongs_to :treasure  end
 class Matey < ActiveRecord::Base;       belongs_to :pirate    end
-class Parrot < 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
@@ -44,6 +44,8 @@ class Pirate < ActiveRecord::Base
   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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: deep_cloneable
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 1.4.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,8 +9,56 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-26 00:00:00.000000000 Z
-dependencies: []
+date: 2012-04-02 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
+    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: jeweler
+  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'
 description: ! 'Extends the functionality of ActiveRecord::Base#clone to perform a
   deep clone that includes user specified associations. '
 email: r.j.delange@nedforce.nl
@@ -21,6 +69,8 @@ extra_rdoc_files:
 - README.rdoc
 files:
 - .document
+- Gemfile
+- Gemfile.lock
 - LICENSE
 - README.rdoc
 - Rakefile
@@ -44,6 +94,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -1579513982850858765
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -52,7 +105,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.6
+rubygems_version: 1.8.21
 signing_key: 
 specification_version: 3
 summary: This gem gives every ActiveRecord::Base object the possibility to do a deep