eq_wo_order 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 94ee46eac4ca9cc090d8f0182cce5b87aa828e9b
-  data.tar.gz: bfbf8290a2a3f91f583ddb68e3cf54924636f5ae
+  metadata.gz: 9de4820c3d69cd160e796b41f915d46cb4280717
+  data.tar.gz: 7e82d8cdc0e89b4def0d227a9a2f53421f8e21b3
 SHA512:
-  metadata.gz: a0814c2e6216e367eddff70fedfac1e67135c397a3e9824ec6f0fd1c33c14bca99ddc550fda9d5a994f0413b63e14b2cb7cfec20bf002f3a106895c785cb48d9
-  data.tar.gz: 4bec73d3241958f98394e3762f4e5cb2f86bf2f70c1f90d2a548523024c91dcf0e1a6ae137da84ec2d1b57226f6dbaad47fdf7fc7ce406f448b4d6869bc5b12d
+  metadata.gz: 94db4b4ee1e4a80f216993d65269faa08084cce8365b91a5e2269eb220cd7c5959e7f400056c3d28ab818c0a58d462b206be6087acc4193608764616ac8d3bca
+  data.tar.gz: 759b83dd59e87a89b7df42609fc46f3a360d7c36af539f006423fb1d4442f7e0439c27bd2f9625c5cc3324449e2a82711c643419f8d82c03ede249b1760d1f48

data/CHANGELOG

@@ -6,3 +6,4 @@ Version 0.2.2 Include CHANGELOG
 Version 0.2.3 Update description with github link
 Version 0.2.4 Ruby-ism refactors for terseness
 Version 0.3.0 Support for nil-case
+Version 0.3.1 Refactor large amounts of code to use Enumerable::any/all, thanks to @jacobsimeon

data/eq_wo_order.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = 'eq_wo_order'
-  s.version     = '0.3.0'
+  s.version     = '0.3.1'
   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

@@ -1,59 +1,34 @@
 RSpec::Matchers.define :eq_wo_order do |expected|
   match do |actual|
-    eq_wo_order_base(actual, expected)
+    eq_wo_order(actual, expected)
   end
 
-  def eq_wo_order_base(actual, expected)
+  def eq_wo_order(actual, expected)
     return false unless actual.class == expected.class
 
     case actual
       when Array
-        primitive_items_match?(actual, expected) &&
-          array_items_match?(actual, expected) &&
-          hash_items_match?(actual, expected)
+        arrays_match?(actual, expected)
       when Hash
-        all_items_in_source?(actual, expected) && all_items_in_source?(expected, actual)
+        hashes_match?(actual, expected)
       else
         actual == expected
     end
   end
 
-  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
-
-  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
-
-  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 do |search_item|
-      source.any? do |source_item|
-        eq_wo_order_base search_item, source_item
+  def arrays_match?(actual, expected)
+    return false unless actual.length == expected.length
+    expected.all? do |expected_item|
+      actual.any? do |candidate|
+        eq_wo_order(candidate, expected_item)
       end
-    end.all?
+    end
   end
 
-  def sort_as_s(arr)
-    arr.sort_by(&:to_s)
+  def hashes_match?(actual, expected)
+    return false unless arrays_match?(actual.keys, expected.keys)
+    expected.all? do |expected_key, expected_value|
+      eq_wo_order(actual[expected_key], expected_value)
+    end
   end
 end

data/spec/features/eq_wo_order_spec.rb

@@ -1,4 +1,4 @@
-require_relative '../../lib/eq_wo_order'
+require 'eq_wo_order'
 
 describe '#eq_wo_order' do
   describe 'basic types' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: eq_wo_order
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Jean de Klerk
@@ -14,42 +14,42 @@ dependencies:
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.7'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
 description: RSpec equality matcher that deeply compares array without order - arrays
@@ -59,9 +59,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
-- .travis.yml
+- ".gitignore"
+- ".rspec"
+- ".travis.yml"
 - CHANGELOG
 - Gemfile
 - LICENSE.txt
@@ -82,17 +82,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: RSpec equality matcher that ignores nested order