RubyGems - json_schemer - Versions diffs - 2.1.1 → 2.2.0 - Mend

json_schemer 2.1.1 → 2.2.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (18) hide show

checksums.yaml +4 -4
data/.github/workflows/ci.yml +1 -1
data/CHANGELOG.md +20 -0
data/Gemfile.lock +11 -4
data/README.md +16 -1
data/json_schemer.gemspec +3 -0
data/lib/json_schemer/configuration.rb +32 -0
data/lib/json_schemer/draft202012/vocab/applicator.rb +1 -1
data/lib/json_schemer/draft202012/vocab/unevaluated.rb +18 -8
data/lib/json_schemer/format.rb +5 -6
data/lib/json_schemer/keyword.rb +3 -0
data/lib/json_schemer/openapi.rb +2 -4
data/lib/json_schemer/openapi30/meta.rb +1 -1
data/lib/json_schemer/result.rb +14 -2
data/lib/json_schemer/schema.rb +60 -59
data/lib/json_schemer/version.rb +1 -1
data/lib/json_schemer.rb +46 -22
metadata +46 -3

checksums.yaml CHANGED Viewed

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1981782f2342c7123beb0374680037bc11f3be72a8e4be0a213cfb7691643415
-  data.tar.gz: e8b6c605ba1ce2a2751ac90167f53c27fad975140ab9a0e8328c2b04ce8fe732
+  metadata.gz: 4013d2026a3ac04ca50649b4cf6437ea2ee477ed1e9d350942cfa7e56ead0828
+  data.tar.gz: 810f08388b21cc68d849181a87a820982c2fc7a577c402d5e05699b0c8d07507
 SHA512:
-  metadata.gz: 4d4c6e6c3660560a602b5610559efe37b5839f1142af6486e350bd207cad49e37a00f397d555878957b14951da95745092240bd14417e2ffd02826f053099952
-  data.tar.gz: 8dc561414463ceeacf7bbd0be95be9c441a50919cdb839ff8366fa0268d96d91e4947985bd7bab406f3c163e913bf7ca923a38e22d777d2549af3329f91c14f2
+  metadata.gz: f4c5bb6fe5e6d4e0ccfd8abd28a0c12ae23254e74c807ba94278680bf7b706970276cef14f26eaf488f9c46ebd8d418b5aef90bf4abd886b9fd1d7513bb6d27a
+  data.tar.gz: 19a0c839189ba44d6688c389fa38b3f0b1ccc9986643471e2df4d50c347c5ce22ec3fa170002fc000fc877e05080842b57cc01351f46ff1e876ba972880e6584

data/.github/workflows/ci.yml CHANGED Viewed

@@ -6,7 +6,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-latest, windows-latest, macos-latest]
-        ruby: [2.5, 2.6, 2.7, 3.0, 3.1, 3.2, head, jruby, jruby-head, truffleruby, truffleruby-head]
+        ruby: [2.5, 2.6, 2.7, 3.0, 3.1, 3.2, 3.3, head, jruby, jruby-head, truffleruby, truffleruby-head]
         exclude:
           - os: windows-latest
             ruby: truffleruby

data/CHANGELOG.md CHANGED Viewed

@@ -1,5 +1,25 @@
 # Changelog
