json_schemer 1.0.1 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 460e70448c0b37c65fd4e51f046036336b17121cc716c197fe80f2e2517f45e7
-  data.tar.gz: f06d11eab9bb88c45a018c8913d6a5d2e33162064c9f995e5772beb811e68ed6
+  metadata.gz: '03538ce8b7525466940396aecbfffeac23f2f942af4e11023ea370d73045ec8b'
+  data.tar.gz: a06e7a91e8c851dffac5b9ecab91e47b6e89d46173abc8f95619dc4eca7f938d
 SHA512:
-  metadata.gz: 83549b328ba3067ed206a8bdea448e34ba274c7c5a7857d38793d74f0691339f845b0e39fdbb0ff8c3869dfbaf0dcd13380c458c80397b100a848f96443bf691
-  data.tar.gz: 106314824f1805e7d2306c10c696d4503b54b4d9203321e37816242c30598c3870ec40ade53dc08692ec3b2a35f18360c96211f0b8af44fd4414931da4e5b1e5
+  metadata.gz: 87f3d572f430bc5b64f25ffc96bf5fcf979fa53eea9e0d325e6d0b853b4f653d2264e151ab312da4e472a02342eb162e9ffdfa3b06c3ec29fa09e39123412f3a
+  data.tar.gz: fbbed8f04fea519b2264075051e64a7f6af2ade9b92600a490a2291065ed9a13eb15fb73cf356a0caff5ea3f63065d4c7a50ff93b293441273ed98708429cfe8

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    json_schemer (1.0.1)
+    json_schemer (1.0.3)
       hana (~> 1.3)
       regexp_parser (~> 2.0)
       simpleidn (~> 0.2)
@@ -13,7 +13,7 @@ GEM
     hana (1.3.7)
     minitest (5.15.0)
     rake (13.0.6)
-    regexp_parser (2.6.1)
+    regexp_parser (2.8.1)
     simplecov (0.22.0)
       docile (~> 1.1)
       simplecov-html (~> 0.11)

data/lib/json_schemer/format/email.rb

@@ -0,0 +1,56 @@
+# frozen_string_literal: true
+module JSONSchemer
+  module Format
+    module Email
+      # https://datatracker.ietf.org/doc/html/rfc6531#section-3.3
+      # I think this is the same as "UTF8-non-ascii"? (https://datatracker.ietf.org/doc/html/rfc6532#section-3.1)
+      UTF8_NON_ASCII = '[^[:ascii:]]'
+      # https://datatracker.ietf.org/doc/html/rfc5321#section-4.1.2
+      A_TEXT = "([\\w!#$%&'*+\\-/=?\\^`{|}~]|#{UTF8_NON_ASCII})"              # atext           = ALPHA / DIGIT /    ; Printable US-ASCII
+                                                                              #                   "!" / "#" /        ;  characters not including
+                                                                              #                   "$" / "%" /        ;  specials.  Used for atoms.
+                                                                              #                   "&" / "'" /
+                                                                              #                   "*" / "+" /
+                                                                              #                   "-" / "/" /
+                                                                              #                   "=" / "?" /
+                                                                              #                   "^" / "_" /
+                                                                              #                   "`" / "{" /
+                                                                              #                   "|" / "}" /
+                                                                              #                   "~"
+      Q_TEXT_SMTP = "([\\x20-\\x21\\x23-\\x5B\\x5D-\\x7E]|#{UTF8_NON_ASCII})" # qtextSMTP       = %d32-33 / %d35-91 / %d93-126
+                                                                              #                 ; i.e., within a quoted string, any
+                                                                              #                 ; ASCII graphic or space is permitted
+                                                                              #                 ; without blackslash-quoting except
+                                                                              #                 ; double-quote and the backslash itself.
+      QUOTED_PAIR_SMTP = '\x5C[\x20-\x7E]'                                    # quoted-pairSMTP = %d92 %d32-126
+                                                                              #                 ; i.e., backslash followed by any ASCII
+                                                                              #                 ; graphic (including itself) or SPace
+      Q_CONTENT_SMTP = "#{Q_TEXT_SMTP}|#{QUOTED_PAIR_SMTP}"                   # QcontentSMTP    = qtextSMTP / quoted-pairSMTP
+      QUOTED_STRING = "\"(#{Q_CONTENT_SMTP})*\""                              # Quoted-string   = DQUOTE *QcontentSMTP DQUOTE
+      ATOM = "#{A_TEXT}+"                                                     # Atom            = 1*atext
+      DOT_STRING = "#{ATOM}(\\.#{ATOM})*"                                     # Dot-string      = Atom *("."  Atom)
+      LOCAL_PART = "#{DOT_STRING}|#{QUOTED_STRING}"                           # Local-part      = Dot-string / Quoted-string
+                                                                              #                 ; MAY be case-sensitive
+                                                                              # IPv4-address-literal  = Snum 3("."  Snum)
+      # using `valid_id?` to check ip addresses because it's complicated.     # IPv6-address-literal  = "IPv6:" IPv6-addr
+      ADDRESS_LITERAL = '\[(IPv6:(?<ipv6>[\h:]+)|(?<ipv4>[\d.]+))\]'          # address-literal = "[" ( IPv4-address-literal /
+                                                                              #                 IPv6-address-literal /
+                                                                              #                 General-address-literal ) "]"
+                                                                              #                 ; See Section 4.1.3
+      # using `valid_hostname?` to check domain because it's complicated
+      MAILBOX = "(#{LOCAL_PART})@(#{ADDRESS_LITERAL}|(?<domain>.+))"          # Mailbox         = Local-part "@" ( Domain / address-literal )
+      EMAIL_REGEX = /\A#{MAILBOX}\z/
+
+      def valid_email?(data)
+        return false unless match = EMAIL_REGEX.match(data)
+        if ipv4 = match.named_captures.fetch('ipv4')
+          valid_ip?(ipv4, Socket::AF_INET)
+        elsif ipv6 = match.named_captures.fetch('ipv6')
+          valid_ip?(ipv6, Socket::AF_INET6)
+        else
+          valid_hostname?(match.named_captures.fetch('domain'))
+        end
+      end
+    end
+  end
+end

