dm-deep_cloning 1.0.1 → 1.0.2

data/Gemfile

@@ -14,7 +14,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-SOURCE         = ENV.fetch('SOURCE', :git).to_sym
+SOURCE         = ENV.fetch('SOURCE', :rubygems).to_sym
 
 DM_VERSION     = '~> 1.2.0'
 
@@ -22,12 +22,12 @@ DO_VERSION     = '~> 0.10.6'
 DM_DO_ADAPTERS = %w[ sqlite postgres mysql oracle sqlserver ]
 
 def dm(module_name)
-  if SOURCE == :rubygems
-    gem "dm-module_name", DM_VERSION
+  if SOURCE == :git
+    gem "dm-#{module_name}", DM_VERSION, :git => "http://github.com/datamapper/dm-#{module_name}.git", :branch => ENV.fetch('BRANCH', 'master')
   elsif SOURCE == :path
     gem "dm-#{module_name}", DM_VERSION, :path => Pathname(__FILE__).dirname.parent
   else
-    gem "dm-#{module_name}", DM_VERSION, :git => "http://github.com/datamapper/dm-#{module_name}.git", :branch => ENV.fetch('BRANCH', 'master')
+    gem "dm-#{module_name}", DM_VERSION
   end
 end
 

data/VERSION

@@ -1 +1 @@
-1.0.1
+1.0.2

data/dm-deep_cloning.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "dm-deep_cloning"
-  s.version = "1.0.1"
+  s.version = "1.0.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Till Schulte-Coerne"]

data/lib/dm-deep_cloning.rb

@@ -49,26 +49,24 @@ module DataMapper
         self.class.properties[k].key? || k.to_s =~ /^(updated|created)_(at|on)$/
       }
 
-      self.class.relationships.each do |relationship|
-        if clone_relations.keys.include?(relationship.name)
-          case relationship
-          when DataMapper::Associations::OneToMany::Relationship, DataMapper::Associations::ManyToMany::Relationship
-            attributes[relationship.name] = self.send(relationship.name).map do |related_object|
-              related_object.deep_clone(mode, clone_relations[relationship.name])
-            end
-            if attributes[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)
-            end
-          when DataMapper::Associations::ManyToOne::Relationship
-            attributes[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}'"
+      clone_relations.keys.each do |relationship_name|
+        relationship = self.class.relationships[relationship_name]
+
+        case relationship
+        when DataMapper::Associations::OneToMany::Relationship, DataMapper::Associations::ManyToMany::Relationship
+          attributes[relationship.name] = self.send(relationship.name).map do |related_object|
+            related_object.deep_clone(mode, clone_relations[relationship.name])
+          end
+          if attributes[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)
           end
-        elsif relationship.is_a?(DataMapper::Associations::ManyToMany::Relationship) # We always need to clone many to many relationship entrys (but not targets of the relations)
-          attributes[relationship.name] = self.send(relationship.name)
+        when DataMapper::Associations::ManyToOne::Relationship
+          attributes[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}'"
         end
       end
 

data/spec/dm-deep_cloning_spec.rb

@@ -53,12 +53,6 @@ describe DataMapper::DeepCloning do
       cloned_post.blog.id.should be(@post1.blog.id)
     end
 
-    it "should handle many to many relations" do
-      cloned_post = @post2.deep_clone(:create)
-
-      cloned_post.related_posts.map(&:id).should =~ [@post1.id]
-    end
-
     it "should not clone timestamps" do
       cloned_post = @post2.deep_clone(:create)
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: dm-deep_cloning
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 19
   prerelease: 
   segments: 
   - 1
   - 0
-  - 1
-  version: 1.0.1
+  - 2
+  version: 1.0.2
 platform: ruby
 authors: 
 - Till Schulte-Coerne