json-schema 1.0.8 → 1.0.9

data/README.textile

@@ -18,7 +18,7 @@ From the git repo:
 
 <pre>
 $ gem build json-schema.gemspec
-$ gem install json-schema-1.0.8.gem
+$ gem install json-schema-1.0.9.gem
 </pre>
 
 

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

@@ -1,3 +1,5 @@
+require_relative 'extends'
+
 module JSON
   class Schema
     class AdditionalPropertiesAttribute < Attribute
@@ -5,6 +7,28 @@ module JSON
         if data.is_a?(Hash)
           extra_properties = data.keys
 
+          extra_properties = remove_valid_properties(extra_properties, current_schema, validator)
+
+          addprop= current_schema.schema['additionalProperties']
+          if addprop.is_a?(Hash)
+            matching_properties= extra_properties # & addprop.keys
+            matching_properties.each do |key|
+              schema = JSON::Schema.new(addprop[key] || addprop, current_schema.uri, validator)
+              fragments << key
+              schema.validate(data[key],fragments,options)
+              fragments.pop
+            end
+            extra_properties -= matching_properties
+          end
+          if !extra_properties.empty? and (addprop == false or (addprop.is_a?(Hash) and !addprop.empty?))
+            message = "The property '#{build_fragment(fragments)}' contains additional properties #{extra_properties.inspect} outside of the schema when none are allowed"
+            validation_error(message, fragments, current_schema, self, options[:record_errors])
+          end
+        end
+      end
+
+      def self.remove_valid_properties(extra_properties, current_schema, validator)
+
           if current_schema.schema['properties']
             extra_properties = extra_properties - current_schema.schema['properties'].keys
           end
@@ -21,19 +45,18 @@ module JSON
             end
           end
 
-          if current_schema.schema['additionalProperties'] == false && !extra_properties.empty?
-            message = "The property '#{build_fragment(fragments)}' contains additional properties #{extra_properties.inspect} outside of the schema when none are allowed"
-            validation_error(message, fragments, current_schema, self, options[:record_errors])
-          elsif current_schema.schema['additionalProperties'].is_a?(Hash)
-            extra_properties.each do |key|
-              schema = JSON::Schema.new(current_schema.schema['additionalProperties'],current_schema.uri,validator)
-              fragments << key
-              schema.validate(data[key],fragments,options)
-              fragments.pop
+          if schemas= current_schema.schema['extends']
+            schemas = [schemas] if !schemas.is_a?(Array)
+            schemas.each do |schema_value|
+              temp_uri,extended_schema= JSON::Schema::ExtendsAttribute.get_extended_uri_and_schema(schema_value, current_schema, validator)
+              if extended_schema
+                extra_properties= remove_valid_properties(extra_properties, extended_schema, validator)
+              end
             end
           end
-        end
+
+          extra_properties
       end
     end
   end
-end
+end

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

@@ -1,3 +1,5 @@
+require_relative 'ref'
+
 module JSON
   class Schema
     class ExtendsAttribute < Attribute
@@ -5,63 +7,43 @@ module JSON
         schemas = current_schema.schema['extends']
         schemas = [schemas] if !schemas.is_a?(Array)
         schemas.each do |s|
-          if s.is_a?(Hash)
-            schema = JSON::Schema.new(s,current_schema.uri,validator)
+          uri,schema = get_extended_uri_and_schema(s, current_schema, validator)
+          if schema
             schema.validate(data, fragments, options)
-          elsif s.is_a?(String)
-            temp_uri = URI.parse(s)
-            if temp_uri.relative?
-              temp_uri = current_schema.uri.clone
-              # Check for absolute path
-              path = s.split("#")[0]
-              if path.nil? || path == ''
-                temp_uri.path = current_schema.uri.path
-              elsif path[0,1] == "/"
-                temp_uri.path = Pathname.new(path).cleanpath.to_s
-              else
-                temp_uri = current_schema.uri.merge(path)
-              end
-              temp_uri.fragment = s.split("#")[1]
-            end
-            temp_uri.fragment = "" if temp_uri.fragment.nil?
+          elsif uri
+            message = "The extended schema '#{uri.to_s}' cannot be found"
+            validation_error(message, fragments, current_schema, self, options[:record_errors])
+          else
+            message = "The property '#{build_fragment(fragments)}' was not a valid schema"
+            validation_error(message, fragments, current_schema, self, options[:record_errors])
+          end
+        end
+      end
 
