eq_wo_order 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bc13907a659560faf9cb2c5b8f8272bd1ae9de28
-  data.tar.gz: 84b9da470b6badb48d437afbeb38eb6c3880cbc8
+  metadata.gz: 0a13884e3cd9352d899c4aeedae8c519b38eaa52
+  data.tar.gz: 8226fa5acae1da4c68b7c2badc1e38226b85740b
 SHA512:
-  metadata.gz: 8407e36c00102f950c711a054c40d9c7448051b3867182b01c9aebfe4b68c94c23ea091114407891970b29629b3ab10ee6c82b53c1109a7904304ee867469b11
-  data.tar.gz: 7a8a05343889ac2fee08eb6cfd8cf19b7512ca3e9c2dea4dec93db69699b5171a93835e60ee96629c5c48bb02338514e77656ef7ee161ca658ae481b03664213
+  metadata.gz: a40168c509368079b33bb9e7712a89137f390444d7fbd8789ca86fdbde0b8baa9d94b366a978079d42b7bf09467d8f1b9a939ee1bed0c689bd45d3bc6b06e736
+  data.tar.gz: 9ebeac453bc021f895d365e76b67fa8236a53521b7a1e901116d67d68d65525e8ec324f7c4d75a54e43b4966f6577293e59da1e1aeed2ef0c2bffbb8ef0cdbbc

data/.gitignore

@@ -14,3 +14,4 @@
 mkmf.log
 .idea
 *.iml
+*.gem

data/.travis.yml

@@ -0,0 +1,3 @@
+language: ruby
+rvm:
+  - 2.2.4

data/CHANGELOG

@@ -0,0 +1,3 @@
+Version 0.0.1 eq_wo_order is released
+Version 0.1.0 Support for arrays of arrays and more complicated structures.
+Version 0.2.0 Support for arrays of hashes of arrays etc - more complicated nesting. Initial support for arrays of disparate types.

data/Gemfile

@@ -1,4 +1,3 @@
 source 'https://rubygems.org'
 
-# Specify your gem's dependencies in eq_wo_order.gemspec
 gemspec

data/README.md

@@ -1,6 +1,8 @@
 # EqWoOrder
 