data/lib/json_schemer/format.rb

@@ -1,11 +1,10 @@
 # frozen_string_literal: true
 module JSONSchemer
   module Format
+    include Email
     include Hostname
     include URITemplate
 
-    # this is no good
-    EMAIL_REGEX = /\A[^@\s]+@([\p{L}\d-]+\.)+[\p{L}\d\-]{2,}\z/i.freeze
     JSON_POINTER_REGEX_STRING = '(\/([^~\/]|~[01])*)*'
     JSON_POINTER_REGEX = /\A#{JSON_POINTER_REGEX_STRING}\z/.freeze
     RELATIVE_JSON_POINTER_REGEX = /\A(0|[1-9]\d*)(#|#{JSON_POINTER_REGEX_STRING})?\z/.freeze
@@ -66,18 +65,12 @@ 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
     end
 
-    def valid_email?(data)
-      return false unless EMAIL_REGEX.match?(data)
-      local, _domain = data.partition('@')
-      !local.start_with?('.') && !local.end_with?('.') && !local.include?('..')
-    end
-
     def valid_ip?(data, family)
       IPAddr.new(data, family)
       IP_REGEX.match?(data)

data/lib/json_schemer/schema/base.rb

@@ -324,16 +324,16 @@ module JSONSchemer
           ref_uri.fragment = nil
         end
 
-        ref_object = if ids.key?(ref_uri) || ref_uri.to_s == @base_uri.to_s
+        ref_object = if ids.key?(ref_uri) || ref_uri.to_s.empty? || ref_uri.to_s == @base_uri.to_s
           self
         else
           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
@@ -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.1'
+  VERSION = '1.0.3'
 end

data/lib/json_schemer.rb

@@ -16,6 +16,7 @@ require 'simpleidn'
 require 'json_schemer/version'
 require 'json_schemer/format/hostname'
 require 'json_schemer/format/uri_template'
+require 'json_schemer/format/email'
 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.1
+  version: 1.0.3
 platform: ruby
 authors:
 - David Harsha
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-05-27 00:00:00.000000000 Z
+date: 2023-06-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -135,6 +135,7 @@ files:
 - lib/json_schemer/ecma_regexp.rb
 - lib/json_schemer/errors.rb
 - lib/json_schemer/format.rb
+- lib/json_schemer/format/email.rb
 - lib/json_schemer/format/hostname.rb
 - lib/json_schemer/format/uri_template.rb
 - lib/json_schemer/schema/base.rb