-            # Grab the parent schema from the schema list
-            schema_key = temp_uri.to_s.split("#")[0] + "#"
+      def self.get_extended_uri_and_schema(s, current_schema, validator)
+        uri,schema = nil,nil
 
-            ref_schema = JSON::Validator.schemas[schema_key]
+        s = {'$ref' => s} if s.is_a?(String)
 
+        if s.is_a?(Hash)
+          uri = current_schema.uri
+          if s['$ref']
+            ref_uri,ref_schema = JSON::Schema::RefAttribute.get_referenced_uri_and_schema(s, current_schema, validator)
             if ref_schema
-              # Perform fragment resolution to retrieve the appropriate level for the schema
-              target_schema = ref_schema.schema
-              fragments = temp_uri.fragment.split("/")
-              fragment_path = ''
-              fragments.each do |fragment|
-                if fragment && fragment != ''
-                  if target_schema.is_a?(Array)
-                    target_schema = target_schema[fragment.to_i]
-                  else
-                    target_schema = target_schema[fragment]
-                  end
-                  fragment_path = fragment_path + "/#{fragment}"
-                  if target_schema.nil?
-                    raise SchemaError.new("The fragment '#{fragment_path}' does not exist on schema #{ref_schema.uri.to_s}")
-                  end
-                end
+              if s.size == 1 # Check if anything else apart from $ref
+                uri,schema = ref_uri,ref_schema
+              else
+                s = s.dup
+                s.delete '$ref'
+                s = ref_schema.schema.merge(s)
               end
-
-              # We have the schema finally, build it and validate!
-              schema = JSON::Schema.new(target_schema,temp_uri,validator)
-              schema.validate(data, fragments, options)
-            else
-              message = "The extended schema '#{temp_uri.to_s}' cannot be found"
-              validation_error(message, fragments, current_schema, self, options[:record_errors])
             end
-          else
-            message = "The property '#{build_fragment(fragments)}' was not a valid schema"
-            validation_error(message, fragments, current_schema, self, options[:record_errors])
           end
+          schema ||= JSON::Schema.new(s,uri,validator)
         end
+
+        [uri,schema]
       end
     end
   end
-end
+end

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

@@ -1,12 +1,28 @@
 module JSON
   class Schema
     class RefAttribute < Attribute
-      def self.validate(current_schema, data, fragments, validator, options = {})        
-        temp_uri = URI.parse(current_schema.schema['$ref'])
+      def self.validate(current_schema, data, fragments, validator, options = {})
+        uri,schema = get_referenced_uri_and_schema(current_schema.schema, current_schema, validator)
+
+        if schema
+          schema.validate(data, fragments, options)
+        elsif uri
+          message = "The referenced schema '#{uri.to_s}' cannot be found"
+          validation_error(message, fragments, current_schema, self, options[:record_errors])
+        else
+          message = "The property '#{build_fragment(fragments)}' was not a valid schema"
+          validation_error(message, fragments, current_schema, self, options[:record_errors])
+        end
+      end
+
+      def self.get_referenced_uri_and_schema(s, current_schema, validator)
+        uri,schema = nil,nil
+
+        temp_uri = URI.parse(s['$ref'])
         if temp_uri.relative?
           temp_uri = current_schema.uri.clone
           # Check for absolute path
-          path = current_schema.schema['$ref'].split("#")[0]
+          path = s['$ref'].split("#")[0]
           if path.nil? || path == ''
             temp_uri.path = current_schema.uri.path
           elsif path[0,1] == "/"
@@ -14,7 +30,7 @@ module JSON
           else
             temp_uri = current_schema.uri.merge(path)
           end
-          temp_uri.fragment = current_schema.schema['$ref'].split("#")[1]
+          temp_uri.fragment = s['$ref'].split("#")[1]
         end
         temp_uri.fragment = "" if temp_uri.fragment.nil?
 
@@ -43,12 +59,11 @@ module JSON
           end
 
           # We have the schema finally, build it and validate!
+          uri = temp_uri
           schema = JSON::Schema.new(target_schema,temp_uri,validator)
-          schema.validate(data, fragments, options)
-        else
-          message = "The referenced schema '#{temp_uri.to_s}' cannot be found"
-          validation_error(message, fragments, current_schema, self, options[:record_errors])
         end
+
+        [uri,schema]
       end
     end
   end

data/lib/json-schema/validator.rb

@@ -407,7 +407,7 @@ module JSON
 
       def parse(s)
         if defined?(MultiJson)
-          MultiJson.respond_to?(:load) ? MultiJson.load(s) : MultiJson.decode(s)
+          MultiJson.respond_to?(:adapter) ? MultiJson.load(s) : MultiJson.decode(s)
         else
           case @@json_backend.to_s
           when 'json'

data/test/schemas/extends_and_additionalProperties-1-filename.schema.json

@@ -0,0 +1,34 @@
+{
+  "$schema": "http://json-schema.org/draft-03/schema#",
+  "type": "object",
+  "extends": "inner.schema.json",
+  "properties": {
+    "outerA": {
+      "description": "blah",
+      "required": false,
+      "additionalProperties": false,
+      "properties": {
+        "outerA1": {
+		  "type":"boolean",
+          "required": false
+        }
+      }
+    },
+    "outerB": {
+      "required": false,
+      "type": "array",
+      "minItems": 1,
+      "maxItems": 50,
+      "items": {
+        "extends": "inner.schema.json",
+        "additionalProperties": false
+      }
+    },
+    "outerC": {
+      "description": "blah",
+      "type":"boolean",
+      "required": false
+    }
+  },
+  "additionalProperties": false
+}

data/test/schemas/extends_and_additionalProperties-1-ref.schema.json

@@ -0,0 +1,34 @@
+{
+  "$schema": "http://json-schema.org/draft-03/schema#",
+  "type": "object",
+  "extends": {"$ref":"inner.schema.json#"},
+  "properties": {
+    "outerA": {
+      "description": "blah",
+      "required": false,
+      "additionalProperties": false,
+      "properties": {
+        "outerA1": {
+		  "type":"boolean",
+          "required": false
+        }
+      }
+    },
+    "outerB": {
+      "required": false,
+      "type": "array",
+      "minItems": 1,
+      "maxItems": 50,
+      "items": {
+        "extends": {"$ref":"inner.schema.json#"},
+        "additionalProperties": false
+      }
+    },
+    "outerC": {
+      "description": "blah",
+      "type":"boolean",
+      "required": false
+    }
+  },
+  "additionalProperties": false
+}

data/test/schemas/extends_and_additionalProperties-2-filename.schema.json

@@ -0,0 +1,33 @@
+{
+  "$schema": "http://json-schema.org/draft-03/schema#",
+  "type": "object",
+  "extends": "inner.schema.json",
+  "additionalProperties": {
+    "outerA": {
+      "description": "blah",
+      "required": false,
+      "additionalProperties": false,
+      "properties": {
+        "outerA1": {
+		  "type":"boolean",
+          "required": false
+        }
+      }
+    },
+    "outerB": {
+      "required": false,
+      "type": "array",
+      "minItems": 1,
+      "maxItems": 50,
+      "items": {
+        "extends": "inner.schema.json",
+        "additionalProperties": false
+      }
+    },
+    "outerC": {
+      "description": "blah",
+      "type":"boolean",
+      "required": false
+    }
+  }
+}

data/test/schemas/extends_and_additionalProperties-2-ref.schema.json

@@ -0,0 +1,33 @@
+{
+  "$schema": "http://json-schema.org/draft-03/schema#",
+  "type": "object",
+  "extends": {"$ref":"inner.schema.json#"},
+  "additionalProperties": {
+    "outerA": {
+      "description": "blah",
+      "required": false,
+      "additionalProperties": false,
+      "properties": {
+        "outerA1": {
+		  "type":"boolean",
+          "required": false
+        }
+      }
+    },
+    "outerB": {
+      "required": false,
+      "type": "array",
+      "minItems": 1,
+      "maxItems": 50,
+      "items": {
+        "extends": {"$ref":"inner.schema.json#"},
+        "additionalProperties": false
+      }
+    },
+    "outerC": {
+      "description": "blah",
+      "type":"boolean",
+      "required": false
+    }
+  }
+}

data/test/schemas/inner.schema.json

@@ -0,0 +1,21 @@
+{
+  "$schema": "http://json-schema.org/draft-03/schema#",
+  "type": "object",
+  "properties": {
+    "innerA": {
+      "description": "blah",
+      "type":"boolean",
+      "required": false
+    },
+    "innerB": {
+      "description": "blah",
+      "type":"boolean",
+      "required": false
+    },
+    "innerC": {
+      "description": "blah",
+      "required": false,
+      "type": "boolean"
+    }
+  }
+}

data/test/test_extends_and_additionalProperties.rb