-TODO: Write a gem description
+[![Build Status](https://travis-ci.org/jadekler/eq_wo_order.svg?branch=master)](https://travis-ci.org/jadekler/eq_wo_order)
+
+RSpec equality matcher that recursively sorts lists, hashes, and lists of hashes before comparing
 
 ## Installation
 
@@ -11,16 +13,25 @@ gem 'eq_wo_order'
 ```
 
 And then execute:
-
-    $ bundle
+ 
+```
+$ bundle
+```
 
 Or install it yourself as:
 
-    $ gem install eq_wo_order
+```
+$ gem install eq_wo_order
+```
 
 ## Usage
 
-TODO: Write usage instructions here
+```
+first = [[1, 2, 3]]
+second = [[3, 1, 2]]
+
+expect(first).to eq_wo_order second
+```
 
 ## Contributing
 

data/Rakefile

@@ -1 +1,5 @@
 require 'bundler/gem_tasks'
+
+task :default do
+  puts system('bundle exec rspec')
+end

data/eq_wo_order.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = 'eq_wo_order'
-  s.version     = '0.1.0'
+  s.version     = '0.2.0'
   s.date        = '2016-02-29'
   s.summary     = 'RSpec equality matcher that ignores nested order'
   s.description = 'RSpec equality matcher that recursively sorts lists, hashes, and lists of hashes before comparing'

data/lib/eq_wo_order.rb

@@ -5,41 +5,49 @@ RSpec::Matchers.define :eq_wo_order do |expected|
 
   def eq_wo_order_base(actual, expected)
     if actual.class == Array
-      actual_sorted = sort_array_of_hashes_by_all_keys actual
-      expected_sorted = sort_array_of_hashes_by_all_keys expected
-
-      actual_sorted == expected_sorted
+      # 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)
+
+      # 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)
+
+      # 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)
+
+      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
-      actual == expected
+      return actual == expected
     end
   end
 
-  def sort_array_of_hashes_by_all_keys(arr)
-    sorted_arr = []
-
-    hash_items = arr.collect { |x| x if x.class == Hash }.compact
-    array_items = arr.collect { |x| x if x.class == Array }.compact
-    primitive_items = arr.collect { |x| x unless x.class == Hash || x.class == Array }.compact
-
-    # primitives
-    sorted_arr.push primitive_items.sort.flatten
+  # 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
 
-    # arrays
-    sorted_array_items = array_items.collect { |item| sort_array_of_hashes_by_all_keys(item) }
-    sorted_arr.push sorted_array_items.flatten
-
-    # hashes
-    intersect_keys(hash_items).each do |key|
-      hash_items = hash_items.sort_by { |item| item[key] }
-    end
-    sorted_arr.push hash_items.flatten
+      source.each do |source_item|
+        eq_wo_order_base = eq_wo_order_base search_item, source_item
+        found = true if eq_wo_order_base
+      end
 
-    sorted_arr
+      found
+    }.all?
   end
 
-  def intersect_keys(arr_of_hashes)
-    keys = arr_of_hashes.collect { |x| x.keys }
-    intersected_keys = keys.reduce(keys.first, :&)
-    intersected_keys == nil ? [] : intersected_keys
+  def sort_as_s(arr)
+    arr.sort { |x, y| x.to_s <=> y.to_s }
   end
 end

data/spec/features/eq_wo_order_spec.rb

@@ -29,8 +29,67 @@ describe '#eq_wo_order' do
       it { is_expected.to eq_wo_order([2, 1]) }
     end
 
-    describe ['a', {b: 'c', d: 'e'}] do
-      it { is_expected.to eq_wo_order([{d: 'e', b: 'c'}, 'a']) }
+    describe [] do
+      it { is_expected.to eq_wo_order([]) }
+    end
+
+    describe 'of disparate types' do
+      describe ['a', {b: 'c', d: 'e'}] do
+        it { is_expected.to eq_wo_order([{d: 'e', b: 'c'}, 'a']) }
+        it { is_expected.not_to eq_wo_order([5, {d: 'e', b: 'c'}, 'a']) }
+      end
+    end
+
+    describe 'of hashes' do
+      describe [{a: 1}, {a: 2}] do
+        it { is_expected.to eq_wo_order([{a: 2}, {a: 1}]) }
+        it { is_expected.not_to eq_wo_order([{a: 1}]) }
+        it { is_expected.not_to eq_wo_order([{a: 1}, {a: 2}, {a: 3}]) }
+      end
+
+      describe [{a: 1, b: 1}, {a: 1, b: 2}] do
+        it { is_expected.to eq_wo_order([{a: 1, b: 2}, {a: 1, b: 1}]) }
+        it { is_expected.not_to eq_wo_order([{a: 1, b: 1}, {a: 1, b: 2, c: 3}]) }
+      end
+
+      describe [{a: 1, b: 1}, {a: 1, b: 2, c: 3}] do
+        it { is_expected.not_to eq_wo_order([{a: 1, b: 2}, {a: 1, b: 1}]) }
+      end
+
+      describe 'of arrays' do
+        describe [{a: [1, 2]}, {a: [3]}] do
+          it { is_expected.to eq_wo_order([{a: [2, 1]}, {a: [3]}]) }
+        end
+      end
+    end
+
+    describe 'of arrays' do
+      describe [[1, 2]] do
+        it { is_expected.to eq_wo_order([[2, 1]]) }
+        it { is_expected.not_to eq_wo_order([[2, 1, 3]]) }
+      end
+
+      describe [[1, 2], [3, 4]] do
+        it { is_expected.to eq_wo_order([[1, 2], [3, 4]]) }
+        it { is_expected.to eq_wo_order([[1, 2], [4, 3]]) }
+        it { is_expected.to eq_wo_order([[2, 1], [4, 3]]) }
+        it { is_expected.to eq_wo_order([[2, 1], [3, 4]]) }
+        it { is_expected.to eq_wo_order([[3, 4], [1, 2]]) }
+        it { is_expected.to eq_wo_order([[3, 4], [2, 1]]) }
+        it { is_expected.to eq_wo_order([[4, 3], [2, 1]]) }
+        it { is_expected.to eq_wo_order([[4, 3], [1, 2]]) }
+        it { is_expected.not_to eq_wo_order([[1, 2]]) }
+        it { is_expected.not_to eq_wo_order([[1, 2], [3, 4], [5, 6]]) }
+      end
+
+      describe [[1, 2, 3]] do
+        it { is_expected.to eq_wo_order([[2, 1, 3]]) }
+        it { is_expected.not_to eq_wo_order([[2, 1]]) }
+      end
+
+      describe [[[1, 2]]] do
+        it { is_expected.to eq_wo_order([[[2, 1]]]) }
+      end
     end
   end
 
@@ -38,54 +97,36 @@ describe '#eq_wo_order' do
     describe({a: 'b', c: 'd'}) do
       it { is_expected.to eq_wo_order({a: 'b', c: 'd'}) }
       it { is_expected.to eq_wo_order({c: 'd', a: 'b'}) }
+      it { is_expected.not_to eq_wo_order({a: 'b', c: 'd', e: 'f'}) }
     end
 
     describe({a: 1, b: 2}) do
       it { is_expected.to eq_wo_order({a: 1, b: 2}) }
       it { is_expected.to eq_wo_order({b: 2, a: 1}) }
     end
-  end
-
-  describe 'arrays of hashes' do
-    describe [{a: 1}, {a: 2}] do
-      it { is_expected.to eq_wo_order([{a: 2}, {a: 1}]) }
-    end
-
-    describe [{a: 1, b: 1}, {a: 1, b: 2}] do
-      it { is_expected.to eq_wo_order([{a: 1, b: 2}, {a: 1, b: 1}]) }
-      it { is_expected.not_to eq_wo_order([{a: 1, b: 1}, {a: 1, b: 2, c: 3}]) }
-    end
-
-    describe [{a: 1, b: 1}, {a: 1, b: 2, c: 3}] do
-      it { is_expected.not_to eq_wo_order([{a: 1, b: 2}, {a: 1, b: 1}]) }
-    end
-  end
 
-  describe 'arrays of arrays' do
-    describe [[1, 2]] do
-      it { is_expected.to eq_wo_order([[2, 1]]) }
-      it { is_expected.not_to eq_wo_order([[2, 1, 3]]) }
-    end
+    describe 'of arrays' do
+      describe({a: [1, 2]}) do
+        it { is_expected.to eq_wo_order({a: [2, 1]}) }
+      end
 
-    describe [[1, 2, 3]] do
-      it { is_expected.to eq_wo_order([[2, 1, 3]]) }
-      it { is_expected.not_to eq_wo_order([[2, 1]]) }
+      describe 'of hashes' do
+        describe({a: [{a: 5}, {b: 7}]}) do
+          it { is_expected.to eq_wo_order({a: [{b: 7}, {a: 5}]}) }
+        end
+      end
     end
 
-    describe [[[1, 2]]] do
-      it { is_expected.to eq_wo_order([[[2, 1]]]) }
-    end
-  end
-
-  describe 'hashes of hashes' do
-    describe({a: {b: {c: 'd', e: 'f'}}}) do
-      it { is_expected.to eq_wo_order({a: {b: {e: 'f', c: 'd'}}}) }
-    end
-  end
+    describe 'of hashes' do
+      describe({a: {b: {c: 'd', e: 'f'}}}) do
+        it { is_expected.to eq_wo_order({a: {b: {e: 'f', c: 'd'}}}) }
+      end
 
-  describe 'hashes of arrays' do
-    describe({a: [1, 2]}) do
-      it { is_expected.to eq_wo_order({a: [2, 1]}) }
+      describe 'of arrays' do
+        describe({a: {b: [1, 2]}}) do
+          it { is_expected.to eq_wo_order({a: {b: [2, 1]}}) }
+        end
+      end
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: eq_wo_order
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Jean de Klerk
@@ -61,12 +61,12 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - .rspec
+- .travis.yml
 - CHANGELOG
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
-- eq_wo_order-0.0.1.gem
 - eq_wo_order.gemspec
 - lib/eq_wo_order.rb
 - lib/version/version.rb