json_schemer 0.2.12 → 0.2.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6d07c36d5981512e6980d79a12084d309b92db45490d3ea821d02713c71fd5fc
-  data.tar.gz: 20dad8f563ba3ca0dcb7586641cf804aea2f727ed4def911fb105fd7bb14965f
+  metadata.gz: '048e6a2fadd3b4717233464de16b5777ebf94bacd20a44005de1b309d93110db'
+  data.tar.gz: 599aa58b678b2d52b559281b5760fff0f0668e0bf8c771635bbf41db814ffe8b
 SHA512:
-  metadata.gz: 199c651105b1330a6946d7099d9c9c0d4f74d1922e03cf3855870660f32c81fb6f94d3748555d17cde6fb56b5b2029388099f7bf977f5585df8ec7dd5da726b5
-  data.tar.gz: e2acf5a285a724dc1c5c99fe35e081ab30f934554aa2f02c691926d75f3ac681594c015ef9224b7d2f70be98dd8d39404f8e4b0c3c87285f23314b523111d20e
+  metadata.gz: c806dea39ba83179cda20f09af807314a3b1c1bf82ff79e496f10c45cea28a9597afebe88f7ed57d8d7c28542a68d53beaff1dd3521386c1fc981f38ff09b27f
+  data.tar.gz: 271d8b4d761d60c29ee598298aefc91543f5edeb3e9b7369f6a0cfee67c07b16eb1a8c5874dfab712cd27fc779e4b4218a1511515ea5a2bf295bc85ab316072b

data/.github/workflows/ci.yml

@@ -4,14 +4,13 @@ jobs:
   ruby:
     strategy:
       matrix:
-        ruby: [2.5.x, 2.6.x, 2.7.x]
+        ruby: [2.4, 2.5, 2.6, 2.7, head, truffleruby-head]
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v1
-    - uses: actions/setup-ruby@v1
+    - uses: actions/checkout@v2
+    - uses: ruby/setup-ruby@v1
       with:
         ruby-version: ${{ matrix.ruby }}
     - run: |
-        gem install bundler
         bundle install
         bundle exec rake test

data/Gemfile.lock

@@ -1,21 +1,21 @@
 PATH
   remote: .
   specs:
-    json_schemer (0.2.12)
-      ecma-re-validator (~> 0.2)
+    json_schemer (0.2.17)
+      ecma-re-validator (~> 0.3)
       hana (~> 1.3)
-      regexp_parser (~> 1.5)
+      regexp_parser (~> 2.0)
       uri_template (~> 0.7)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    ecma-re-validator (0.2.1)
-      regexp_parser (~> 1.2)
-    hana (1.3.6)
-    minitest (5.11.3)
+    ecma-re-validator (0.3.0)
+      regexp_parser (~> 2.0)
+    hana (1.3.7)
+    minitest (5.14.2)
     rake (13.0.1)
-    regexp_parser (1.7.1)
+    regexp_parser (2.0.0)
     uri_template (0.7.0)
 
 PLATFORMS

data/README.md

