dm-deep_cloning 1.0.2 → 1.0.3

data/VERSION

@@ -1 +1 @@
-1.0.2
+1.0.3

data/dm-deep_cloning.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "dm-deep_cloning"
-  s.version = "1.0.2"
+  s.version = "1.0.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Till Schulte-Coerne"]
-  s.date = "2012-08-14"
+  s.date = "2012-08-15"
   s.description = "A library that lets you clone objects and object graphs"
   s.email = "till.schulte-coerne@innoq.com"
   s.extra_rdoc_files = [
@@ -51,6 +51,10 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<rake>, [">= 0"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.4"])
       s.add_development_dependency(%q<rspec>, ["~> 1.3"])
+      s.add_development_dependency(%q<data_objects>, ["~> 0.10.6"])
+      s.add_development_dependency(%q<do_mysql>, ["~> 0.10.6"])
+      s.add_development_dependency(%q<dm-do-adapter>, ["~> 1.2.0"])
+      s.add_development_dependency(%q<dm-mysql-adapter>, ["~> 1.2.0"])
       s.add_development_dependency(%q<dm-migrations>, ["~> 1.2.0"])
       s.add_development_dependency(%q<dm-timestamps>, ["~> 1.2.0"])
       s.add_runtime_dependency(%q<dm-core>, ["~> 1.0"])
@@ -63,6 +67,10 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<rake>, [">= 0"])
       s.add_dependency(%q<jeweler>, ["~> 1.4"])
       s.add_dependency(%q<rspec>, ["~> 1.3"])
+      s.add_dependency(%q<data_objects>, ["~> 0.10.6"])
+      s.add_dependency(%q<do_mysql>, ["~> 0.10.6"])
+      s.add_dependency(%q<dm-do-adapter>, ["~> 1.2.0"])
+      s.add_dependency(%q<dm-mysql-adapter>, ["~> 1.2.0"])
       s.add_dependency(%q<dm-migrations>, ["~> 1.2.0"])
       s.add_dependency(%q<dm-timestamps>, ["~> 1.2.0"])
       s.add_dependency(%q<dm-core>, ["~> 1.0"])
@@ -76,6 +84,10 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<rake>, [">= 0"])
     s.add_dependency(%q<jeweler>, ["~> 1.4"])
     s.add_dependency(%q<rspec>, ["~> 1.3"])
+    s.add_dependency(%q<data_objects>, ["~> 0.10.6"])
+    s.add_dependency(%q<do_mysql>, ["~> 0.10.6"])
+    s.add_dependency(%q<dm-do-adapter>, ["~> 1.2.0"])
+    s.add_dependency(%q<dm-mysql-adapter>, ["~> 1.2.0"])
     s.add_dependency(%q<dm-migrations>, ["~> 1.2.0"])
     s.add_dependency(%q<dm-timestamps>, ["~> 1.2.0"])
     s.add_dependency(%q<dm-core>, ["~> 1.0"])

data/lib/dm-deep_cloning.rb

@@ -24,8 +24,6 @@ module DataMapper
     DEFAULT_MODE = :new
 
     def deep_clone(*args)
-      args_size = args.size # For error messages
-
       mode = args.shift if [:new, :create].include?(args.first)
       mode ||= DEFAULT_MODE
 
@@ -45,7 +43,7 @@ module DataMapper
         end
       end
   
