json-schema 2.0.5 → 2.1.0

data/README.textile

@@ -22,7 +22,7 @@ From the git repo:
 
 <pre>
 $ gem build json-schema.gemspec
-$ gem install json-schema-2.0.5.gem
+$ gem install json-schema-2.1.0.gem
 </pre>
 
 
@@ -149,6 +149,34 @@ errors = JSON::Validator.fully_validate(schema, data, :errors_as_objects => true
 
 </pre>
 
+h3. Validate against a fragment of a supplied schema
+
+<pre>
+  require 'rubygems'
+  require 'json-schema'
+
+  schema = {
+    "type" => "object",
+    "required" => ["a","b"],
+    "properties" => {
+      "a" => {"type" => "integer"},
+      "b" => {"type" => "string"},
+      "c" => {
+        "type" => "object",
+        "properties" => {
+          "z" => {"type" => "integer"}
+        }
+      }
+    }
+  }
+
+  data = {
+    "z" => 1
+  }
+
+  JSON::Validator.validate(schema, data, :fragment => "#/properties/c")
+</pre>
+
 h3. Validate a JSON object against a JSON schema object, while also validating the schema itself
 
 <pre>

data/lib/json-schema/validator.rb

@@ -170,8 +170,39 @@ module JSON
       @@mutex.synchronize { @base_schema = initialize_schema(schema_data) }
       @data = initialize_data(data)
       @@mutex.synchronize { build_schemas(@base_schema) }
+
+      # If the :fragment option is set, try and validate against the fragment
+      if opts[:fragment]
+        @base_schema = schema_from_fragment(@base_schema, opts[:fragment])
+      end
     end
 
+    def schema_from_fragment(base_schema, fragment)
+      fragments = fragment.split("/")
+
+      # ensure the first element was a hash, per the fragment spec
+      if fragments.shift != "#"
+        raise JSON::Schema::SchemaError.new("Invalid fragment syntax in :fragment option")
+      end
+
+      fragments.each do |f|
+        if 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]
+        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]
+        else
+          raise JSON::Schema::SchemaError.new("Invalid schema encountered when resolving :fragment option")
+        end
+      end
+
+      base_schema
+    end
 
     # Run a simple true/false validation of data against a schema
     def validate()

data/test/schemas/test_fragment_resolution.rb

@@ -0,0 +1,30 @@
+require 'test/unit'
+require File.dirname(__FILE__) + '/../lib/json-schema'
+
+class FragmentResolution < Test::Unit::TestCase
+  def test_fragment_resolution
+    schema = {
+      "$schema" => "http://json-schema.org/draft-04/schema#",
+      "properties" => {
+        "a" => {
+          "type" => "object",
+          "properties" => {
+            "b" => {"type" => "integer" }
+          }
+        }
+      }
+    }
+
+    data = {"b" => 5}
+    assert(!JSON::Validator.validate(schema,data))
+    assert(JSON::Validator.validate(schema,data,:fragment => "#/properties/a"))
+
+    assert_raise JSON::Schema::SchemaError do
+      JSON::Validator.validate!(schema,data,:fragment => "/properties/a")
+    end
+
+    assert_raise JSON::Schema::SchemaError do
+      JSON::Validator.validate!(schema,data,:fragment => "#/properties/b")
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: json-schema
 version: !ruby/object:Gem::Version
-  version: 2.0.5
+  version: 2.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-01 00:00:00.000000000 Z
+date: 2013-07-03 00:00:00.000000000 Z
 dependencies: []
 description: 
 email: hoxworth@gmail.com
@@ -70,6 +70,7 @@ files:
 - resources/draft-04.json
 - README.textile
 - LICENSE.md
+- test/schemas/test_fragment_resolution.rb
 - test/test_extended_schema.rb
 - test/test_extends_and_additionalProperties.rb
 - test/test_files_v3.rb
@@ -111,11 +112,12 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: Ruby JSON Schema Validator
 test_files:
+- test/schemas/test_fragment_resolution.rb
 - test/test_extended_schema.rb
 - test/test_extends_and_additionalProperties.rb
 - test/test_files_v3.rb