json-schema 0.1.13 → 0.1.14

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

@@ -0,0 +1,38 @@
+module JSON
+  class Schema
+    
+    class Draft3 < Validator
+      def initialize
+        super
+        @attributes = {
+          "type" => JSON::Schema::TypeAttribute,
+          "disallow" => JSON::Schema::DisallowAttribute,
+          "format" => JSON::Schema::FormatAttribute,
+          "maximum" => JSON::Schema::MaximumAttribute,
+          "minimum" => JSON::Schema::MinimumAttribute,
+          "minItems" => JSON::Schema::MinItemsAttribute,
+          "maxItems" => JSON::Schema::MaxItemsAttribute,
+          "uniqueItems" => JSON::Schema::UniqueItemsAttribute,
+          "minLength" => JSON::Schema::MinLengthAttribute,
+          "maxLength" => JSON::Schema::MaxLengthAttribute,
+          "divisibleBy" => JSON::Schema::DivisibleByAttribute,
+          "enum" => JSON::Schema::EnumAttribute,
+          "properties" => JSON::Schema::PropertiesAttribute,
+          "pattern" => JSON::Schema::PatternAttribute,
+          "patternProperties" => JSON::Schema::PatternPropertiesAttribute,
+          "additionalProperties" => JSON::Schema::AdditionalPropertiesAttribute,
+          "items" => JSON::Schema::ItemsAttribute,
+          "additionalItems" => JSON::Schema::AdditionalItemsAttribute,
+          "dependencies" => JSON::Schema::DependenciesAttribute,
+          "extends" => JSON::Schema::ExtendsAttribute,
+          "$ref" => JSON::Schema::RefAttribute
+        }
+        @uri = URI.parse("http://json-schema.org/draft-03/schema#")
+      end
+      
+      JSON::Validator.register_validator(self.new)
+      JSON::Validator.register_default_validator(self.new)
+    end
+    
+  end
+end

data/test/test_extended_schema.rb

@@ -0,0 +1,68 @@
+require 'test/unit'
+require File.dirname(__FILE__) + '/../lib/json-schema'
+
+class BitwiseAndAttribute < JSON::Schema::Attribute
+  def self.validate(current_schema, data, fragments, validator, options = {})
+    if data.is_a?(Integer) && data & current_schema.schema['bitwise-and'].to_i == 0
+      message = "The property '#{build_fragment(fragments)}' did not evaluate  to true when bitwise-AND'd with  #{current_schema.schema['bitwise-or']}"
+      raise JSON::Schema::ValidationError.new(message, fragments, current_schema)
+    end
+  end
+end
+
+class ExtendedSchema < JSON::Schema::Validator
+  def initialize
+    super
+    extend_schema_definition("http://json-schema.org/draft-03/schema#")
+    @attributes["bitwise-and"] = BitwiseAndAttribute
+    @uri = URI.parse("http://test.com/test.json")
+  end
+  
+  JSON::Validator.register_validator(self.new)
+end
+
+class JSONSchemaTestExtendedSchema < Test::Unit::TestCase
+  def test_schema_from_file
+    schema = {
+      "$schema" => "http://json-schema.org/draft-03/schema#",
+      "properties" => {
+        "a" => {
+          "bitwise-and" => 1
+        },
+        "b" => {
+          "type" => "string"
+        }
+      }
+    }
+    
+    data = {"a" => 0, "b" => "taco"}
+    assert(JSON::Validator.validate(schema,data))
+    data = {"a" => 1, "b" => "taco"}
+    assert(JSON::Validator.validate(schema,data))
+    data = {"a" => 1, "b" => 5}
+    assert(!JSON::Validator.validate(schema,data))
+    
+    schema = {
+      "$schema" => "http://test.com/test.json",
+      "properties" => {
+        "a" => {
+          "bitwise-and" => 1
+        },
+        "b" => {
+          "type" => "string"
+        }
+      }
+    }
+    
+    data = {
+      "a" => 0
+    }
+    
+    data = {"a" => 1, "b" => "taco"}
+    assert(JSON::Validator.validate(schema,data))
+    data = {"a" => 0, "b" => "taco"}
+    assert(!JSON::Validator.validate(schema,data))
+    data = {"a" => 1, "b" => 5}
+    assert(!JSON::Validator.validate(schema,data))
+  end
+end

