easy_diff 0.0.1 → 0.0.2

data/Gemfile

@@ -6,7 +6,7 @@ source "http://rubygems.org"
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.
 group :development do
-  gem "rspec", "~> 2.3.0"
+  gem "rspec", "~> 2.4.0"
   gem "yard", "~> 0.6.0"
   gem "bundler", "~> 1.0.0"
   gem "jeweler", "~> 1.5.2"

data/Gemfile.lock

@@ -1,7 +1,7 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    diff-lcs (1.1.2)
+    diff-lcs (1.1.3)
     git (1.2.5)
     jeweler (1.5.2)
       bundler (~> 1.0.0)
@@ -9,14 +9,14 @@ GEM
       rake
     rake (0.8.7)
     rcov (0.9.9)
-    rspec (2.3.0)
-      rspec-core (~> 2.3.0)
-      rspec-expectations (~> 2.3.0)
-      rspec-mocks (~> 2.3.0)
-    rspec-core (2.3.1)
-    rspec-expectations (2.3.0)
+    rspec (2.4.0)
+      rspec-core (~> 2.4.0)
+      rspec-expectations (~> 2.4.0)
+      rspec-mocks (~> 2.4.0)
+    rspec-core (2.4.0)
+    rspec-expectations (2.4.0)
       diff-lcs (~> 1.1.2)
-    rspec-mocks (2.3.0)
+    rspec-mocks (2.4.0)
     yard (0.6.4)
 
 PLATFORMS
@@ -26,5 +26,5 @@ DEPENDENCIES
   bundler (~> 1.0.0)
   jeweler (~> 1.5.2)
   rcov
-  rspec (~> 2.3.0)
+  rspec (~> 2.4.0)
   yard (~> 0.6.0)

data/README.rdoc

@@ -119,6 +119,26 @@ Using Hash#easy_unmerge! will modify self instead of returning a new hash.
   #     :some_str => "bla"
   #   }
   
+=== Hash#easy_clone
+
+Performs a deep clone on a hash
+
+  original = {
+    :tags => ['b', 'c', 'd'],
+    :pos => {:x => '3', :y => '2'}
+  }
+  
+  new = original.easy_clone
+  
+  new[:tags] << 'e'
+  new[:pos][:y] = '1'
+  
+  # The original hash will still look like this:
+  # original = {
+  #   :tags => ['b', 'c', 'd'],
+  #   :pos => {:x => '3', :y => '2'}
+  # }
+
 == Contributing to easy_diff
  
 * Check out the latest master to make sure the feature hasn't been implemented or the bug hasn't been fixed yet

data/VERSION

@@ -1 +1 @@
-0.0.1
+0.0.2

data/easy_diff.gemspec

@@ -0,0 +1,70 @@
+# Generated by jeweler
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = "easy_diff"
+  s.version = "0.0.2"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["Abner Qian"]
+  s.date = "2012-02-13"
+  s.description = "Easy Diff enhances the functionality of Hash, allowing recursive diff, merge, and unmerge of arbitrarily constructed hashes.\n  This is perfect for people who need to do diffs on not only plain text files but also data as Hash or JSON objects. Unmerge\n  is included with diff and merge to more easily allow versioning of arbitrary data."
+  s.email = "LargeBagel@gmail.com"
+  s.extra_rdoc_files = [
+    "LICENSE.txt",
+    "README.rdoc"
+  ]
+  s.files = [
+    ".document",
+    ".rspec",
+    "Gemfile",
+    "Gemfile.lock",
+    "LICENSE.txt",
+    "README.rdoc",
+    "Rakefile",
+    "VERSION",
+    "easy_diff.gemspec",
+    "lib/easy_diff.rb",
+    "lib/easy_diff/core.rb",
+    "lib/easy_diff/hash_ext.rb",
+    "lib/easy_diff/safe_dup.rb",
+    "spec/easy_diff_spec.rb",
+    "spec/spec_helper.rb"
+  ]
+  s.homepage = "http://github.com/Blargel/easy_diff"
+  s.licenses = ["MIT"]
+  s.require_paths = ["lib"]
+  s.rubygems_version = "1.8.12"
+  s.summary = "Recursive diff, merge, and unmerge for hashes and arrays."
+  s.test_files = [
+    "spec/easy_diff_spec.rb",
+    "spec/spec_helper.rb"
+  ]
+
+  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_development_dependency(%q<rspec>, ["~> 2.4.0"])
+      s.add_development_dependency(%q<yard>, ["~> 0.6.0"])
+      s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
+      s.add_development_dependency(%q<jeweler>, ["~> 1.5.2"])
+      s.add_development_dependency(%q<rcov>, [">= 0"])
+    else
+      s.add_dependency(%q<rspec>, ["~> 2.4.0"])
+      s.add_dependency(%q<yard>, ["~> 0.6.0"])
+      s.add_dependency(%q<bundler>, ["~> 1.0.0"])
+      s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
+      s.add_dependency(%q<rcov>, [">= 0"])
+    end
+  else
+    s.add_dependency(%q<rspec>, ["~> 2.4.0"])
+    s.add_dependency(%q<yard>, ["~> 0.6.0"])
+    s.add_dependency(%q<bundler>, ["~> 1.0.0"])
+    s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
+    s.add_dependency(%q<rcov>, [">= 0"])
+  end
+end
+

