json-schema 2.1.3 → 2.1.4

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    NWQ0NmRiOWRjODkxOWJiYTU4MmVhMTI4NmI1MDQyZDkzMzU2ZWQ1Zg==
+  data.tar.gz: !binary |-
+    MDcwZGNmZjk4YmY1ZjVjZjIwNGFlNGQ4MjNmYTllOGY5MzRjZWE0YQ==
+!binary "U0hBNTEy":
+  metadata.gz: !binary |-
+    YzFkOGY5ZWZlOGIxOTVkYzUyOTU3MDRiYTljN2IwN2UyOGI4MTY2YmVkM2Iy
+    ZmU3MzZkODI2ZDlkYmQ4YTZjOWE2MTYwZTc2Mjc1MjhkN2QxZDA5ZTliNmMz
+    YTc1YzMzYzEzNzMxNDQ1ZTU2YWU2NDEyZGRkMThjMTMyMjI1Mzc=
+  data.tar.gz: !binary |-
+    YWIzMjE4ZGZkYTA3NjIzODg2OGNmMWZmNDJkM2VjNzhhYzZlZDZjMTU1Yzgw
+    NzA0NzlkYjFhNjJjZDZjMmQ5OTBiYjUzMWVmOTQyM2U3YzIzMzQyOTIyNDUz
+    OTM1MzhiNTkxODlmMmVlMjEzYWQ4MWIzYWRhZjM5OTQxMTEwOWQ=

data/README.textile

@@ -22,7 +22,7 @@ From the git repo:
 
 <pre>
 $ gem build json-schema.gemspec
-$ gem install json-schema-2.1.3.gem
+$ gem install json-schema-2.1.4.gem
 </pre>
 
 

data/lib/json-schema.rb

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

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

@@ -26,7 +26,7 @@ module JSON
           end
         end
 
-        if !valid
+        if !valid || !errors.empty?
           message = "The property '#{build_fragment(fragments)}' of type #{data.class} did not match all of the required schemas"
           validation_error(processor, message, fragments, current_schema, self, options[:record_errors])
           validation_errors(processor).last.sub_errors = errors
@@ -34,4 +34,4 @@ module JSON
       end
     end
   end
-end
+end

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

@@ -9,7 +9,7 @@ module JSON
           if data.is_a?(String)
             error_message = "The property '#{build_fragment(fragments)}' must be a date/time in the ISO-8601 format of YYYY-MM-DDThh:mm:ssZ or YYYY-MM-DDThh:mm:ss.ssZ"
             validation_error(processor, error_message, fragments, current_schema, self, options[:record_errors]) and return if !data.is_a?(String)
-            r = Regexp.new('^\d\d\d\d-\d\d-\d\dT(\d\d):(\d\d):(\d\d)([\.,]\d+)?(Z|[+-](\d\d)(:\d\d)?)?$')
+            r = Regexp.new('^\d\d\d\d-\d\d-\d\dT(\d\d):(\d\d):(\d\d)([\.,]\d+)?(Z|[+-](\d\d)(:?\d\d)?)?$')
             if (m = r.match(data))
               parts = data.split("T")
               begin

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

@@ -2,34 +2,31 @@ module JSON
   class Schema
     class OneOfAttribute < Attribute
       def self.validate(current_schema, data, fragments, processor, validator, options = {})
-        matched = false
-        valid = false
-
+        validation_errors = 0
         current_schema.schema['oneOf'].each do |element|
           schema = JSON::Schema.new(element,current_schema.uri,validator)
 
           begin
-            schema.validate(data,fragments,processor,options)
-            if matched
-              valid = false
-            else
-              matched = true
-              valid = true
-            end
+            # need to raise exceptions on error because
+            # schema.validate doesn't reliably return true/false
+            schema.validate(data,fragments,processor,options.merge(:record_errors => false))
           rescue ValidationError
+            validation_errors += 1
           end
 
         end
 
-        if !valid
-          if matched
-            message = "The property '#{build_fragment(fragments)}' of type #{data.class} matched more than one of the required schemas"
-          else
-            message = "The property '#{build_fragment(fragments)}' of type #{data.class} did not match any of the required schemas"
-          end
-          validation_error(processor, message, fragments, current_schema, self, options[:record_errors])
+        case validation_errors
+        when current_schema.schema['oneOf'].length - 1 # correct, matched only one
+          message = nil
+        when current_schema.schema['oneOf'].length  # didn't match any
+          message = "The property '#{build_fragment(fragments)}' of type #{data.class} did not match any of the required schemas"
+        else # too many matches
+          message = "The property '#{build_fragment(fragments)}' of type #{data.class} matched more than one of the required schemas"
         end
+
+        validation_error(processor, message, fragments, current_schema, self, options[:record_errors]) if message
       end
     end
   end
-end
+end

data/lib/json-schema/uri/file.rb

@@ -1,3 +1,4 @@
+require 'rbconfig'
 require 'uri'
 
 module URI
@@ -5,28 +6,31 @@ module URI
   # Ruby does not have built-in support for filesystem URIs, and definitely does not have built-in support for
   # using open-uri with filesystem URIs
   class File < Generic
-    
+
     COMPONENT = [
-          :scheme,  
-          :path, 
+          :scheme,
+          :path,
           :fragment,
           :host
         ].freeze
-        
+
     def initialize(*arg)
-      arg[2] = ""
+      # arg[2] is the 'host'; this logic to set it to "" causes file schemes with UNC to break
+      # so don't do it on windows platforms
+      is_windows = (RbConfig::CONFIG['host_os'] =~ /mswin|mingw|cygwin/)
+      arg[2] = "" unless is_windows
       super(*arg)
     end
-    
+
     def self.build(args)
       tmp = Util::make_components_hash(self, args)
       return super(tmp)
     end
-    
+
     def open(*rest, &block)
       ::File.open(self.path, *rest, &block)
     end
-    
+
     @@schemes['FILE'] = File
   end
-end
+end

data/lib/json-schema/validator.rb

@@ -189,21 +189,28 @@ module JSON
       end
 
       fragments.each do |f|
-        if base_schema.is_a?(Hash)
+        if base_schema.is_a?(JSON::Schema) #test if fragment is a JSON:Schema instance
+          if !base_schema.schema.has_key?(f)
+            raise JSON::Schema::SchemaError.new("Invalid fragment resolution for :fragment option")
+          end
+        base_schema = base_schema.schema[f]
+        elsif base_schema.is_a?(Hash)
           if !base_schema.has_key?(f)
             raise JSON::Schema::SchemaError.new("Invalid fragment resolution for :fragment option")
           end
-          base_schema = base_schema[f]
+        base_schema = initialize_schema(base_schema[f]) #need to return a Schema instance for validation to work
         elsif base_schema.is_a?(Array)
           if base_schema[f.to_i].nil?
             raise JSON::Schema::SchemaError.new("Invalid fragment resolution for :fragment option")
           end
-          base_schema = base_schema[f.to_i]
+        base_schema = initialize_schema(base_schema[f.to_i])
         else
           raise JSON::Schema::SchemaError.new("Invalid schema encountered when resolving :fragment option")
         end
       end
-
+      if @options[:list] #check if the schema is validating a list
+        base_schema.schema = schema_to_list(base_schema.schema)
+      end
       base_schema
     end
 
@@ -553,18 +560,23 @@ module JSON
       @@fake_uri_generator.call(schema)
     end
 
+    def schema_to_list(schema)
+      new_schema = {"type" => "array", "items" => schema}
+      if !schema["$schema"].nil?
+        new_schema["$schema"] = schema["$schema"]
+      end
+
+      new_schema
+    end
+
     def initialize_schema(schema)
       if schema.is_a?(String)
         begin
           # Build a fake URI for this
           schema_uri = URI.parse(fake_uri(schema))
           schema = JSON::Validator.parse(schema)
-          if @options[:list]
-            new_schema = {"type" => "array", "items" => schema}
-            if !schema["$schema"].nil?
-              new_schema["$schema"] = schema["$schema"]
-            end
-            schema = new_schema
+          if @options[:list] && @options[:fragment].nil?
+            schema = schema_to_list(schema)
           end
           schema = JSON::Schema.new(schema,schema_uri,@options[:version])
           Validator.add_schema(schema)
@@ -581,12 +593,8 @@ module JSON
           end
           if Validator.schemas[schema_uri.to_s].nil?
             schema = JSON::Validator.parse(open(schema_uri.to_s).read)
-            if @options[:list]
-              new_schema = {"type" => "array", "items" => schema}
-              if !schema["$schema"].nil?
-                new_schema["$schema"] = schema["$schema"]
-              end
-              schema = new_schema
+            if @options[:list] && @options[:fragment].nil?
+              schema = schema_to_list(schema)
             end
             schema = JSON::Schema.new(schema,schema_uri,@options[:version])
             Validator.add_schema(schema)
@@ -595,12 +603,8 @@ module JSON
           end
         end
       elsif schema.is_a?(Hash)
-        if @options[:list]
-          new_schema = {"type" => "array", "items" => schema}
-          if !schema["$schema"].nil?
-            new_schema["$schema"] = schema["$schema"]
-          end
-          schema = new_schema
+        if @options[:list] && @options[:fragment].nil?
+          schema = schema_to_list(schema)
         end
         schema_uri = URI.parse(fake_uri(serialize(schema)))
         schema = JSON::Schema.new(schema,schema_uri,@options[:version])

data/test/data/all_of_ref_data.json

@@ -0,0 +1,3 @@
+{
+  "name" : "john"
+}

data/test/data/one_of_ref_links_data.json

@@ -0,0 +1,5 @@
+{ "links":
+  [{ "rel" : ["self"] , "href":"http://api.example.com/api/object/3" }
+  ,{ "rel" : ["up"] , "href":"http://api.example.com/api/object" }
+  ]
+}

data/test/schemas/all_of_ref_base_schema.json