data/test/{test_jsonschema.rb → test_jsonschema_draft3.rb}

@@ -1,10 +1,11 @@
 require 'test/unit'
 require File.dirname(__FILE__) + '/../lib/json-schema'
 
-class JSONSchemaTest < Test::Unit::TestCase
+class JSONSchemaDraft3Test < Test::Unit::TestCase
   def test_types
     # Set up the default datatype
     schema = {
+      "$schema" => "http://json-schema.org/draft-03/schema#",
       "properties" => {
         "a" => {}
       }
@@ -168,6 +169,7 @@ class JSONSchemaTest < Test::Unit::TestCase
   def test_required
     # Set up the default datatype
     schema = {
+      "$schema" => "http://json-schema.org/draft-03/schema#",
       "properties" => {
         "a" => {"required" => true}
       }
@@ -179,6 +181,7 @@ class JSONSchemaTest < Test::Unit::TestCase
     assert(JSON::Validator.validate(schema,data))
     
     schema = {
+      "$schema" => "http://json-schema.org/draft-03/schema#",
       "properties" => {
         "a" => {"type" => "integer"}
       }
@@ -194,6 +197,7 @@ class JSONSchemaTest < Test::Unit::TestCase
   def test_minimum
     # Set up the default datatype
     schema = {
+      "$schema" => "http://json-schema.org/draft-03/schema#",
       "properties" => {
         "a" => {"minimum" => 5}
       }
@@ -244,6 +248,7 @@ class JSONSchemaTest < Test::Unit::TestCase
   def test_maximum
     # Set up the default datatype
     schema = {
+      "$schema" => "http://json-schema.org/draft-03/schema#",
       "properties" => {
         "a" => {"maximum" => 5}
       }
@@ -293,6 +298,7 @@ class JSONSchemaTest < Test::Unit::TestCase
   def test_min_items
     # Set up the default datatype
     schema = {
+      "$schema" => "http://json-schema.org/draft-03/schema#",
       "properties" => {
         "a" => {"minItems" => 1}
       }
@@ -319,6 +325,7 @@ class JSONSchemaTest < Test::Unit::TestCase
   def test_max_items
     # Set up the default datatype
     schema = {
+      "$schema" => "http://json-schema.org/draft-03/schema#",
       "properties" => {
         "a" => {"maxItems" => 1}
       }
@@ -345,6 +352,7 @@ class JSONSchemaTest < Test::Unit::TestCase
   def test_unique_items
     # Set up the default datatype
     schema = {
+      "$schema" => "http://json-schema.org/draft-03/schema#",
       "properties" => {
         "a" => {"uniqueItems" => true}
       }
@@ -416,6 +424,7 @@ class JSONSchemaTest < Test::Unit::TestCase
   def test_pattern
     # Set up the default datatype
     schema = {
+      "$schema" => "http://json-schema.org/draft-03/schema#",
       "properties" => {
         "a" => {"pattern" => "\\d+ taco"}
       }
@@ -429,18 +438,19 @@ class JSONSchemaTest < Test::Unit::TestCase
     data["a"] = "156 taco bell"
     assert(JSON::Validator.validate(schema,data))
     
-    data["a"] = "taco"
-    assert(!JSON::Validator.validate(schema,data))
-    
     # Test a non-string
     data["a"] = 5
     assert(JSON::Validator.validate(schema,data))
+    
+    data["a"] = "taco"
+    assert(!JSON::Validator.validate(schema,data))
   end
   
   
   def test_min_length
     # Set up the default datatype
     schema = {
+      "$schema" => "http://json-schema.org/draft-03/schema#",
       "properties" => {
         "a" => {"minLength" => 1}
       }
@@ -466,6 +476,7 @@ class JSONSchemaTest < Test::Unit::TestCase
   def test_max_length
     # Set up the default datatype
     schema = {
+      "$schema" => "http://json-schema.org/draft-03/schema#",
       "properties" => {
         "a" => {"maxLength" => 1}
       }
@@ -491,6 +502,7 @@ class JSONSchemaTest < Test::Unit::TestCase
   def test_enum
     # Set up the default datatype
     schema = {
+      "$schema" => "http://json-schema.org/draft-03/schema#",
       "properties" => {
         "a" => {"enum" => [1,'boo',[1,2,3],{"a" => "b"}]}
       }
@@ -526,6 +538,7 @@ class JSONSchemaTest < Test::Unit::TestCase
   def test_divisible_by
     # Set up the default datatype
     schema = {
+      "$schema" => "http://json-schema.org/draft-03/schema#",
       "properties" => {
         "a" => {"divisibleBy" => 1.1}
       }
@@ -559,6 +572,7 @@ class JSONSchemaTest < Test::Unit::TestCase
   def test_disallow
     # Set up the default datatype
     schema = {
+      "$schema" => "http://json-schema.org/draft-03/schema#",
       "properties" => {
         "a" => {"disallow" => "integer"}
       }
@@ -592,12 +606,14 @@ class JSONSchemaTest < Test::Unit::TestCase
   
   def test_extends
     schema = {
+      "$schema" => "http://json-schema.org/draft-03/schema#",
       "properties" => {
         "a" => { "type" => "integer"}
       } 
     }
     
     schema2 = {
+      "$schema" => "http://json-schema.org/draft-03/schema#",
       "properties" => {
         "a" => { "maximum" => 5 }
       }
@@ -618,6 +634,7 @@ class JSONSchemaTest < Test::Unit::TestCase
   def test_pattern_properties
     # Set up the default datatype
     schema = {
+      "$schema" => "http://json-schema.org/draft-03/schema#",
       "patternProperties" => {
         "\\d+ taco" => {"type" => "integer"}
       }
@@ -638,6 +655,7 @@ class JSONSchemaTest < Test::Unit::TestCase
   def test_additional_properties
     # Test no additional properties allowed
     schema = {
+      "$schema" => "http://json-schema.org/draft-03/schema#",
       "properties" => {
         "a" => { "type" => "integer" }
       },
@@ -661,6 +679,7 @@ class JSONSchemaTest < Test::Unit::TestCase
     
     # Make sure this works with pattern properties set, too
     schema = {
+      "$schema" => "http://json-schema.org/draft-03/schema#",
       "patternProperties" => {
         "\\d+ taco" => {"type" => "integer"}
       },
@@ -680,6 +699,7 @@ class JSONSchemaTest < Test::Unit::TestCase
   
   def test_items
     schema = {
+      "$schema" => "http://json-schema.org/draft-03/schema#",
       "items" => { "type" => "integer" }
     }
     
@@ -689,6 +709,7 @@ class JSONSchemaTest < Test::Unit::TestCase
     assert(!JSON::Validator.validate(schema,data))
     
     schema = {
+      "$schema" => "http://json-schema.org/draft-03/schema#",
       "items" => [
         {"type" => "integer"},
         {"type" => "string"}
@@ -703,6 +724,7 @@ class JSONSchemaTest < Test::Unit::TestCase
     assert(!JSON::Validator.validate(schema,data))
     
     schema = {
+      "$schema" => "http://json-schema.org/draft-03/schema#",
       "items" => [
         {"type" => "integer"},
         {"type" => "string"}
@@ -715,7 +737,7 @@ class JSONSchemaTest < Test::Unit::TestCase
     data = [1,"string",3]
     assert(!JSON::Validator.validate(schema,data))
     
-    schema = {"items" => [{"type" => "integer"},{"type" => "string"}],"additionalItems" => {"type" => "integer"}}
+    schema = {"$schema" => "http://json-schema.org/draft-03/schema#","items" => [{"type" => "integer"},{"type" => "string"}],"additionalItems" => {"type" => "integer"}}
     
     data = [1,"string"]
     assert(JSON::Validator.validate(schema,data))
@@ -728,6 +750,7 @@ class JSONSchemaTest < Test::Unit::TestCase
   
   def test_list_option
     schema = {
+      "$schema" => "http://json-schema.org/draft-03/schema#",
       "type" => "object",
       "properties" => { "a" => {"type" => "integer", "required" => true} }
     }
@@ -747,6 +770,7 @@ class JSONSchemaTest < Test::Unit::TestCase
   
   def test_self_reference
     schema = {
+      "$schema" => "http://json-schema.org/draft-03/schema#",
       "type" => "object",
       "properties" => { "a" => {"type" => "integer"}, "b" => {"$ref" => "#"}}
     }
@@ -760,6 +784,7 @@ class JSONSchemaTest < Test::Unit::TestCase
   
   def test_format_ipv4
     schema = {
+      "$schema" => "http://json-schema.org/draft-03/schema#",
       "type" => "object",
       "properties" => { "a" => {"type" => "string", "format" => "ip-address"}}
     }
@@ -782,6 +807,7 @@ class JSONSchemaTest < Test::Unit::TestCase
   
   def test_format_ipv6
     schema = {
+      "$schema" => "http://json-schema.org/draft-03/schema#",
       "type" => "object",
       "properties" => { "a" => {"type" => "string", "format" => "ipv6"}}
     }
@@ -804,6 +830,7 @@ class JSONSchemaTest < Test::Unit::TestCase
   
   def test_format_time
     schema = {
+      "$schema" => "http://json-schema.org/draft-03/schema#",
       "type" => "object",
       "properties" => { "a" => {"type" => "string", "format" => "time"}}
     }
@@ -829,6 +856,7 @@ class JSONSchemaTest < Test::Unit::TestCase
   
   def test_format_date
     schema = {
+      "$schema" => "http://json-schema.org/draft-03/schema#",
       "type" => "object",
       "properties" => { "a" => {"type" => "string", "format" => "date"}}
     }
@@ -849,6 +877,7 @@ class JSONSchemaTest < Test::Unit::TestCase
   
   def test_format_datetime
     schema = {
+      "$schema" => "http://json-schema.org/draft-03/schema#",
       "type" => "object",
       "properties" => { "a" => {"type" => "string", "format" => "date-time"}}
     }
@@ -879,6 +908,7 @@ class JSONSchemaTest < Test::Unit::TestCase
     data2 = {"a" => 5}
     
     schema = {
+      "$schema" => "http://json-schema.org/draft-03/schema#",
       "type" => "object",
       "properties" => { "a" => {"format" => "regex"}}
     }
@@ -886,6 +916,7 @@ class JSONSchemaTest < Test::Unit::TestCase
     assert(!JSON::Validator.validate(schema,data2))
     
     schema = {
+      "$schema" => "http://json-schema.org/draft-03/schema#",
       "type" => "object",
       "properties" => { "a" => {"format" => "color"}}
     }
@@ -893,6 +924,7 @@ class JSONSchemaTest < Test::Unit::TestCase
     assert(!JSON::Validator.validate(schema,data2))
     
     schema = {
+      "$schema" => "http://json-schema.org/draft-03/schema#",
       "type" => "object",
       "properties" => { "a" => {"format" => "style"}}
     }
@@ -900,6 +932,7 @@ class JSONSchemaTest < Test::Unit::TestCase
     assert(!JSON::Validator.validate(schema,data2))
     
     schema = {
+      "$schema" => "http://json-schema.org/draft-03/schema#",
       "type" => "object",
       "properties" => { "a" => {"format" => "phone"}}
     }
@@ -907,6 +940,7 @@ class JSONSchemaTest < Test::Unit::TestCase
     assert(!JSON::Validator.validate(schema,data2))
     
     schema = {
+      "$schema" => "http://json-schema.org/draft-03/schema#",
       "type" => "object",
       "properties" => { "a" => {"format" => "uri"}}
     }
@@ -914,6 +948,7 @@ class JSONSchemaTest < Test::Unit::TestCase
     assert(!JSON::Validator.validate(schema,data2))
     
     schema = {
+      "$schema" => "http://json-schema.org/draft-03/schema#",
       "type" => "object",
       "properties" => { "a" => {"format" => "email"}}
     }
@@ -921,6 +956,7 @@ class JSONSchemaTest < Test::Unit::TestCase
     assert(!JSON::Validator.validate(schema,data2))
     
     schema = {
+      "$schema" => "http://json-schema.org/draft-03/schema#",
       "type" => "object",
       "properties" => { "a" => {"format" => "host-name"}}
     }
@@ -935,6 +971,7 @@ class JSONSchemaTest < Test::Unit::TestCase
     data3 = {"a" => 5.4}
     
     schema = {
+      "$schema" => "http://json-schema.org/draft-03/schema#",
       "type" => "object",
       "properties" => { "a" => {"format" => "utc-millisec"}}
     }
@@ -945,5 +982,22 @@ class JSONSchemaTest < Test::Unit::TestCase
   
   
   
+  def test_schema
+    schema = {
+      "$schema" => "http://json-schema.org/THIS-IS-NOT-A-SCHEMA",
+      "type" => "object"
+    }
+    
+    data = {"a" => "taco"}
+    assert(!JSON::Validator.validate(schema,data))
+    
+    schema = {
+      "$schema" => "http://json-schema.org/draft-03/schema#",
+      "type" => "object"
+    }
+    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: 1
+  hash: 7
   prerelease: false
   segments: 
   - 0
   - 1
-  - 13
-  version: 0.1.13
+  - 14
+  version: 0.1.14
 platform: ruby
 authors: 
 - Kenny Hoxworth
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-16 00:00:00 -05:00
+date: 2011-03-08 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -41,13 +41,36 @@ extensions: []
 extra_rdoc_files: 
 - README.textile
 files: 
+- lib/json-schema/attributes/additionalitems.rb
+- lib/json-schema/attributes/additionalproperties.rb
+- lib/json-schema/attributes/dependencies.rb
+- lib/json-schema/attributes/disallow.rb
+- lib/json-schema/attributes/divisibleby.rb
+- lib/json-schema/attributes/enum.rb
+- lib/json-schema/attributes/extends.rb
+- lib/json-schema/attributes/format.rb
+- lib/json-schema/attributes/items.rb
+- lib/json-schema/attributes/maximum.rb
+- lib/json-schema/attributes/maxitems.rb
+- lib/json-schema/attributes/maxlength.rb
+- lib/json-schema/attributes/minimum.rb
+- lib/json-schema/attributes/minitems.rb
+- lib/json-schema/attributes/minlength.rb
+- lib/json-schema/attributes/pattern.rb
+- lib/json-schema/attributes/patternproperties.rb
+- lib/json-schema/attributes/properties.rb
+- lib/json-schema/attributes/ref.rb
+- lib/json-schema/attributes/type.rb
+- lib/json-schema/attributes/uniqueitems.rb
 - lib/json-schema/schema.rb
 - lib/json-schema/uri/file.rb
 - lib/json-schema/validator.rb
+- lib/json-schema/validators/draft3.rb
 - lib/json-schema.rb
 - README.textile
+- test/test_extended_schema.rb
 - test/test_files.rb
-- test/test_jsonschema.rb
+- test/test_jsonschema_draft3.rb
 has_rdoc: true
 homepage: http://github.com/hoxworth/json-schema/tree/master
 licenses: []
@@ -83,5 +106,6 @@ signing_key:
 specification_version: 3
 summary: Ruby JSON Schema Validator
 test_files: 
+- test/test_extended_schema.rb
 - test/test_files.rb
-- test/test_jsonschema.rb
+- test/test_jsonschema_draft3.rb