data/lib/easy_diff/core.rb

@@ -62,5 +62,9 @@ module EasyDiff
       end
       original
     end
+    
+    def self.easy_clone(original)
+      Marshal::load(Marshal.dump(original))
+    end
   end
 end

data/lib/easy_diff/hash_ext.rb

@@ -13,11 +13,15 @@ module EasyDiff
     end
   
     def easy_merge(other)
-      self.dup.easy_merge!(other)
+      self.easy_clone.easy_merge!(other)
     end
   
     def easy_unmerge(other)
-      self.dup.easy_unmerge!(other)
+      self.easy_clone.easy_unmerge!(other)
+    end
+    
+    def easy_clone
+      EasyDiff::Core.easy_clone self
     end
   end
 end

data/spec/easy_diff_spec.rb

@@ -62,6 +62,14 @@ describe EasyDiff do
      :extra_removed => "bye",
      :extra_added => "hi"
    }
+   @original.should == {
+      :tags => ['a', 'b', 'c'],
+      :pos => {:x => '1', :y => '2'},
+      :some_str => "bla",
+      :some_int => 1,
+      :some_bool => false,
+      :extra_removed => "bye"
+    }
   end
   
   it "should stay the same" do
@@ -70,4 +78,27 @@ describe EasyDiff do
     original = unmerged.easy_merge removed
     original.should == @original
   end
+  
+  it "should do a deep clone" do
+    cloned = @original.easy_clone
+    cloned.should == @original
+    cloned[:tags] << 'd'
+    cloned[:pos][:x] = '2'
+    cloned.should == {
+      :tags => ['a', 'b', 'c', 'd'],
+      :pos => {:x => '2', :y => '2'},
+      :some_str => "bla",
+      :some_int => 1,
+      :some_bool => false,
+      :extra_removed => "bye"
+    }
+    @original.should == {
+      :tags => ['a', 'b', 'c'],
+      :pos => {:x => '1', :y => '2'},
+      :some_str => "bla",
+      :some_int => 1,
+      :some_bool => false,
+      :extra_removed => "bye"
+    }
+  end
 end

metadata

@@ -1,86 +1,83 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: easy_diff
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 0.0.2
   prerelease: 
-  version: 0.0.1
 platform: ruby
-authors: 
+authors:
 - Abner Qian
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-03-03 00:00:00 -08:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-02-13 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &2151858500 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        version: 2.3.0
+      - !ruby/object:Gem::Version
+        version: 2.4.0
   type: :development
   prerelease: false
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
+  version_requirements: *2151858500
+- !ruby/object:Gem::Dependency
   name: yard
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  requirement: &2151856820 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 0.6.0
   type: :development
   prerelease: false
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
+  version_requirements: *2151856820
+- !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: &2151855560 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
+  version_requirements: *2151855560
+- !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: &2151854440 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 1.5.2
   type: :development
   prerelease: false
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
+  version_requirements: *2151854440
+- !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  requirement: &2151853080 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *id005
-description: |-
-  Easy Diff enhances the functionality of Hash, allowing recursive diff, merge, and unmerge of arbitrarily constructed hashes.
-    This is perfect for people who need to do diffs on not only plain text files but also data as Hash or JSON objects. Unmerge
-    is included with diff and merge to more easily allow versioning of arbitrary data.
+  version_requirements: *2151853080
+description: ! "Easy Diff enhances the functionality of Hash, allowing recursive diff,
+  merge, and unmerge of arbitrarily constructed hashes.\n  This is perfect for people
+  who need to do diffs on not only plain text files but also data as Hash or JSON
+  objects. Unmerge\n  is included with diff and merge to more easily allow versioning
+  of arbitrary data."
 email: LargeBagel@gmail.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - LICENSE.txt
 - README.rdoc
-files: 
+files:
 - .document
 - .rspec
 - Gemfile
@@ -89,43 +86,41 @@ files:
 - README.rdoc
 - Rakefile
 - VERSION
+- easy_diff.gemspec
 - lib/easy_diff.rb
 - lib/easy_diff/core.rb
 - lib/easy_diff/hash_ext.rb
 - lib/easy_diff/safe_dup.rb
 - spec/easy_diff_spec.rb
 - spec/spec_helper.rb
-has_rdoc: true
 homepage: http://github.com/Blargel/easy_diff
-licenses: 
+licenses:
 - MIT
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 744956757776922527
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: -1601548536444288509
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.5.2
+rubygems_version: 1.8.12
 signing_key: 
 specification_version: 3
 summary: Recursive diff, merge, and unmerge for hashes and arrays.
-test_files: 
+test_files:
 - spec/easy_diff_spec.rb
 - spec/spec_helper.rb