json_schemer 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0a14b7cec8b7dd7aa1b10acb4e47445fdd66ea218862c1f40f65221e789d0fdb
-  data.tar.gz: 8d84709159df2cfdafdef42cd9bcc982644b89713857faad3ff563a74f4ef937
+  metadata.gz: f44b977f6f07e9dfbb34d58681bc0b22059143bc761364b8c8edb81b5ba7fb16
+  data.tar.gz: f606d14d205b33bb4f1c221cb6526e79afee01d965d61883763c8f516fabd69e
 SHA512:
-  metadata.gz: '09cad7b2683c64f022ed697239c0083882efd769a292561ce2b3027dc5162831036faa9161572a8d8e9f3248e169acc76658fedfbcd42df5d92df787e5612ad4'
-  data.tar.gz: 181f8e84068f344a9f662952592eb283a820363dba4e2162af42bcd9dc8313d9d4591bb43faafa9a6a46ebf420a1af27aa17df1fea73d107a59bf22e16d90661
+  metadata.gz: 046d14ee062722084b3b7954c488b6e86ba89b5ba112879b53ecf173c3c969d183ec4baa381c2f30eca61f6595fbe199337cff5ecfbb4eb7226d1f662d4b80e9
+  data.tar.gz: 684807637dc7510c868fc173716a1846c35368db792bd8fa1a8e2de605d3e58901df668b451567610294bd989ea057a6fb28e02bd59c2bd4d1df0b4f7571d629

data/Gemfile.lock

@@ -1,27 +1,19 @@
 PATH
   remote: .
   specs:
-    json_schemer (0.1.0)
+    json_schemer (0.1.1)
       ecma-re-validator (~> 0.1.2)
       hana (~> 1.3.3)
