json-compare 0.1.6 → 0.1.8

data/.travis.yml

@@ -2,6 +2,5 @@ language: ruby
 rvm:
   - 1.8.7
   - 1.9.2
-  - 1.9.3
-  - rbx-18mode
+  - 1.9.3 
   - ree

data/CHANGES

@@ -1,3 +1,8 @@
+= 0.1.8
+
+ * FIX: comparing a String with a Fixnum (Marc Neumann)
+ * FIX: return remove when old_hash has more keys then the new_hash (Marc Neumann)
+
 = 0.1.6
 
  * Fixed comparison of fixnum array elements (robworley)

data/lib/json-compare/comparer.rb

@@ -6,7 +6,7 @@ module JsonCompare
     def is_boolean(obj)
       !!obj == obj
     end
-    
+
     def compare_elements(old, new)
       diff = {}
       if old.kind_of? Hash
@@ -29,16 +29,22 @@ module JsonCompare
     end
 
     def compare_hashes(old_hash, new_hash)
+      old_hash = old_hash == nil ? {} : old_hash
+      new_hash = new_hash == nil ? {} : new_hash
       keys = (old_hash.keys + new_hash.keys).uniq
       result = get_diffs_struct
       keys.each do |k|
         if !old_hash.has_key? k
           result[:append][k] = new_hash[k]
         elsif !new_hash.has_key? k
-          result[:remove][k] = new_hash[k]
+          result[:remove][k] = old_hash[k]
         else
           diff = compare_elements(old_hash[k], new_hash[k])
-          result[:update][k] = diff unless diff.empty?
+          if diff.respond_to? "empty?"
+            result[:update][k] = diff unless diff.empty?
+          else
+            result[:update][k] = diff # some classes have no empty? method
+          end
         end
       end
       filter_results(result)

data/lib/json-compare/version.rb

@@ -1,3 +1,3 @@
 module JsonCompare
-  VERSION = "0.1.6"
+  VERSION = "0.1.8"
 end

data/spec/lib/json-compare_spec.rb

@@ -13,6 +13,22 @@ describe 'Json compare' do
     end
   end
 
+  describe 'Comparison of different classes' do
+    it 'should compare String with Fixnum' do
+      json1 = Yajl::Parser.parse('{"a":"1"}')
+      json2 = Yajl::Parser.parse('{"a":1}')
+      result = JsonCompare.get_diff(json1,json2)
+      result.should eq({:update=>{"a"=>1}})
+    end
+
+    it 'should compare String with Float' do
+      json1 = Yajl::Parser.parse('{"a":"1"}')
+      json2 = Yajl::Parser.parse('{"a":1.0}')
+      result = JsonCompare.get_diff(json1,json2)
+      result.should eq({:update=>{"a"=>1}})
+    end
+  end
+
   describe 'Hashes Comparison' do
     it 'should return empty Hash' do
       result = JsonCompare.get_diff({}, {})
@@ -97,6 +113,11 @@ describe 'Json compare' do
                       "empty"=>nil
                     }]
                   }]
+                },
+                :remove => {
+                  "Something" => [{
+                      "Something" => [{}]
+                  }]
                 }
               }
             }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: json-compare
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-04 00:00:00.000000000 Z
+date: 2013-12-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake