json_schemer 1.0.0 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 93264835a6cd46b1c657876bda6a68c53a130c36390e84c316f6ffad3d00194f
-  data.tar.gz: 6bc567c682cb103cc673dade1f0a46a0b7500973acf6915acd7d7093de7a74e3
+  metadata.gz: 57b910832ad52857f782a9e0c9d17247b3d298493e2876d4d87dcc7bd72c623e
+  data.tar.gz: 4f36b7e698c0de3b9cac3d5fc54572dfd2288f28e0e29c7475f162cf5e878c95
 SHA512:
-  metadata.gz: 5e0fe51563031e2bcce3331cd13b251a0e8007740c9d5b70e59a03b5151114e221ad50b24358094ccc33b31fcabb0b62e76674a966d5c8bf3ed872accd839f4f
-  data.tar.gz: 2835c05bbb368718f20e8ec435def32619b3876d7c1e78259f92ac8b57d0f45b27cc6a9481fc101efe8e0456054ddfffc8d05ad60f37b63f8e2475e95b81e368
+  metadata.gz: 6cb5d43a92de555b7fb72febcd305990b94ed7764bfb300a158ec3ee864e4d7c9944afa4ff4726ce30e57af0325a8bb9e295e281b4b981cc459f44ddd3e507da
+  data.tar.gz: f41eab50d37542486c230fcbe14a57c7dbb6564acac9815a3ff4b9977a7683a9703162d59650e34c3dc640693fa919c6b607403e575b233c77468fcc39f0703b

data/Gemfile.lock

@@ -1,11 +1,10 @@
 PATH
   remote: .
   specs:
-    json_schemer (1.0.0)
+    json_schemer (1.0.2)
       hana (~> 1.3)
       regexp_parser (~> 2.0)
       simpleidn (~> 0.2)
-      uri_template (~> 0.7)
 
 GEM
   remote: https://rubygems.org/
@@ -27,7 +26,6 @@ GEM
       unf_ext
     unf (0.1.4-java)
     unf_ext (0.0.8.2)
-    uri_template (0.7.0)
 
 PLATFORMS
   java

data/json_schemer.gemspec

@@ -30,5 +30,4 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency "hana", "~> 1.3"
   spec.add_runtime_dependency "regexp_parser", "~> 2.0"
   spec.add_runtime_dependency "simpleidn", "~> 0.2"
-  spec.add_runtime_dependency "uri_template", "~> 0.7"
 end

data/lib/json_schemer/ecma_regexp.rb

@@ -2,19 +2,26 @@
 module JSONSchemer
   class EcmaRegexp
     class Syntax < Regexp::Syntax::Base