-      rdf (~> 3.0.1)
       uri_template (~> 0.7.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    concurrent-ruby (1.0.5)
     ecma-re-validator (0.1.2)
       regexp_parser (~> 0.2)
-    hamster (3.0.0)
-      concurrent-ruby (~> 1.0)
     hana (1.3.3)
-    link_header (0.0.8)
     minitest (5.11.1)
     rake (10.5.0)
-    rdf (3.0.1)
-      hamster (~> 3.0)
-      link_header (~> 0.0, >= 0.0.8)
     regexp_parser (0.4.9)
     uri_template (0.7.0)
 

data/json_schemer.gemspec

@@ -24,8 +24,14 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "minitest", "~> 5.0"
 
+  # spec.add_development_dependency "benchmark-ips", "~> 2.7.2"
+  # spec.add_development_dependency "jschema", "~> 0.2.1"
+  # spec.add_development_dependency "json-schema", "~> 2.8.0"
+  # spec.add_development_dependency "json_schema", "~> 0.17.0"
+  # spec.add_development_dependency "json_validation", "~> 0.1.0"
+  # spec.add_development_dependency "jsonschema", "~> 2.0.2"
+
   spec.add_runtime_dependency "ecma-re-validator", "~> 0.1.2"
   spec.add_runtime_dependency "hana", "~> 1.3.3"
-  spec.add_runtime_dependency "rdf", "~> 3.0.1"
   spec.add_runtime_dependency "uri_template", "~> 0.7.0"
 end

data/lib/json_schemer.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require "json_schemer/version"
+require "json_schemer/format"
 
 require "base64"
 require "ecma-re-validator"
@@ -8,7 +9,6 @@ require "hana"
 require "ipaddr"
 require "json"
 require 'net/http'
-require "rdf"
 require "time"
 require "uri"
 require "uri_template"
@@ -16,13 +16,6 @@ require "uri_template"
 module JSONSchemer
   class Schema
     BOOLEANS = Set[true, false].freeze
-    # 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}])?'
-    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
-    RELATIVE_JSON_POINTER_REGEX = /\A(0|[1-9]\d*)(#|#{JSON_POINTER_REGEX_STRING})?\z/.freeze
 
     def initialize(schema)
       @root = schema
@@ -215,7 +208,7 @@ module JSONSchemer
 
       yield error(data, schema, pointer, 'maxLength') if max_length && data.size > max_length
       yield error(data, schema, pointer, 'minLength') if min_length && data.size < min_length
-      yield error(data, schema, pointer, 'pattern') if pattern && !Regexp.new(pattern).match?(data)
+      yield error(data, schema, pointer, 'pattern') if pattern && Regexp.new(pattern) !~ data
 
       validate_string_format(data, schema, pointer, format, &Proc.new) if format
 
@@ -252,9 +245,9 @@ module JSONSchemer
       when 'time'
         valid_date_time?("2001-02-03T#{data}")
       when 'email'
-        data.ascii_only? && EMAIL_REGEX.match?(data)
+        data.ascii_only? && valid_email?(data)
       when 'idn-email'
-        EMAIL_REGEX.match?(data)
+        valid_email?(data)
       when 'hostname'
         data.ascii_only? && valid_hostname?(data)
       when 'idn-hostname'
@@ -264,19 +257,19 @@ module JSONSchemer
       when 'ipv6'
         valid_ip?(data, :v6)
       when 'uri'
-        data.ascii_only? && RDF::URI::IRI.match?(data)
+        data.ascii_only? && valid_iri?(data)
       when 'uri-reference'
-        data.ascii_only? && (RDF::URI::IRI.match?(data) || RDF::URI::IRELATIVE_REF.match?(data))
+        data.ascii_only? && (valid_iri?(data) || valid_iri_reference?(data))
       when 'iri'
-        RDF::URI::IRI.match?(data)
+        valid_iri?(data)
       when 'iri-reference'
-        RDF::URI::IRI.match?(data) || RDF::URI::IRELATIVE_REF.match?(data)
+        valid_iri?(data) || valid_iri_reference?(data)
       when 'uri-template'
         valid_uri_template?(data)
       when 'json-pointer'
         valid_json_pointer?(data)
       when 'relative-json-pointer'
-        RELATIVE_JSON_POINTER_REGEX.match?(data)
+        valid_relative_json_pointer?(data)
       when 'regex'
         EcmaReValidator.valid?(data)
       end
@@ -361,7 +354,7 @@ module JSONSchemer
             [Regexp.new(pattern), property_schema]
           end
           regex_pattern_properties.each do |regex, property_schema|
-            if regex.match?(key)
+            if regex =~ key
               validate(value, property_schema, "#{pointer}/#{key}", parent_uri, &block)
               matched_key = true
             end
@@ -398,8 +391,12 @@ module JSONSchemer
       false
     end
 
+    def valid_email?(data)
+      !!(Format::EMAIL_REGEX =~ data)
+    end
+
     def valid_hostname?(data)
-      HOSTNAME_REGEX.match?(data) && data.split('.').all? { |label| label.size <= 63 }
+      !!(Format::HOSTNAME_REGEX =~ data && data.split('.').all? { |label| label.size <= 63 })
     end
 
     def valid_ip?(data, type)
@@ -409,6 +406,14 @@ module JSONSchemer
       false
     end
 
+    def valid_iri?(data)
+      !!(Format::IRI =~ data)
+    end
+
+    def valid_iri_reference?(data)
+      !!(Format::IRELATIVE_REF =~ data)
+    end
+
     def valid_uri_template?(data)
       URITemplate.new(data)
       true
@@ -417,7 +422,11 @@ module JSONSchemer
     end
 
     def valid_json_pointer?(data)
-      JSON_POINTER_REGEX.match?(data)
+      !!(Format::JSON_POINTER_REGEX =~ data)
+    end
+
+    def valid_relative_json_pointer?(data)
+      !!(Format::RELATIVE_JSON_POINTER_REGEX =~ data)
     end
 
     def join_uri(a, b)

data/lib/json_schemer/format.rb

@@ -0,0 +1,61 @@
+# frozen_string_literal: true
+
+module JSONSchemer::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}])?'
+  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
+  RELATIVE_JSON_POINTER_REGEX = /\A(0|[1-9]\d*)(#|#{JSON_POINTER_REGEX_STRING})?\z/.freeze
+
+  # https://github.com/ruby-rdf/rdf
+
+  # IRI components
+  UCSCHAR = Regexp.compile(<<-EOS.gsub(/\s+/, ''))
+    [\\u00A0-\\uD7FF]|[\\uF900-\\uFDCF]|[\\uFDF0-\\uFFEF]|
+    [\\u{10000}-\\u{1FFFD}]|[\\u{20000}-\\u{2FFFD}]|[\\u{30000}-\\u{3FFFD}]|
+    [\\u{40000}-\\u{4FFFD}]|[\\u{50000}-\\u{5FFFD}]|[\\u{60000}-\\u{6FFFD}]|
+    [\\u{70000}-\\u{7FFFD}]|[\\u{80000}-\\u{8FFFD}]|[\\u{90000}-\\u{9FFFD}]|
+    [\\u{A0000}-\\u{AFFFD}]|[\\u{B0000}-\\u{BFFFD}]|[\\u{C0000}-\\u{CFFFD}]|
+    [\\u{D0000}-\\u{DFFFD}]|[\\u{E1000}-\\u{EFFFD}]
+  EOS
+  IPRIVATE = Regexp.compile("[\\uE000-\\uF8FF]|[\\u{F0000}-\\u{FFFFD}]|[\\u100000-\\u10FFFD]").freeze
+  SCHEME = Regexp.compile("[A-Za-z](?:[A-Za-z0-9+-\.])*").freeze
+  PORT = Regexp.compile("[0-9]*").freeze
+  IP_LITERAL = Regexp.compile("\\[[0-9A-Fa-f:\\.]*\\]").freeze  # Simplified, no IPvFuture
+  PCT_ENCODED = Regexp.compile("%[0-9A-Fa-f][0-9A-Fa-f]").freeze
+  GEN_DELIMS = Regexp.compile("[:/\\?\\#\\[\\]@]").freeze
+  SUB_DELIMS = Regexp.compile("[!\\$&'\\(\\)\\*\\+,;=]").freeze
+  RESERVED = Regexp.compile("(?:#{GEN_DELIMS}|#{SUB_DELIMS})").freeze
+  UNRESERVED = Regexp.compile("[A-Za-z0-9\._~-]").freeze
+
+  IUNRESERVED = Regexp.compile("[A-Za-z0-9\._~-]|#{UCSCHAR}").freeze
+
+  IPCHAR = Regexp.compile("(?:#{IUNRESERVED}|#{PCT_ENCODED}|#{SUB_DELIMS}|:|@)").freeze
+
+  IQUERY = Regexp.compile("(?:#{IPCHAR}|#{IPRIVATE}|/|\\?)*").freeze
+
+  IFRAGMENT = Regexp.compile("(?:#{IPCHAR}|/|\\?)*").freeze.freeze
+
+  ISEGMENT = Regexp.compile("(?:#{IPCHAR})*").freeze
+  ISEGMENT_NZ = Regexp.compile("(?:#{IPCHAR})+").freeze
+  ISEGMENT_NZ_NC = Regexp.compile("(?:(?:#{IUNRESERVED})|(?:#{PCT_ENCODED})|(?:#{SUB_DELIMS})|@)+").freeze
+
+  IPATH_ABEMPTY = Regexp.compile("(?:/#{ISEGMENT})*").freeze
+  IPATH_ABSOLUTE = Regexp.compile("/(?:(?:#{ISEGMENT_NZ})(/#{ISEGMENT})*)?").freeze
+  IPATH_NOSCHEME = Regexp.compile("(?:#{ISEGMENT_NZ_NC})(?:/#{ISEGMENT})*").freeze
+  IPATH_ROOTLESS = Regexp.compile("(?:#{ISEGMENT_NZ})(?:/#{ISEGMENT})*").freeze
+  IPATH_EMPTY = Regexp.compile("").freeze
+
+  IREG_NAME   = Regexp.compile("(?:(?:#{IUNRESERVED})|(?:#{PCT_ENCODED})|(?:#{SUB_DELIMS}))*").freeze
+  IHOST = Regexp.compile("(?:#{IP_LITERAL})|(?:#{IREG_NAME})").freeze
+  IUSERINFO = Regexp.compile("(?:(?:#{IUNRESERVED})|(?:#{PCT_ENCODED})|(?:#{SUB_DELIMS})|:)*").freeze
+  IAUTHORITY = Regexp.compile("(?:#{IUSERINFO}@)?#{IHOST}(?::#{PORT})?").freeze
+
+  IRELATIVE_PART = Regexp.compile("(?:(?://#{IAUTHORITY}(?:#{IPATH_ABEMPTY}))|(?:#{IPATH_ABSOLUTE})|(?:#{IPATH_NOSCHEME})|(?:#{IPATH_EMPTY}))").freeze
+  IRELATIVE_REF = Regexp.compile("^#{IRELATIVE_PART}(?:\\?#{IQUERY})?(?:\\##{IFRAGMENT})?$").freeze
+
+  IHIER_PART = Regexp.compile("(?:(?://#{IAUTHORITY}#{IPATH_ABEMPTY})|(?:#{IPATH_ABSOLUTE})|(?:#{IPATH_ROOTLESS})|(?:#{IPATH_EMPTY}))").freeze
+  IRI = Regexp.compile("^#{SCHEME}:(?:#{IHIER_PART})(?:\\?#{IQUERY})?(?:\\##{IFRAGMENT})?$").freeze
+end

data/lib/json_schemer/version.rb

@@ -1,3 +1,3 @@
 module JSONSchemer
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: json_schemer
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - David Harsha
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-01-23 00:00:00.000000000 Z
+date: 2018-01-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -80,20 +80,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.3.3
-- !ruby/object:Gem::Dependency
-  name: rdf
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 3.0.1
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 3.0.1
 - !ruby/object:Gem::Dependency
   name: uri_template
   requirement: !ruby/object:Gem::Requirement
@@ -127,6 +113,7 @@ files:
 - bin/setup
 - json_schemer.gemspec
 - lib/json_schemer.rb
+- lib/json_schemer/format.rb
 - lib/json_schemer/version.rb
 homepage: https://github.com/davishmcclurg/json_schemer
 licenses: