json_schemer 0.2.10 → 0.2.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bf65b652bb728979d855beb43ca825f5bdfc2f9cbd05ed71e721900edb5ca478
-  data.tar.gz: 9b2a5bb41e365da48e6fe18fadb36d690397026f79ca5a0d00e05a89b82add77
+  metadata.gz: 14785b9586c0f152587eedbdea3da0a37f8a766b21db28821ffa374fef6d6235
+  data.tar.gz: fe50adb42c6b0da48fc43b7c8ebee40e61a42f4ccfa3d87de6723551388b223c
 SHA512:
-  metadata.gz: 652cda34ebb49e94b9e725e3143c7f7ed18329cdcb046aa55b1ef1f49f0b4722154389e49d13ce8d4182cb640c1b1b418107fa8b01b54572505207e930b34e51
-  data.tar.gz: 1f922f37d0540c33f7d2238cf9bfc2bf03f2231c07668e94a6216c576bbd1db0f74db6f10456e7a96ae3bb3ed034ad9eb062c327dade08c64ec16a6cf09f1172
+  metadata.gz: e23c122d31d6a9c38326c90c1ac9af35148ce0b13ff1a576f2fb9bfff7cfdd289d2122b73d5b8b20330d8323e8ec98b11452ec0b70ccd339a26e6dba4d7f33b5
+  data.tar.gz: a4be1485304ae45f125e6b73494c5a1a5cf98d092c66b25dd2ff81fed0a74833165d8655abc46799faa97af0372d9d3f06e4a5e30554b0c31260b01699aa76be

data/.github/workflows/ci.yml

@@ -4,19 +4,13 @@ jobs:
   ruby:
     strategy:
       matrix:
-        ruby: [2.4.x, 2.5.x, 2.6.x]
+        ruby: [2.4, 2.5, 2.6, 2.7, 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 }}
-    - uses: actions/setup-python@v1
-      with:
-        python-version: 3.x
     - run: |
-        pip install --user Flask
-        ./JSON-Schema-Test-Suite/bin/jsonschema_suite serve &
-        gem install bundler
         bundle install
         bundle exec rake test

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    json_schemer (0.2.10)
+    json_schemer (0.2.15)
       ecma-re-validator (~> 0.2)
       hana (~> 1.3)
       regexp_parser (~> 1.5)
@@ -10,12 +10,12 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    ecma-re-validator (0.2.0)
+    ecma-re-validator (0.2.1)
       regexp_parser (~> 1.2)
-    hana (1.3.5)
+    hana (1.3.6)
     minitest (5.11.3)
-    rake (10.5.0)
-    regexp_parser (1.7.0)
+    rake (13.0.1)
+    regexp_parser (1.8.1)
     uri_template (0.7.0)
 
 PLATFORMS
@@ -25,7 +25,7 @@ DEPENDENCIES
   bundler (~> 2.0)
   json_schemer!
   minitest (~> 5.0)
-  rake (~> 10.0)
+  rake (~> 13.0)
 
 BUNDLED WITH
    2.1.4

data/json_schemer.gemspec

@@ -23,7 +23,7 @@ Gem::Specification.new do |spec|
   spec.required_ruby_version = '~> 2.4'
 
   spec.add_development_dependency "bundler", "~> 2.0"
-  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "rake", "~> 13.0"
   spec.add_development_dependency "minitest", "~> 5.0"
 
   # spec.add_development_dependency "benchmark-ips", "~> 2.7.2"

data/lib/json_schemer.rb

@@ -14,6 +14,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/schema/base'
 require 'json_schemer/schema/draft4'
@@ -28,6 +29,7 @@ module JSONSchemer
   class InvalidSymbolKey < StandardError; end
 
   DRAFT_CLASS_BY_META_SCHEMA = {
+    'http://json-schema.org/schema#' => Schema::Draft4, # Version-less $schema deprecated after Draft 4
     'http://json-schema.org/draft-04/schema#' => Schema::Draft4,
     'http://json-schema.org/draft-06/schema#' => Schema::Draft6,
     'http://json-schema.org/draft-07/schema#' => Schema::Draft7

data/lib/json_schemer/errors.rb

@@ -0,0 +1,31 @@
+# Based on code from @robacarp found in issue 48:
+# https://github.com/davishmcclurg/json_schemer/issues/48
+#
+module JSONSchemer
+  module Errors
+    class << self
+      def pretty(error)
+        data_pointer, type, schema = error.values_at('data_pointer', 'type', 'schema')
+        location = data_pointer.empty? ? 'root' : "property '#{data_pointer}'"
+
+        case type
+        when 'required'
+          keys = error.fetch('details').fetch('missing_keys').join(', ')
+          "#{location} is missing required keys: #{keys}"
+        when 'null', 'string', 'boolean', 'integer', 'number', 'array', 'object'
+          "#{location} is not of type: #{type}"
+        when 'pattern'
+          "#{location} does not match pattern: #{schema.fetch('pattern')}"
+        when 'format'
+          "#{location} does not match format: #{schema.fetch('format')}"
+        when 'const'
+          "#{location} is not: #{schema.fetch('const').inspect}"
+        when 'enum'
+          "#{location} is not one of: #{schema.fetch('enum')}"
+        else
+          "#{location} is invalid: error_type=#{type}"
+        end
+      end
+    end
+  end
+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

data/lib/json_schemer/schema/base.rb

@@ -568,12 +568,10 @@ module JSONSchemer
       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 +613,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.10'
+  VERSION = '0.2.15'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: json_schemer
 version: !ruby/object:Gem::Version
-  version: 0.2.10
+  version: 0.2.15
 platform: ruby
 authors:
 - David Harsha
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-02-26 00:00:00.000000000 Z
+date: 2020-10-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -127,6 +127,7 @@ files:
 - json_schemer.gemspec
 - lib/json_schemer.rb
 - lib/json_schemer/cached_ref_resolver.rb
+- lib/json_schemer/errors.rb
 - lib/json_schemer/format.rb
 - lib/json_schemer/schema/base.rb
 - lib/json_schemer/schema/draft4.rb
@@ -152,7 +153,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: JSON Schema validator. Supports drafts 4, 6, and 7.