json_schemer 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b7c6d8c0cfc688eea00cec0ab2a81d5057a721c93a50a575b3b50baa1ab409ba
-  data.tar.gz: afdaa69cadc1be649758a99fd7ea5d9e7035b21271fcdfdf1897d8db82e2187f
+  metadata.gz: 73e909cd3b478fdfd80f7b4cf6f662e2b2089f9e4d36e53545250e08d6108ded
+  data.tar.gz: ce95d5099ca09f52616555570b014c4d4501f4ef3742fb70c06f61846d061aeb
 SHA512:
-  metadata.gz: c5a0cfcb7d8b8a175a7a59b10a5e4435344588bd0a9fe8cbe4ca547309cc4c8a8be9adfef1406077c9919aaf82b62b24401fb8669a00b118513a150556c90a26
-  data.tar.gz: 927134f6cc7158702a3c7b6082aeb7dda435453d3eac8dbd98f5eb52e9aed6ad8165435bbe643781a505fb14f75c012dc921eb9ee9dd4f8fb1df8d3e19eff4ca
+  metadata.gz: 5b6e683f487d15ac6c88bed99e18ef73e949816a980abfe2edf066e2f92831e08d8245c9685104fe6df2d51e00de9b1670909681f1785704faf8adc17ec3ca26
+  data.tar.gz: dc9d610aade61f19a6f168d64945f0c90021548f9ead54bd8a76d9dfae2f0d2aa35c3e534fdd724b087faf8ed318704654dda63eedc531a37be0669e1f46c9e8

data/.travis.yml

@@ -3,8 +3,7 @@ language: ruby
 rvm:
   - 2.6
   - 2.5
-  - 2.3
-  - 2.2
+  - 2.4
 before_install: gem install bundler -v 1.16.1
 before_script:
   - pip install --user Flask

data/Gemfile.lock

@@ -1,11 +1,11 @@
 PATH
   remote: .
   specs:
-    json_schemer (0.2.1)
-      ecma-re-validator (~> 0.2.0)
-      hana (~> 1.3.3)
-      regexp_parser (~> 1.5.0)
-      uri_template (~> 0.7.0)
+    json_schemer (0.2.2)
+      ecma-re-validator (~> 0.2)
+      hana (~> 1.3)
+      regexp_parser (~> 1.5)
+      uri_template (~> 0.7)
 
 GEM
   remote: https://rubygems.org/
@@ -15,7 +15,7 @@ GEM
     hana (1.3.5)
     minitest (5.11.3)
     rake (10.5.0)
-    regexp_parser (1.5.1)
+    regexp_parser (1.6.0)
     uri_template (0.7.0)
 
 PLATFORMS

data/json_schemer.gemspec

@@ -32,8 +32,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.0"
-  spec.add_runtime_dependency "hana", "~> 1.3.3"
-  spec.add_runtime_dependency "uri_template", "~> 0.7.0"
-  spec.add_runtime_dependency "regexp_parser", "~> 1.5.0"
+  spec.add_runtime_dependency "ecma-re-validator", "~> 0.2"
+  spec.add_runtime_dependency "hana", "~> 1.3"
+  spec.add_runtime_dependency "uri_template", "~> 0.7"
+  spec.add_runtime_dependency "regexp_parser", "~> 1.5"
 end

data/lib/json_schemer.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
-
 require 'base64'
+require 'ipaddr'
 require 'json'
 require 'net/http'
 require 'pathname'
@@ -9,7 +9,7 @@ require 'uri'
 
 require 'ecma-re-validator'
 require 'hana'
-require 'ipaddr'
+require 'regexp_parser'
 require 'uri_template'
 
 require 'json_schemer/version'

data/lib/json_schemer/cached_ref_resolver.rb

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-
 module JSONSchemer
   class CachedRefResolver
     def initialize(&ref_resolver)

data/lib/json_schemer/format.rb

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-
 module JSONSchemer
   module Format
     # this is no good
@@ -9,6 +8,7 @@ module JSONSchemer
     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
+    DATE_TIME_OFFSET_REGEX = /(Z|[\+\-]([01][0-9]|2[0-3]):[0-5][0-9])\z/i.freeze
 
     # https://github.com/ruby-rdf/rdf
 
@@ -108,18 +108,18 @@ module JSONSchemer
 
     def valid_date_time?(data)
       DateTime.rfc3339(data)
-      true
+      DATE_TIME_OFFSET_REGEX.match?(data)
     rescue ArgumentError => e
       raise e unless e.message == 'invalid date'
       false
     end
 
     def valid_email?(data)
-      !!(EMAIL_REGEX =~ data)
+      EMAIL_REGEX.match?(data)
     end
 
     def valid_hostname?(data)
-      !!(HOSTNAME_REGEX =~ data && data.split('.').all? { |label| label.size <= 63 })
+      HOSTNAME_REGEX.match?(data) && data.split('.').all? { |label| label.size <= 63 }
     end
 
     def valid_ip?(data, type)
@@ -130,11 +130,11 @@ module JSONSchemer
     end
 
     def valid_iri?(data)
-      !!(IRI =~ data)
+      IRI.match?(data)
     end
 
     def valid_iri_reference?(data)
-      !!(IRELATIVE_REF =~ data)
+      IRELATIVE_REF.match?(data)
     end
 
     def valid_uri_template?(data)
@@ -145,11 +145,11 @@ module JSONSchemer
     end
 
     def valid_json_pointer?(data)
-      !!(JSON_POINTER_REGEX =~ data)
+      JSON_POINTER_REGEX.match?(data)
     end
 
     def valid_relative_json_pointer?(data)
-      !!(RELATIVE_JSON_POINTER_REGEX =~ data)
+      RELATIVE_JSON_POINTER_REGEX.match?(data)
     end
   end
 end

data/lib/json_schemer/schema/base.rb

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-
 module JSONSchemer
   module Schema
     class Base
@@ -506,7 +505,7 @@ module JSONSchemer
               [pattern, ecma_262_regex(pattern), property_schema]
             end
             regex_pattern_properties.each do |pattern, regex, property_schema|
-              if regex =~ key
+              if regex.match?(key)
                 subinstance = instance.merge(
                   data: value,
                   data_pointer: "#{instance.data_pointer}/#{key}",
@@ -552,10 +551,13 @@ module JSONSchemer
       end
 
       def join_uri(a, b)
-        if a && b
+        b = URI.parse(b) if b
+        if a && b && a.relative? && b.relative?
+          b
+        elsif a && b
           URI.join(a, b)
         elsif b
-          URI.parse(b)
+          b
         else
           a
         end

data/lib/json_schemer/schema/draft4.rb

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-
 module JSONSchemer
   module Schema
     class Draft4 < Base

data/lib/json_schemer/schema/draft6.rb

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-
 module JSONSchemer
   module Schema
     class Draft6 < Base

data/lib/json_schemer/schema/draft7.rb

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-
 module JSONSchemer
   module Schema
     class Draft7 < Base

data/lib/json_schemer/version.rb

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-
 module JSONSchemer
-  VERSION = '0.2.1'
+  VERSION = '0.2.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: json_schemer
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - David Harsha
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-07-22 00:00:00.000000000 Z
+date: 2019-08-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -58,56 +58,56 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: '0.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: '0.2'
 - !ruby/object:Gem::Dependency
   name: hana
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.3
+        version: '1.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.3
+        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: uri_template
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.0
+        version: '0.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.0
+        version: '0.7'
 - !ruby/object:Gem::Dependency
   name: regexp_parser
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.5.0
+        version: '1.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.5.0
+        version: '1.5'
 description: 
 email:
 - davishmcclurg@gmail.com