@@ -92,6 +92,20 @@ JSONSchemer.schema(
   # default: false
   insert_property_defaults: true,
 
+  # modify properties during validation. You can pass one Proc or a list of Procs to modify data.
+  # Proc/[Proc]
+  # default: nil
+  before_property_validation: proc do |data, property, property_schema, _parent|
+    data[property] ||= 42
+  end,
+
+  # modify properties after validation. You can pass one Proc or a list of Procs to modify data.
+  # Proc/[Proc]
+  # default: nil
+  after_property_validation: proc do |data, property, property_schema, _parent|
+    data[property] = Date.iso8601(data[property]) if property_schema.is_a?(Hash) && property_schema['format'] == 'date'
+  end,
+
   # resolve external references
   # 'net/http'/proc/lambda/respond_to?(:call)
   # 'net/http': proc { |uri| JSON.parse(Net::HTTP.get(uri)) }

data/json_schemer.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.required_ruby_version = '~> 2.5'
+  spec.required_ruby_version = '>= 2.4'
 
   spec.add_development_dependency "bundler", "~> 2.0"
   spec.add_development_dependency "rake", "~> 13.0"
@@ -34,8 +34,8 @@ Gem::Specification.new do |spec|
   # spec.add_development_dependency "jsonschema", "~> 2.0.2"
   # spec.add_development_dependency "rj_schema", "~> 0.2.0"
 
-  spec.add_runtime_dependency "ecma-re-validator", "~> 0.2"
+  spec.add_runtime_dependency "ecma-re-validator", "~> 0.3"
   spec.add_runtime_dependency "hana", "~> 1.3"
   spec.add_runtime_dependency "uri_template", "~> 0.7"
-  spec.add_runtime_dependency "regexp_parser", "~> 1.5"
+  spec.add_runtime_dependency "regexp_parser", "~> 2.0"
 end

data/lib/json_schemer/format.rb

@@ -3,7 +3,7 @@ module JSONSchemer
   module Format
     # this is no good
     EMAIL_REGEX = /\A[^@\s]+@([\p{L}\d-]+\.)+[\p{L}\d\-]{2,}\z/i.freeze
-    LABEL_REGEX_STRING = '\p{L}([\p{L}\p{N}\-]*[\p{L}\p{N}])?'
+    LABEL_REGEX_STRING = '[\p{L}\p{N}]([\p{L}\p{N}\-]*[\p{L}\p{N}])?'
     HOSTNAME_REGEX = /\A(#{LABEL_REGEX_STRING}\.)*#{LABEL_REGEX_STRING}\z/i.freeze
     JSON_POINTER_REGEX_STRING = '(\/([^~\/]|~[01])*)*'
     JSON_POINTER_REGEX = /\A#{JSON_POINTER_REGEX_STRING}\z/.freeze
@@ -101,7 +101,14 @@ module JSONSchemer
     end
 
     def iri_escape(data)
-      URI.escape(data, /[^[[:ascii:]]]/)
+      data.gsub(/[^[:ascii:]]/) do |match|
+        us = match
+        tmp = +''
+        us.each_byte do |uc|
+          tmp << sprintf('%%%02X', uc)
+        end
+        tmp
+      end.force_encoding(Encoding::US_ASCII)
     end
 
     def valid_uri_template?(data)

data/lib/json_schemer/schema/base.rb

@@ -4,16 +4,17 @@ module JSONSchemer
     class Base
       include Format
 
-      Instance = Struct.new(:data, :data_pointer, :schema, :schema_pointer, :parent_uri, :insert_property_defaults) do
+      Instance = Struct.new(:data, :data_pointer, :schema, :schema_pointer, :parent_uri, :before_property_validation, :after_property_validation) do
         def merge(
           data: self.data,
           data_pointer: self.data_pointer,
           schema: self.schema,
           schema_pointer: self.schema_pointer,
           parent_uri: self.parent_uri,
-          insert_property_defaults: self.insert_property_defaults
+          before_property_validation: self.before_property_validation,
+          after_property_validation: self.after_property_validation
         )
-          self.class.new(data, data_pointer, schema, schema_pointer, parent_uri, insert_property_defaults)
+          self.class.new(data, data_pointer, schema, schema_pointer, parent_uri, before_property_validation, after_property_validation)
         end
       end
 
@@ -29,10 +30,18 @@ module JSONSchemer
         :eol => '\z'
       }.freeze
 
+      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
+        end
+      end
+
       def initialize(
         schema,
         format: true,
         insert_property_defaults: false,
+        before_property_validation: nil,
+        after_property_validation: nil,
         formats: nil,
         keywords: nil,
         ref_resolver: DEFAULT_REF_RESOLVER
@@ -40,18 +49,20 @@ module JSONSchemer
         raise InvalidSymbolKey, 'schemas must use string keys' if schema.is_a?(Hash) && !schema.empty? && !schema.first.first.is_a?(String)
         @root = schema
         @format = format
-        @insert_property_defaults = insert_property_defaults
+        @before_property_validation = [*before_property_validation]
+        @before_property_validation.unshift(INSERT_DEFAULT_PROPERTY) if insert_property_defaults
+        @after_property_validation = [*after_property_validation]
         @formats = formats
         @keywords = keywords
         @ref_resolver = ref_resolver == 'net/http' ? CachedRefResolver.new(&NET_HTTP_REF_RESOLVER) : ref_resolver
       end
 
       def valid?(data)
-        valid_instance?(Instance.new(data, '', root, '', nil, !!@insert_property_defaults))
+        valid_instance?(Instance.new(data, '', root, '', nil, @before_property_validation, @after_property_validation))
       end
 
       def validate(data)
-        validate_instance(Instance.new(data, '', root, '', nil, !!@insert_property_defaults))
+        validate_instance(Instance.new(data, '', root, '', nil, @before_property_validation, @after_property_validation))
       end
 
     protected
@@ -101,7 +112,7 @@ module JSONSchemer
         if keywords
           keywords.each do |keyword, callable|
             if schema.key?(keyword)
-              result = callable.call(data, schema, instance.pointer)
+              result = callable.call(data, schema, instance.data_pointer)
               if result.is_a?(Array)
                 result.each(&block)
               elsif !result
@@ -119,7 +130,8 @@ module JSONSchemer
             subinstance = instance.merge(
               schema: subschema,
               schema_pointer: "#{instance.schema_pointer}/allOf/#{index}",
-              insert_property_defaults: false
+              before_property_validation: false,
+              after_property_validation: false
             )
             validate_instance(subinstance, &block)
           end
@@ -130,7 +142,8 @@ module JSONSchemer
             subinstance = instance.merge(
               schema: subschema,
               schema_pointer: "#{instance.schema_pointer}/anyOf/#{index}",
-              insert_property_defaults: false
+              before_property_validation: false,
+              after_property_validation: false
             )
             validate_instance(subinstance)
           end
@@ -142,7 +155,8 @@ module JSONSchemer
             subinstance = instance.merge(
               schema: subschema,
               schema_pointer: "#{instance.schema_pointer}/oneOf/#{index}",
-              insert_property_defaults: false
+              before_property_validation: false,
+              after_property_validation: false
             )
             validate_instance(subinstance)
           end
@@ -158,12 +172,13 @@ module JSONSchemer
           subinstance = instance.merge(
             schema: not_schema,
             schema_pointer: "#{instance.schema_pointer}/not",
-            insert_property_defaults: false
+            before_property_validation: false,
+            after_property_validation: false
           )
           yield error(subinstance, 'not') if valid_instance?(subinstance)
         end
 
-        if if_schema && valid_instance?(instance.merge(schema: if_schema, insert_property_defaults: false))
+        if if_schema && valid_instance?(instance.merge(schema: if_schema, before_property_validation: false, after_property_validation: false))
           validate_instance(instance.merge(schema: then_schema, schema_pointer: "#{instance.schema_pointer}/then"), &block) unless then_schema.nil?
         elsif if_schema
           validate_instance(instance.merge(schema: else_schema, schema_pointer: "#{instance.schema_pointer}/else"), &block) unless else_schema.nil?
@@ -487,10 +502,10 @@ module JSONSchemer
         dependencies = schema['dependencies']
         property_names = schema['propertyNames']
 
-        if instance.insert_property_defaults && properties
+        if instance.before_property_validation && properties
           properties.each do |property, property_schema|
-            if !data.key?(property) && property_schema.is_a?(Hash) && property_schema.key?('default')
-              data[property] = property_schema.fetch('default').clone
+            instance.before_property_validation.each do |hook|
+              hook.call(data, property, property_schema, schema)
             end
           end
         end
@@ -565,15 +580,21 @@ module JSONSchemer
             validate_instance(subinstance, &block)
           end
         end
+
+        if instance.after_property_validation && properties
+          properties.each do |property, property_schema|
+            instance.after_property_validation.each do |hook|
+              hook.call(data, property, property_schema, schema)
+            end
+          end
+        end
       end
 
       def safe_strict_decode64(data)
-        begin
-          Base64.strict_decode64(data)
-        rescue ArgumentError => e
-          raise e unless e.message == 'invalid base64'
-          nil
-        end
+        Base64.strict_decode64(data)
+      rescue ArgumentError => e
+        raise e unless e.message == 'invalid base64'
+        nil
       end
 
       def ecma_262_regex(pattern)
@@ -615,16 +636,15 @@ module JSONSchemer
         if schema.is_a?(Array)
           schema.each_with_index { |subschema, index| resolve_ids(subschema, ids, parent_uri, "#{pointer}/#{index}") }
         elsif schema.is_a?(Hash)
-          id = schema[id_keyword]
-          uri = join_uri(parent_uri, id)
-          unless uri == parent_uri
-            ids[uri.to_s] = {
-              schema: schema,
-              pointer: pointer
-            }
-          end
-          if definitions = schema['definitions']
-            definitions.each { |key, subschema| resolve_ids(subschema, ids, uri, "#{pointer}/definitions/#{key}") }
+          uri = join_uri(parent_uri, schema[id_keyword])
+          schema.each do |key, value|
+            if key == id_keyword && uri != parent_uri
+              ids[uri.to_s] = {
+                schema: schema,
+                pointer: pointer
+              }
+            end
+            resolve_ids(value, ids, uri, "#{pointer}/#{key}")
           end
         end
         ids

data/lib/json_schemer/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: json_schemer
 version: !ruby/object:Gem::Version
-  version: 0.2.12
+  version: 0.2.17
 platform: ruby
 authors:
 - David Harsha
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-07-12 00:00:00.000000000 Z
+date: 2020-12-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '0.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '0.3'
 - !ruby/object:Gem::Dependency
   name: hana
   requirement: !ruby/object:Gem::Requirement
@@ -100,14 +100,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '2.0'
 description: 
 email:
 - davishmcclurg@gmail.com
@@ -144,17 +144,16 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - "~>"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: '2.5'
+      version: '2.4'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: JSON Schema validator. Supports drafts 4, 6, and 7.