json-schema 2.8.0 → 2.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 598f5a11313e53a8a719936d8bbe08bddb6d07b3
-  data.tar.gz: d9a1cde316718f0fdfd042f737bcb3d1b637d313
+SHA256:
+  metadata.gz: 3361b9ea49eb9e208babcec94973eb5efd0d371c2a2cbab16cca9e6555b11b77
+  data.tar.gz: 82f4c4d50b75db5d379555c76ca2606580c14d74a0ec5088504cfb5f5025e1ed
 SHA512:
-  metadata.gz: e28327d9e15a145572c347c2124a9645a4e303cbad1641dde72dad47536f2071eb0fcc9628b439bb24d6f109cf1fd146d8cba2728236d2a88717a29db20fe875
-  data.tar.gz: b414849b2f9e74d7bfcfb0198ff11739caeb08eebd4929a5bd6e445b1a89c3b79c916b453f2c3d9cde05719f997e5b6eac0835534cbacc2bdb9016c296c8228f
+  metadata.gz: 5040893a974d35c4e9833076d8db0073215fdc6330535a4ae7c7d3eef3bdfd902e3642ed5bd9729735b65d8821e30db2b563411d4fd6cf0187c6efe2a4179669
+  data.tar.gz: 9161d768e8829faafefeabf7723c462019831393d4c696ccbc9b7f7be9f5affcc988cf93a2ce1709ea1b6cddd70230fa44815cd4a3e965b7c15ea65b2b0c3de2

data/README.md

@@ -375,6 +375,33 @@ schema = {
 errors = JSON::Validator.fully_validate(schema, {"a" => "23"})
 ```
 
+Validating a JSON Schema
+------------------------
+
+To validate that a JSON Schema conforms to the JSON Schema standard,
+you need to validate your schema against the metaschema for the appropriate
+JSON Schema Draft. All of the normal validation methods can be used
+for this. First retrieve the appropriate metaschema from the internal
+cache (using `JSON::Validator.validator_for_name()` or
+`JSON::Validator.validator_for_uri()`) and then simply validate your
+schema against it.
+
+
+```ruby
+require "json-schema"
+
+schema = {
+  "type" => "object",
+  "properties" => {
+    "a" => {"type" => "integer"}
+  }
+}
+
+metaschema = JSON::Validator.validator_for_name("draft4").metaschema
+# => true
+JSON::Validator.validate(metaschema, schema)
+```
+
 Controlling Remote Schema Reading
 ---------------------------------
 

data/lib/json-schema.rb

@@ -14,6 +14,5 @@ require 'json-schema/schema'
 require 'json-schema/schema/reader'
 require 'json-schema/validator'
 
-Dir[File.join(File.dirname(__FILE__), "json-schema/attributes/*.rb")].each {|file| require file }
-Dir[File.join(File.dirname(__FILE__), "json-schema/attributes/formats/*.rb")].each {|file| require file }
+Dir[File.join(File.dirname(__FILE__), "json-schema/attributes/**/*.rb")].each {|file| require file }
 Dir[File.join(File.dirname(__FILE__), "json-schema/validators/*.rb")].sort!.each {|file| require file }

data/lib/json-schema/attributes/dependencies.rb

@@ -34,11 +34,5 @@ module JSON
         value.is_a?(String) || value.is_a?(Array) || value.is_a?(Hash)
       end
     end
-
-    class DependenciesV4Attribute < DependenciesAttribute
-      def self.accept_value?(value)
-        value.is_a?(Array) || value.is_a?(Hash)
-      end
-    end
   end
 end

data/lib/json-schema/attributes/dependencies_v4.rb

@@ -0,0 +1,11 @@
+require 'json-schema/attributes/dependencies'
+
+module JSON
+  class Schema
+    class DependenciesV4Attribute < DependenciesAttribute
+      def self.accept_value?(value)
+        value.is_a?(Array) || value.is_a?(Hash)
+      end
+    end
+  end
+end

data/lib/json-schema/attributes/divisibleby.rb

@@ -12,7 +12,7 @@ module JSON
 
         factor = current_schema.schema[keyword]
 
-        if factor == 0 || factor == 0.0 || (BigDecimal.new(data.to_s) % BigDecimal.new(factor.to_s)).to_f != 0
+        if factor == 0 || factor == 0.0 || (BigDecimal(data.to_s) % BigDecimal(factor.to_s)).to_f != 0
           message = "The property '#{build_fragment(fragments)}' was not divisible by #{factor}"
           validation_error(processor, message, fragments, current_schema, self, options[:record_errors])
         end

data/lib/json-schema/attributes/formats/custom.rb

@@ -1,4 +1,4 @@
-require 'json-schema/attribute'
+require 'json-schema/attributes/format'
 require 'json-schema/errors/custom_format_error'
 
 module JSON

data/lib/json-schema/attributes/formats/date.rb

@@ -1,4 +1,4 @@
-require 'json-schema/attribute'
+require 'json-schema/attributes/format'
 
 module JSON
   class Schema

data/lib/json-schema/attributes/formats/date_time.rb

@@ -1,4 +1,4 @@
-require 'json-schema/attribute'
+require 'json-schema/attributes/format'
 
 module JSON
   class Schema

data/lib/json-schema/attributes/formats/date_time_v4.rb

@@ -1,4 +1,4 @@
-require 'json-schema/attribute'
+require 'json-schema/attributes/format'
 
 module JSON
   class Schema

data/lib/json-schema/attributes/formats/time.rb

@@ -1,4 +1,4 @@
-require 'json-schema/attribute'
+require 'json-schema/attributes/format'
 
 module JSON
   class Schema

data/lib/json-schema/attributes/formats/uri.rb

@@ -1,4 +1,4 @@
-require 'json-schema/attribute'
+require 'json-schema/attributes/format'
 require 'json-schema/errors/uri_error'
 
 module JSON

data/lib/json-schema/attributes/limit.rb

@@ -48,132 +48,5 @@ module JSON
         raise NotImplementedError
       end
     end
-
-    class MinLengthAttribute < LimitAttribute
-      def self.acceptable_type
-        String
-      end
-
-      def self.limit_name
-        'minLength'
-      end
-
-      def self.error_message(schema)
-        "was not of a minimum string length of #{limit(schema)}"
-      end
-
-      def self.value(data)
-        data.length
-      end
-    end
-
-    class MaxLengthAttribute < MinLengthAttribute
-      def self.limit_name
-        'maxLength'
-      end
-
-      def self.error_message(schema)
-        "was not of a maximum string length of #{limit(schema)}"
-      end
-    end
-
-    class MinItemsAttribute < LimitAttribute
-      def self.acceptable_type
-        Array
-      end
-
-      def self.value(data)
-        data.length
-      end
-
-      def self.limit_name
-        'minItems'
-      end
-
-      def self.error_message(schema)
-        "did not contain a minimum number of items #{limit(schema)}"
-      end
-    end
-
-    class MaxItemsAttribute < MinItemsAttribute
-      def self.limit_name
-        'maxItems'
-      end
-
-      def self.error_message(schema)
-        "had more items than the allowed #{limit(schema)}"
-      end
-    end
-
-    class MinPropertiesAttribute < LimitAttribute
-      def self.acceptable_type
-        Hash
-      end
-
-      def self.value(data)
-        data.size
-      end
-
-      def self.limit_name
-        'minProperties'
-      end
-
-      def self.error_message(schema)
-        "did not contain a minimum number of properties #{limit(schema)}"
-      end
-    end
-
-    class MaxPropertiesAttribute < MinPropertiesAttribute
-      def self.limit_name
-        'maxProperties'
-      end
-
-      def self.error_message(schema)
-        "had more properties than the allowed #{limit(schema)}"
-      end
-    end
-
-    class NumericLimitAttribute < LimitAttribute
-      def self.acceptable_type
-        Numeric
-      end
-
-      def self.error_message(schema)
-        exclusivity = exclusive?(schema) ? 'exclusively' : 'inclusively'
-        format("did not have a %s value of %s, %s", limit_name, limit(schema), exclusivity)
-      end
-    end
-
-    class MaximumAttribute < NumericLimitAttribute
-      def self.limit_name
-        'maximum'
-      end
-
-      def self.exclusive?(schema)
-        schema['exclusiveMaximum']
-      end
-    end
-
-    class MaximumInclusiveAttribute < MaximumAttribute
-      def self.exclusive?(schema)
-        schema['maximumCanEqual'] == false
-      end
-    end
-
-    class MinimumAttribute < NumericLimitAttribute
-      def self.limit_name
-        'minimum'
-      end
-
-      def self.exclusive?(schema)
-        schema['exclusiveMinimum']
-      end
-    end
-
-    class MinimumInclusiveAttribute < MinimumAttribute
-      def self.exclusive?(schema)
-        schema['minimumCanEqual'] == false
-      end
-    end
   end
 end

data/lib/json-schema/attributes/limits/items.rb

@@ -0,0 +1,15 @@
+require 'json-schema/attributes/limit'
+
+module JSON
+  class Schema
+    class ItemsLimitAttribute < LimitAttribute
+      def self.acceptable_type
+        Array
+      end
+
+      def self.value(data)
+        data.length
+      end
+    end
+  end
+end

data/lib/json-schema/attributes/limits/length.rb

@@ -0,0 +1,15 @@
+require 'json-schema/attributes/limit'
+
+module JSON
+  class Schema
+    class LengthLimitAttribute < LimitAttribute
+      def self.acceptable_type
+        String
+      end
+
+      def self.value(data)
+        data.length
+      end
+    end
+  end
+end

data/lib/json-schema/attributes/limits/max_items.rb

@@ -0,0 +1,15 @@
+require 'json-schema/attributes/limits/items'
+
+module JSON
+  class Schema
+    class MaxItemsAttribute < ItemsLimitAttribute
+      def self.limit_name
+        'maxItems'
+      end
+
+      def self.error_message(schema)
+        "had more items than the allowed #{limit(schema)}"
+      end
+    end
+  end
+end

data/lib/json-schema/attributes/limits/max_length.rb

@@ -0,0 +1,15 @@
+require 'json-schema/attributes/limits/length'
+
+module JSON
+  class Schema
+    class MaxLengthAttribute < LengthLimitAttribute
+      def self.limit_name
+        'maxLength'
+      end
+
+      def self.error_message(schema)
+        "was not of a maximum string length of #{limit(schema)}"
+      end
+    end
+  end
+end

data/lib/json-schema/attributes/limits/max_properties.rb

@@ -0,0 +1,15 @@
+require 'json-schema/attributes/limits/properties'
+
+module JSON
+  class Schema
+    class MaxPropertiesAttribute < PropertiesLimitAttribute
+      def self.limit_name
+        'maxProperties'
+      end
+
+      def self.error_message(schema)
+        "had more properties than the allowed #{limit(schema)}"
+      end
+    end
+  end
+end

data/lib/json-schema/attributes/limits/maximum.rb

@@ -0,0 +1,15 @@
+require 'json-schema/attributes/limits/numeric'
+
+module JSON
+  class Schema
+    class MaximumAttribute < NumericLimitAttribute
+      def self.limit_name
+        'maximum'
+      end
+
+      def self.exclusive?(schema)
+        schema['exclusiveMaximum']
+      end
+    end
+  end
+end

data/lib/json-schema/attributes/limits/maximum_inclusive.rb

@@ -0,0 +1,11 @@
+require 'json-schema/attributes/limits/maximum'
+
+module JSON
+  class Schema
+    class MaximumInclusiveAttribute < MaximumAttribute
+      def self.exclusive?(schema)
+        schema['maximumCanEqual'] == false
+      end
+    end
+  end
+end

data/lib/json-schema/attributes/limits/min_items.rb

@@ -0,0 +1,15 @@
+require 'json-schema/attributes/limits/items'
+
+module JSON
+  class Schema
+    class MinItemsAttribute < ItemsLimitAttribute
+      def self.limit_name
+        'minItems'
+      end
+
+      def self.error_message(schema)
+        "did not contain a minimum number of items #{limit(schema)}"
+      end
+    end
+  end
+end

data/lib/json-schema/attributes/limits/min_length.rb

@@ -0,0 +1,15 @@
+require 'json-schema/attributes/limits/length'
+
+module JSON
+  class Schema
+    class MinLengthAttribute < LengthLimitAttribute
+      def self.limit_name
+        'minLength'
+      end
+
+      def self.error_message(schema)
+        "was not of a minimum string length of #{limit(schema)}"
+      end
+    end
+  end
+end

data/lib/json-schema/attributes/limits/min_properties.rb

@@ -0,0 +1,15 @@
+require 'json-schema/attributes/limits/properties'
+
+module JSON
+  class Schema
+    class MinPropertiesAttribute < PropertiesLimitAttribute
+      def self.limit_name
+        'minProperties'
+      end
+
+      def self.error_message(schema)
+        "did not contain a minimum number of properties #{limit(schema)}"
+      end
+    end
+  end
+end

data/lib/json-schema/attributes/limits/minimum.rb

@@ -0,0 +1,15 @@
+require 'json-schema/attributes/limits/numeric'
+
+module JSON
+  class Schema
+    class MinimumAttribute < NumericLimitAttribute
+      def self.limit_name
+        'minimum'
+      end
+
+      def self.exclusive?(schema)
+        schema['exclusiveMinimum']
+      end
+    end
+  end
+end

data/lib/json-schema/attributes/limits/minimum_inclusive.rb

@@ -0,0 +1,11 @@
+require 'json-schema/attributes/limits/minimum'
+
+module JSON
+  class Schema
+    class MinimumInclusiveAttribute < MinimumAttribute
+      def self.exclusive?(schema)
+        schema['minimumCanEqual'] == false
+      end
+    end
+  end
+end

data/lib/json-schema/attributes/limits/numeric.rb

@@ -0,0 +1,16 @@
+require 'json-schema/attributes/limit'
+
+module JSON
+  class Schema
+    class NumericLimitAttribute < LimitAttribute
+      def self.acceptable_type
+        Numeric
+      end
+
+      def self.error_message(schema)
+        exclusivity = exclusive?(schema) ? 'exclusively' : 'inclusively'
+        format("did not have a %s value of %s, %s", limit_name, limit(schema), exclusivity)
+      end
+    end
+  end
+end

data/lib/json-schema/attributes/limits/properties.rb

@@ -0,0 +1,15 @@
+require 'json-schema/attributes/limit'
+
+module JSON
+  class Schema
+    class PropertiesLimitAttribute < LimitAttribute
+      def self.acceptable_type
+        Hash
+      end
+
+      def self.value(data)
+        data.size
+      end
+    end
+  end
+end

data/lib/json-schema/attributes/properties.rb

@@ -62,13 +62,5 @@ module JSON
         end
       end
     end
-
-    class PropertiesV4Attribute < PropertiesAttribute
-      # draft4 relies on its own RequiredAttribute validation at a higher level, rather than
-      # as an attribute of individual properties.
-      def self.required?(schema, options)
-        options[:strict] == true
-      end
-    end
   end
 end

data/lib/json-schema/attributes/properties_v4.rb

@@ -0,0 +1,13 @@
+require 'json-schema/attributes/properties'
+
+module JSON
+  class Schema
+    class PropertiesV4Attribute < PropertiesAttribute
+      # draft4 relies on its own RequiredAttribute validation at a higher level, rather than
+      # as an attribute of individual properties.
+      def self.required?(schema, options)
+        options[:strict] == true
+      end
+    end
+  end
+end

data/lib/json-schema/validator.rb

@@ -103,6 +103,8 @@ module JSON
 
       if @options[:list]
         base_schema.to_array_schema
+      elsif base_schema.is_a?(Hash)
+        JSON::Schema.new(base_schema, schema_uri, @options[:version])
       else
         base_schema
       end
@@ -578,7 +580,7 @@ module JSON
             begin
               json_uri = Util::URI.normalized_uri(data)
               data = self.class.parse(custom_open(json_uri))
-            rescue JSON::Schema::JsonLoadError
+            rescue JSON::Schema::JsonLoadError, JSON::Schema::UriError
               # Silently discard the error - use the data as-is
             end
           end

data/lib/json-schema/validators/draft6.rb

@@ -43,8 +43,8 @@ module JSON
           'uri' => UriFormat
         }
         @formats = @default_formats.clone
-        @uri = JSON::Util::URI.parse("http://json-schema.org/draft-06/schema#")
-        @names = ["draft6", "http://json-schema.org/draft-06/schema#"]
+        @uri = JSON::Util::URI.parse("http://json-schema.org/draft/schema#")
+        @names = ["draft6", "http://json-schema.org/draft/schema#"]
         @metaschema_name = "draft-06.json"
       end
 

data/resources/draft-06.json

@@ -1,7 +1,7 @@
 {
-    "id": "http://json-schema.org/draft-06/schema#",
-    "$schema": "http://json-schema.org/draft-06/schema#",
-    "description": "Core schema meta-schema",
+    "$schema": "http://json-schema.org/draft/schema#",
+    "$id": "http://json-schema.org/draft/schema#",
+    "title": "Core schema meta-schema",
     "definitions": {
         "schemaArray": {
             "type": "array",
@@ -13,28 +13,43 @@
             "minimum": 0
         },
         "positiveIntegerDefault0": {
-            "allOf": [ { "$ref": "#/definitions/positiveInteger" }, { "default": 0 } ]
+            "allOf": [
+                { "$ref": "#/definitions/positiveInteger" },
+                { "default": 0 }
+            ]
         },
         "simpleTypes": {
-            "enum": [ "array", "boolean", "integer", "null", "number", "object", "string" ]
+            "enum": [
+                "array",
+                "boolean",
+                "integer",
+                "null",
+                "number",
+                "object",
+                "string"
+            ]
         },
         "stringArray": {
             "type": "array",
             "items": { "type": "string" },
-            "minItems": 1,
-            "uniqueItems": true
+            "uniqueItems": true,
+            "defaultItems": []
         }
     },
-    "type": "object",
+    "type": ["object", "boolean"],
     "properties": {
-        "id": {
+        "$id": {
             "type": "string",
-            "format": "uri"
+            "format": "uri-reference"
         },
         "$schema": {
             "type": "string",
             "format": "uri"
         },
+        "$ref": {
+            "type": "string",
+            "format": "uri-reference"
+        },
         "title": {
             "type": "string"
         },
@@ -44,22 +59,19 @@
         "default": {},
         "multipleOf": {
             "type": "number",
-            "minimum": 0,
-            "exclusiveMinimum": true
+            "exclusiveMinimum": 0
         },
         "maximum": {
             "type": "number"
         },
         "exclusiveMaximum": {
-            "type": "boolean",
-            "default": false
+            "type": "number"
         },
         "minimum": {
             "type": "number"
         },
         "exclusiveMinimum": {
-            "type": "boolean",
-            "default": false
+            "type": "number"
         },
         "maxLength": { "$ref": "#/definitions/positiveInteger" },
         "minLength": { "$ref": "#/definitions/positiveIntegerDefault0" },
@@ -67,13 +79,7 @@
             "type": "string",
             "format": "regex"
         },
-        "additionalItems": {
-            "anyOf": [
-                { "type": "boolean" },
-                { "$ref": "#" }
-            ],
-            "default": {}
-        },
+        "additionalItems": { "$ref": "#" },
         "items": {
             "anyOf": [
                 { "$ref": "#" },
@@ -87,16 +93,11 @@
             "type": "boolean",
             "default": false
         },
+        "contains": { "$ref": "#" },
         "maxProperties": { "$ref": "#/definitions/positiveInteger" },
         "minProperties": { "$ref": "#/definitions/positiveIntegerDefault0" },
         "required": { "$ref": "#/definitions/stringArray" },
-        "additionalProperties": {
-            "anyOf": [
-                { "type": "boolean" },
-                { "$ref": "#" }
-            ],
-            "default": {}
-        },
+        "additionalProperties": { "$ref": "#" },
         "definitions": {
             "type": "object",
             "additionalProperties": { "$ref": "#" },
@@ -121,6 +122,8 @@
                 ]
             }
         },
+        "propertyNames": { "$ref": "#" },
+        "const": {},
         "enum": {
             "type": "array",
             "minItems": 1,
@@ -137,14 +140,11 @@
                 }
             ]
         },
+        "format": { "type": "string" },
         "allOf": { "$ref": "#/definitions/schemaArray" },
         "anyOf": { "$ref": "#/definitions/schemaArray" },
         "oneOf": { "$ref": "#/definitions/schemaArray" },
         "not": { "$ref": "#" }
     },
-    "dependencies": {
-        "exclusiveMaximum": [ "maximum" ],
-        "exclusiveMinimum": [ "minimum" ]
-    },
     "default": {}
 }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: json-schema
 version: !ruby/object:Gem::Version
-  version: 2.8.0
+  version: 2.8.1
 platform: ruby
 authors:
 - Kenny Hoxworth
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-07 00:00:00.000000000 Z
+date: 2018-10-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -97,6 +97,7 @@ files:
 - lib/json-schema/attributes/allof.rb
 - lib/json-schema/attributes/anyof.rb
 - lib/json-schema/attributes/dependencies.rb
+- lib/json-schema/attributes/dependencies_v4.rb
 - lib/json-schema/attributes/disallow.rb
 - lib/json-schema/attributes/divisibleby.rb
 - lib/json-schema/attributes/enum.rb
@@ -111,6 +112,20 @@ files:
 - lib/json-schema/attributes/formats/uri.rb
 - lib/json-schema/attributes/items.rb
 - lib/json-schema/attributes/limit.rb
+- lib/json-schema/attributes/limits/items.rb
+- lib/json-schema/attributes/limits/length.rb
+- lib/json-schema/attributes/limits/max_items.rb
+- lib/json-schema/attributes/limits/max_length.rb
+- lib/json-schema/attributes/limits/max_properties.rb
+- lib/json-schema/attributes/limits/maximum.rb
+- lib/json-schema/attributes/limits/maximum_inclusive.rb
+- lib/json-schema/attributes/limits/min_items.rb
+- lib/json-schema/attributes/limits/min_length.rb
+- lib/json-schema/attributes/limits/min_properties.rb
+- lib/json-schema/attributes/limits/minimum.rb
+- lib/json-schema/attributes/limits/minimum_inclusive.rb
+- lib/json-schema/attributes/limits/numeric.rb
+- lib/json-schema/attributes/limits/properties.rb
 - lib/json-schema/attributes/maxdecimal.rb
 - lib/json-schema/attributes/multipleof.rb
 - lib/json-schema/attributes/not.rb
@@ -119,6 +134,7 @@ files:
 - lib/json-schema/attributes/patternproperties.rb
 - lib/json-schema/attributes/properties.rb
 - lib/json-schema/attributes/properties_optional.rb
+- lib/json-schema/attributes/properties_v4.rb
 - lib/json-schema/attributes/ref.rb
 - lib/json-schema/attributes/required.rb
 - lib/json-schema/attributes/type.rb
@@ -173,7 +189,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '1.8'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Ruby JSON Schema Validator