hashes_equal 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 723e208b4818b3724802a8fb3c54fbe6349ce1fe93ba477d4d1fd7fc4b23a73f
-  data.tar.gz: c55f8bbb2b9c26d263b3b92f6349e4c23a1cfe5113ff3db57483627289087b14
+  metadata.gz: 592e8dd71868e0562bc22597481fe2976e66a1d98736b226b5081888845eee0c
+  data.tar.gz: 66a73f2d9ae4fadd454a25985d491fb3cab67aff4720c2c67a6173b902edcbcc
 SHA512:
-  metadata.gz: d34411729d8d5a1b85c6f8f495946377410569afcccf53726ffeadbb69ab24e42e1677c76658c2ce5780ede5111beb33f6c32335404a0e954b372bd946d638d6
-  data.tar.gz: 6913b25aac360fed3290b420780387db5b4bc646976e6347753e8d465d586eef0ac9a6c15c9287b4c205ddb667e284ce8f311e348727ca0848c83f08ec96ec4c
+  metadata.gz: 441e2cef13aad2345f16f3be8e67907731f055f1d3760ba6ca6d46e91f8ccd5e343c93d58fefd56c7a25b7490f1a4483a761a859c56c95775616b827a9686823
+  data.tar.gz: 255341610fea9f2e88d9f73a693396b9cf00e64b08ef8f3f5016de765d0064aa333b1a1ee8052f22c8503b5ac7d26209dd833543ab1a4d095363eb9c8959ff9c

data/lib/hashes_equal.rb

@@ -2,6 +2,7 @@
 
 require 'hashes_equal/version'
 require 'hashes_equal/hash_compare_helper'
+require 'hashes_equal/enumerable_compare_helper'
 
 module HashesEqual
 end

data/lib/hashes_equal/enumerable_compare_helper.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+require 'hashes_equal/enumerable_diff_displayer'
+
+module HashesEqual
+  module EnumerableCompareHelper
+    def assert_enumerable_equal(expected, actual, verbose: true)
+      displayable_diff = EnumerableDiffDisplayer.new(
+        expected: expected,
+        actual: actual
+      ).call
+      if verbose
+        assert_equal expected, actual, displayable_diff
+      else
+        assert expected == actual, displayable_diff
+      end
+    end
+  end
+end

data/lib/hashes_equal/enumerable_diff_displayer.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+require 'assertable'
+require 'hashdiff'
+require 'hashes_equal/generic_diff_displayer'
+
+module HashesEqual
+  class EnumerableDiffDisplayer < GenericDiffDisplayer
+    class ExpectationMustBeEnumerable < ArgumentError; end
+    class ActualValueMustBeEnumerable < ArgumentError; end
+
+    private
+
+    def check_args
+      super
+      raise ExpectationMustBeEnumerable unless expected.is_a?(Enumerable)
+      raise ActualValueMustBeEnumerable unless actual.is_a?(Enumerable)
+    end
+  end
+end

data/lib/hashes_equal/generic_diff_displayer.rb

@@ -0,0 +1,81 @@
+# frozen_string_literal: true
+
+require 'assertable'
+require 'hashdiff'
+
+module HashesEqual
+  class GenericDiffDisplayer
+    include Assertable
+
+    class UnprocessableHashdiff < ArgumentError; end
+
+    def initialize(expected:, actual:)
+      @expected = expected
+      @actual = actual
+      assert_send :expected
+      assert_send :actual
+      check_args
+    end
+
+    def call
+      compute_diff
+      ANSI.white do
+        formatted_diff
+      end
+    end
+
+    private
+
+    attr_reader :expected, :actual, :diff
+
+    def check_args
+      # Add specific checks if needed
+    end
+
+    def compute_diff
+      @diff = perform_diff_computation
+    end
+
+    def perform_diff_computation
+      Hashdiff.diff(expected, actual)
+    end
+
+    def formatted_diff
+      "\n" + diff.map do |diff_element|
+        format_element diff_element
+      end.join("\n")
+    end
+
+    def format_element(diff_element)
+      # exp_val is act_val in case of "+"
+      type, key, exp_val, act_val = diff_element
+      return missing_value_message(key, exp_val) if type == '-'
+      return spurious_value_message(key, exp_val) if type == '+'
+      return value_disagreement_message(key, exp_val, act_val) if type == '~'
+
+      raise UnprocessableHashdiff, diff_element
+    end
+
+    def missing_value_message(key, exp_val)
+      [
+        "actual value for #{ANSI.red { key }} is missing, expected was",
+        ANSI.green { exp_val.inspect }
+      ].join("\n\t")
+    end
+
+    def spurious_value_message(key, exp_val)
+      [
+        "spurious value #{ANSI.red { exp_val.inspect }}",
+        "for #{key} was not expected"
+      ].join(' ')
+    end
+
+    def value_disagreement_message(key, exp_val, act_val)
+      [
+        "values for #{key} differ",
+        "expected: #{ANSI.green { exp_val.inspect }}",
+        "actual: #{ANSI.red { act_val.inspect }}"
+      ].join("\n\t")
+    end
+  end
+end

