json-schema 0.9.4 → 0.9.5

data/README.textile

@@ -6,10 +6,6 @@ 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:
@@ -22,7 +18,7 @@ From the git repo:
 
 <pre>
 $ gem build json-schema.gemspec
-$ gem install json-schema-0.9.4.gem
+$ gem install json-schema-0.9.5.gem
 </pre>
 
 
@@ -197,4 +193,4 @@ The 'format' attribute is only validated for the following values:
 
 All other 'format' attribute values are simply checked to ensure the instance value is of the correct datatype (e.g., an instance value is validated to be an integer or a float in the case of 'utc-millisec').
 
-Additionally, JSON::Validator does not handle any json hyperschema attributes.
+Additionally, JSON::Validator does not handle any json hyperschema attributes.

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

@@ -12,7 +12,7 @@ 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) + path).cleanpath.to_s
+            temp_uri = current_schema.uri.merge(path)
           end
           temp_uri.fragment = current_schema.schema['$ref'].split("#")[1]
         end
@@ -51,4 +51,4 @@ module JSON
       end
     end
   end
-end
+end

data/lib/json-schema/schema.rb

@@ -13,7 +13,7 @@ module JSON
       if @schema['id']
         temp_uri = URI.parse(@schema['id'])
         if temp_uri.relative?
-          uri.path = (Pathname.new(uri.path) + @schema['id']).cleanpath.to_s
+          uri = uri.merge(@schema['id'])
           temp_uri = uri
         end
         @uri = temp_uri

data/lib/json-schema/validator.rb

@@ -134,7 +134,7 @@ module JSON
         if path && path[0,1] == '/'
           uri.path = Pathname.new(path).cleanpath.to_s
         else
-          uri.path = (Pathname.new(parent_schema.uri.path) + path).cleanpath.to_s
+          uri = parent_schema.uri.merge(path)
         end
         uri.fragment = ''
       end
@@ -386,4 +386,4 @@ module JSON
     end
     
   end
-end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: json-schema
 version: !ruby/object:Gem::Version 
-  hash: 51
+  hash: 49
   prerelease: false
   segments: 
   - 0
   - 9
-  - 4
-  version: 0.9.4
+  - 5
+  version: 0.9.5
 platform: ruby
 authors: 
 - Kenny Hoxworth
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-03 00:00:00 -04:00
+date: 2011-05-31 00:00:00 -04:00
 default_executable: 
 dependencies: []