match_json 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: dbc46ca994f742211eef028282ffe68fd347348c
-  data.tar.gz: 8319a12a7de9cac7164d26055df0e0f4d2c92f21
+SHA256:
+  metadata.gz: a7885b90321caa660711df8efaefc8c68685a6dccebf016699446285438cf9e7
+  data.tar.gz: 67b355f32cc560b957a34323766fae402ac083866a11e94193204266a1f655bf
 SHA512:
-  metadata.gz: a5bab51f9a0988851bb3231fda9eb38d848ef3d376eb7288812866b562d407ddf394fe0fec43163b2e40833491024e7a6890818bc3eac40224c42dd4bfb6d17b
-  data.tar.gz: 7d78a70cfcc882073f20b7de4c55c760bacce249bcce889ff52a2555baf45e0bb5b27de5dff1c11f4e548a1237a4d043110b8a633ccaacad6a1cddcad7c700d0
+  metadata.gz: cdb5deeff6835ffd46ce4539fd85ad9938bfe1485c36073076c44c659811cf8a3e79ad13d37805fbace4f9fdd5af179c77f98af368fffbcd8fb517e7775cb29d
+  data.tar.gz: 278fb942dc789194b407821173ee4d84161972a859fe60b514faeae6dc72e945b7c7c016c929f386ab8eaa4ec45e5f620711a0aaed89daa4c0ea808207652705

data/README.md

@@ -129,15 +129,22 @@ Just add them to `spec/support/match_json.rb`:
 
 ```ruby
 MatchJson::Matchers::IncludeJson::PATTERNS['id'] = /\A\d{6}\z/
+MatchJson::Matchers::IncludeJson::PATTERNS[/id:(\w+)'] = proc { |actual, match| /\A#{match}_\z/ =~ actual }
 ```
 
 and then use it in your spec like so:
 
 ```ruby
 it 'uses patten to check value' do
+
+  # MatchJson::Matchers::IncludeJson::PATTERNS['id'] = /\A\d{6}\z/
   expect(%Q({"one": "123456"})).to match_json(%Q({"one": "{id}"}))
   # .. you can even do this:
   expect(%Q({"one": 123456})).to match_json(%Q({"one": {id}}))
+
+  # MatchJson::Matchers::IncludeJson::PATTERNS[/id:(\w+)'] = proc { |actual, match| /\A#{match}_\z/ =~ actual }
+  expect(%Q({"id": "usr_xxx"})).to match_json(%Q({"one": "{id:usr}"}))
+  expect(%Q({"id": "cus_xxx"})).to match_json(%Q({"one": "{id:cus}"}))
 end
 ```
 

data/lib/match_json/matchers/include_json.rb

@@ -84,6 +84,11 @@ module MatchJson
         when regexp?(value)
           reg_exp = value.match(/{re:(.*)}/)[1]
           actual =~ Regexp.new(reg_exp)
+        when defined_regexp?(value)
+          defined_regexps = PATTERNS.keys.find_all { |pattern| pattern.is_a? Regexp }
+          matches = value.match(/{(\w+):(\w+)}/)
+          reg_exp = defined_regexps.find {|re| re.match?("#{matches[1]}:#{matches[2]}") }
+          PATTERNS[reg_exp].call(actual, matches[2])
         when pattern?(value)
           actual =~ PATTERNS["#{value.tr('{}', '')}"]
         when non_string_pattern?(value) && !actual.is_a?(String)
@@ -105,6 +110,10 @@ module MatchJson
         !!(str =~ /\A\{re:.+\}\z/)
       end
 
+      def defined_regexp?(str)
+        !!(str =~ /\A\{\w+:\w+\}\z/)
+      end
+
       def compared_different_types?(actual, expected)
         actual.class != expected.class
       end

data/lib/match_json/version.rb

@@ -1,3 +1,3 @@
 module MatchJson
-  VERSION = "0.0.7"
+  VERSION = "0.0.8"
 end

data/spec/match_json/include_json_spec.rb

@@ -97,4 +97,20 @@ describe "include_json" do
       }.to fail_with(%Q("one":"{id}:non-string" was not found in\n {"one":true}))
     end
   end
+
+  context 'with custom pattern as regexp' do
+    let(:regexp) { /id:(\w+)/ }
+    before do
+      MatchJson::Matchers::IncludeJson::PATTERNS[regexp] = proc { |actual, match| /\A#{match}_\w+\z/ =~ actual }
+    end
+
+    after do
+      MatchJson::Matchers::IncludeJson::PATTERNS.delete(regexp)
+    end
+
+    it 'uses patten to check value' do
+      expect(%Q({"one": "cus_xxx"})).to include_json(%Q({"one": "{id:cus}"}))
+      expect(%Q({"one": "cust_xxx"})).to_not include_json(%Q({"one": "{id:cus}"}))
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: match_json
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - Pavel Gabriel
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-26 00:00:00.000000000 Z
+date: 2018-07-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -150,7 +150,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.7.5
 signing_key: 
 specification_version: 4
 summary: RSpec matcher for JSON documents