json_schemer 0.2.21 → 0.2.23

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ed760df49bc348a5011d6baf6416462f0069b31a8c1ef99550913d30a8a8a41e
-  data.tar.gz: c271118e1a2f8c26de0aace952e10340642536b44cd3b88f91ea22aa11c9bd0a
+  metadata.gz: 1c55d246b024978c9c972889597f5224da512f7452e67369e9164264be0c809e
+  data.tar.gz: e08104af62466e8c05c03091b1c14f01d28ea8be255a363ae13c88dbe450423c
 SHA512:
-  metadata.gz: 737e7a7888a61e8f2807e0307c8a96653943a7b88d27bb2fa4666a806f514f89274643b96a0dd48eb4eb940cfd0fd76d9254827360f2a53808263b66e25fc932
-  data.tar.gz: 522393b56be1b0ad983785b2b4ffe2268b11649336a151934260800b099f4160850c85dec19a44ace008cfbf5c6a208f7c53b8e04bf939ab86c8bdd75d6b873e
+  metadata.gz: be1e817cf98bcdcfe89c7e798475e23cb6961e0523691e950a1c3ed8b3e34357d949bc63b7096ed8cb29c966b0bd16b9aa29ef674bd26e6b302a849a09aaa7ee
+  data.tar.gz: 590e048ad223135c9634a3e12036cbc83f2a6773143df22f4c7f56e19f228fd56e4425a07302c0d30e4c0aa6e6a94fd255ec15ebd0e59d8a568922110a9b9d55

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    json_schemer (0.2.21)
+    json_schemer (0.2.23)
       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.0)
     uri_template (0.7.0)
 
 PLATFORMS
@@ -28,4 +28,4 @@ DEPENDENCIES
   rake (~> 13.0)
 
 BUNDLED WITH
-   2.3.11
+   2.3.25

data/README.md

