match_json 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 57bf78ba08a2206400b474522a4e5945ec306e9b
-  data.tar.gz: aa7e17daa7bab8fc1fd61e51fa694b67c3714ed2
+  metadata.gz: 85aee492f202a8aa740ce50b390990f23c896950
+  data.tar.gz: 2d60002f2d1993bbbb51aa85e2b62d1d73aa149d
 SHA512:
-  metadata.gz: d759631412ea874063e35261a050b3652a0898b28c372a1f4669d266b852bbdca589384a87c5a66a8813b6304707a47a37aa40f09a773a0879af169748adaa96
-  data.tar.gz: 6c7fb7d11597b029a64b42e15b474b6281acb9c7e33b990bfe771f5ef45c146894ffe1cd3f9778f81672dfffe51569c5eee9bbcedb46cfbaeea984c0d658c4dc
+  metadata.gz: 8e4c6e88d0c4a29f1dc0c19e5b121999a2bdf4538f70abe2ba43b0edfca6f69a45c1454501cfbd0ad5202269e9c5d519125b61d4310004c581130e355b3abb37
+  data.tar.gz: 7b4ba9b8fa5ea69078cecf230264f10faa463c52bf348ac15c1d3a16065e22f2e65eab96bb23ace6ad7429ce7ad248bb7dc1f98581fa80e9d3488060e088f8ab

data/CHANGELOG.md

@@ -0,0 +1,2 @@
+### 0.0.5
+ * allow to use pattern for non-string values (by @marocchino)

data/README.md

@@ -68,6 +68,8 @@ and then use it in your spec:
 ```ruby
 it 'uses patten to check value' do
   expect(%Q({"one": "123456"})).to include_json(%Q({"one": "{id}"}))
+  # you can do even this:
+  expect(%Q({"one": 123456})).to include_json(%Q({"one": {id}}))
 end
 ```
 

data/lib/match_json/matchers/include_json.rb

@@ -11,13 +11,13 @@ module MatchJson
       }
 
       def initialize(expected_json)
-        @expected_json = JSON.parse(expected_json)
+        @expected_json = JSON.parse(expected_json.gsub(/(?<!")(\{\w+\})(?!")/, '"\1:non-string"'))
       end
 
       def matches?(actual_json)
         @actual_json = actual_json.respond_to?(:body) ? JSON.parse(actual_json.body) : JSON.parse(actual_json)
 
-        match = catch(:match) { json_included?(@actual_json, @expected_json) }
+        catch(:match) { json_included?(@actual_json, @expected_json) }
       end
 
       def failure_message
@@ -55,10 +55,10 @@ module MatchJson
 
       def array_included?(actual, expected, nested, raise_error)
         expected.each do |value|
-          if (!actual.any? { |actual_value| equal_value?(actual_value, value, nested, false) })
+          if actual.nil? || (!actual.any? { |actual_value| equal_value?(actual_value, value, nested, false) })
             @failure_message = %Q("#{value}" was not found in\n )
             @failure_message << %Q("#{nested}"=>) if !nested.empty?
-            @failure_message << "#{actual}"
+            @failure_message << "#{actual.nil? ? "nil" : actual}"
 
             if raise_error
               throw(:match, false)
@@ -85,7 +85,9 @@ module MatchJson
           reg_exp = value.match(/{re:(.*)}/)[1]
           actual =~ Regexp.new(reg_exp)
         when pattern?(value)
-          actual =~ PATTERNS["#{value.gsub('{', '').gsub('}', '')}"]
+          actual =~ PATTERNS["#{value.tr('{}', '')}"]
+        when non_string_pattern?(value) && !actual.is_a?(String)
+          actual.to_s =~ PATTERNS["#{value.tr('{}', '').sub(':non-string', '')}"]
         else
           value == actual
         end
@@ -95,6 +97,10 @@ module MatchJson
         !!(str =~ /\A\{\w+\}\z/)
       end
 
+      def non_string_pattern?(str)
+        !!(str =~ /\A\{\w+\}:non-string\z/)
+      end
+
       def regexp?(str)
         !!(str =~ /\A\{re:.+\}\z/)
       end

data/lib/match_json/version.rb

@@ -1,3 +1,3 @@
 module MatchJson
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

data/spec/match_json/matchers_spec.rb

@@ -32,6 +32,12 @@ describe "include_json" do
         expect(%Q({ "array" : [1, 2, 3] })).to include_json(%Q({ "array" : [5, 1] }))
       }.to fail_with(%Q("5" was not found in\n " > array"=>[1, 2, 3]))
     end
+
+    it 'fails with there is null instead of array' do
+      expect {
+        expect(%Q({ "array" : null })).to include_json(%Q({ "array" : [5] }))
+      }.to fail_with(%Q("5" was not found in\n " > array"=>nil))
+    end
   end
 
   context 'when array contains object' do
@@ -80,6 +86,8 @@ describe "include_json" do
 
     it 'uses patten to check value' do
       expect(%Q({"one": "123456"})).to include_json(%Q({"one": "{id}"}))
+      expect(%Q({"one": 123456})).to include_json(%Q({"one": {id}}))
+      expect(%Q({"one": "123456"})).not_to include_json(%Q({"one": {id}}))
 
       expect {
         expect(%Q({"one": "abcdef"})).to include_json(%Q({"one": "{id}"}))

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: match_json
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Pavel Gabriel
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-03 00:00:00.000000000 Z
+date: 2015-03-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -67,6 +67,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- CHANGELOG.md
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -99,7 +100,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: RSpec matcher for JSON documents