@@ -0,0 +1,50 @@
+require 'test/unit'
+require File.dirname(__FILE__) + '/../lib/json-schema'
+
+class ExtendsNestedTest < Test::Unit::TestCase
+
+  def assert_validity(valid, schema_name, data, msg=nil)
+    file = File.expand_path("../schemas/#{schema_name}.schema.json",__FILE__)
+    errors = JSON::Validator.fully_validate file, data
+    msg.sub! /\.$/, '' if msg
+    send (valid ? :assert_equal : :refute_equal), [], errors, \
+      "Schema should be #{valid ? :valid : :invalid}#{msg ? ".\n[#{schema_name}] #{msg}" : ''}"
+  end
+
+  def assert_valid(schema_name, data, msg=nil) assert_validity true, schema_name, data, msg end
+  def refute_valid(schema_name, data, msg=nil) assert_validity false, schema_name, data, msg end
+
+  %w[
+    extends_and_additionalProperties-1-filename extends_and_additionalProperties-1-ref
+    extends_and_additionalProperties-2-filename extends_and_additionalProperties-2-ref
+  ].each do |schema_name|
+    test_prefix= 'test_' + schema_name.gsub('-','_')
+    class_eval <<-EOB
+
+      def #{test_prefix}_valid_outer
+        assert_valid '#{schema_name}', {"outerC"=>true}, "Outer defn is broken, maybe the outer extends overrode it?"
+      end
+
+      def #{test_prefix}_valid_outer_extended
+        assert_valid '#{schema_name}', {"innerA"=>true}, "Extends at the root level isn't working."
+      end
+
+      def #{test_prefix}_valid_inner
+        assert_valid '#{schema_name}', {"outerB"=>[{"innerA"=>true}]}, "Extends isn't working in the array element defn."
+      end
+
+      def #{test_prefix}_invalid_inner
+        refute_valid '#{schema_name}', {"outerB"=>[{"whaaaaat"=>true}]}, "Array element defn allowing anything when it should only allow what's in inner.schema"
+      end
+    EOB
+
+    if schema_name['extends_and_additionalProperties-1']
+      class_eval <<-EOB
+        def #{test_prefix}_invalid_outer
+          refute_valid '#{schema_name}', {"whaaaaat"=>true}, "Outer defn allowing anything when it shouldn't."
+        end
+      EOB
+    end
+
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: json-schema
 version: !ruby/object:Gem::Version
-  version: 1.0.8
+  version: 1.0.9
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-13 00:00:00.000000000 Z
+date: 2012-08-29 00:00:00.000000000 Z
 dependencies: []
 description: 
 email: hoxworth@gmail.com
@@ -58,6 +58,7 @@ files:
 - README.textile
 - LICENSE.md
 - test/test_extended_schema.rb
+- test/test_extends_and_additionalProperties.rb
 - test/test_files.rb
 - test/test_full_validation.rb
 - test/test_jsonschema_draft1.rb
@@ -66,8 +67,13 @@ files:
 - test/test_schema_validation.rb
 - test/data/bad_data_1.json
 - test/data/good_data_1.json
+- test/schemas/extends_and_additionalProperties-1-filename.schema.json
+- test/schemas/extends_and_additionalProperties-1-ref.schema.json
+- test/schemas/extends_and_additionalProperties-2-filename.schema.json
+- test/schemas/extends_and_additionalProperties-2-ref.schema.json
 - test/schemas/good_schema_1.json
 - test/schemas/good_schema_2.json
+- test/schemas/inner.schema.json
 homepage: http://github.com/hoxworth/json-schema/tree/master
 licenses: []
 post_install_message: 
@@ -88,12 +94,13 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Ruby JSON Schema Validator
 test_files:
 - test/test_extended_schema.rb
+- test/test_extends_and_additionalProperties.rb
 - test/test_files.rb
 - test/test_full_validation.rb
 - test/test_jsonschema_draft1.rb
@@ -102,5 +109,11 @@ test_files:
 - test/test_schema_validation.rb
 - test/data/bad_data_1.json
 - test/data/good_data_1.json
+- test/schemas/extends_and_additionalProperties-1-filename.schema.json
+- test/schemas/extends_and_additionalProperties-1-ref.schema.json
+- test/schemas/extends_and_additionalProperties-2-filename.schema.json
+- test/schemas/extends_and_additionalProperties-2-ref.schema.json
 - test/schemas/good_schema_1.json
 - test/schemas/good_schema_2.json
+- test/schemas/inner.schema.json
+has_rdoc: