json-schema 0.1.4 → 0.1.5

data/lib/json-schema/validator.rb

@@ -73,9 +73,9 @@ module JSON
     
     # Validate the current schema
     def validate_schema(current_schema, data, fragments)
-      
+          
       ValidationMethods.each do |method|
-        if current_schema.schema[method]
+        if !current_schema.schema[method].nil?
           self.send(("validate_" + method.sub('$','')).to_sym, current_schema, data, fragments)
         end
       end
@@ -346,10 +346,10 @@ module JSON
           message = "The property '#{build_fragment(fragments)}' contains additional properties outside of the schema when none are allowed"
           raise ValidationError.new(message, fragments, current_schema)
         elsif current_schema.schema['additionalProperties'].is_a?(Hash)
-          data.each do |key,value|
+          extra_properties.each do |key|
             schema = JSON::Schema.new(current_schema.schema['additionalProperties'],current_schema.uri)
             fragments << key
-            validate_schema(schema, value, fragments)
+            validate_schema(schema, data[key], fragments)
             fragments.pop
           end
         end
@@ -385,7 +385,7 @@ module JSON
         if current_schema.schema['additionalItems'] == false && current_schema.schema['items'].length != data.length
           message = "The property '#{build_fragment(fragments)}' contains additional array elements outside of the schema when none are allowed"
           raise ValidationError.new(message, fragments, current_schema)
-        elsif current_schema.schema['additionaItems'].is_a?(Hash)
+        elsif current_schema.schema['additionalItems'].is_a?(Hash)
           schema = JSON::Schema.new(current_schema.schema['additionalItems'],current_schema.uri)
           data.each_with_index do |item,i|
             if i >= current_schema.schema['items'].length
@@ -500,6 +500,9 @@ module JSON
           schema = JSON::Schema.new(JSON.parse(open(uri.to_s).read), uri)
           @schemas[uri.to_s] = schema
           build_schemas(schema)
+        rescue JSON::ParserError
+          # Don't rescue this error, we want JSON formatting issues to bubble up
+          raise $!
         rescue
           # Failures will occur when this URI cannot be referenced yet. Don't worry about it,
           # the proper error will fall out if the ref isn't ever defined
@@ -657,21 +660,17 @@ module JSON
         begin
           schema = JSON.parse(schema)
         rescue
-          begin
-            # Build a uri for it
-            schema_uri = URI.parse(schema)
-            if schema_uri.relative?
-              # Check for absolute path
-              if schema[0,1] == '/'
-                schema_uri = URI.parse("file://#{schema}")
-              else
-                schema_uri = URI.parse("file://#{Dir.pwd}/#{schema}")
-              end
+          # Build a uri for it
+          schema_uri = URI.parse(schema)
+          if schema_uri.relative?
+            # Check for absolute path
+            if schema[0,1] == '/'
+              schema_uri = URI.parse("file://#{schema}")
+            else
+              schema_uri = URI.parse("file://#{Dir.pwd}/#{schema}")
             end
-            schema = JSON.parse(open(schema_uri.to_s).read)
-          rescue            
-            raise "Invalid schema: #{schema_uri.to_s}"
           end
+          schema = JSON.parse(open(schema_uri.to_s).read)
         end
       end
       
@@ -685,19 +684,15 @@ module JSON
         begin
           data = JSON.parse(data)
         rescue
-          begin
-            json_uri = URI.parse(data)
-            if json_uri.relative?
-              if data[0,1] == '/'
-                schema_uri = URI.parse("file://#{data}")
-              else
-                schema_uri = URI.parse("file://#{Dir.pwd}/#{data}")
-              end
+          json_uri = URI.parse(data)
+          if json_uri.relative?
+            if data[0,1] == '/'
+              schema_uri = URI.parse("file://#{data}")
+            else
+              schema_uri = URI.parse("file://#{Dir.pwd}/#{data}")
             end
-            data = JSON.parse(open(json_uri.to_s).read)
-          rescue
-            raise "Invalid JSON: #{json_uri.to_s}"
           end
+          data = JSON.parse(open(json_uri.to_s).read)
         end
       end
       data

