deep_cloneable 1.0.0 → 1.1.0

data/README.rdoc

@@ -25,12 +25,7 @@ And include the gem in your apps config
   ./script/plugin install git://github.com/moiristo/deep_cloneable.git
 
 == Example
-
-=== Cloning a model without an attribute
-   pirate.clone :except => :name
  
-=== Cloning a model without multiple attributes
-   pirate.clone :except => [:name, :nick_name]
 === Cloning one single association
    pirate.clone :include => :mateys
 
@@ -42,6 +37,15 @@ And include the gem in your apps config
 
 === Cloning really deep with multiple associations
    pirate.clone :include => [:mateys, {:treasures => :gold_pieces}]
+   
+=== 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   
+   pirate.clone :include => :parrot, :except => [:name, { :parrot => [:name] }]
 
 == Note on Patches/Pull Requests
  

data/VERSION

@@ -1 +1 @@
-1.0.0
+1.1.0

data/deep_cloneable.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{deep_cloneable}
-  s.version = "1.0.0"
+  s.version = "1.1.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Reinier de Lange"]
-  s.date = %q{2010-10-18}
+  s.date = %q{2010-10-19}
   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.extra_rdoc_files = [

data/lib/deep_cloneable.rb

@@ -6,30 +6,37 @@ class ActiveRecord::Base
     #
     # === Usage:
     # 
-    # ==== Cloning a model without an attribute
-    #   pirate.clone :except => :name
-    # 
-    # ==== Cloning a model without multiple attributes
-    #   pirate.clone :except => [:name, :nick_name]
     # ==== Cloning one single association
-    #   pirate.clone :include => :mateys
-    #
+    #    pirate.clone :include => :mateys
+    # 
     # ==== Cloning multiple associations
-    #   pirate.clone :include => [:mateys, :treasures]
-    #
+    #    pirate.clone :include => [:mateys, :treasures]
+    # 
     # ==== Cloning really deep
-    #   pirate.clone :include => {:treasures => :gold_pieces}
-    #
+    #    pirate.clone :include => {:treasures => :gold_pieces}
+    # 
     # ==== Cloning really deep with multiple associations
-    #   pirate.clone :include => [:mateys, {:treasures => :gold_pieces}]
+    #    pirate.clone :include => [:mateys, {:treasures => :gold_pieces}]
+    #    
+    # ==== 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   
+    #    pirate.clone :include => :parrot, :except => [:name, { :parrot => [:name] }]
     # 
     def clone(options = {})
       kopy = super()
-    
+
+      deep_exceptions = {}
       if options[:except]
-        Array(options[:except]).each do |attribute|
-          kopy.send(:write_attribute, attribute, attributes_from_column_definition[attribute.to_s])
+        exceptions = options[:except].nil? ? [] : [options[:except]].flatten
+        exceptions.each do |attribute|
+          kopy.send(:write_attribute, attribute, attributes_from_column_definition[attribute.to_s]) unless attribute.kind_of?(Hash)
         end
+        deep_exceptions = exceptions.select{|e| e.kind_of?(Hash) }.inject({}){|m,h| m.merge(h) }
       end
     
       if options[:include]
@@ -38,12 +45,21 @@ class ActiveRecord::Base
             deep_associations = association[association.keys.first]
             association = association.keys.first
           end
+          
           opts = deep_associations.blank? ? {} : {:include => deep_associations}
-          cloned_object = case self.class.reflect_on_association(association).macro
+          opts.merge!(:except => deep_exceptions[association]) if deep_exceptions[association]
+        
+          association_reflection = self.class.reflect_on_association(association)          
+          cloned_object = case association_reflection.macro
                           when :belongs_to, :has_one
                             self.send(association) && self.send(association).clone(opts)
                           when :has_many, :has_and_belongs_to_many
-                            self.send(association).collect { |obj| obj.clone(opts) }
+                            fk = association_reflection.options[:foreign_key] || self.class.to_s.underscore
+                            self.send(association).collect do |obj| 
+                              tmp = obj.clone(opts)
+                              tmp.send("#{fk}=", kopy)
+                              tmp
+                            end
                           end
           kopy.send("#{association}=", cloned_object)
         end

data/test/test_deep_cloneable.rb

@@ -68,4 +68,12 @@ class TestDeepCloneable < Test::Unit::TestCase
     assert clone.save
     assert_not_equal clone.parrot, @jack.parrot
   end
+  
+  def test_should_pass_nested_exceptions
+    clone = @jack.clone(:include => :parrot, :except => [:name, { :parrot => [:name] }])
+    assert clone.save
+    assert_not_equal clone.parrot, @jack.parrot
+    assert_not_nil @jack.parrot.name
+    assert_nil clone.parrot.name    
+  end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: deep_cloneable
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 19
   prerelease: false
   segments: 
   - 1
+  - 1
   - 0
-  - 0
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors: 
 - Reinier de Lange
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-18 00:00:00 +02:00
+date: 2010-10-19 00:00:00 +02:00
 default_executable: 
 dependencies: []