json_schemer 0.1.6 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8dc3f244ec43815a4207b9be2112cc76afee3cd37b96a3e1eb0fd9b189f8ad72
-  data.tar.gz: 3dcede7d0418d30e98fe75054000657bf03201a1fbf8231810506a2a91de1bbb
+  metadata.gz: 382a4fe7c0bfaba4ac319cc29289337490b69440217d6725034e516efe5a9f97
+  data.tar.gz: 59abe27c6052f6f7a210a0c1a51c08ffbb231f6dfe0f5f10d1021a9ccb05b0ac
 SHA512:
-  metadata.gz: 1ea22d403dd91c7c555d7fe949a25840255a1ed55af658aad703b965b79e063fe2ae5a1d82b3b3ac7a6a56cc32b5720ec0639d734235e934ccaef04f87a11146
-  data.tar.gz: 243e04ef109d923d9de753856943f2269548485de36f476e9d527be132c1f737abcd1ee6e74c6b3263bb95d9b03fcfc0a6f8a11c4249d538baab0d469c97652d
+  metadata.gz: 59328690e27ae9ef6fe1a2c82bca000d99ea1678a39de8f81e01e5f58ffa6cb1254adfb2163ba738b784bff3067c51d429ae6eb61da83da755ca72982b704669
+  data.tar.gz: 003be8eb68f6f57a70aeaa1014a0e2f26f63252eddb7599b44270c15850d5195acc7a60042927714cfb2e406d0a4af6d5d5c2c4a66c905460b20fb2323e1b82c

data/Gemfile.lock

@@ -1,9 +1,10 @@
 PATH
   remote: .
   specs:
-    json_schemer (0.1.6)
+    json_schemer (0.1.7)
       ecma-re-validator (~> 0.1.2)
       hana (~> 1.3.3)
+      regexp_parser (~> 0.5.0)
       uri_template (~> 0.7.0)
 
 GEM

data/json_schemer.gemspec

@@ -34,4 +34,5 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency "ecma-re-validator", "~> 0.1.2"
   spec.add_runtime_dependency "hana", "~> 1.3.3"
   spec.add_runtime_dependency "uri_template", "~> 0.7.0"
+  spec.add_runtime_dependency "regexp_parser", "~> 0.5.0"
 end

data/lib/json_schemer/schema/base.rb

@@ -29,6 +29,13 @@ module JSONSchemer
       NET_HTTP_REF_RESOLVER = proc { |uri| JSON.parse(Net::HTTP.get(uri)) }.freeze
       BOOLEANS = Set[true, false].freeze
 
+      RUBY_REGEX_ANCHORS_TO_ECMA_262 = {
+        :bos => 'A',
+        :eos => 'z',
+        :bol => '\A',
+        :eol => '\z'
+      }.freeze
+
       def initialize(
         schema,
         format: true,
@@ -332,7 +339,7 @@ module JSONSchemer
 
         yield error(instance, 'maxLength') if max_length && data.size > max_length
         yield error(instance, 'minLength') if min_length && data.size < min_length
-        yield error(instance, 'pattern') if pattern && Regexp.new(pattern) !~ data
+        yield error(instance, 'pattern') if pattern && ecma_262_regex(pattern) !~ data
         yield error(instance, 'format') if format? && spec_format?(format) && !valid_spec_format?(data, format)
 
         if content_encoding || content_media_type
@@ -474,7 +481,7 @@ module JSONSchemer
 
           if pattern_properties
             regex_pattern_properties ||= pattern_properties.map do |pattern, property_schema|
-              [pattern, Regexp.new(pattern), property_schema]
+              [pattern, ecma_262_regex(pattern), property_schema]
             end
             regex_pattern_properties.each do |pattern, regex, property_schema|
               if regex =~ key
@@ -513,6 +520,15 @@ module JSONSchemer
         end
       end
 
+      def ecma_262_regex(pattern)
+        @ecma_262_regex ||= {}
+        @ecma_262_regex[pattern] ||= Regexp.new(
+          Regexp::Scanner.scan(pattern).map do |type, token, text|
+            type == :anchor ? RUBY_REGEX_ANCHORS_TO_ECMA_262.fetch(token, text) : text
+          end.join
+        )
+      end
+
       def join_uri(a, b)
         if a && b
           URI.join(a, b)

data/lib/json_schemer/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module JSONSchemer
-  VERSION = '0.1.6'
+  VERSION = '0.1.7'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: json_schemer
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors:
 - David Harsha
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-08-27 00:00:00.000000000 Z
+date: 2018-08-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -94,6 +94,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.7.0
+- !ruby/object:Gem::Dependency
+  name: regexp_parser
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.5.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.5.0
 description: 
 email:
 - davishmcclurg@gmail.com