json_schema 0.16.2 → 0.17.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 09b4fb3d188de13d0b3cf40da40e254f7bcd3773
-  data.tar.gz: afb180eca27353b2b0333fa275e187e3761d4b60
+  metadata.gz: 25771d5785cc8f1c249faf54a5cf959c52be83e4
+  data.tar.gz: f7e42165700c051f470a39490af317af95633ba5
 SHA512:
-  metadata.gz: edc47bca46cb7d902ee9214c6e6964ba29e0f581f599c53402178bb4d539d9898bc9a0d3a18e7fac9bfb5dcc85c787199c73b16547d19ae0a72048ff58875c00
-  data.tar.gz: 8e37fd7f32820b37f842332916272092eef00f10880670dc197c158662554172949359fbc2adc42e33814ffd7b26dfef829e4a9d7c16d3f42b5115e99868c606
+  metadata.gz: 447291afc762715084fd14582b23aa8ec113e71ee03ad6750fd2b0a50efecb258064714b74f37814b0a6647e64741566c0f8c5aa02b42282aef95a606f2c6177
+  data.tar.gz: 0c4fa419f94ace1a55a3bd8ec8268ad93704139372868a0cd4c421c72f94c46eafdfa92e1c5b1e9e51dfca27307ce4ef8c9147774eee97e7b58d1d35b40a1bf3

data/lib/json_schema/validator.rb

@@ -567,6 +567,15 @@ module JsonSchema
       "ipv6" => ->(data) { data =~ IPV6_PATTERN },
       "regex" => ->(data) { Regexp.new(data) rescue false },
       "uri" => ->(data) { URI.parse(data) rescue false },
+
+      # From the spec: a string instance is valid URI Reference (either a URI
+      # or a relative-reference), according to RFC3986.
+      #
+      # URI.parse will a handle a relative reference as well as an absolute
+      # one. Really though we should try to make "uri" more restrictive, and
+      # both of these could do to be more robust.
+      "uri-reference" => ->(data) { URI.parse(data) rescue false },
+
       "uuid" => ->(data) { data =~ UUID_PATTERN },
     }.freeze
 

data/test/json_schema/parser_test.rb

@@ -285,7 +285,8 @@ describe JsonSchema::Parser do
     refute parse
     assert_includes error_messages, '"obscure-thing" is not a valid format, ' \
                                     'must be one of date, date-time, email, ' \
-                                    'hostname, ipv4, ipv6, regex, uri, uuid.'
+                                    'hostname, ipv4, ipv6, regex, uri, ' \
+                                    'uri-reference, uuid.'
     assert_includes error_types, :unknown_format
   end
 
@@ -321,8 +322,8 @@ describe JsonSchema::Parser do
     refute parse
     assert_includes error_messages, '"not-a-format" is not a valid format, ' \
                                     'must be one of date, date-time, email, ' \
-                                    'hostname, ipv4, ipv6, regex, uri, uuid, ' \
-                                    'the-answer.'
+                                    'hostname, ipv4, ipv6, regex, uri, ' \
+                                    'uri-reference, uuid, the-answer.'
     assert_includes error_types, :unknown_format
   end
 

data/test/json_schema/validator_test.rb

@@ -867,6 +867,32 @@ describe JsonSchema::Validator do
     assert_includes error_types, :invalid_format
   end
 
+  it "validates absolute uri-reference format successfully" do
+    pointer("#/definitions/app/definitions/owner").merge!(
+      "format" => "uri-reference"
+    )
+    data_sample["owner"] = "https://example.com"
+    assert validate
+  end
+
+  it "validates relative uri format successfully" do
+    pointer("#/definitions/app/definitions/owner").merge!(
+      "format" => "uri"
+    )
+    data_sample["owner"] = "#hello"
+    assert validate
+  end
+
+  it "validates uri format unsuccessfully" do
+    pointer("#/definitions/app/definitions/owner").merge!(
+      "format" => "uri-reference"
+    )
+    data_sample["owner"] = "http://example.com[]"
+    refute validate
+    assert_includes error_messages, %{http://example.com[] is not a valid uri-reference.}
+    assert_includes error_types, :invalid_format
+  end
+
   it "validates uuid format successfully" do
     pointer("#/definitions/app/definitions/owner").merge!(
       "format" => "uuid"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: json_schema
 version: !ruby/object:Gem::Version
-  version: 0.16.2
+  version: 0.17.0
 platform: ruby
 authors:
 - Brandur
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-18 00:00:00.000000000 Z
+date: 2017-09-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ecma-re-validator