data/test/test_files.rb

@@ -0,0 +1,44 @@
+require 'test/unit'
+require File.dirname(__FILE__) + '/../lib/json-schema'
+
+class JSONSchemaTest < Test::Unit::TestCase
+  def test_schema_from_file
+    data = {"a" => 5}
+    assert(JSON::Validator.validate(File.join(File.dirname(__FILE__),"schemas/good_schema_1.json"),data))
+    data = {"a" => "bad"}
+    assert(!JSON::Validator.validate(File.join(File.dirname(__FILE__),"schemas/good_schema_1.json"),data))
+  end
+  
+  def test_data_from_file
+    schema = {"type" => "object", "properties" => {"a" => {"type" => "integer"}}}
+    assert(JSON::Validator.validate(schema,File.join(File.dirname(__FILE__),"data/good_data_1.json")))
+    assert(!JSON::Validator.validate(schema,File.join(File.dirname(__FILE__),"data/bad_data_1.json")))
+  end
+  
+  def test_both_from_file
+    assert(JSON::Validator.validate(File.join(File.dirname(__FILE__),"schemas/good_schema_1.json"),File.join(File.dirname(__FILE__),"data/good_data_1.json")))
+    assert(!JSON::Validator.validate(File.join(File.dirname(__FILE__),"schemas/good_schema_1.json"),File.join(File.dirname(__FILE__),"data/bad_data_1.json")))
+  end
+  
+  def test_invalid_schema
+    data = {}
+    assert_raise JSON::ParserError do
+      assert(JSON::Validator.validate(File.join(File.dirname(__FILE__),"schemas/invalid_schema_1.json"),data))
+    end
+  end
+  
+  def test_invalid_data
+    schema = {}
+    assert_raise JSON::ParserError do
+      assert(JSON::Validator.validate(schema,File.join(File.dirname(__FILE__),"data/invalid_data_1.json")))
+    end
+  end
+  
+  def test_file_ref
+    data = {"b" => {"a" => 5}}
+    assert(JSON::Validator.validate(File.join(File.dirname(__FILE__),"schemas/good_schema_2.json"),data))
+    
+    data = {"b" => {"a" => "boo"}}
+    assert(!JSON::Validator.validate(File.join(File.dirname(__FILE__),"schemas/good_schema_1.json"),data))
+  end
+end

data/test/test_jsonschema.rb

@@ -146,7 +146,22 @@ class JSONSchemaTest < Test::Unit::TestCase
     
     data["a"] = false
     assert(!JSON::Validator.validate(schema,data))
-  end
+    
+    # Test a union type with schemas
+    schema["properties"]["a"]["type"] = [{ "type" => "string" }, {"type" => "object", "properties" => {"b" => {"type" => "integer"}}}]
+  
+    data["a"] = "test"
+    assert(JSON::Validator.validate(schema,data))
+    
+    data["a"] = 5
+    assert(!JSON::Validator.validate(schema,data))
+    
+    data["a"] = {"b" => 5}
+    assert(JSON::Validator.validate(schema,data))
+    
+    data["a"] = {"b" => "taco"}
+    assert(!JSON::Validator.validate(schema,data))
+   end
   
   
   
@@ -157,12 +172,21 @@ class JSONSchemaTest < Test::Unit::TestCase
         "a" => {"required" => true}
       }
     }
-    data = {
-    }
+    data = {}
     
     assert(!JSON::Validator.validate(schema,data))
     data['a'] = "Hello"
     assert(JSON::Validator.validate(schema,data))
+    
+    schema = {
+      "properties" => {
+        "a" => {"type" => "integer"}
+      }
+    }
+    
+    data = {}
+    assert(JSON::Validator.validate(schema,data))
+    
   end
   
   
@@ -565,5 +589,140 @@ class JSONSchemaTest < Test::Unit::TestCase
   end
   
   