data/lib/hashes_equal/hash_diff_displayer.rb

@@ -2,79 +2,19 @@
 
 require 'assertable'
 require 'hashdiff'
+require 'hashes_equal/generic_diff_displayer'
 
 module HashesEqual
-  class HashDiffDisplayer
-    include Assertable
-
+  class HashDiffDisplayer < GenericDiffDisplayer
     class ExpectationMustBeHash < ArgumentError; end
     class ActualValueMustBeAHash < ArgumentError; end
-    class UnprocessableHashdiff < ArgumentError; end
-
-    def initialize(expected:, actual:)
-      @expected = expected
-      @actual = actual
-      assert_send :expected
-      assert_send :actual
-      raise ExpectationMustBeHash unless expected.is_a?(Hash)
-      raise ActualValueMustBeAHash unless actual.is_a?(Hash)
-    end
-
-    def call
-      compute_diff
-      ANSI.white do
-        formatted_diff
-      end
-    end
 
     private
 
-    attr_reader :expected, :actual, :diff
-
-    def compute_diff
-      @diff = perform_diff_computation
-    end
-
-    def perform_diff_computation
-      Hashdiff.diff(expected, actual)
-    end
-
-    def formatted_diff
-      "\n" + diff.map do |diff_element|
-        format_element diff_element
-      end.join("\n")
-    end
-
-    def format_element(diff_element)
-      # exp_val is act_val in case of "+"
-      type, key, exp_val, act_val = diff_element
-      return missing_value_message(key, exp_val) if type == '-'
-      return spurious_value_message(key, exp_val) if type == '+'
-      return value_disagreement_message(key, exp_val, act_val) if type == '~'
-
-      raise UnprocessableHashdiff, diff_element
-    end
-
-    def missing_value_message(key, exp_val)
-      [
-        "actual value for #{ANSI.red { key }} is missing, expected was",
-        ANSI.green { exp_val.inspect }
-      ].join("\n\t")
-    end
-
-    def spurious_value_message(key, exp_val)
-      [
-        "spurious value #{ANSI.red { exp_val.inspect }}",
-        "for #{key} was not expected"
-      ].join(' ')
-    end
-
-    def value_disagreement_message(key, exp_val, act_val)
-      [
-        "values for #{key} differ",
-        "expected: #{ANSI.green { exp_val.inspect }}",
-        "actual: #{ANSI.red { act_val.inspect }}"
-      ].join("\n\t")
+    def check_args
+      super
+      raise ExpectationMustBeHash unless expected.is_a?(Hash)
+      raise ActualValueMustBeAHash unless actual.is_a?(Hash)
     end
   end
 end

data/lib/hashes_equal/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module HashesEqual
-  VERSION = '0.1.0'
+  VERSION = '0.1.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hashes_equal
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Shippingbo
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-06-08 00:00:00.000000000 Z
+date: 2020-06-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ansi
@@ -245,7 +245,6 @@ files:
 - ".travis.yml"
 - CODE_OF_CONDUCT.md
 - Gemfile
-- Gemfile.lock
 - Guardfile
 - LICENSE.txt
 - Makefile
@@ -255,6 +254,9 @@ files:
 - bin/setup
 - hashes_equal.gemspec
 - lib/hashes_equal.rb
+- lib/hashes_equal/enumerable_compare_helper.rb
+- lib/hashes_equal/enumerable_diff_displayer.rb
+- lib/hashes_equal/generic_diff_displayer.rb
 - lib/hashes_equal/hash_compare_helper.rb
 - lib/hashes_equal/hash_diff_displayer.rb
 - lib/hashes_equal/version.rb