easy_diff 0.0.2 → 0.0.3

data/VERSION

@@ -1 +1 @@
-0.0.2
+0.0.3

data/lib/easy_diff/core.rb

@@ -5,9 +5,9 @@ module EasyDiff
       added   = nil
 
       if original.nil?
-        added = modified.safe_dup 
+        added = modified.safe_dup
       elsif modified.nil?
-        removed = original.safe_dup 
+        removed = original.safe_dup
       elsif original.is_a?(Hash) && modified.is_a?(Hash)
         removed = {}
         added   = {}
@@ -20,8 +20,8 @@ module EasyDiff
         keys_added.each{ |key| added[key] = modified[key].safe_dup }
         keys_in_common.each do |key|
           r, a = easy_diff original[key], modified[key]
-          removed[key] = r unless r.nil?
-          added[key] = a unless a.nil?
+          removed[key] = r unless _blank?(r)
+          added[key] = a unless _blank?(a)
         end
       elsif original.is_a?(Array) && modified.is_a?(Array)
         removed = original - modified
@@ -32,7 +32,7 @@ module EasyDiff
       end
       return removed, added
     end
-  
+
     def self.easy_unmerge!(original, removed)
       if original.is_a?(Hash) && removed.is_a?(Hash)
         original_keys  = original.keys
@@ -47,7 +47,7 @@ module EasyDiff
       end
       original
     end
-  
+
     def self.easy_merge!(original, added)
       if added.nil?
         return original
@@ -62,9 +62,17 @@ module EasyDiff
       end
       original
     end
-    
+
     def self.easy_clone(original)
       Marshal::load(Marshal.dump(original))
     end
+
+    def self._blank?(obj)
+      if obj.respond_to?(:empty?)
+        obj.empty?
+      else
+        obj.nil?
+      end
+    end
   end
 end

data/spec/easy_diff_spec.rb

@@ -101,4 +101,26 @@ describe EasyDiff do
       :extra_removed => "bye"
     }
   end
+
+  it "should not show empty hashes or arrays as diffs" do
+    @modified[:tags] = @original[:tags]
+    @modified[:pos] = @original[:pos]
+    @removed.delete :pos
+    @removed.delete :tags
+    @added.delete :pos
+    @added.delete :tags
+    removed, added = @original.easy_diff @modified
+    removed.should == @removed
+    added.should == @added
+  end
+
+  it "should show added empty hashes as a diff" do
+    @original[:empty_array] = []
+    @modified[:empty_hash] = {}
+    @removed[:empty_array] = []
+    @added[:empty_hash] = {}
+    removed, added = @original.easy_diff @modified
+    removed.should == @removed
+    added.should == @added
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: easy_diff
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-13 00:00:00.000000000 Z
+date: 2014-07-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2151858500 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,15 @@ dependencies:
         version: 2.4.0
   type: :development
   prerelease: false
-  version_requirements: *2151858500
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.4.0
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &2151856820 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +37,15 @@ dependencies:
         version: 0.6.0
   type: :development
   prerelease: false
-  version_requirements: *2151856820
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.6.0
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &2151855560 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +53,15 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *2151855560
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &2151854440 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +69,15 @@ dependencies:
         version: 1.5.2
   type: :development
   prerelease: false
-  version_requirements: *2151854440
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.5.2
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &2151853080 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +85,12 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2151853080
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 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
@@ -108,7 +133,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1601548536444288509
+      hash: -682295806044477025
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -117,7 +142,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.12
+rubygems_version: 1.8.29
 signing_key: 
 specification_version: 3
 summary: Recursive diff, merge, and unmerge for hashes and arrays.