json-schema 0.9.2 → 0.9.3

data/README.textile

@@ -6,6 +6,10 @@ h2. Dependencies
 
 The JSON::Schema library has no dependencies if the validation methods are called using Ruby objects. However, either the <code>json</code> or the <code>yajl-ruby</code> gem needs to be installed to validate JSON strings or files containing JSON data.
 
+h2. 0.9.3 Notes
+
+For those upgrading to version 0.9.3 and above and use external file references, the library changed how files are referenced. The JSON Schema spec clearly states that relative URIs are to be referenced against the parent schema's URI, and not the parent schema's 'parent' URI, as the library previously assumed. 
+
 h2. Installation
 
 From rubygems.org:
@@ -18,7 +22,7 @@ From the git repo:
 
 <pre>
 $ gem build json-schema.gemspec
-$ gem install json-schema-0.9.1.gem
+$ gem install json-schema-0.9.3.gem
 </pre>
 
 

data/lib/json-schema/attributes/ref.rb

@@ -12,14 +12,15 @@ module JSON
           elsif path[0,1] == "/"
             temp_uri.path = Pathname.new(path).cleanpath.to_s
           else
-            temp_uri.path = (Pathname.new(current_schema.uri.path).parent + path).cleanpath.to_s
+            temp_uri.path = (Pathname.new(current_schema.uri.path) + path).cleanpath.to_s
           end
           temp_uri.fragment = current_schema.schema['$ref'].split("#")[1]
         end
         temp_uri.fragment = "" if temp_uri.fragment.nil?
 
         # Grab the parent schema from the schema list
-        schema_key = temp_uri.to_s.split("#")[0]
+        schema_key = temp_uri.to_s.split("#")[0] + "#"
+
         ref_schema = JSON::Validator.schemas[schema_key]
 
         if ref_schema

data/lib/json-schema/schema.rb

@@ -13,12 +13,12 @@ module JSON
       if @schema['id']
         temp_uri = URI.parse(@schema['id'])
         if temp_uri.relative?
-          uri.path = (Pathname.new(uri.path).parent + @schema['id']).cleanpath.to_s
+          uri.path = (Pathname.new(uri.path) + @schema['id']).cleanpath.to_s
           temp_uri = uri
         end
         @uri = temp_uri
       end
-      @uri.fragment = nil
+      @uri.fragment = ''
       
       # If there is a $schema on this schema, use it to determine which validator to use
       if @schema['$schema']

data/lib/json-schema/validator.rb

@@ -134,9 +134,9 @@ module JSON
         if path && path[0,1] == '/'
           uri.path = Pathname.new(path).cleanpath.to_s
         else
-          uri.path = (Pathname.new(parent_schema.uri.path).parent + path).cleanpath.to_s
+          uri.path = (Pathname.new(parent_schema.uri.path) + path).cleanpath.to_s
         end
-        uri.fragment = nil
+        uri.fragment = ''
       end
       
       if Validator.schemas[uri.to_s].nil?
@@ -156,7 +156,12 @@ module JSON
     
     
     # Build all schemas with IDs, mapping out the namespace
-    def build_schemas(parent_schema)    
+    def build_schemas(parent_schema)  
+      # Build ref schemas if they exist
+      if parent_schema.schema["$ref"]
+        load_ref_schema(parent_schema, parent_schema.schema["$ref"])
+      end
+      
       # Check for schemas in union types
       ["type", "disallow"].each do |key|
         if parent_schema.schema[key] && parent_schema.schema[key].is_a?(Array)
@@ -199,16 +204,12 @@ module JSON
     
     # Either load a reference schema or create a new schema
     def handle_schema(parent_schema, obj)
-      if obj['$ref']
-         load_ref_schema(parent_schema, obj['$ref'])
-       else
-         schema_uri = parent_schema.uri.clone
-         schema = JSON::Schema.new(obj,schema_uri,@options[:version])
-         if obj['id']
-           Validator.add_schema(schema)
-         end
-         build_schemas(schema)
-       end
+      schema_uri = parent_schema.uri.clone
+      schema = JSON::Schema.new(obj,schema_uri,@options[:version])
+      if obj['id']
+        Validator.add_schema(schema)
+      end
+      build_schemas(schema)
     end
         
     
@@ -226,6 +227,7 @@ module JSON
       def validate!(schema, data,opts={})
         validator = JSON::Validator.new(schema, data, opts)
         validator.validate
+        return true
       end
       alias_method 'validate2', 'validate!'
       
@@ -267,7 +269,7 @@ module JSON
       
       def json_backend=(backend)
         backend = backend.to_s
-        if @@available_json_backend.include?(backend)
+        if @@available_json_backends.include?(backend)
           @@json_backend = backend
         else
           raise JSON::Schema::JsonParseError.new("The JSON backend '#{backend}' could not be found.")

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: json-schema
 version: !ruby/object:Gem::Version 
-  hash: 63
+  hash: 61
   prerelease: false
   segments: 
   - 0
   - 9
-  - 2
-  version: 0.9.2
+  - 3
+  version: 0.9.3
 platform: ruby
 authors: 
 - Kenny Hoxworth
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-30 00:00:00 -04:00
+date: 2011-04-21 00:00:00 -04:00
 default_executable: 
 dependencies: []