eq_wo_order 0.2.3 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: eaee03f0ce69e34896909a941a98035527836c5e
-  data.tar.gz: f85e7071fcdb43c02c4093c9afc18eea722e07c4
+  metadata.gz: 8c745e416ae194cf358f919b8d45a49cc4195fc2
+  data.tar.gz: 9fbb9d7568a585c7cd49db4707779a44e3b6a699
 SHA512:
-  metadata.gz: f18f4fc97534351dabfba68a6e95dc0b7c778ab1b77d2a4be082dbc9fda66714f586241270e4274f62394b1b12736f49f62bc4812baed310dae0813ac0430b8c
-  data.tar.gz: 65fb8e9a014a587f7bfa971fb35cbee18cf0acf5e90ce60f8c92930f66f3fc5d05e1906641e28ddbd49ff07bac0cb708ee6c7e150c9567b8dc67c17e26e42feb
+  metadata.gz: 837cc0dcfe1dc23bd417f38d891f7b9c7459cd09e56fc070ada8087b6683759fa72311938bc755079a7c1649fd84743f38b898b07ccc4eae99b7097ac4dc4bdb
+  data.tar.gz: 83ab48db977a78032493bf706b2f33b114cc1d522aab45b837396a84906bc5430cc5007414b2273109b54f89e4b3943bc5952fd5b9de69b2d9fd07873526507b

data/CHANGELOG

@@ -4,3 +4,4 @@ Version 0.2.0 Support for arrays of hashes of arrays etc - more complicated nest
 Version 0.2.1 Small description update
 Version 0.2.2 Include CHANGELOG
 Version 0.2.3 Update description with github link
+Version 0.2.4 Ruby-ism refactors for terseness

data/eq_wo_order.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = 'eq_wo_order'
-  s.version     = '0.2.3'
+  s.version     = '0.2.4'
   s.date        = '2016-02-29'
   s.summary     = 'RSpec equality matcher that ignores nested order'
   s.description = 'RSpec equality matcher that deeply compares array without order - arrays of primitives, hashes, and arrays. Examples at github.com/jadekler/eq_wo_order'

data/lib/eq_wo_order.rb

@@ -4,50 +4,54 @@ RSpec::Matchers.define :eq_wo_order do |expected|
   end
 
   def eq_wo_order_base(actual, expected)
-    if actual.class == Array
-      # arrays
-      actual_array_items = actual.find_all { |x| x.class == Array }
-      expected_array_items = expected.find_all { |x| x.class == Array }
-      array_items_match = all_items_in_source?(actual_array_items, expected_array_items) &&
-        all_items_in_source?(expected_array_items, actual_array_items)
+    case actual
+      when Array
+        primitive_items_match?(actual, expected) &&
+          array_items_match?(actual, expected) &&
+          hash_items_match?(actual, expected)
+      when Hash
+        all_items_in_source?(actual, expected) && all_items_in_source?(expected, actual)
+      else
+        actual == expected
+    end
+  end
 
-      # hashes
-      actual_hash_items = actual.find_all { |x| x.class == Hash }
-      expected_hash_items = expected.find_all { |x| x.class == Hash }
-      hash_items_match = all_items_in_source?(actual_hash_items, expected_hash_items) &&
-        all_items_in_source?(expected_hash_items, actual_hash_items)
+  def primitive_items_match?(actual, expected)
+    actual_primitive_items = primitives(actual)
+    expected_primitive_items = primitives(expected)
+    sort_as_s(actual_primitive_items) == sort_as_s(expected_primitive_items)
+  end
 
-      # primitives
-      actual_primitive_items = actual.find_all { |x| x.class != Hash && x.class != Array }
-      expected_primitive_items = expected.find_all { |x| x.class != Hash && x.class != Array }
-      primitive_items_match = sort_as_s(actual_primitive_items) == sort_as_s(expected_primitive_items)
+  def hash_items_match?(actual, expected)
+    actual_hash_items = actual.grep(Hash)
+    expected_hash_items = expected.grep(Hash)
+    all_items_in_source?(actual_hash_items, expected_hash_items) &&
+      all_items_in_source?(expected_hash_items, actual_hash_items)
+  end
 
-      return primitive_items_match && array_items_match && hash_items_match
-    elsif actual.class == Hash
-      return all_items_in_source?(actual, expected) &&
-        all_items_in_source?(expected, actual)
-    else
-      return actual == expected
-    end
+  def array_items_match?(actual, expected)
+    actual_array_items = actual.grep(Array)
+    expected_array_items = expected.grep(Array)
+    all_items_in_source?(actual_array_items, expected_array_items) &&
+      all_items_in_source?(expected_array_items, actual_array_items)
+  end
+
+  def primitives(list)
+    list.find_all { |x| x.class != Hash && x.class != Array }
   end
 
   # given one array of arrays/hashes
   # and another array of arrays/hashes
   # are all the items of the first found in the second?
   def all_items_in_source?(search, source)
-    search.map { |search_item|
-      found = false
-
-      source.each do |source_item|
-        eq_wo_order_base = eq_wo_order_base search_item, source_item
-        found = true if eq_wo_order_base
+    search.map do |search_item|
+      source.any? do |source_item|
+        eq_wo_order_base search_item, source_item
       end
-
-      found
-    }.all?
+    end.all?
   end
 
   def sort_as_s(arr)
-    arr.sort { |x, y| x.to_s <=> y.to_s }
+    arr.sort_by(&:to_s)
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: eq_wo_order
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors:
 - Jean de Klerk