+## [2.2.0] - XXXX-XX-XX
+## Bug Fixes
+- Support symbol keys when accessing original instance: https://github.com/davishmcclurg/json_schemer/commit/d52c130e9967919c6cf1c9dbc3f0babfb8b01cf8
+- Support custom keywords in nested schemas: https://github.com/davishmcclurg/json_schemer/commit/93c85a5006981347c7e9a4c11b73c6bdb65d8ba2
+- Stringify instance location for custom keywords: https://github.com/davishmcclurg/json_schemer/commit/513c99130b9e7986b09881e7efd3fb7143744754
+- Reduce unhelpful error output in `unevaluated` keywords: https://github.com/davishmcclurg/json_schemer/pull/164
+- Handle parse errors during schema validation: https://github.com/davishmcclurg/json_schemer/pull/171
+- Follow refs when finding default property values: https://github.com/davishmcclurg/json_schemer/pull/175
+## Features
+- Global configuration with `Configuration` object: https://github.com/davishmcclurg/json_schemer/pull/170
+- Symbol key property defaults with `insert_property_defaults: :symbol`: https://github.com/davishmcclurg/json_schemer/commit/a72473dc84199107ddedc8998950e5b82273232a
+- Consistent schema type support for schema validation methods: https://github.com/davishmcclurg/json_schemer/commit/bbcd0cea20cbaa61cf2bdae5f53840861cae54b8
+- Validation option support for schema validation methods: https://github.com/davishmcclurg/json_schemer/commit/2eeef77de522f127619b7d0faa51e0d7e40977ad
+[2.2.0]: https://github.com/davishmcclurg/json_schemer/releases/tag/v2.2.0
 ## [2.1.1] - 2023-11-28
 ### Bug Fixes

data/Gemfile.lock CHANGED Viewed

@@ -1,7 +1,9 @@
 PATH
   remote: .
   specs:
-    json_schemer (2.1.1)
+    json_schemer (2.2.0)
+      base64
+      bigdecimal
       hana (~> 1.3)
       regexp_parser (~> 2.0)
       simpleidn (~> 0.2)
@@ -9,7 +11,11 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
+    base64 (0.2.0)
+    bigdecimal (3.1.6)
+    bigdecimal (3.1.6-java)
     concurrent-ruby (1.2.2)
+    csv (3.2.8)
     docile (1.4.0)
     hana (1.3.7)
     i18n (1.14.1)
@@ -17,8 +23,8 @@ GEM
     i18n-debug (1.2.0)
       i18n (< 2)
     minitest (5.15.0)
-    rake (13.0.6)
-    regexp_parser (2.8.2)
+    rake (13.1.0)
+    regexp_parser (2.9.0)
     simplecov (0.22.0)
       docile (~> 1.1)
       simplecov-html (~> 0.11)
@@ -38,6 +44,7 @@ PLATFORMS
 DEPENDENCIES
   bundler (~> 2.0)
+  csv
   i18n
   i18n-debug
   json_schemer!
@@ -46,4 +53,4 @@ DEPENDENCIES
   simplecov (~> 0.22)
 BUNDLED WITH
-   2.3.25
+   2.3.27

data/README.md CHANGED Viewed

@@ -212,7 +212,8 @@ JSONSchemer.schema(
   },
   # insert default property values during validation
-  # true/false
+  # string keys by default (use `:symbol` to insert symbol keys)
+  # true/false/:symbol
   # default: false
   insert_property_defaults: true,
