easy_diff 0.0.3 → 0.0.4

data/README.rdoc

@@ -7,7 +7,7 @@ is included with diff and merge to more easily allow versioning of arbitrary dat
 == Install
 
   gem install easy_diff
-  
+
 == Examples
 
 === Hash#easy_diff
@@ -23,7 +23,7 @@ The first contains what has to be removed from self to create the second hash. T
     :some_bool => false,
     :extra_removed => "bye"
   }
-  
+
   modified = {
     :tags => ['b', 'c', 'd'],
     :pos => {:x => '3', :y => '2'},
@@ -32,9 +32,9 @@ The first contains what has to be removed from self to create the second hash. T
     :some_bool => true,
     :extra_added => "hi"
   }
-  
+
   removed, added = original.easy_diff modified
-  
+
   # The removed and added hashes should contain the following:
   # removed = {
   #     :tags => ['a'],
@@ -43,7 +43,7 @@ The first contains what has to be removed from self to create the second hash. T
   #     :some_bool => false,
   #     :extra_removed => "bye"
   #   }
-  #   
+  #
   #   added = {
   #     :tags => ['d'],
   #     :pos => {:x => '3'},
@@ -51,7 +51,7 @@ The first contains what has to be removed from self to create the second hash. T
   #     :some_bool => true,
   #     :extra_added => "hi"
   #   }
-  
+
 === Hash#easy_merge
 
 Takes a hash and recursively merges it with self. Arrays are merged by the union operation and then sorted.
@@ -65,7 +65,7 @@ Using Hash#easy_merge! will modify self instead of returning a new hash.
     :some_bool => false,
     :extra_removed => "bye"
   }
-  
+
   extra = {
     :tags => ['d'],
     :pos => {:x => '3'},
@@ -73,7 +73,7 @@ Using Hash#easy_merge! will modify self instead of returning a new hash.
     :some_bool => true,
     :extra_added => "hi"
   }
-  
+
   merged = original.easy_merge extra
 
   # The merged hash should look like this:
@@ -86,7 +86,7 @@ Using Hash#easy_merge! will modify self instead of returning a new hash.
   #   :extra_removed => "bye",
   #   :extra_added => "hi"
   # }
-  
+
 === Hash#easy_unmerge
 
 Takes a hash and recursively unmerges it with self. By unmerging, I mean it will remove all matching values from
@@ -101,7 +101,7 @@ Using Hash#easy_unmerge! will modify self instead of returning a new hash.
     :some_bool => true,
     :extra_added => "hi"
   }
-  
+
   extra = {
     :tags => ['d'],
     :pos => {:x => '3'},
@@ -109,7 +109,7 @@ Using Hash#easy_unmerge! will modify self instead of returning a new hash.
     :some_bool => true,
     :extra_added => "hi"
   }
-  
+
   unmerged = original.easy_unmerge extra
 
   # The unmerged hash should look like this:
@@ -118,7 +118,7 @@ Using Hash#easy_unmerge! will modify self instead of returning a new hash.
   #     :pos => {:y => '2'},
   #     :some_str => "bla"
   #   }
-  
+
 === Hash#easy_clone
 
 Performs a deep clone on a hash
@@ -127,12 +127,12 @@ Performs a deep clone on a hash
     :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'],
@@ -140,7 +140,7 @@ Performs a deep clone on a hash
   # }
 
 == 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
 * Check out the issue tracker to make sure someone already hasn't requested it and/or contributed it
 * Fork the project

data/VERSION

@@ -1 +1 @@
-0.0.3
+0.0.4

data/lib/easy_diff.rb

@@ -3,4 +3,4 @@ require File.expand_path(File.dirname(__FILE__) + '/easy_diff/core')
 require File.expand_path(File.dirname(__FILE__) + '/easy_diff/hash_ext')
 
 Object.send :include, EasyDiff::SafeDup
-Hash.send :include, EasyDiff::HashExt
+Hash.send :include, EasyDiff::HashExt

data/lib/easy_diff/core.rb

@@ -68,11 +68,11 @@ module EasyDiff
     end
 
     def self._blank?(obj)
-      if obj.respond_to?(:empty?)
+      if obj.is_a?(Hash) || obj.is_a?(Array)
         obj.empty?
       else
         obj.nil?
       end
     end
   end
-end
+end

data/lib/easy_diff/hash_ext.rb

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

data/lib/easy_diff/safe_dup.rb

@@ -8,4 +8,4 @@ module EasyDiff
       end
     end
   end
-end
+end

data/spec/easy_diff_spec.rb

@@ -10,7 +10,7 @@ describe EasyDiff do
       :some_bool => false,
       :extra_removed => "bye"
     }
-    
+
     @modified = {
       :tags => ['b', 'c', 'd'],
       :pos => {:x => '3', :y => '2'},
@@ -19,7 +19,7 @@ describe EasyDiff do
       :some_bool => true,
       :extra_added => "hi"
     }
-    
+
     @removed = {
       :tags => ['a'],
       :pos => {:x => '1'},
@@ -27,7 +27,7 @@ describe EasyDiff do
       :some_bool => false,
       :extra_removed => "bye"
     }
-    
+
     @added = {
       :tags => ['d'],
       :pos => {:x => '3'},
@@ -41,7 +41,7 @@ describe EasyDiff do
     removed.should == @removed
     added.should == @added
   end
-  
+
   it "should compute easy_unmerge" do
     unmerged = @modified.easy_unmerge @added
     unmerged.should == {
@@ -50,7 +50,7 @@ describe EasyDiff do
       :some_str => "bla"
     }
   end
-  
+
   it "should compute easy_merge" do
    merged = @original.easy_merge @added
    merged.should == {
@@ -71,14 +71,14 @@ describe EasyDiff do
       :extra_removed => "bye"
     }
   end
-  
+
   it "should stay the same" do
     removed, added = @original.easy_diff @modified
     unmerged = @modified.easy_unmerge added
     original = unmerged.easy_merge removed
     original.should == @original
   end
-  
+
   it "should do a deep clone" do
     cloned = @original.easy_clone
     cloned.should == @original
@@ -123,4 +123,12 @@ describe EasyDiff do
     removed.should == @removed
     added.should == @added
   end
+
+  it "should only check empty? on Hashes and Arrays" do
+    original = {:possibly_empty_string => ""}
+    modified = {:possibly_empty_string => "not empty"}
+    removed, added = original.easy_diff modified
+    removed.should == {:possibly_empty_string => ""}
+    added.should == {:possibly_empty_string => "not empty"}
+  end
 end

data/spec/spec_helper.rb

@@ -8,5 +8,5 @@ require 'easy_diff'
 Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each {|f| require f}
 
 RSpec.configure do |config|
-  
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: easy_diff
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-05 00:00:00.000000000 Z
+date: 2014-12-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -133,7 +133,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -682295806044477025
+      hash: -1698235666282817780
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: