json-schema 0.9.8 → 0.9.9

data/README.textile

@@ -18,7 +18,7 @@ From the git repo:
 
 <pre>
 $ gem build json-schema.gemspec
-$ gem install json-schema-0.9.8.gem
+$ gem install json-schema-0.9.9.gem
 </pre>
 
 
@@ -93,6 +93,26 @@ rescue JSON::Schema::ValidationError
 end
 </pre>
 
+h3. Validate a JSON object against a JSON schema object, while also validating the schema itself
+
+<pre>
+require 'rubygems'
+require 'json-schema'
+
+schema = {
+  "type" => "object",
+  "properties" => {
+    "a" => {"type" => "integer", "required" => "true"}  # This will fail schema validation!
+  }
+}
+
+data = {
+  "a" => 5
+}
+
+JSON::Validator.validate(schema, data, :validate_schema => false)
+</pre>
+
 h3. Validate an object against a JSON Schema Draft 2 schema
 
 <pre>

data/lib/json-schema.rb

@@ -3,6 +3,6 @@ $LOAD_PATH.unshift "#{File.dirname(__FILE__)}/json-schema"
 require 'rubygems'
 require 'schema'
 require 'validator'
-Dir[File.join(File.dirname(__FILE__), "json-schema/attributes/*")].each {|file| require file }
-Dir[File.join(File.dirname(__FILE__), "json-schema/validators/*")].each {|file| require file }
-require 'uri/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")].each {|file| require file }
+require 'uri/file'

data/lib/json-schema/validator.rb

@@ -74,7 +74,8 @@ module JSON
     @@cache_schemas = false
     @@default_opts = {
       :list => false,
-      :version => nil
+      :version => nil,
+      :validate_schema => false
     }
     @@validators = {}
     @@default_validator = nil
@@ -85,6 +86,7 @@ module JSON
       @options = @@default_opts.clone.merge(opts)
 
       # I'm not a fan of this, but it's quick and dirty to get it working for now
+      version_string = "draft-03"
       if @options[:version]
         @options[:version] = case @options[:version].to_s
         when "draft3"
@@ -96,10 +98,23 @@ module JSON
         else
           raise JSON::Schema::SchemaError.new("The requested JSON schema version is not supported")
         end
+        version_string = @options[:version]
         u = URI.parse("http://json-schema.org/#{@options[:version]}/schema#")
         validator = JSON::Validator.validators["#{u.scheme}://#{u.host}#{u.path}"]
         @options[:version] = validator
       end
+      
+      # validate the schema, if requested
+      if @options[:validate_schema]
+        begin
+          metaschema_file = File.join(Pathname.new(File.dirname(__FILE__)).parent.parent, "resources", "#{version_string}.json").to_s          
+          meta_validator = JSON::Validator.new(metaschema_file, schema_data)
+          meta_validator.validate
+        rescue JSON::Schema::ValidationError, JSON::Schema::SchemaError
+          raise $!
+        end
+      end
+      
       @base_schema = initialize_schema(schema_data)
       @data = initialize_data(data)
       build_schemas(@base_schema)

data/test/test_schema_validation.rb

@@ -0,0 +1,33 @@
+require 'test/unit'
+require File.dirname(__FILE__) + '/../lib/json-schema'
+
+class JSONSchemaValidation < Test::Unit::TestCase
+    
+  def test_draft03_validation
+    if JSON::Validator.json_backend != nil
+      data = {"b" => {"a" => 5}}
+      schema = {
+        "$schema" => "http://json-schema.org/draft-03/schema#",
+        "type" => "object",
+        "properties" => {
+          "b" => {
+            "required" => true
+          }
+        }
+      }
+      
+      assert(JSON::Validator.validate(schema,data,:validate_schema => true))
+    
+      schema = {
+        "$schema" => "http://json-schema.org/draft-03/schema#",
+        "type" => "object",
+        "properties" => {
+          "b" => {
+            "required" => "true"
+          }
+        }
+      }     
+      assert(!JSON::Validator.validate(schema,data,:validate_schema => true))
+    end
+  end
+end

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: json-schema
 version: !ruby/object:Gem::Version 
-  hash: 43
   prerelease: false
   segments: 
   - 0
   - 9
-  - 8
-  version: 0.9.8
+  - 9
+  version: 0.9.9
 platform: ruby
 authors: 
 - Kenny Hoxworth
@@ -15,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-13 00:00:00 -04:00
+date: 2011-07-24 00:00:00 -04:00
 default_executable: 
 dependencies: []
 
@@ -67,6 +66,7 @@ files:
 - test/test_jsonschema_draft1.rb
 - test/test_jsonschema_draft2.rb
 - test/test_jsonschema_draft3.rb
+- test/test_schema_validation.rb
 has_rdoc: true
 homepage: http://github.com/hoxworth/json-schema/tree/master
 licenses: []
@@ -81,7 +81,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
@@ -90,7 +89,6 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
@@ -107,3 +105,4 @@ test_files:
 - test/test_jsonschema_draft1.rb
 - test/test_jsonschema_draft2.rb
 - test/test_jsonschema_draft3.rb
+- test/test_schema_validation.rb