@@ -256,6 +257,20 @@ JSONSchemer.schema(
 )
 ```
+## Global Configuration
+Configuration options can be set globally by modifying `JSONSchemer.configuration`. Global options are applied to any new schemas at creation time (global configuration changes are not reflected in existing schemas). They can be overridden with the regular keyword arguments described [above](#options).
+```ruby
+# configuration block
+JSONSchemer.configure do |config|
+  config.regexp_resolver = 'ecma'
+end
+# configuration accessors
+JSONSchemer.configuration.insert_property_defaults = true
+```
 ## Custom Error Messages
 Error messages can be customized using the `x-error` keyword and/or [I18n](https://github.com/ruby-i18n/i18n) translations. `x-error` takes precedence if both are defined.

data/json_schemer.gemspec CHANGED Viewed

@@ -26,9 +26,12 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rake", "~> 13.0"
   spec.add_development_dependency "minitest", "~> 5.0"
   spec.add_development_dependency "simplecov", "~> 0.22"
+  spec.add_development_dependency "csv"
   spec.add_development_dependency "i18n"
   spec.add_development_dependency "i18n-debug"
+  spec.add_runtime_dependency "base64"
+  spec.add_runtime_dependency "bigdecimal"
   spec.add_runtime_dependency "hana", "~> 1.3"
   spec.add_runtime_dependency "regexp_parser", "~> 2.0"
   spec.add_runtime_dependency "simpleidn", "~> 0.2"

data/lib/json_schemer/configuration.rb ADDED Viewed

@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+module JSONSchemer
+  Configuration = Struct.new(
+    :base_uri, :meta_schema, :vocabulary, :format, :formats, :content_encodings, :content_media_types, :keywords,
+    :before_property_validation, :after_property_validation, :insert_property_defaults, :property_default_resolver,
+    :ref_resolver, :regexp_resolver, :output_format, :resolve_enumerators, :access_mode,
+    keyword_init: true
+  ) do
+    def initialize(
+      base_uri: URI('json-schemer://schema'),
+      meta_schema: Draft202012::BASE_URI.to_s,
+      vocabulary: nil,
+      format: true,
+      formats: {},
+      content_encodings: {},
+      content_media_types: {},
+      keywords: {},
+      before_property_validation: [],
+      after_property_validation: [],
+      insert_property_defaults: false,
+      property_default_resolver: nil,
+      ref_resolver: proc { |uri| raise UnknownRef, uri.to_s },
+      regexp_resolver: 'ruby',
+      output_format: 'classic',
+      resolve_enumerators: false,
+      access_mode: nil
+    )
+      super
+    end
+  end
+end

data/lib/json_schemer/draft202012/vocab/applicator.rb CHANGED Viewed

@@ -300,7 +300,7 @@ module JSONSchemer
           end
           def false_schema_error(formatted_instance_location:, **)
-            "object property at #{formatted_instance_location} is not defined and schema does not allow additional properties"
+            "object property at #{formatted_instance_location} is a disallowed additional property"
           end
           def parse

data/lib/json_schemer/draft202012/vocab/unevaluated.rb CHANGED Viewed

@@ -8,6 +8,10 @@ module JSONSchemer
             "array items at #{formatted_instance_location} do not match `unevaluatedItems` schema"
           end
+          def false_schema_error(formatted_instance_location:, **)
+            "array item at #{formatted_instance_location} is a disallowed unevaluated item"
+          end
           def parse
             subschema(value)
           end
@@ -18,7 +22,7 @@ module JSONSchemer
             unevaluated_items = instance.size.times.to_set
             context.adjacent_results.each_value do |adjacent_result|
-              collect_unevaluated_items(adjacent_result, instance_location, unevaluated_items)
+              collect_unevaluated_items(adjacent_result, unevaluated_items)
             end
             nested = unevaluated_items.map do |index|
@@ -30,8 +34,7 @@ module JSONSchemer
         private
-          def collect_unevaluated_items(result, instance_location, unevaluated_items)
-            return unless result.valid && result.instance_location == instance_location
+          def collect_unevaluated_items(result, unevaluated_items)
             case result.source
             when Applicator::PrefixItems
               unevaluated_items.subtract(0..result.annotation)
@@ -41,7 +44,9 @@ module JSONSchemer
               unevaluated_items.subtract(result.annotation)
             end
             result.nested&.each do |subresult|
-              collect_unevaluated_items(subresult, instance_location, unevaluated_items)
+              if subresult.valid && subresult.instance_location == result.instance_location
+                collect_unevaluated_items(subresult, unevaluated_items)
+              end
             end
           end
         end
@@ -51,6 +56,10 @@ module JSONSchemer
             "object properties at #{formatted_instance_location} do not match `unevaluatedProperties` schema"
           end
+          def false_schema_error(formatted_instance_location:, **)
+            "object property at #{formatted_instance_location} is a disallowed unevaluated property"
+          end
           def parse
             subschema(value)
           end
@@ -61,7 +70,7 @@ module JSONSchemer
             evaluated_keys = Set[]
             context.adjacent_results.each_value do |adjacent_result|
-              collect_evaluated_keys(adjacent_result, instance_location, evaluated_keys)
+              collect_evaluated_keys(adjacent_result, evaluated_keys)
             end
             evaluated = instance.reject do |key, _value|
@@ -77,14 +86,15 @@ module JSONSchemer
         private
-          def collect_evaluated_keys(result, instance_location, evaluated_keys)
-            return unless result.valid && result.instance_location == instance_location
+          def collect_evaluated_keys(result, evaluated_keys)
             case result.source
             when Applicator::Properties, Applicator::PatternProperties, Applicator::AdditionalProperties, UnevaluatedProperties
               evaluated_keys.merge(result.annotation)
             end
             result.nested&.each do |subresult|
-              collect_evaluated_keys(subresult, instance_location, evaluated_keys)
+              if subresult.valid && subresult.instance_location == result.instance_location
+                collect_evaluated_keys(subresult, evaluated_keys)
+              end
             end
           end
         end

data/lib/json_schemer/format.rb CHANGED Viewed

@@ -76,8 +76,8 @@ module JSONSchemer
     IRI_ESCAPE_REGEX = /[^[:ascii:]]/
     UUID_REGEX = /\A\h{8}-\h{4}-\h{4}-[89AB]\h{3}-\h{12}\z/i
     NIL_UUID = '00000000-0000-0000-0000-000000000000'
-    ASCII_8BIT_TO_PERCENT_ENCODED = 256.times.each_with_object({}) do |byte, out|
-      out[-byte.chr] = -sprintf('%%%02X', byte)
+    BINARY_TO_PERCENT_ENCODED = 256.times.each_with_object({}) do |byte, out|
+      out[-byte.chr(Encoding::BINARY)] = -sprintf('%%%02X', byte)
     end.freeze
     class << self
@@ -88,10 +88,9 @@ module JSONSchemer
       include URITemplate
       def percent_encode(data, regexp)
-        data = data.dup
-        data.force_encoding(Encoding::ASCII_8BIT)
-        data.gsub!(regexp, ASCII_8BIT_TO_PERCENT_ENCODED)
-        data.force_encoding(Encoding::US_ASCII)
+        binary = data.b
+        binary.gsub!(regexp, BINARY_TO_PERCENT_ENCODED)
+        binary.force_encoding(data.encoding)
       end
       def valid_date_time?(data)

data/lib/json_schemer/keyword.rb CHANGED Viewed

@@ -45,8 +45,11 @@ module JSONSchemer
     end
     def subschema(value, keyword = nil, **options)
+      options[:configuration] ||= schema.configuration
       options[:base_uri] ||= schema.base_uri
       options[:meta_schema] ||= schema.meta_schema
+      options[:ref_resolver] ||= schema.ref_resolver
+      options[:regexp_resolver] ||= schema.regexp_resolver
       Schema.new(value, self, root, keyword, **options)
     end
   end

data/lib/json_schemer/openapi.rb CHANGED Viewed

@@ -8,16 +8,14 @@ module JSONSchemer
       case version
       when /\A3\.1\.\d+\z/
         @document_schema = JSONSchemer.openapi31_document
-        json_schema_dialect = document.fetch('jsonSchemaDialect') { OpenAPI31::BASE_URI.to_s }
+        meta_schema = document.fetch('jsonSchemaDialect') { OpenAPI31::BASE_URI.to_s }
       when /\A3\.0\.\d+\z/
         @document_schema = JSONSchemer.openapi30_document
-        json_schema_dialect = OpenAPI30::BASE_URI.to_s
+        meta_schema = OpenAPI30::BASE_URI.to_s
       else
         raise UnsupportedOpenAPIVersion, version
       end
-      meta_schema = META_SCHEMAS_BY_BASE_URI_STR[json_schema_dialect] || raise(UnsupportedMetaSchema, json_schema_dialect)
       @schema = JSONSchemer.schema(@document, :meta_schema => meta_schema, **options)
     end

data/lib/json_schemer/openapi30/meta.rb CHANGED Viewed

@@ -5,7 +5,7 @@ module JSONSchemer
     # https://spec.openapis.org/oas/v3.0.3#data-types
     FORMATS = OpenAPI31::FORMATS.merge(
       'byte' => proc { |instance, _value| ContentEncoding::BASE64.call(instance).first },
-      'binary' => proc { |instance, _value| instance.is_a?(String) && instance.encoding == Encoding::ASCII_8BIT },
+      'binary' => proc { |instance, _value| instance.is_a?(String) && instance.encoding == Encoding::BINARY },
       'date' => Format::DATE
     )
     SCHEMA = {

data/lib/json_schemer/result.rb CHANGED Viewed

@@ -201,8 +201,8 @@ module JSONSchemer
         if result.source.is_a?(Schema::PROPERTIES_KEYWORD_CLASS) && result.instance.is_a?(Hash)
           result.source.parsed.each do |property, schema|
-            next if result.instance.key?(property) || !schema.parsed.key?('default')
-            default = schema.parsed.fetch('default')
+            next if result.instance.key?(property)
+            next unless default = default_keyword_instance(schema)
             instance_location = Location.join(result.instance_location, property)
             keyword_location = Location.join(Location.join(result.keyword_location, property), default.keyword)
             default_result = default.validate(nil, instance_location, keyword_location, nil)
@@ -225,5 +225,17 @@ module JSONSchemer
       inserted
     end
+  private
+    def default_keyword_instance(schema)
+      schema.parsed.fetch('default') do
+        schema.parsed.find do |_keyword, keyword_instance|
+          next unless keyword_instance.respond_to?(:ref_schema)
+          next unless default = default_keyword_instance(keyword_instance.ref_schema)
+          break default
+        end
+      end
+    end
   end
 end

data/lib/json_schemer/schema.rb CHANGED Viewed

@@ -4,28 +4,26 @@ module JSONSchemer
     Context = Struct.new(:instance, :dynamic_scope, :adjacent_results, :short_circuit, :access_mode) do
       def original_instance(instance_location)
         Hana::Pointer.parse(Location.resolve(instance_location)).reduce(instance) do |obj, token|
-          obj.fetch(obj.is_a?(Array) ? token.to_i : token)
+          if obj.is_a?(Array)
+            obj.fetch(token.to_i)
+          elsif !obj.key?(token) && obj.key?(token.to_sym)
+            obj.fetch(token.to_sym)
+          else
+            obj.fetch(token)
+          end
         end
       end
     end
     include Output
-    DEFAULT_SCHEMA = Draft202012::BASE_URI.to_s.freeze
     SCHEMA_KEYWORD_CLASS = Draft202012::Vocab::Core::Schema
     VOCABULARY_KEYWORD_CLASS = Draft202012::Vocab::Core::Vocabulary
     ID_KEYWORD_CLASS = Draft202012::Vocab::Core::Id
     UNKNOWN_KEYWORD_CLASS = Draft202012::Vocab::Core::UnknownKeyword
     NOT_KEYWORD_CLASS = Draft202012::Vocab::Applicator::Not
     PROPERTIES_KEYWORD_CLASS = Draft202012::Vocab::Applicator::Properties
-    DEFAULT_BASE_URI = URI('json-schemer://schema').freeze
-    DEFAULT_FORMATS = {}.freeze
-    DEFAULT_CONTENT_ENCODINGS = {}.freeze
-    DEFAULT_CONTENT_MEDIA_TYPES = {}.freeze
-    DEFAULT_KEYWORDS = {}.freeze
-    DEFAULT_BEFORE_PROPERTY_VALIDATION = [].freeze
-    DEFAULT_AFTER_PROPERTY_VALIDATION = [].freeze
-    DEFAULT_REF_RESOLVER = proc { |uri| raise UnknownRef, uri.to_s }
     NET_HTTP_REF_RESOLVER = proc { |uri| JSON.parse(Net::HTTP.get(uri)) }
     RUBY_REGEXP_RESOLVER = proc { |pattern| Regexp.new(pattern) }
     ECMA_REGEXP_RESOLVER = proc { |pattern| Regexp.new(EcmaRegexp.ruby_equivalent(pattern)) }
@@ -40,39 +38,44 @@ module JSONSchemer
         false
       end
     end
+    SYMBOL_PROPERTY_DEFAULT_RESOLVER = proc do |instance, property, results_with_tree_validity|
+      DEFAULT_PROPERTY_DEFAULT_RESOLVER.call(instance, property.to_sym, results_with_tree_validity)
+    end
     attr_accessor :base_uri, :meta_schema, :keywords, :keyword_order
-    attr_reader :value, :parent, :root, :parsed
-    attr_reader :vocabulary, :format, :formats, :content_encodings, :content_media_types, :custom_keywords, :before_property_validation, :after_property_validation, :insert_property_defaults, :property_default_resolver
+    attr_reader :value, :parent, :root, :configuration, :parsed
+    attr_reader :vocabulary, :format, :formats, :content_encodings, :content_media_types, :custom_keywords, :before_property_validation, :after_property_validation, :insert_property_defaults
     def initialize(
       value,
       parent = nil,
       root = self,
       keyword = nil,
-      base_uri: DEFAULT_BASE_URI,
-      meta_schema: nil,
-      vocabulary: nil,
-      format: true,
-      formats: DEFAULT_FORMATS,
-      content_encodings: DEFAULT_CONTENT_ENCODINGS,
-      content_media_types: DEFAULT_CONTENT_MEDIA_TYPES,
-      keywords: DEFAULT_KEYWORDS,
-      before_property_validation: DEFAULT_BEFORE_PROPERTY_VALIDATION,
-      after_property_validation: DEFAULT_AFTER_PROPERTY_VALIDATION,
-      insert_property_defaults: false,
-      property_default_resolver: DEFAULT_PROPERTY_DEFAULT_RESOLVER,
-      ref_resolver: DEFAULT_REF_RESOLVER,
-      regexp_resolver: 'ruby',
-      output_format: 'classic',
-      resolve_enumerators: false,
-      access_mode: nil
+      configuration: JSONSchemer.configuration,
+      base_uri: configuration.base_uri,
+      meta_schema: configuration.meta_schema,
+      vocabulary: configuration.vocabulary,
+      format: configuration.format,
+      formats: configuration.formats,
+      content_encodings: configuration.content_encodings,
+      content_media_types: configuration.content_media_types,
+      keywords: configuration.keywords,
+      before_property_validation: configuration.before_property_validation,
+      after_property_validation: configuration.after_property_validation,
+      insert_property_defaults: configuration.insert_property_defaults,
+      property_default_resolver: configuration.property_default_resolver,
+      ref_resolver: configuration.ref_resolver,
+      regexp_resolver: configuration.regexp_resolver,
+      output_format: configuration.output_format,
+      resolve_enumerators: configuration.resolve_enumerators,
+      access_mode: configuration.access_mode
     )
       @value = deep_stringify_keys(value)
       @parent = parent
       @root = root
       @keyword = keyword
       @schema = self
+      @configuration = configuration
       @base_uri = base_uri
       @meta_schema = meta_schema
       @vocabulary = vocabulary
@@ -109,12 +112,12 @@ module JSONSchemer
       output
     end
-    def valid_schema?
-      meta_schema.valid?(value)
+    def valid_schema?(**options)
+      meta_schema.valid?(value, **options)
     end
-    def validate_schema
-      meta_schema.validate(value)
+    def validate_schema(**options)
+      meta_schema.validate(value, **options)
     end
     def ref(value)
@@ -142,10 +145,11 @@ module JSONSchemer
           adjacent_results[keyword_instance.class] = keyword_result
         end
-        if custom_keywords.any?
-          custom_keywords.each do |custom_keyword, callable|
+        if root.custom_keywords.any?
+          resolved_instance_location = Location.resolve(instance_location)
+          root.custom_keywords.each do |custom_keyword, callable|
             if value.key?(custom_keyword)
-              [*callable.call(instance, value, instance_location)].each do |custom_keyword_result|
+              [*callable.call(instance, value, resolved_instance_location)].each do |custom_keyword_result|
                 custom_keyword_valid = custom_keyword_result == true
                 valid &&= custom_keyword_valid
                 type = custom_keyword_result.is_a?(String) ? custom_keyword_result : custom_keyword
@@ -184,16 +188,9 @@ module JSONSchemer
         uri.fragment = nil
         remote_schema = JSONSchemer.schema(
           ref_resolver.call(uri) || raise(InvalidRefResolution, uri.to_s),
+          :configuration => configuration,
           :base_uri => uri,
           :meta_schema => meta_schema,
-          :format => format,
-          :formats => formats,
-          :content_encodings => content_encodings,
-          :content_media_types => content_media_types,
-          :keywords => custom_keywords,
-          :before_property_validation => before_property_validation,
-          :after_property_validation => after_property_validation,
-          :property_default_resolver => property_default_resolver,
           :ref_resolver => ref_resolver,
           :regexp_resolver => regexp_resolver
         )
@@ -342,6 +339,21 @@ module JSONSchemer
       end
     end
+    def ref_resolver
+      @ref_resolver ||= @original_ref_resolver == 'net/http' ? CachedResolver.new(&NET_HTTP_REF_RESOLVER) : @original_ref_resolver
+    end
+    def regexp_resolver
+      @regexp_resolver ||= case @original_regexp_resolver
+      when 'ecma'
+        CachedResolver.new(&ECMA_REGEXP_RESOLVER)
+      when 'ruby'
+        CachedResolver.new(&RUBY_REGEXP_RESOLVER)
+      else
+        @original_regexp_resolver
+      end
+    end
     def inspect
       "#<#{self.class.name} @value=#{@value.inspect} @parent=#{@parent.inspect} @keyword=#{@keyword.inspect}>"
     end
@@ -353,8 +365,8 @@ module JSONSchemer
       if value.is_a?(Hash) && value.key?('$schema')
         @parsed['$schema'] = SCHEMA_KEYWORD_CLASS.new(value.fetch('$schema'), self, '$schema')
-      elsif root == self && !meta_schema
-        SCHEMA_KEYWORD_CLASS.new(DEFAULT_SCHEMA, self, '$schema')
+      elsif meta_schema.is_a?(String)
+        SCHEMA_KEYWORD_CLASS.new(meta_schema, self, '$schema')
       end
       if value.is_a?(Hash) && value.key?('$vocabulary')
@@ -394,19 +406,8 @@ module JSONSchemer
       @root_keyword_location ||= Location.root
     end
-    def ref_resolver
-      @ref_resolver ||= @original_ref_resolver == 'net/http' ? CachedResolver.new(&NET_HTTP_REF_RESOLVER) : @original_ref_resolver
-    end
-    def regexp_resolver
-      @regexp_resolver ||= case @original_regexp_resolver
-      when 'ecma'
-        CachedResolver.new(&ECMA_REGEXP_RESOLVER)
-      when 'ruby'
-        CachedResolver.new(&RUBY_REGEXP_RESOLVER)
-      else
-        @original_regexp_resolver
-      end
+    def property_default_resolver
+      @property_default_resolver ||= insert_property_defaults == :symbol ? SYMBOL_PROPERTY_DEFAULT_RESOLVER : DEFAULT_PROPERTY_DEFAULT_RESOLVER
     end
     def resolve_enumerators!(output)

data/lib/json_schemer/version.rb CHANGED Viewed

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

data/lib/json_schemer.rb CHANGED Viewed

@@ -59,10 +59,10 @@ require 'json_schemer/openapi30/meta'
 require 'json_schemer/openapi30/vocab/base'
 require 'json_schemer/openapi30/vocab'
 require 'json_schemer/openapi'
+require 'json_schemer/configuration'
 require 'json_schemer/schema'
 module JSONSchemer
-  class UnsupportedMetaSchema < StandardError; end
   class UnsupportedOpenAPIVersion < StandardError; end
   class UnknownRef < StandardError; end
   class UnknownFormat < StandardError; end
@@ -113,33 +113,19 @@ module JSONSchemer
   end
   class << self
-    def schema(schema, meta_schema: draft202012, **options)
-      case schema
-      when String
-        schema = JSON.parse(schema)
-      when Pathname
-        base_uri = URI.parse(File.join('file:', URI::DEFAULT_PARSER.escape(schema.realpath.to_s)))
-        options[:base_uri] = base_uri
-        schema = if options.key?(:ref_resolver)
-          FILE_URI_REF_RESOLVER.call(base_uri)
-        else
-          ref_resolver = CachedResolver.new(&FILE_URI_REF_RESOLVER)
-          options[:ref_resolver] = ref_resolver
-          ref_resolver.call(base_uri)
-        end
-      end
-      unless meta_schema.is_a?(Schema)
-        meta_schema = META_SCHEMAS_BY_BASE_URI_STR[meta_schema] || raise(UnsupportedMetaSchema, meta_schema)
-      end
-      Schema.new(schema, :meta_schema => meta_schema, **options)
+    def schema(schema, **options)
+      schema = resolve(schema, options)
+      Schema.new(schema, **options)
     end
     def valid_schema?(schema, **options)
-      schema(schema, **options).valid_schema?
+      schema = resolve(schema, options)
+      meta_schema(schema, options).valid?(schema, **options.slice(:output_format, :resolve_enumerators, :access_mode))
     end
     def validate_schema(schema, **options)
-      schema(schema, **options).validate_schema
+      schema = resolve(schema, options)
+      meta_schema(schema, options).validate(schema, **options.slice(:output_format, :resolve_enumerators, :access_mode))
     end
     def draft202012
@@ -245,6 +231,44 @@ module JSONSchemer
     def openapi(document, **options)
       OpenAPI.new(document, **options)
     end
+    def configuration
+      @configuration ||= Configuration.new
+    end
+    def configure
+      yield configuration
+    end
+  private
+    def resolve(schema, options)
+      case schema
+      when String
+        JSON.parse(schema)
+      when Pathname
+        base_uri = URI.parse(File.join('file:', URI::DEFAULT_PARSER.escape(schema.realpath.to_s)))
+        options[:base_uri] = base_uri
+        if options.key?(:ref_resolver)
+          FILE_URI_REF_RESOLVER.call(base_uri)
+        else
+          ref_resolver = CachedResolver.new(&FILE_URI_REF_RESOLVER)
+          options[:ref_resolver] = ref_resolver
+          ref_resolver.call(base_uri)
+        end
+      else
+        schema
+      end
+    end
+    def meta_schema(schema, options)
+      parseable_schema = {}
+      if schema.is_a?(Hash)
+        meta_schema = schema['$schema'] || schema[:'$schema']
+        parseable_schema['$schema'] = meta_schema if meta_schema.is_a?(String)
+      end
+      schema(parseable_schema, **options).meta_schema
+    end
   end
   META_SCHEMA_CALLABLES_BY_BASE_URI_STR = {

metadata CHANGED Viewed

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: json_schemer
 version: !ruby/object:Gem::Version
-  version: 2.1.1
+  version: 2.2.0
 platform: ruby
 authors:
 - David Harsha
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-11-28 00:00:00.000000000 Z
+date: 2024-03-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -66,6 +66,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.22'
+- !ruby/object:Gem::Dependency
+  name: csv
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: i18n
   requirement: !ruby/object:Gem::Requirement
@@ -94,6 +108,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: base64
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: bigdecimal
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: hana
   requirement: !ruby/object:Gem::Requirement
@@ -160,6 +202,7 @@ files:
 - json_schemer.gemspec
 - lib/json_schemer.rb
 - lib/json_schemer/cached_resolver.rb
+- lib/json_schemer/configuration.rb
 - lib/json_schemer/content.rb
 - lib/json_schemer/draft201909/meta.rb
 - lib/json_schemer/draft201909/vocab.rb
@@ -225,7 +268,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.10
+rubygems_version: 3.5.3
 signing_key:
 specification_version: 4
 summary: JSON Schema validator. Supports drafts 4, 6, 7, 2019-09, 2020-12, OpenAPI