+  
+  def test_extends
+    schema = {
+      "properties" => {
+        "a" => { "type" => "integer"}
+      } 
+    }
+    
+    schema2 = {
+      "properties" => {
+        "a" => { "maximum" => 5 }
+      }
+    }
+    
+    data = {
+      "a" => 10
+    }
+    
+    assert(JSON::Validator.validate(schema,data))
+    assert(!JSON::Validator.validate(schema2,data))
+    
+    schema["extends"] = schema2
+    
+    assert(!JSON::Validator.validate(schema,data))
+  end
+  
+  def test_pattern_properties
+    # Set up the default datatype
+    schema = {
+      "patternProperties" => {
+        "\\d+ taco" => {"type" => "integer"}
+      }
+    }
+    
+    data = {
+      "a" => true,
+      "1 taco" => 1,
+      "20 tacos" => 20
+    }
+    
+    assert(JSON::Validator.validate(schema,data))
+    data["20 tacos"] = "string!"
+    assert(!JSON::Validator.validate(schema,data))
+  end
+  
+  
+  def test_additional_properties
+    # Test no additional properties allowed
+    schema = {
+      "properties" => {
+        "a" => { "type" => "integer" }
+      },
+      "additionalProperties" => false
+    }
+    
+    data = {
+      "a" => 10
+    }
+    
+    assert(JSON::Validator.validate(schema,data))
+    data["b"] = 5
+    assert(!JSON::Validator.validate(schema,data))
+    
+    # Test additional properties match a schema
+    schema["additionalProperties"] = { "type" => "string" }
+    data["b"] = "taco"
+    assert(JSON::Validator.validate(schema,data))
+    data["b"] = 5
+    assert(!JSON::Validator.validate(schema,data))
+    
+    # Make sure this works with pattern properties set, too
+    schema = {
+      "patternProperties" => {
+        "\\d+ taco" => {"type" => "integer"}
+      },
+      "additionalProperties" => false
+    }
+    
+    data = {
+      "5 tacos" => 5,
+      "20 tacos" => 20
+    }
+    
+    assert(JSON::Validator.validate(schema,data))
+    data["b"] = 5
+    assert(!JSON::Validator.validate(schema,data))
+  end
+  
+  
+  def test_items
+    schema = {
+      "items" => { "type" => "integer" }
+    }
+    
+    data = [1,2,4]
+    assert(JSON::Validator.validate(schema,data))
+    data = [1,2,"string"]
+    assert(!JSON::Validator.validate(schema,data))
+    
+    schema = {
+      "items" => [
+        {"type" => "integer"},
+        {"type" => "string"}
+      ]
+    }
+    
+    data = [1,"string"]
+    assert(JSON::Validator.validate(schema,data))
+    data = [1,"string",3]
+    assert(JSON::Validator.validate(schema,data))
+    data = ["string",1]
+    assert(!JSON::Validator.validate(schema,data))
+    
+    schema = {
+      "items" => [
+        {"type" => "integer"},
+        {"type" => "string"}
+      ],
+      "additionalItems" => false
+    }
+    
+    data = [1,"string"]
+    assert(JSON::Validator.validate(schema,data))
+    data = [1,"string",3]
+    assert(!JSON::Validator.validate(schema,data))
+    
+    schema = {"items" => [{"type" => "integer"},{"type" => "string"}],"additionalItems" => {"type" => "integer"}}
+    
+    data = [1,"string"]
+    assert(JSON::Validator.validate(schema,data))
+    data = [1,"string",3]
+    assert(JSON::Validator.validate(schema,data))
+    data = [1,"string","string"]
+    assert(!JSON::Validator.validate(schema,data))
+  end
 end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: json-schema
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: false
   segments: 
   - 0
   - 1
-  - 4
-  version: 0.1.4
+  - 5
+  version: 0.1.5
 platform: ruby
 authors: 
 - Kenny Hoxworth
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-30 00:00:00 -05:00
+date: 2010-12-01 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -45,6 +45,7 @@ files:
 - lib/json-schema/uri/file.rb
 - lib/json-schema/validator.rb
 - lib/json-schema.rb
+- test/test_files.rb
 - test/test_jsonschema.rb
 - README.textile
 has_rdoc: true
@@ -82,4 +83,5 @@ signing_key:
 specification_version: 3
 summary: Ruby JSON Schema Validator
 test_files: 
+- test/test_files.rb
 - test/test_jsonschema.rb