@@ -0,0 +1,4 @@
+{"type": "object",
+ "properties" : {
+   "name" : { "type": "integer" }
+ }

data/test/schemas/all_of_ref_schema.json

@@ -0,0 +1,7 @@
+{ "$schema" : "http://json-schema.org/draft-04/schema#",
+  "type" : "object",
+  "allOf" :
+  [ { "$ref" : "all_of_ref_base_schema.json" }
+  ]
+
+}

data/test/schemas/one_of_ref_links_schema.json

@@ -0,0 +1,16 @@
+{ "$schema": "http://json-schema.org/draft-04/schema#"
+, "type": "object"
+, "properties":
+  { "links" :
+    { "type" : "array"
+    , "items" :
+      { "type" : "object"
+      , "oneOf" :
+        [ { "$ref" : "self_link_schema.json"}
+        , { "$ref" : "up_link_schema.json" }
+        ]
+      }
+    }
+  }
+}
+

data/test/schemas/self_link_schema.json

@@ -0,0 +1,17 @@
+{ "$schema": "http://json-schema.org/draft-04/schema#"
+, "type": "object"
+, "properties" :
+  { "rel" :
+    { "type" : "array"
+    , "items" :
+      [ { "type" : "string"
+        , "pattern" : "self"
+        }
+      ]
+    }
+  , "href" :
+    { "type" : "string"
+    }
+  }
+}
+

data/test/schemas/up_link_schema.json

@@ -0,0 +1,17 @@
+{ "$schema": "http://json-schema.org/draft-04/schema#"
+, "type": "object"
+, "properties" :
+  { "rel" :
+    { "type" : "array"
+    , "items" :
+      [ { "type" : "string"
+        , "pattern" : "up"
+        }
+      ]
+    }
+  , "href" :
+    { "type" : "string"
+    }
+  }
+}
+

data/test/test_all_of_ref_schema.rb

@@ -0,0 +1,11 @@
+require 'test/unit'
+require File.dirname(__FILE__) + '/../lib/json-schema'
+
+class AnyOfRefSchemaTest < Test::Unit::TestCase
+  def test_all_of_ref_schema
+    schema = File.join(File.dirname(__FILE__),"schemas/all_of_ref_schema.json")
+    data = File.join(File.dirname(__FILE__),"data/all_of_ref_data.json")
+    errors = JSON::Validator.fully_validate(schema,data, :errors_as_objects => true)
+    assert(!errors.empty?, "should have failed to validate")
+  end
+end

data/test/test_any_of_ref_schema.rb

@@ -2,7 +2,7 @@ require 'test/unit'
 require File.dirname(__FILE__) + '/../lib/json-schema'
 
 class AnyOfRefSchemaTest < Test::Unit::TestCase
-  def test_all_of_ref_schema
+  def test_any_of_ref_schema
     schema = File.join(File.dirname(__FILE__),"schemas/any_of_ref_schema.json")
     data = File.join(File.dirname(__FILE__),"data/any_of_ref_data.json")
     errors = JSON::Validator.fully_validate(schema,data, :errors_as_objects => true)

data/test/{schemas/test_fragment_resolution.rb → test_fragment_resolution.rb}

@@ -5,6 +5,7 @@ class FragmentResolution < Test::Unit::TestCase
   def test_fragment_resolution
     schema = {
       "$schema" => "http://json-schema.org/draft-04/schema#",
+      "required" => ["a"],
       "properties" => {
         "a" => {
           "type" => "object",

data/test/test_jsonschema_draft3.rb

@@ -970,7 +970,7 @@ class JSONSchemaDraft3Test < Test::Unit::TestCase
     data = {"a" => "2010-01-01T12:00:00+01:30"}
     assert(JSON::Validator.validate(schema,data))
     data = {"a" => "2010-01-01T12:00:00+0234"}
-    assert(!JSON::Validator.validate(schema,data))
+    assert(JSON::Validator.validate(schema,data))
     data = {"a" => "2010-01-01T12:00:00+01:"}
     assert(!JSON::Validator.validate(schema,data))
     data = {"a" => "2010-01-01T12:00:00+0"}

data/test/test_jsonschema_draft4.rb

@@ -893,6 +893,10 @@ class JSONSchemaDraft4Test < Test::Unit::TestCase
     assert(JSON::Validator.validate(schema,data))
     data = {"a" => "2010-01-01T12:00:00,1Z"}
     assert(JSON::Validator.validate(schema,data))
+    data = {"a" => "2010-01-01T12:00:00+0000"}
+    assert(JSON::Validator.validate(schema,data))
+    data = {"a" => "2010-01-01T12:00:00+00:00"}
+    assert(JSON::Validator.validate(schema,data))
     data = {"a" => "2010-01-32T12:00:00Z"}
     assert(!JSON::Validator.validate(schema,data))
     data = {"a" => "2010-13-01T12:00:00Z"}

data/test/test_one_of.rb

@@ -0,0 +1,42 @@
+require 'test/unit'
+require File.dirname(__FILE__) + '/../lib/json-schema'
+
+class OneOfTest < Test::Unit::TestCase
+  def test_one_of_links_schema
+    schema = File.join(File.dirname(__FILE__),"schemas/one_of_ref_links_schema.json")
+    data = File.join(File.dirname(__FILE__),"data/one_of_ref_links_data.json")
+    errors = JSON::Validator.fully_validate(schema,data, :errors_as_objects => true)
+    assert(errors.empty?, errors.map{|e| e[:message] }.join("\n"))
+  end
+
+
+  def test_one_of_with_string_patterns
+    schema = {
+      "$schema" => "http://json-schema.org/draft-04/schema#",
+      "oneOf" => [
+        {
+          "properties" => {"a" => {"type" => "string", "pattern" => "foo"}},
+        },
+        {
+          "properties" => {"a" => {"type" => "string", "pattern" => "bar"}},
+        },
+        {
+          "properties" => {"a" => {"type" => "string", "pattern" => "baz"}},
+        }
+      ]
+    }
+
+    data = {"a" => "foo"}
+    assert(JSON::Validator.validate(schema,data))
+
+    data = {"a" => "foobar"}
+    assert(!JSON::Validator.validate(schema,data))
+
+    data = {"a" => "baz"}
+    assert(JSON::Validator.validate(schema,data))
+
+    data = {"a" => 5}
+    assert(!JSON::Validator.validate(schema,data))
+  end
+
+end

metadata

@@ -1,15 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: json-schema
 version: !ruby/object:Gem::Version
-  version: 2.1.3
-  prerelease: 
+  version: 2.1.4
 platform: ruby
 authors:
 - Kenny Hoxworth
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-02 00:00:00.000000000 Z
+date: 2013-12-31 00:00:00.000000000 Z
 dependencies: []
 description: 
 email: hoxworth@gmail.com
@@ -70,22 +69,28 @@ files:
 - resources/draft-04.json
 - README.textile
 - LICENSE.md
-- test/schemas/test_fragment_resolution.rb
+- test/test_all_of_ref_schema.rb
 - test/test_any_of_ref_schema.rb
 - test/test_extended_schema.rb
 - test/test_extends_and_additionalProperties.rb
 - test/test_files_v3.rb
+- test/test_fragment_resolution.rb
 - test/test_full_validation.rb
 - test/test_jsonschema_draft1.rb
 - test/test_jsonschema_draft2.rb
 - test/test_jsonschema_draft3.rb
 - test/test_jsonschema_draft4.rb
+- test/test_one_of.rb
 - test/test_ruby_schema.rb
 - test/test_schema_type_attribute.rb
 - test/test_schema_validation.rb
+- test/data/all_of_ref_data.json
 - test/data/any_of_ref_data.json
 - test/data/bad_data_1.json
 - test/data/good_data_1.json
+- test/data/one_of_ref_links_data.json
+- test/schemas/all_of_ref_base_schema.json
+- test/schemas/all_of_ref_schema.json
 - test/schemas/any_of_ref_jane_schema.json
 - test/schemas/any_of_ref_jimmy_schema.json
 - test/schemas/any_of_ref_john_schema.json
@@ -99,47 +104,56 @@ files:
 - test/schemas/good_schema_extends1.json
 - test/schemas/good_schema_extends2.json
 - test/schemas/inner.schema.json
+- test/schemas/one_of_ref_links_schema.json
+- test/schemas/self_link_schema.json
+- test/schemas/up_link_schema.json
 homepage: http://github.com/hoxworth/json-schema/tree/master
-licenses: []
+licenses:
+- MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.0.7
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Ruby JSON Schema Validator
 test_files:
-- test/schemas/test_fragment_resolution.rb
+- test/test_all_of_ref_schema.rb
 - test/test_any_of_ref_schema.rb
 - test/test_extended_schema.rb
 - test/test_extends_and_additionalProperties.rb
 - test/test_files_v3.rb
+- test/test_fragment_resolution.rb
 - test/test_full_validation.rb
 - test/test_jsonschema_draft1.rb
 - test/test_jsonschema_draft2.rb
 - test/test_jsonschema_draft3.rb
 - test/test_jsonschema_draft4.rb
+- test/test_one_of.rb
 - test/test_ruby_schema.rb
 - test/test_schema_type_attribute.rb
 - test/test_schema_validation.rb
+- test/data/all_of_ref_data.json
 - test/data/any_of_ref_data.json
 - test/data/bad_data_1.json
 - test/data/good_data_1.json
+- test/data/one_of_ref_links_data.json
+- test/schemas/all_of_ref_base_schema.json
+- test/schemas/all_of_ref_schema.json
 - test/schemas/any_of_ref_jane_schema.json
 - test/schemas/any_of_ref_jimmy_schema.json
 - test/schemas/any_of_ref_john_schema.json
@@ -153,3 +167,6 @@ test_files:
 - test/schemas/good_schema_extends1.json
 - test/schemas/good_schema_extends2.json
 - test/schemas/inner.schema.json
+- test/schemas/one_of_ref_links_schema.json
+- test/schemas/self_link_schema.json
+- test/schemas/up_link_schema.json