structure_compare 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6ccf54b4f42263485c1a93a50989e69b82d40e91
-  data.tar.gz: a0a85c991d901feb6fdfae988df7e48c07d628d6
+  metadata.gz: c7e3a4d3ba5b971952f4c8b36cbc5625eddeef86
+  data.tar.gz: 696b6e7775ff575315164a84cd4156082f12d369
 SHA512:
-  metadata.gz: c1d25d9ddf2945090a8b9cb534e63dce989e241199e72145a8caf374fab5325afc4afab9c7acdd05fe88cd4af187d4f6a358ad728ed082b75348a96c2241a79d
-  data.tar.gz: f2ef2e68269c3f9a9555214189d98e25e849d2e7db6ecf706daa80ae5999d3f5dc42df529d80b4956c71f53499c55e47756e89b23e0d5f83335c4e5e48a29433
+  metadata.gz: a6ede945d269bfdebb0eb77783a9a3797d426e0b0198a3b801fd7b076be9790ac2f6116ac6282098b3af3ce5373108abb08a9eaa6af54348b026278a962d450e
+  data.tar.gz: dcead81b09f0223e65cc5a7120cbdf4059ec2c2a085c3170ae3ab4c1178915dbed9ae53b14c04f794e8a8a5e2b14e4fee23b5f4f2d2fe47ec76025ed9dd32fe5

data/lib/structure_compare/structure_comparison.rb

@@ -92,16 +92,16 @@ module StructureCompare
 
       if @options[:strict_key_order]
         if expected_keys != actual_keys
-          not_equal_error!(expected_keys, actual_keys, failure_message)
+          not_equal_error!(failure_message)
         end
       else
         # NOTE: first did this with sorting, but can't sort mixed type keys
         all_keys_present = (
-          expected_keys.all?{ |key| actual.has_key?(key) } &&
-          actual_keys.all?{ |key| expected.has_key?(key) }
+          expected_keys.all?{ |key| actual_keys.include?(key) } &&
+          actual_keys.all?{ |key| expected_keys.include?(key) }
         )
         if !all_keys_present
-          not_equal_error!(expected_keys, actual_keys, failure_message)
+          not_equal_error!(failure_message)
         end
       end
     end
@@ -113,7 +113,7 @@ module StructureCompare
     def check_kind_of!(expected, actual)
       unless actual.kind_of?(expected.class)
         failure_message = "expected #{actual.class.to_s} to be kind of #{expected.class.to_s}"
-        not_equal_error!(expected, actual, failure_message)
+        not_equal_error!(failure_message)
       end
     end
 
@@ -128,7 +128,7 @@ module StructureCompare
 
       if !is_equal
         failure_message ||= "expected: #{expected.inspect}, got: #{actual.inspect}"
-        not_equal_error!(expected, actual, failure_message)
+        not_equal_error!(failure_message)
       end
     end
 
@@ -142,7 +142,7 @@ module StructureCompare
     end
 
     # TODO make this part of an overridden exception?
-    def not_equal_error!(expected, actual, failure_message)
+    def not_equal_error!(failure_message)
       @error = failure_message
       raise StructuresNotEqualError.new() # TODO error message, path
     end

data/lib/structure_compare/version.rb

@@ -1,3 +1,3 @@
 module StructureCompare
-  VERSION = "0.1.5"
+  VERSION = "0.1.6"
 end

data/test/structure_compare_test.rb

@@ -17,6 +17,12 @@ class StructureCompareTest < MiniTest::Test
     assert_structures_equal({a: 1, b: 2}, {b: 2, a: 1})
     assert_structures_equal({a: 1, b: 2}, {b: 2, a: 1}, strict_key_order: false)
     refute_structures_equal({a: 1, b: 2}, {b: 2, a: 1}, strict_key_order: true)
+
+    # this was a bug with combining relaxed key order and indifferent access
+    assert_structures_equal(
+      {a: 1, b: 2}, {"b": 2, "a": 1},
+      strict_key_order: false, indifferent_access: true
+    )
   end
 
   def test_compares_leaf_value_types

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: structure_compare
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - Markus Seeger