-      attributes = self.attributes.reject{ |(k, v)|
+      attrs = self.attributes.reject{ |(k, v)|
         self.class.properties[k].key? || k.to_s =~ /^(updated|created)_(at|on)$/
       }
 
@@ -54,23 +52,29 @@ module DataMapper
 
         case relationship
         when DataMapper::Associations::OneToMany::Relationship, DataMapper::Associations::ManyToMany::Relationship
-          attributes[relationship.name] = self.send(relationship.name).map do |related_object|
+          attrs[relationship.name] = self.send(relationship.name).to_a.map do |related_object|
+            # Q: Why `to_a`????
+            # A: This is used to indirectly disable `eager_load` in the `attributes` method called in the following recursive call.
+            # Q: Aha!!! But why???
+            # A: It simply doesn't work with STI.
+            # Q: f***!
+            # A: Yea! Took me 3 hours.
             related_object.deep_clone(mode, clone_relations[relationship.name])
           end
-          if attributes[relationship.name].empty?
+          if attrs[relationship.name].empty?
             # Delete the atrribute if no objects need to be assigned to the relation.
             # dm-core seems to have a problem with Foo.new(:bars => []). Sadly
             # this was not reproduceable in the specs.
-            attributes.delete(relationship.name)
+            attrs.delete(relationship.name)
           end
         when DataMapper::Associations::ManyToOne::Relationship
-          attributes[relationship.name] = self.send(relationship.name).deep_clone(mode, clone_relations[relationship.name])
+          attrs[relationship.name] = self.send(relationship.name).deep_clone(mode, clone_relations[relationship.name])
         else
-          raise "Deep cloning failed: Unknown relationship '#{relationship.class}' for relation '#{relationship.name}' in '#{self.class}'"
+          raise "Deep cloning failed: Unknown relationship '#{relationship_name}' in '#{self.class}'"
         end
       end
 
-      self.class.send(mode, attributes)
+      self.class.send(mode, attrs)
     end
 
   end # mod DeepCloning

data/spec/dm-deep_cloning_spec.rb

@@ -90,6 +90,17 @@ describe DataMapper::DeepCloning do
       cloned_blog.posts.should be_empty
     end
 
+    it "should work with STI" do
+      blog = Blog.create(:name => "test")
+      blog.posts << special_post = SpecialPost.create(:title => 'Special', :text => "Post", :secret => "Psst...", :blog => blog)
+
+      cloned_blog = blog.deep_clone(:create, :posts)
+
+      cloned_blog.posts.last.class.should be(SpecialPost)
+      cloned_blog.posts.last.should_not be(special_post)
+      cloned_blog.posts.last.secret.should be(special_post.secret)
+    end
+
     it "should not save new objects if not specified" do
       *old_counts = Blog.count, Post.count
 

data/spec/spec_helper.rb

@@ -27,6 +27,8 @@ class Post
   include DataMapper::Resource
 
   property :id,     Serial
+  property :type,   Discriminator
+
   property :author, String
   property :title,  String
   property :text,   Text
@@ -38,6 +40,10 @@ class Post
   has n, :related_posts, "Post", :through => Resource
 end
 
+class SpecialPost < Post
+  property :secret, String
+end
+
 class Blog
   include DataMapper::Resource
   property :id,   Serial

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: dm-deep_cloning
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: 
   segments: 
   - 1
   - 0
-  - 2
-  version: 1.0.2
+  - 3
+  version: 1.0.3
 platform: ruby
 authors: 
 - Till Schulte-Coerne
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-08-14 00:00:00 Z
+date: 2012-08-15 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   version_requirements: &id001 !ruby/object:Gem::Requirement 
@@ -95,6 +95,38 @@ dependencies:
   prerelease: false
 - !ruby/object:Gem::Dependency 
   version_requirements: &id006 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 59
+        segments: 
+        - 0
+        - 10
+        - 6
+        version: 0.10.6
+  requirement: *id006
+  type: :development
+  name: data_objects
+  prerelease: false
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id007 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 59
+        segments: 
+        - 0
+        - 10
+        - 6
+        version: 0.10.6
+  requirement: *id007
+  type: :development
+  name: do_mysql
+  prerelease: false
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -105,12 +137,44 @@ dependencies:
         - 2
         - 0
         version: 1.2.0
-  requirement: *id006
+  requirement: *id008
+  type: :development
+  name: dm-do-adapter
+  prerelease: false
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id009 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 31
+        segments: 
+        - 1
+        - 2
+        - 0
+        version: 1.2.0
+  requirement: *id009
+  type: :development
+  name: dm-mysql-adapter
+  prerelease: false
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id010 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 31
+        segments: 
+        - 1
+        - 2
+        - 0
+        version: 1.2.0
+  requirement: *id010
   type: :development
   name: dm-migrations
   prerelease: false
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id007 !ruby/object:Gem::Requirement 
+  version_requirements: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -121,12 +185,12 @@ dependencies:
         - 2
         - 0
         version: 1.2.0
-  requirement: *id007
+  requirement: *id011
   type: :development
   name: dm-timestamps
   prerelease: false
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id008 !ruby/object:Gem::Requirement 
+  version_requirements: &id012 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -136,12 +200,12 @@ dependencies:
         - 1
         - 0
         version: "1.0"
-  requirement: *id008
+  requirement: *id012
   type: :runtime
   name: dm-core
   prerelease: false
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id009 !ruby/object:Gem::Requirement 
+  version_requirements: &id013 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -151,12 +215,12 @@ dependencies:
         - 1
         - 0
         version: "1.0"
-  requirement: *id009
+  requirement: *id013
   type: :runtime
   name: dm-transactions
   prerelease: false
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id010 !ruby/object:Gem::Requirement 
+  version_requirements: &id014 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -167,12 +231,12 @@ dependencies:
         - 2
         - 9
         version: 1.2.9
-  requirement: *id010
+  requirement: *id014
   type: :development
   name: rspec
   prerelease: false
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id011 !ruby/object:Gem::Requirement 
+  version_requirements: &id015 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -183,7 +247,7 @@ dependencies:
         - 2
         - 9
         version: 1.2.9
-  requirement: *id011
+  requirement: *id015
   type: :development
   name: dm-migrations
   prerelease: false