activerecord_clone 0.1.0 → 0.1.1

data/Gemfile

@@ -9,7 +9,7 @@ gem "activerecord"
 # Include everything needed to run rake, tests, features, etc.
 group :development do
   gem "rspec", "~> 2.3.0"
-  gem "bundler", "~> 1.0.0"
+  gem "bundler"
   gem "jeweler", "~> 1.6.4"
   gem "rcov", ">= 0"
 end

data/Gemfile.lock

@@ -41,7 +41,7 @@ PLATFORMS
 DEPENDENCIES
   activerecord
   activesupport
-  bundler (~> 1.0.0)
+  bundler
   jeweler (~> 1.6.4)
   rcov
   rspec (~> 2.3.0)

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.1.1

data/activerecord_clone.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "activerecord_clone"
-  s.version = "0.1.0"
+  s.version = "0.1.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["science", "buffpojken"]
@@ -47,14 +47,14 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<activesupport>, [">= 0"])
       s.add_runtime_dependency(%q<activerecord>, [">= 0"])
       s.add_development_dependency(%q<rspec>, ["~> 2.3.0"])
-      s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
+      s.add_development_dependency(%q<bundler>, [">= 0"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.6.4"])
       s.add_development_dependency(%q<rcov>, [">= 0"])
     else
       s.add_dependency(%q<activesupport>, [">= 0"])
       s.add_dependency(%q<activerecord>, [">= 0"])
       s.add_dependency(%q<rspec>, ["~> 2.3.0"])
-      s.add_dependency(%q<bundler>, ["~> 1.0.0"])
+      s.add_dependency(%q<bundler>, [">= 0"])
       s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
       s.add_dependency(%q<rcov>, [">= 0"])
     end
@@ -62,7 +62,7 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<activesupport>, [">= 0"])
     s.add_dependency(%q<activerecord>, [">= 0"])
     s.add_dependency(%q<rspec>, ["~> 2.3.0"])
-    s.add_dependency(%q<bundler>, ["~> 1.0.0"])
+    s.add_dependency(%q<bundler>, [">= 0"])
     s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
     s.add_dependency(%q<rcov>, [">= 0"])
   end

data/lib/active_record/clone.rb

@@ -27,7 +27,7 @@ module ActiveRecord
       @options = {}
       
       def can_clone(options={})
-        @options = default_options.merge(options)
+        @options = default_options.keep_merge(options)
       end
             
       private
@@ -50,12 +50,14 @@ module ActiveRecord
     module InstanceMethods
       
       def clone_ar(options={})
-        options = (self.instance_variable_get(:@options) ? self.instance_variable_get(:@options) : self.class.send(:default_options)).merge(options)
+        options = (self.instance_variable_get(:@options) ? self.instance_variable_get(:@options) : self.class.send(:default_options)).keep_merge(options)
+        puts options
         attrs = []
         if options[:only] and options[:only].is_a? Array
           attrs = self.attribute_names.reject {|item| options[:only].include? item}
         else
           excluded = options[:excluded] + (options[:skip_relations] ? self.class.send(:foreing_keys) : [])
+
           attrs = self.attribute_names.reject { |item| excluded.include? item}
         end
         

data/lib/activerecord_clone.rb

@@ -1,2 +1,81 @@
+class Hash
+
+  # Merges self with another hash, recursively.
+  # 
+  # This code was lovingly stolen from some random gem:
+  # http://gemjack.com/gems/tartan-0.1.1/classes/Hash.html
+  # 
+  # Thanks to whoever made it.
+
+  def deep_merge(hash)
+    target = dup
+    
+    hash.keys.each do |key|
+      if hash[key].is_a? Hash and self[key].is_a? Hash
+        target[key] = target[key].deep_merge(hash[key])
+        next
+      end
+      
+      target[key] = hash[key]
+    end
+    
+    target
+  end
+
+
+  # From: http://www.gemtacular.com/gemdocs/cerberus-0.2.2/doc/classes/Hash.html
+  # File lib/cerberus/utils.rb, line 42
+
+  def deep_merge!(second)
+    second.each_pair do |k,v|
+      if self[k].is_a?(Hash) and second[k].is_a?(Hash)
+        self[k].deep_merge!(second[k])
+      else
+        self[k] = second[k]
+      end
+    end
+  end
+
+
+#-----------------
+        
+   # cf. http://subtech.g.hatena.ne.jp/cho45/20061122
+   def deep_merge2(other)
+      deep_proc = Proc.new { |k, s, o|
+         if s.kind_of?(Hash) && o.kind_of?(Hash)
+            next s.merge(o, &deep_proc)
+         end
+         next o
+      }
+      merge(other, &deep_proc)
+   end
+
+
+   def deep_merge3(second)
+
+      # From: http://www.ruby-forum.com/topic/142809
+      # Author: Stefan Rusterholz
+
+      merger = proc { |key,v1,v2| Hash === v1 && Hash === v2 ? v1.merge(v2, &merger) : v2 }
+      self.merge(second, &merger)
+
+   end
+
+
+   def keep_merge(hash)
+      target = dup
+      hash.keys.each do |key|
+         if hash[key].is_a? Hash and self[key].is_a? Hash
+            target[key] = target[key].keep_merge(hash[key])
+            next
+         end
+         #target[key] = hash[key]
+         target.update(hash) { |key, *values| values.flatten.uniq }
+      end
+      target
+   end
+
+end
+
 require 'active_record/clone'
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activerecord_clone
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -14,7 +14,7 @@ date: 2011-10-19 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &2152873640 !ruby/object:Gem::Requirement
+  requirement: &2169345520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2152873640
+  version_requirements: *2169345520
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &2152873160 !ruby/object:Gem::Requirement
+  requirement: &2169344920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2152873160
+  version_requirements: *2169344920
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2152872680 !ruby/object:Gem::Requirement
+  requirement: &2169344320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -44,21 +44,21 @@ dependencies:
         version: 2.3.0
   type: :development
   prerelease: false
-  version_requirements: *2152872680
+  version_requirements: *2169344320
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &2152872200 !ruby/object:Gem::Requirement
+  requirement: &2169343660 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152872200
+  version_requirements: *2169343660
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &2152871720 !ruby/object:Gem::Requirement
+  requirement: &2169343180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -66,10 +66,10 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *2152871720
+  version_requirements: *2169343180
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &2168729400 !ruby/object:Gem::Requirement
+  requirement: &2169342600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -77,7 +77,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2168729400
+  version_requirements: *2169342600
 description: ! "Provides the method of 'clone_ar' that can clone your current object.\n
   \   Accepts options on both class level and method call level."
 email: emil.palm@qubator.com
@@ -118,7 +118,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -753603999457149900
+      hash: 136612710791117306
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: