json-schema 0.1.0 → 0.1.1

data/README.textile

@@ -1,11 +1,17 @@
 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 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:
+
+<pre>
+gem install json-schema
+</pre>
+
 If downloading the git repo, build the gem and install it:
 
 <pre>

data/lib/json-schema/validator.rb

@@ -209,7 +209,13 @@ module JSON
         temp_uri = URI.parse(current_schema.schema['$ref'])
         if temp_uri.relative?
           temp_uri = current_schema.uri.clone
-          temp_uri.path = (Pathname.new(current_schema.uri.path).parent + current_schema.schema['$ref'].split("#")[0]).cleanpath
+          # Check for absolute path
+          path = current_schema.schema['$ref'].split("#")[0]
+          if path[0,1] == "/"
+            temp_uri.path = Pathname.new(path).cleanpath
+          else
+            temp_uri.path = (Pathname.new(current_schema.uri.path).parent + path).cleanpath
+          end
           temp_uri.fragment = current_schema.schema['$ref'].split("#")[1]
         end
         temp_uri.fragment = "" if temp_uri.fragment.nil?
@@ -296,7 +302,13 @@ module JSON
       uri = URI.parse(ref)
       if uri.relative?
         uri = parent_schema.uri.clone
-        uri.path = (Pathname.new(parent_schema.uri.path).parent + ref.split("#")[0]).cleanpath
+        # Check for absolute path
+        path = ref.split("#")[0]
+        if path[0,1] == '/'
+          uri.path = Pathname.new(path).cleanpath
+        else
+          uri.path = (Pathname.new(parent_schema.uri.path).parent + path).cleanpath
+        end
         uri.fragment = nil
       end
       
@@ -446,7 +458,14 @@ module JSON
           begin
             # Build a uri for it
             schema_uri = URI.parse(schema)
-            schema_uri = URI.parse("file://#{Dir.pwd}/#{schema}") if schema_uri.relative?
+            if schema_uri.relative?
+              # Check for absolute path
+              if schema[0,1] == '/'
+                schema_uri = URI.parse("file://#{schema}")
+              else
+                schema_uri = URI.parse("file://#{Dir.pwd}/#{schema}")
+              end
+            end
             schema = JSON.parse(open(schema_uri.to_s).read)
           rescue            
             raise "Invalid schema: #{schema_uri.to_s}"
@@ -466,7 +485,13 @@ module JSON
         rescue
           begin
             json_uri = URI.parse(data)
-            json_uri = URI.parse("file://#{Dir.pwd}/#{data}") if json_uri.relative?
+            if json_uri.relative?
+              if data[0,1] == '/'
+                schema_uri = URI.parse("file://#{data}")
+              else
+                schema_uri = URI.parse("file://#{Dir.pwd}/#{data}")
+              end
+            end
             data = JSON.parse(open(json_uri.to_s).read)
           rescue
             raise "Invalid JSON: #{json_uri.to_s}"

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: json-schema
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: false
   segments: 
   - 0
   - 1
-  - 0
-  version: 0.1.0
+  - 1
+  version: 0.1.1
 platform: ruby
 authors: 
 - Kenny Hoxworth
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-24 00:00:00 -05:00
+date: 2010-11-29 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -32,7 +32,7 @@ dependencies:
         version: "0"
   type: :runtime
   version_requirements: *id001
-description: A Ruby JSON Schema Validator based on JSON Schema draft 03
+description: 
 email: hoxworth@gmail.com
 executables: []
 
@@ -41,12 +41,12 @@ extensions: []
 extra_rdoc_files: 
 - README.textile
 files: 
-- lib/json-schema.rb
 - lib/json-schema/schema.rb
-- lib/json-schema/validator.rb
 - lib/json-schema/uri/file.rb
-- README.textile
+- lib/json-schema/validator.rb
+- lib/json-schema.rb
 - test/test_jsonschema.rb
+- README.textile
 has_rdoc: true
 homepage: http://github.com/hoxworth/json-schema/tree/master
 licenses: []