jschematic 0.0.5 → 0.0.6

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    jschematic (0.0.2)
+    jschematic (0.0.5)
       addressable
 
 GEM

data/History.txt

@@ -1,3 +1,6 @@
+== 0.0.6
+* Improve and document the Context API (Mike Sassak)
+
 == 0.0.5
 * Initial support for validation contexts (Mike Sassak)
 * $ref support (Mike Sassak)

data/README.md

@@ -31,7 +31,12 @@ fine yajl-ruby gem for testing).
 
 ## Advanced Usage
 
-Hasn't been documented yet.
+Pass extra schemas to inform the validation context:
+
+    Jschematic.validate(json, schema, :context => [cs1, cs2])
+
+Each context schema will be consulting in those cases where cross-schema
+referencing is allowed, e.g. $ref.
 
 ## Testing
 

data/features/ref.feature

@@ -90,7 +90,7 @@ Feature: Core schema: $ref
       """
 
   Scenario: Ref resolves to different schema
-    Given this schema:
+    Given the validation context contains this schema:
       """
       {
           "id": "http://www.example.com/schemas/person",
@@ -101,7 +101,7 @@ Feature: Core schema: $ref
           }
       }
       """
-    And this schema:
+    When the schema is:
       """
       {
           "title": "A Happy Family Much Like All Other Happy Families",

data/features/step_definitions/jschematic_steps.rb

@@ -1,40 +1,40 @@
-Given "this schema:" do |schema|
-  add_schema(parse(schema))
+Given "the validation context contains this schema:" do |schema|
+  add_context_schema(schema)
 end
 
 When /^the schema is '(.+)'$/ do |schema|
-  add_schema(parse(schema))
+  set_schema(schema)
 end
 
 When "the schema is:" do |schema|
-  add_schema(parse(schema))
+  set_schema(schema)
 end
 
 Then /^'(.+)' is valid JSON$/ do |json|
-  assert_valid(parse(json), all_schemas)
+  assert_valid(parse(json), current_schema, context_schemas)
 end
 
 Then /^'(.+)' is not valid JSON$/ do |json|
-  assert_invalid(parse(json), all_schemas)
+  assert_invalid(parse(json), current_schema, context_schemas)
 end
 
 Then "this is valid JSON:" do |json|
-  assert_valid(parse(json), all_schemas)
+  assert_valid(parse(json), current_schema, context_schemas)
 end
 
 Then "this is not valid JSON:" do |json|
-  assert_invalid(parse(json), all_schemas)
+  assert_invalid(parse(json), current_schema, context_schemas)
 end
 
 Then "these are valid JSON:" do |instances|
   instances.raw.each do |row|
-    assert_valid(parse(row[0]), all_schemas)
+    assert_valid(parse(row[0]), current_schema, context_schemas)
   end
 end
 
 Then "these are not valid JSON:" do |instances|
   instances.raw.each do |row|
-    assert_invalid(parse(row[0]), all_schemas)
+    assert_invalid(parse(row[0]), current_schema, context_schemas)
   end
 end
 
@@ -50,25 +50,32 @@ module JschematicWorld
     raise "Parsing '#{json}' failed with #{e.to_s}"
   end
 
-  def assert_valid(json, raw_schemas)
-    Jschematic.validate(json, *raw_schemas).should be_true
+  def assert_valid(json, current_schema, context_schemas)
+    Jschematic.validate(json, current_schema, :context => context_schemas).should be_true
   end
 
-  def assert_invalid(json, raw_schemas)
-    Jschematic.validate(json, *raw_schemas).should be_false
+  def assert_invalid(json, current_schema, context_schemas)
+    Jschematic.validate(json, current_schema, :context => context_schemas).should be_false
   end
 
   def build_schema
-    @_schema ||= Jschematic::Schema.new(all_schemas.first)
+    Jschematic::Schema.new(current_schema)
   end
 
-  def add_schema(schema)
-    @_schemas ||= []
-    @_schemas << schema
+  def set_schema(schema)
+    @_schema = parse(schema)
   end
 
-  def all_schemas
-    @_schemas ||= []
+  def current_schema
+    @_schema ||= nil
+  end
+
+  def add_context_schema(schema)
+    context_schemas << parse(schema)
+  end
+
+  def context_schemas
+    @_context_schemas ||= []
   end
 end
 

data/jschematic.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = 'jschematic'
-  s.version     = '0.0.5'
+  s.version     = '0.0.6'
   s.authors     = ["Mike Sassak"]
   s.description = "JSON Schema v3 Validator"
   s.summary     = "jschematic #{s.version}"

data/lib/jschematic.rb

@@ -1,13 +1,13 @@
 require 'jschematic/context'
 
 module Jschematic
-  def self.validate(instance, *schemas)
-    validate!(instance, *schemas)
+  def self.validate(instance, schema, opts={})
+    validate!(instance, schema, opts)
   rescue ValidationError
     false
   end
 
-  def self.validate!(instance, *schemas)
-    Context.new(*schemas).validate!(instance)
+  def self.validate!(instance, schema, opts={})
+    Context.new(*opts[:context]).validate!(instance, schema)
   end
 end

data/lib/jschematic/context.rb

@@ -2,12 +2,12 @@ require 'jschematic/schema'
 
 module Jschematic
   class Context
-    def initialize(*schemas)
-      @schemas = schemas.collect{ |raw_schema| Schema.new(raw_schema) }
+    def initialize(*raw_schemas)
+      @schemas = raw_schemas.collect{ |raw_schema| Schema.new(raw_schema) }
     end
 
-    def validate!(instance)
-      @schemas.last.accepts?(instance)
+    def validate!(instance, raw_schema)
+      Schema.new(raw_schema).accepts?(instance)
     end
   end
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 5
-  version: 0.0.5
+  - 6
+  version: 0.0.6
 platform: ruby
 authors: 
 - Mike Sassak
@@ -177,7 +177,7 @@ rubyforge_project:
 rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
-summary: jschematic 0.0.5
+summary: jschematic 0.0.6
 test_files: 
 - features/default.feature
 - features/dependencies.feature