@@ -110,7 +110,14 @@ JSONSchemer.schema(
   # 'net/http'/proc/lambda/respond_to?(:call)
   # 'net/http': proc { |uri| JSON.parse(Net::HTTP.get(uri)) }
   # default: proc { |uri| raise UnknownRef, uri.to_s }
-  ref_resolver: 'net/http'
+  ref_resolver: 'net/http',
+  
+  # use different method to match regexes
+  # 'ecma'/'ruby'/proc/lambda/respond_to?(:call)
+  # default: 'ecma'
+  regexp_resolver: proc do |pattern|
+    RE2::Regexp.new(pattern)
+  end
 )
 ```
 

data/lib/json_schemer/cached_resolver.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+module JSONSchemer
+  class CachedResolver
+    def initialize(&resolver)
+      @resolver = resolver
+      @cache = {}
+    end
+
+    def call(*args)
+      @cache[args] = @resolver.call(*args) unless @cache.key?(args)
+      @cache[args]
+    end
+  end
+
+  class CachedRefResolver < CachedResolver; end
+end

data/lib/json_schemer/schema/base.rb

@@ -30,6 +30,14 @@ module JSONSchemer
         :eol => '\z'
       }.freeze
 
+      ECMA_262_REGEXP_RESOLVER = proc do |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
+
       INSERT_DEFAULT_PROPERTY = proc do |data, property, property_schema, _parent|
         if !data.key?(property) && property_schema.is_a?(Hash) && property_schema.key?('default')
           data[property] = property_schema.fetch('default').clone
@@ -44,7 +52,8 @@ module JSONSchemer
         after_property_validation: nil,
         formats: nil,
         keywords: nil,
-        ref_resolver: DEFAULT_REF_RESOLVER
+        ref_resolver: DEFAULT_REF_RESOLVER,
+        regexp_resolver: 'ecma'
       )
         raise InvalidSymbolKey, 'schemas must use string keys' if schema.is_a?(Hash) && !schema.empty? && !schema.first.first.is_a?(String)
         @root = schema
@@ -54,7 +63,15 @@ module JSONSchemer
         @after_property_validation = [*after_property_validation]
         @formats = formats
         @keywords = keywords
-        @ref_resolver = ref_resolver == 'net/http' ? CachedRefResolver.new(&NET_HTTP_REF_RESOLVER) : ref_resolver
+        @ref_resolver = ref_resolver == 'net/http' ? CachedResolver.new(&NET_HTTP_REF_RESOLVER) : ref_resolver
+        @regexp_resolver = case regexp_resolver
+        when 'ecma'
+          CachedResolver.new(&ECMA_262_REGEXP_RESOLVER)
+        when 'ruby'
+          CachedResolver.new(&Regexp.method(:new))
+        else
+          regexp_resolver
+        end
       end
 
       def valid?(data)
@@ -204,7 +221,7 @@ module JSONSchemer
 
     private
 
-      attr_reader :root, :formats, :keywords, :ref_resolver
+      attr_reader :root, :formats, :keywords, :ref_resolver, :regexp_resolver
 
       def id_keyword
         ID_KEYWORD
@@ -228,7 +245,8 @@ module JSONSchemer
           format: format?,
           formats: formats,
           keywords: keywords,
-          ref_resolver: ref_resolver
+          ref_resolver: ref_resolver,
+          regexp_resolver: regexp_resolver
         )
       end
 
@@ -398,7 +416,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 && ecma_262_regex(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
@@ -551,7 +569,7 @@ module JSONSchemer
 
           if pattern_properties
             regex_pattern_properties ||= pattern_properties.map do |pattern, property_schema|
-              [pattern, ecma_262_regex(pattern), property_schema]
+              [pattern, resolve_regexp(pattern), property_schema]
             end
             regex_pattern_properties.each do |pattern, regex, property_schema|
               if regex.match?(key)
@@ -596,15 +614,6 @@ module JSONSchemer
         nil
       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)
         b = URI.parse(b) if b
         if a && b && a.relative? && b.relative?
@@ -652,6 +661,10 @@ module JSONSchemer
       def resolve_ref(uri)
         ref_resolver.call(uri) || raise(InvalidRefResolution, uri.to_s)
       end
+
+      def resolve_regexp(pattern)
+        regexp_resolver.call(pattern) || raise(InvalidRegexpResolution, pattern)
+      end
     end
   end
 end

data/lib/json_schemer/version.rb

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

data/lib/json_schemer.rb

@@ -17,7 +17,7 @@ require 'uri_template'
 require 'json_schemer/version'
 require 'json_schemer/format'
 require 'json_schemer/errors'
-require 'json_schemer/cached_ref_resolver'
+require 'json_schemer/cached_resolver'
 require 'json_schemer/schema/base'
 require 'json_schemer/schema/draft4'
 require 'json_schemer/schema/draft6'
@@ -27,6 +27,7 @@ module JSONSchemer
   class UnsupportedMetaSchema < StandardError; end
   class UnknownRef < StandardError; end
   class InvalidRefResolution < StandardError; end
+  class InvalidRegexpResolution < StandardError; end
   class InvalidFileURI < StandardError; end
   class InvalidSymbolKey < StandardError; end
 
@@ -59,7 +60,7 @@ module JSONSchemer
         if options.key?(:ref_resolver)
           schema = FILE_URI_REF_RESOLVER.call(uri)
         else
-          ref_resolver = CachedRefResolver.new(&FILE_URI_REF_RESOLVER)
+          ref_resolver = CachedResolver.new(&FILE_URI_REF_RESOLVER)
           schema = ref_resolver.call(uri)
           options[:ref_resolver] = ref_resolver
         end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: json_schemer
 version: !ruby/object:Gem::Version
-  version: 0.2.21
+  version: 0.2.23
 platform: ruby
 authors:
 - David Harsha
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-05-05 00:00:00.000000000 Z
+date: 2022-11-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -129,7 +129,7 @@ files:
 - exe/json_schemer
 - json_schemer.gemspec
 - lib/json_schemer.rb
-- lib/json_schemer/cached_ref_resolver.rb
+- lib/json_schemer/cached_resolver.rb
 - lib/json_schemer/errors.rb
 - lib/json_schemer/format.rb
 - lib/json_schemer/schema/base.rb

data/lib/json_schemer/cached_ref_resolver.rb

@@ -1,14 +0,0 @@
-# frozen_string_literal: true
-module JSONSchemer
-  class CachedRefResolver
-    def initialize(&ref_resolver)
-      @ref_resolver = ref_resolver
-      @cache = {}
-    end
-
-    def call(uri)
-      @cache[uri] = @ref_resolver.call(uri) unless @cache.key?(uri)
-      @cache[uri]
-    end
-  end
-end