Adjustments to refactored URI building/fetching

voxpupuli · Nov 7, 2014 · c442f1d · c442f1d
1 parent 3ea70e5
commit c442f1d
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 6 deletions.
diff --git a/lib/json-schema/validator.rb b/lib/json-schema/validator.rb
@@ -134,15 +134,15 @@ def load_ref_schema(parent_schema, ref)
     end
 
     def absolutize_ref_uri(ref, parent_schema_uri)
-      ref_uri = URI.parse(ref)
+      ref_uri = Addressable::URI.parse(ref)
 
       return ref_uri if ref_uri.absolute?
       # This is a self reference and thus the schema does not need to be re-loaded
       return parent_schema_uri if ref_uri.path.empty?
 
       uri = parent_schema_uri.clone
       uri.fragment = ''
-      uri.merge(Pathname(ref_uri.path).cleanpath.to_s)
+      uri.join(ref_uri.path)
     end
 
     # Build all schemas with IDs, mapping out the namespace
@@ -589,6 +589,5 @@ def normalized_uri(data)
       end
       uri
     end
-
   end
 end
diff --git a/test/data/file with spaces.json b/test/data/file with spaces.json