easy_diff 0.0.6 → 0.0.7

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    OGE4YThiNDMzODk5ZDA1MDQyZTY5YWZjMDI3MzNhNTJlMjA2ZTI3Mg==
+    YWUyMjFiNjI3ODUzYjhjNjI0N2YyODczNDU3MTNlMmExZGI3NWI4Ng==
   data.tar.gz: !binary |-
-    ZDkzMmJjMzA5OWVjYzRhNjQ1NTQ1MTc4NWQwOTJkNjQ3NmRhN2E4ZQ==
+    NDk4MzAzNzVmZTJhMzc5M2VlMDVmMmE1Mjg1MjAxYjkwN2E3ZGQwYQ==
 SHA512:
   metadata.gz: !binary |-
-    Nzc5NmE0M2U1ZTAzYjk5OWU3YzJmZjgyYTcyZmM0MzZjZDVmMGVjNDhiN2Ix
-    OWVmM2U2NTRmNmNmZjYzYjljYmI0ZGZhOTVhMDM2ZWYwYjFkNjYzMDdmZjM1
-    ODE1NzQ2NGQwOTE0NWY3YTc3NDBjYzY2ZDYyODAyY2IyZWE5ODI=
+    NWFjNTYxNDJiNzQ1MmIwZDdmZDAxMzE4NTc5M2FhNGUxY2Q5ZmZiMzRjMmMx
+    MmRmZDEzYWE1YWZjZWE1OGVlYzZiODc2ZDA4ZmQ5M2UxNjgyZmVkMmU3OThi
+    ODhmM2VkODdkYTQyNGY4MTM1YTExNzRiNzQwNDAwZjgxNjNiNWU=
   data.tar.gz: !binary |-
-    NzQ4ZGU3MmU1ZjY2ZGRhNTJiODFlYTI2ZjUxZjlkNWQ3MDM5YWJkZmI2OWVi
-    MzI1MWZiOTYyYzhmMDc1MjkzYzY4NGZjM2I0ZjI4YmI3MWJkZmFiNjE1NzY3
-    ZGVkY2I2YjBiNzkwNmQzMTA0MjBlOWRiNjA4ZDQzMWExYzcyYWQ=
+    NWZiYjcyZGViOGZiZjYzZTZiYWVkMDA4MTU3YjczYmJjZDYyYmM1Mjg5YTE4
+    NzUxOWVjOGVlZjUzZTRhMTBiYzlhMGJmMjdlZDRhMDgyYTIwMDEyNWQ0NWRl
+    NmQ1ZTE4YWQwZWJlY2Q0MjcwMTExY2U0ZWNlOWE5ZmQ0YWNkYjg=

data/VERSION

@@ -1 +1 @@
-0.0.6
+0.0.7

data/lib/easy_diff/core.rb

@@ -41,7 +41,9 @@ module EasyDiff
         keys_in_common.each{ |key| original.delete(key) if easy_unmerge!(original[key], removed[key]).nil? }
       elsif original.is_a?(Array) && removed.is_a?(Array)
         original.reject!{ |e| removed.include?(e) }
-        original.sort!
+        original.sort_by! { |item|
+          item.is_a?(Hash) ? item.sort : item
+        }
       elsif original == removed
         original = nil
       end

data/spec/easy_diff_spec.rb

@@ -132,29 +132,49 @@ describe EasyDiff do
     added.should == {:possibly_empty_string => "not empty"}
   end
 
-  it "should merge Arrays containing Hashes" do
-    original = {
-      "key" => [
-        {"c" => "1"},
-        {"a" => "2"},
-        {"a" => "1"},
-      ]
-    }
+  describe 'handling Arrays containing Hashes' do
+    let(:original) do
+      {
+        "key" => [
+          {"c" => "1"},
+          {"a" => "2"},
+          {"a" => "1"},
+        ]
+      }
+    end
 
-    to_merge = {
-      "key" => [
-        {"b" => "2"},
-      ]
-    }
+    it "should merge properly" do
+      to_merge = {
+        "key" => [
+          {"b" => "2"},
+        ]
+      }
 
-    merged = original.easy_merge to_merge
-    merged.should == {
-      "key" => [
-        {"a" => "1"},
-        {"a" => "2"},
-        {"b" => "2"},
-        {"c" => "1"},
-      ]
-    }
+      merged = original.easy_merge to_merge
+      merged.should == {
+        "key" => [
+          {"a" => "1"},
+          {"a" => "2"},
+          {"b" => "2"},
+          {"c" => "1"},
+        ]
+      }
+    end
+
+    it "should unmerge properly" do
+      to_unmerge = {
+        "key" => [
+          {"a" => "2"},
+        ]
+      }
+
+      unmerged = original.easy_unmerge to_unmerge
+      unmerged.should == {
+        "key" => [
+          {"a" => "1"},
+          {"c" => "1"},
+        ]
+      }
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: easy_diff
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - Abner Qian
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-05 00:00:00.000000000 Z
+date: 2016-01-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec