match_hash 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9444052b2bfb07b0870ee7f202ee53abba6ec312
-  data.tar.gz: cc64e3822421f8b999f873ae846933ec872a7111
+  metadata.gz: 517de75736bb5f7ea565f2ecc9cb6812a1feccd2
+  data.tar.gz: eb2869112fdfdf27c0a8da6fd4d438f6c3f8eefd
 SHA512:
-  metadata.gz: f8d70c66123189688786ecbcf5f3d9d796a405b7a87991c5ef8fce2fee3031d1fbf5ca75215291fe6165ab3efc891b95d8747baa2c71dabc4399ed96e263352f
-  data.tar.gz: '095625802374af8d88235c5d0fb2a72678701d41db787bd658934da152fa4bf4f67b403171a7ed08601c2b3b91f05b6d8cd61ecd013f625a39d7bcb821897c62'
+  metadata.gz: a9647e92789d25f1b6b92c6a0938cc43774fa33de8d8bbbc65015d8ed384ba52b29f9244f7db005980220def25c2650c08c72c612938ed6da237cddfd9a42978
+  data.tar.gz: e7e8e751cbd450ce613095018deb0693bb2bc46cd57a0d2b1106a3b465135784518b4294804e25871e7d83d6a49770abb45a0c8d5abc59ab1589867978e47d33

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## v0.1.2
+2018-08-04
+* [Don't choke on hashes inside arrays](https://github.com/yukihirop/match_hash/pull/3)
+
 ## v0.1.1
 2016-01-03
 * RENAME lib/environment.rb -> lib/match_hash.rb

data/Gemfile.lock

@@ -1,13 +1,18 @@
 PATH
   remote: .
   specs:
-    match_hash (0.1.0)
+    match_hash (0.1.2)
       rspec-expectations (~> 3.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
+    coderay (1.1.2)
     diff-lcs (1.2.5)
+    method_source (0.9.0)
+    pry (0.11.3)
+      coderay (~> 1.1.0)
+      method_source (~> 0.9.0)
     rake (10.5.0)
     rspec (3.5.0)
       rspec-core (~> 3.5.0)
@@ -29,8 +34,9 @@ PLATFORMS
 DEPENDENCIES
   bundler (~> 1.13)
   match_hash!
+  pry
   rake (~> 10.5.0)
   rspec (~> 3.0)
 
 BUNDLED WITH
-   1.13.6
+   1.16.0.pre.3

data/README.md

@@ -18,10 +18,6 @@ Add this line to your application's `Gemfile` :
 ```ruby
 gem 'match_hash'
 ```
-Add this line to your application's `spec_helper.rb` :
-```ruby
-require 'match_hash'
-```
 
 And then execute:
 
@@ -37,37 +33,49 @@ The new matcher could be used in RSpec as follows:
 
 ```ruby
 describe MatchHash do
-
-  before do
-    @A = {
-        a11:11,
-        a12:{
-            b11:21,
-            b12:22
-        },
-        a13:[1,2,3],
+  let(:expected) do
+    {
+      a11:11,
+      a12:12,
+      a13:13,
+      a14:{
+          b11:11,
+          b12:12
+      },
+      a15:[1,2,3],
+      a16:16,
+      a17: [{b13: 13}]
     }
+  end
 
-    @B = {
-        a11:11,
-        a12:{
-            b11:21,
-            b12:22
-        },
-        a13:[3,2,1],
+  let(:actual) do
+    {
+      a11:11,
+      a12:12,
+      a13:13,
+      a14:{
+          b11:11,
+          b12:12
+      },
+      a15:[3,2,1],
+      a16:16,
+      a17: [{b13: 14}]
     }
   end
 
-  it "A hash match A hash" do
-    expect(@A).to match_hash(@A)
+  it "has a version number" do
+    expect(MatchHash::VERSION).not_to be nil
   end
 
-  it "A hash do not match B hash and occured raise_error" do
-    expect do
-      expect(@A).to match_hash(@B)
-    end.to raise_error
+  it "expected hash match expected hash" do
+    expect(expected).to match_hash(expected)
   end
 
+  it "expected hash do not match actual hash and occured raise_error" do
+    expect do
+      expect(expected).to match_hash(actual)
+    end.to raise_error(RSpec::Expectations::ExpectationNotMetError)
+  end
 end
 ```
 
@@ -76,19 +84,24 @@ end
 For example:
 
 ```ruby
-1) MatchHash A hash match A hash
-     Failure/Error: expect(@A).to match_hash(@B)
+Failures:
+
+  1) MatchHash expected hash match expected hash
+     Failure/Error: expect(expected).to match_hash(actual)
 
        Diff:
-       @@ -2,6 +2,6 @@
+
+       @@ -2,7 +2,7 @@
         :a12 => 12,
         :a13 => 13,
         :a14 => {:b11=>11, :b12=>12},
        -:a15 => [3, 2, 1],
        +:a15 => [1, 2, 3],
         :a16 => 16,
+       -:a17 => [{:b13=>14}],
+       +:a17 => [{:b13=>13}],
 
-     # ./spec/match_hash_spec.rb:36:in `block (2 levels) in <top (required)>'
+     # ./spec/match_hash_spec.rb:40:in `block (2 levels) in <top (required)>'
 ```
 
 ## Contributing

data/lib/match_hash/sub/match_hash.rb

@@ -1,8 +1,10 @@
+require 'pry'
+
 module Sub
 
   private
 
-  def match_hash(expected, actual)
+  def match_hash?(expected, actual)
     expected.each do |key, value|
       return true unless actual.has_key?(key)
       @is_errors << match_value(expected[key], actual[key])
@@ -17,19 +19,29 @@ module Sub
     end
     @is_errors.include?(true)
   end
+  alias :match_hash :match_hash?
 
-  def match_array(expected, actual)
-    expected.each_with_index do |i|
-      match_value(expected[i],actual[i])
+  def match_array?(expected, actual)
+    expected.each_with_index do |data,i|
+      case data
+      when Hash
+        match_hash(data, actual[i])
+      when Array
+        match_array(data, actual[i])
+      else
+        match_value(data, actual[i])
+      end
     end
   end
+  alias :match_array :match_array?
 
   # trueを返すときがエラー
-  def match_value(expected, actual)
+  def match_value?(expected, actual)
     match_hash(expected, actual) if expected.is_a?(Hash)
     match_array(expected, actual) if expected.is_a?(Array)
     return false if expected == actual
     return true
   end
+  alias :match_value :match_value?
 
 end

data/lib/match_hash/version.rb

@@ -1,3 +1,3 @@
 module MatchHash
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

data/match_hash.gemspec

@@ -36,5 +36,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 1.13"
   spec.add_development_dependency "rake", "~> 10.5.0"
   spec.add_development_dependency "rspec", "~> 3.0"
+  spec.add_development_dependency "pry"
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: match_hash
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - yukihirop
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-01-03 00:00:00.000000000 Z
+date: 2018-08-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec-expectations
@@ -66,6 +66,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Custom Matcher errors generate from RSpec::Matchers::ExpectedsForMultipleDiffs.from.message_with_diff
 email:
 - te108186@gmail.com
@@ -109,7 +123,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: This is a Custom Matcher to match hash in RSpec