-      implements :anchor, Anchor::Extended
-      implements :assertion, Assertion::All
-      implements :backref, Backreference::Plain + Backreference::Name
-      implements :escape, Escape::Basic + %i[control backspace form_feed newline carriage tab vertical_tab] + Escape::Unicode + Escape::Meta + Escape::Hex + Escape::Octal
-      implements :property, UnicodeProperty::All
-      implements :nonproperty, UnicodeProperty::All
-      implements :free_space, %i[whitespace]
-      implements :group, Group::Basic + Group::Named + Group::Passive
-      implements :literal, Literal::All
-      implements :meta, Meta::Extended
-      implements :quantifier, Quantifier::Greedy + Quantifier::Reluctant + Quantifier::Interval + Quantifier::IntervalReluctant
-      implements :set, CharacterSet::Basic
-      implements :type, CharacterType::Extended
+      # regexp_parser >= 2.3.0 uses syntax classes directly instead of instances
+      # :nocov:
+      SYNTAX = respond_to?(:implements) ? self : new
+      # :nocov:
+      SYNTAX.implements :anchor, Anchor::Extended
+      SYNTAX.implements :assertion, Assertion::All
+      # literal %i[number] to support regexp_parser < 2.2.0 (Backreference::Plain)
+      SYNTAX.implements :backref, %i[number] + Backreference::Name
+      # :meta_sequence, :bell, and :escape are not supported in ecma
+      SYNTAX.implements :escape, Escape::Basic + (Escape::Control - %i[meta_sequence]) + (Escape::ASCII - %i[bell escape]) + Escape::Unicode + Escape::Meta + Escape::Hex + Escape::Octal
+      SYNTAX.implements :property, UnicodeProperty::All
+      SYNTAX.implements :nonproperty, UnicodeProperty::All
+      # :comment is not supported in ecma
+      SYNTAX.implements :free_space, (FreeSpace::All - %i[comment])
+      SYNTAX.implements :group, Group::Basic + Group::Named + Group::Passive
+      SYNTAX.implements :literal, Literal::All
+      SYNTAX.implements :meta, Meta::Extended
+      SYNTAX.implements :quantifier, Quantifier::Greedy + Quantifier::Reluctant + Quantifier::Interval + Quantifier::IntervalReluctant
+      SYNTAX.implements :set, CharacterSet::Basic
+      SYNTAX.implements :type, CharacterType::Extended
     end
 
     RUBY_EQUIVALENTS = {
@@ -31,7 +38,7 @@ module JSONSchemer
     class << self
       def ruby_equivalent(pattern)
         Regexp::Scanner.scan(pattern).map do |type, token, text|
-          Syntax.check!(*Syntax.normalize(type, token))
+          Syntax::SYNTAX.check!(*Syntax::SYNTAX.normalize(type, token))
           RUBY_EQUIVALENTS.dig(type, token) || text
         rescue Regexp::Syntax::NotImplementedError
           raise InvalidEcmaRegexp, "invalid token #{text.inspect} (#{type}:#{token}) in #{pattern.inspect}"

data/lib/json_schemer/format/uri_template.rb

@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+module JSONSchemer
+  module Format
+    module URITemplate
+      # https://datatracker.ietf.org/doc/html/rfc6570
+      PCT_ENCODED = '%\h{2}'                                         # pct-encoded     =  "%" HEXDIG HEXDIG
+      EXPLODE = '\*'                                                 # explode         =  "*"
+      MAX_LENGTH = '[1-9]\d{0,3}'                                    # max-length      =  %x31-39 0*3DIGIT   ; positive integer < 10000
+      PREFIX = ":#{MAX_LENGTH}"                                      # prefix          =  ":" max-length
+      MODIFIER_LEVEL4 = "#{PREFIX}|#{EXPLODE}"                       # modifier-level4 =  prefix / explode
+      VARCHAR = "(\\w|#{PCT_ENCODED})"                               # varchar         =  ALPHA / DIGIT / "_" / pct-encoded
+      VARNAME = "#{VARCHAR}(\\.?#{VARCHAR})*"                        # varname         =  varchar *( ["."] varchar )
+      VARSPEC = "#{VARNAME}(#{MODIFIER_LEVEL4})?"                    # varspec         =  varname [ modifier-level4 ]
+      VARIABLE_LIST = "#{VARSPEC}(,#{VARSPEC})*"                     # variable-list   =  varspec *( "," varspec )
+      OPERATOR = '[+#./;?&=,!@|]'                                    # operator        =  op-level2 / op-level3 / op-reserve
+                                                                     # op-level2       =  "+" / "#"
+                                                                     # op-level3       =  "." / "/" / ";" / "?" / "&"
+                                                                     # op-reserve      =  "=" / "," / "!" / "@" / "|"
+      EXPRESSION = "{#{OPERATOR}?#{VARIABLE_LIST}}"                  # expression      =  "{" [ operator ] variable-list "}"
+      LITERALS = "[^\\x00-\\x20\\x7F\"%'<>\\\\^`{|}]|#{PCT_ENCODED}" # literals        =  %x21 / %x23-24 / %x26 / %x28-3B / %x3D / %x3F-5B
+                                                                     #                 /  %x5D / %x5F / %x61-7A / %x7E / ucschar / iprivate
+                                                                     #                 /  pct-encoded
+                                                                     #                      ; any Unicode character except: CTL, SP,
+                                                                     #                      ;  DQUOTE, "'", "%" (aside from pct-encoded),
+                                                                     #                      ;  "<", ">", "\", "^", "`", "{", "|", "}"
+      URI_TEMPLATE = "(#{LITERALS}|#{EXPRESSION})*"                  # URI-Template    = *( literals / expression )
+      URI_TEMPLATE_REGEX = /\A#{URI_TEMPLATE}\z/
+
+      def valid_uri_template?(data)
+        URI_TEMPLATE_REGEX.match?(data)
+      end
+    end
+  end
+end

data/lib/json_schemer/format.rb

@@ -2,6 +2,7 @@
 module JSONSchemer
   module Format
     include Hostname
+    include URITemplate
 
     # this is no good
     EMAIL_REGEX = /\A[^@\s]+@([\p{L}\d-]+\.)+[\p{L}\d\-]{2,}\z/i.freeze
@@ -65,7 +66,7 @@ module JSONSchemer
     def valid_date_time?(data)
       return false if HOUR_24_REGEX.match?(data)
       datetime = DateTime.rfc3339(data)
-      return false if LEAP_SECOND_REGEX.match?(data) && datetime.to_time.utc.strftime('%H:%M') != '23:59'
+      return false if LEAP_SECOND_REGEX.match?(data) && datetime.new_offset.strftime('%H:%M') != '23:59'
       DATE_TIME_OFFSET_REGEX.match?(data)
     rescue ArgumentError
       false
@@ -115,13 +116,6 @@ module JSONSchemer
       end.force_encoding(Encoding::US_ASCII)
     end
 
-    def valid_uri_template?(data)
-      URITemplate.new(data)
-      true
-    rescue URITemplate::Invalid
-      false
-    end
-
     def valid_json_pointer?(data)
       JSON_POINTER_REGEX.match?(data)
     end

data/lib/json_schemer/schema/base.rb

@@ -32,7 +32,7 @@ module JSONSchemer
       end
 
       JSON_POINTER_TOKEN_ESCAPE_CHARS = { '~' => '~0', '/' => '~1' }
-      JSON_POINTER_TOKEN_ESCAPE_REGEXP = Regexp.union(JSON_POINTER_TOKEN_ESCAPE_CHARS.keys)
+      JSON_POINTER_TOKEN_ESCAPE_REGEX = Regexp.union(JSON_POINTER_TOKEN_ESCAPE_CHARS.keys)
 
       class << self
         def draft_name
@@ -330,10 +330,10 @@ module JSONSchemer
           child(resolve_ref(ref_uri), base_uri: ref_uri)
         end
 
-        ref_schema, ref_schema_pointer = ref_object.ids[ref_uri] || [ref_object.root, '']
+        ref_schema, ref_schema_pointer, ref_parent_base_uri = ref_object.ids[ref_uri] || [ref_object.root, '', ref_uri]
 
         ref_uri_pointer_parts = Hana::Pointer.parse(URI.decode_www_form_component(ref_uri_pointer))
-        schema, base_uri = ref_uri_pointer_parts.reduce([ref_schema, ref_uri]) do |(obj, uri), token|
+        schema, base_uri = ref_uri_pointer_parts.reduce([ref_schema, ref_parent_base_uri]) do |(obj, uri), token|
           if obj.is_a?(Array)
             [obj.fetch(token.to_i), uri]
           else
@@ -624,7 +624,7 @@ module JSONSchemer
       end
 
       def escape_json_pointer_token(token)
-        token.gsub(JSON_POINTER_TOKEN_ESCAPE_REGEXP, JSON_POINTER_TOKEN_ESCAPE_CHARS)
+        token.gsub(JSON_POINTER_TOKEN_ESCAPE_REGEX, JSON_POINTER_TOKEN_ESCAPE_CHARS)
       end
 
       def join_uri(a, b)
@@ -646,16 +646,18 @@ module JSONSchemer
         if schema.is_a?(Array)
           schema.each_with_index { |subschema, index| resolve_ids(subschema, ids, base_uri, "#{pointer}/#{index}") }
         elsif schema.is_a?(Hash)
-          uri = join_uri(base_uri, schema[id_keyword])
+          if schema.key?(id_keyword)
+            parent_base_uri = base_uri
+            base_uri = join_uri(base_uri, schema[id_keyword])
+            ids[base_uri] ||= [schema, pointer, parent_base_uri]
+          end
           schema.each do |key, value|
             case key
-            when id_keyword
-              ids[uri] ||= [schema, pointer]
             when 'items', 'allOf', 'anyOf', 'oneOf', 'additionalItems', 'contains', 'additionalProperties', 'propertyNames', 'if', 'then', 'else', 'not'
-              resolve_ids(value, ids, uri, "#{pointer}/#{key}")
+              resolve_ids(value, ids, base_uri, "#{pointer}/#{key}")
             when 'properties', 'patternProperties', 'definitions', 'dependencies'
               value.each do |subkey, subvalue|
-                resolve_ids(subvalue, ids, uri, "#{pointer}/#{key}/#{subkey}")
+                resolve_ids(subvalue, ids, base_uri, "#{pointer}/#{key}/#{subkey}")
               end
             end
           end

data/lib/json_schemer/version.rb

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

data/lib/json_schemer.rb

@@ -12,10 +12,10 @@ require 'uri'
 require 'hana'
 require 'regexp_parser'
 require 'simpleidn'
-require 'uri_template'
 
 require 'json_schemer/version'
 require 'json_schemer/format/hostname'
+require 'json_schemer/format/uri_template'
 require 'json_schemer/format'
 require 'json_schemer/errors'
 require 'json_schemer/cached_resolver'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: json_schemer
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.2
 platform: ruby
 authors:
 - David Harsha
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-05-26 00:00:00.000000000 Z
+date: 2023-06-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -108,20 +108,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.2'
-- !ruby/object:Gem::Dependency
-  name: uri_template
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.7'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.7'
 description:
 email:
 - davishmcclurg@gmail.com
@@ -150,6 +136,7 @@ files:
 - lib/json_schemer/errors.rb
 - lib/json_schemer/format.rb
 - lib/json_schemer/format/hostname.rb
+- lib/json_schemer/format/uri_template.rb
 - lib/json_schemer/schema/base.rb
 - lib/json_schemer/schema/draft4.json
 - lib/json_schemer/schema/draft4.rb