json-schema 0.1.6 → 0.1.7

data/README.textile

@@ -2,8 +2,6 @@ h1. Ruby JSON Schema Validator
 
 This library is intended to provide Ruby with an interface for validating JSON objects against a JSON schema conforming to "JSON Schema Draft 3":http://tools.ietf.org/html/draft-zyp-json-schema-03. The project originally started as a fork of "Constellation's ruby-jsonschema":https://github.com/Constellation/ruby-jsonchema project, but differences in the JSON schema draft versions implemented as well as assumptions made by the ruby-jsonschema library forced this to become a new project.
 
-This project is far from complete but is in a somewhat usable state...
-
 h2. Usage
 
 Install:
@@ -16,7 +14,7 @@ If downloading the git repo, build the gem and install it:
 
 <pre>
 $ rake package
-$ gem install pkg/json-schema-0.1.0.gem
+$ gem install pkg/json-schema-0.1.6.gem
 </pre>
 
 <pre>
@@ -85,20 +83,20 @@ h2. Not implemented
 
 The following core schema definitions are not implemented:
 
+* format - Some of the formats listed will be supported, others are fairly vague in their definition and may be left out
 * default - This library aims to solely be a validator and does not modify an object it is validating.
 * $schema - Support for this will come later, possibly with the ability to validate against other JSON Schema draft versions
 
 In addition, the following hyper schema attributes are not implemented at this time:
 
-* links (not much to do with validation...)
+* links
 * fragmentResolution (only handles default slash-delimited)
-* readonly
 * contentEncoding
 * pathStart
-* mediaType
 
 
 h2. To Do
 
 * (Much) More testing
-* Adding a persistence option to schemas that enables the validator to only load schemas once across multiple validations
+* Documentation
+* Breaking the current validator out into a subclass, acting as the foundation for supporting multiple versions of validators

data/lib/json-schema/validator.rb

@@ -2,6 +2,7 @@ require 'uri'
 require 'open-uri'
 require 'pathname'
 require 'bigdecimal'
+require 'digest/sha1'
 
 module JSON
   
@@ -46,9 +47,7 @@ module JSON
     
     def initialize(schema_data, data)
       @base_schema = initialize_schema(schema_data)
-      @data = initialize_data(data)
-      Validator.add_schema(@base_schema)
-      
+      @data = initialize_data(data)    
       build_schemas(@base_schema)
     end  
     
@@ -613,10 +612,11 @@ module JSON
     private
     
     def initialize_schema(schema)
-      schema_uri = URI.parse("file://#{Dir.pwd}/__base_schema__.json")
       if schema.is_a?(String)
         begin
-          schema = JSON.parse(schema)
+          # Build a fake URI for this
+          schema_uri = URI.parse("file://#{Dir.pwd}/#{Digest::SHA1.hexdigest(schema)}.json")
+          schema = JSON::Schema.new(JSON.parse(schema),schema_uri)
         rescue
           # Build a uri for it
           schema_uri = URI.parse(schema)
@@ -628,11 +628,22 @@ module JSON
               schema_uri = URI.parse("file://#{Dir.pwd}/#{schema}")
             end
           end
-          schema = JSON.parse(open(schema_uri.to_s).read)
+          if Validator.schemas[schema_uri.to_s].nil?
+            schema = JSON::Schema.new(JSON.parse(open(schema_uri.to_s).read),schema_uri)
+            Validator.add_schema(schema)
+          else
+            schema = Validator.schemas[schema_uri.to_s]
+          end
         end
+      elsif schema.is_a?(Hash)
+        schema = schema.to_json
+        schema_uri = URI.parse("file://#{Dir.pwd}/#{Digest::SHA1.hexdigest(schema)}.json")
+        schema = JSON::Schema.new(JSON.parse(schema),schema_uri)
+      else
+        raise "Invalid schema - must be either a string or a hash"
       end
       
-      JSON::Schema.new(schema,schema_uri)
+      schema
     end
     
     

metadata

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