json-schema 0.1.7 → 0.1.8

data/README.textile

@@ -24,8 +24,9 @@ require 'json-schema'
 JSON::Validator.validate('schema.json', 'data.json')
 
 schema = {
+  "type" => "object",
   "properties" => {
-    "a" => {"type" => "integer"}
+    "a" => {"type" => "integer", "required" => true}
   }
 }
 
@@ -35,6 +36,9 @@ data = {
 
 JSON::Validator.validate(schema, data)
 
+data = [data,data,data]
+JSON::Validator.validate(schema, data, :list => true)
+
 data = {
   "a" => "taco"
 }

data/lib/json-schema/validator.rb

@@ -20,6 +20,9 @@ module JSON
 
     @@schemas = {}
     @@cache_schemas = false
+    @@default_opts = {
+      :list => false
+    }
 
     ValidationMethods = [
       "type",
@@ -45,7 +48,8 @@ module JSON
     ]
     
     
-    def initialize(schema_data, data)
+    def initialize(schema_data, data, opts={})
+      @options = @@default_opts.clone.merge(opts)
       @base_schema = initialize_schema(schema_data)
       @data = initialize_data(data)    
       build_schemas(@base_schema)
@@ -579,13 +583,13 @@ module JSON
         
     
     class << self
-      def validate(schema, data)
-        validator = JSON::Validator.new(schema, data)
+      def validate(schema, data,opts={})
+        validator = JSON::Validator.new(schema, data, opts)
         validator.validate
       end
     
-      def validate2(schema, data)
-        validator = JSON::Validator.new(schema, data)
+      def validate2(schema, data,opts={})
+        validator = JSON::Validator.new(schema, data, opts)
         validator.validate2
       end
       
@@ -615,8 +619,9 @@ module JSON
       if schema.is_a?(String)
         begin
           # Build a fake URI for this
-          schema_uri = URI.parse("file://#{Dir.pwd}/#{Digest::SHA1.hexdigest(schema)}.json")
+          schema_uri = URI.parse("file://#{Dir.pwd}/#{Digest::SHA1.hexdigest(schema)}")
           schema = JSON::Schema.new(JSON.parse(schema),schema_uri)
+          Validator.add_schema(schema)
         rescue
           # Build a uri for it
           schema_uri = URI.parse(schema)
@@ -637,12 +642,19 @@ module JSON
         end
       elsif schema.is_a?(Hash)
         schema = schema.to_json
-        schema_uri = URI.parse("file://#{Dir.pwd}/#{Digest::SHA1.hexdigest(schema)}.json")
+        schema_uri = URI.parse("file://#{Dir.pwd}/#{Digest::SHA1.hexdigest(schema)}")
         schema = JSON::Schema.new(JSON.parse(schema),schema_uri)
+        Validator.add_schema(schema)
       else
         raise "Invalid schema - must be either a string or a hash"
       end
       
+      if @options[:list]
+        inter_json = {:type => "array", :items => schema.schema}.to_json
+        wrapper_schema = JSON::Schema.new(JSON.parse(inter_json),URI.parse("file://#{Dir.pwd}/#{Digest::SHA1.hexdigest(inter_json)}"))
+        schema = wrapper_schema
+      end      
+      
       schema
     end
     

data/test/test_jsonschema.rb

@@ -724,5 +724,25 @@ class JSONSchemaTest < Test::Unit::TestCase
     data = [1,"string","string"]
     assert(!JSON::Validator.validate(schema,data))
   end
+  
+  
+  def test_list_option
+    schema = {
+      "type" => "object",
+      "properties" => { "a" => {"type" => "integer", "required" => true} }
+    }
+    
+    data = [{"a" => 1},{"a" => 2},{"a" => 3}]
+    assert(JSON::Validator.validate(schema,data,:list => true))
+    assert(!JSON::Validator.validate(schema,data))    
+    
+    data = [{"a" => 1},{"b" => 2},{"a" => 3}]
+    assert(!JSON::Validator.validate(schema,data,:list => true))
+    
+    data = {"a" => 1}
+    assert(!JSON::Validator.validate(schema,data,:list => true))
+    
+  end
+  
 end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: json-schema
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 11
   prerelease: false
   segments: 
   - 0
   - 1
-  - 7
-  version: 0.1.7
+  - 8
+  version: 0.1.8
 platform: ruby
 authors: 
 - Kenny Hoxworth
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-03 00:00:00 -05:00
+date: 2010-12-14 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency