json_schemer 0.2.22 → 0.2.24

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bc9ff5876e71054ee601dc4464c99560e86557796ef792e36512e1f08725a065
-  data.tar.gz: 5ee26787348f3aecb1a591c38c7bccc7aaf4166fd14d1299999d426ecaa15893
+  metadata.gz: 24ab3d7f62a2ca93d0dcd3fb33191de983006b504d7bdae60066268fabf7eb50
+  data.tar.gz: 5f695dffd93a834e81491d5a5b328e6b193d56886666533e6ec0c5e7ba5b5be0
 SHA512:
-  metadata.gz: 9b5dc77e4a136d9dd7ab774e530880188c3125647535707d67b9b09e615e538bfe826249fd53644d3dc452e8387667bc74a3e24ec21f847145bc4b92de15371d
-  data.tar.gz: 160ead197e1f0a61090e936a526e4753156b185e4049db6d5ca7efb9c8bbf4430ebd9a0eff952299fc5bdb0b93a063745d9be3e919bee80ce93c05864a9655b7
+  metadata.gz: 0bd588c8b88bd813c52a13bb997cdd3f668f9b36570bc15a0780aa35b80fdaa49cc2862f6749be1cea9c5708169cbee990385799907a3957c7ceac32ce9ff5cf
+  data.tar.gz: 6c835337e619f60ae9a72a4036dbcbeb06519e9c3c6f47216ab4650f0c15955a45be0ae2ace13a0a2c92f6066e106fa6073b6c795ff808cc90854f85a1ad9e76

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    json_schemer (0.2.22)
+    json_schemer (0.2.24)
       ecma-re-validator (~> 0.3)
       hana (~> 1.3)
       regexp_parser (~> 2.0)
@@ -15,7 +15,7 @@ GEM
     hana (1.3.7)
     minitest (5.15.0)
     rake (13.0.6)
-    regexp_parser (2.3.1)
+    regexp_parser (2.6.1)
     uri_template (0.7.0)
 
 PLATFORMS
@@ -28,4 +28,4 @@ DEPENDENCIES
   rake (~> 13.0)
 
 BUNDLED WITH
-   2.3.11
+   2.3.25

data/lib/json_schemer/schema/base.rb

@@ -44,6 +44,9 @@ module JSONSchemer
         end
       end
 
+      JSON_POINTER_TOKEN_ESCAPE_CHARS = { '~' => '~0', '/' => '~1' }
+      JSON_POINTER_TOKEN_ESCAPE_REGEXP = Regexp.union(JSON_POINTER_TOKEN_ESCAPE_CHARS.keys)
+
       def initialize(
         schema,
         format: true,
@@ -416,7 +419,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 && resolve_regexp(pattern) !~ data
+        yield error(instance, 'pattern') if pattern && !resolve_regexp(pattern).match?(data)
         yield error(instance, 'format') if format? && spec_format?(format) && !valid_spec_format?(data, format)
 
         if content_encoding || content_media_type
@@ -531,7 +534,8 @@ module JSONSchemer
           dependencies.each do |key, value|
             next unless data.key?(key)
             subschema = value.is_a?(Array) ? { 'required' => value } : value
-            subinstance = instance.merge(schema: subschema, schema_pointer: "#{instance.schema_pointer}/dependencies/#{key}")
+            escaped_key = escape_json_pointer_token(key)
+            subinstance = instance.merge(schema: subschema, schema_pointer: "#{instance.schema_pointer}/dependencies/#{escaped_key}")
             validate_instance(subinstance, &block)
           end
         end
@@ -545,6 +549,8 @@ module JSONSchemer
 
         regex_pattern_properties = nil
         data.each do |key, value|
+          escaped_key = escape_json_pointer_token(key)
+
           unless property_names.nil?
             subinstance = instance.merge(
               data: key,
@@ -559,9 +565,9 @@ module JSONSchemer
           if properties && properties.key?(key)
             subinstance = instance.merge(
               data: value,
-              data_pointer: "#{instance.data_pointer}/#{key}",
+              data_pointer: "#{instance.data_pointer}/#{escaped_key}",
               schema: properties[key],
-              schema_pointer: "#{instance.schema_pointer}/properties/#{key}"
+              schema_pointer: "#{instance.schema_pointer}/properties/#{escaped_key}"
             )
             validate_instance(subinstance, &block)
             matched_key = true
@@ -572,12 +578,13 @@ module JSONSchemer
               [pattern, resolve_regexp(pattern), property_schema]
             end
             regex_pattern_properties.each do |pattern, regex, property_schema|
+              escaped_pattern = escape_json_pointer_token(pattern)
               if regex.match?(key)
                 subinstance = instance.merge(
                   data: value,
-                  data_pointer: "#{instance.data_pointer}/#{key}",
+                  data_pointer: "#{instance.data_pointer}/#{escaped_key}",
                   schema: property_schema,
-                  schema_pointer: "#{instance.schema_pointer}/patternProperties/#{pattern}"
+                  schema_pointer: "#{instance.schema_pointer}/patternProperties/#{escaped_pattern}"
                 )
                 validate_instance(subinstance, &block)
                 matched_key = true
@@ -590,7 +597,7 @@ module JSONSchemer
           unless additional_properties.nil?
             subinstance = instance.merge(
               data: value,
-              data_pointer: "#{instance.data_pointer}/#{key}",
+              data_pointer: "#{instance.data_pointer}/#{escaped_key}",
               schema: additional_properties,
               schema_pointer: "#{instance.schema_pointer}/additionalProperties"
             )
@@ -614,6 +621,10 @@ module JSONSchemer
         nil
       end
 
+      def escape_json_pointer_token(token)
+        token.gsub(JSON_POINTER_TOKEN_ESCAPE_REGEXP, JSON_POINTER_TOKEN_ESCAPE_CHARS)
+      end
+
       def join_uri(a, b)
         b = URI.parse(b) if b
         if a && b && a.relative? && b.relative?

data/lib/json_schemer/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module JSONSchemer
-  VERSION = '0.2.22'
+  VERSION = '0.2.24'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: json_schemer
 version: !ruby/object:Gem::Version
-  version: 0.2.22
+  version: 0.2.24
 platform: ruby
 authors:
 - David Harsha
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-10-27 00:00:00.000000000 Z
+date: 2022-12-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler