Use unescape for paths before reading files

lib/json-schema/validator.rb

@@ -142,7 +142,7 @@ def absolutize_ref_uri(ref, parent_schema_uri)
 
       uri = parent_schema_uri.clone
       uri.fragment = ''
-      uri.join(ref_uri.path)
+      normalized_uri(uri.join(ref_uri.path))
     end
 
     # Build all schemas with IDs, mapping out the namespace
@@ -574,14 +574,15 @@ def custom_open(uri)
       if uri.absolute? && uri.scheme != 'file'
         open(uri.to_s).read
       else
-        File.read(uri.path)
+        File.read(Addressable::URI.unescape(uri.path))
       end
     end
 
     def normalized_uri(data)
       uri = Addressable::URI.parse(data)
       # Check for absolute path
       if uri.relative?
+        data = data.to_s
         data = "#{Dir.pwd}/#{data}" if data[0,1] != '/'
         uri = Addressable::URI.convert_path(data)
       end

test/schemas/ref john with spaces schema.json

@@ -1,4 +1,10 @@
-{ "$schema" : "http://json-schema.org/draft-04/schema#"
-, "type" : "string"
-, "pattern" : "john"
+{
+  "$schema" : "http://json-schema.org/draft-04/schema#",
+  "type" : "object",
+  "properties": {
+    "first": {
+      "type": "string",
+      "enum": ["john"]
+    }
+  }
 }

test/test_uri_related.rb

@@ -34,7 +34,7 @@ def test_schema_ref_with_empty_fragment
         }
       }
     }
-    data = { "names" => ['john'] }
+    data = {"first" => "john" }
     assert_valid schema, data
   end
 
@@ -47,13 +47,19 @@ def test_schema_ref_from_file_with_spaces
           "type"=> "array",
           "items"=> {
             "anyOf"=> [
-              { "$ref" => "test/schemas/ref john with spaces schema.json" },
+              { "$ref" => "test/schemas/ref john with spaces schema.json" }
             ]
           }
         }
       }
     }
-    data = { "names" => ['john'] }
+    data = {"first" => "john" }
+    assert_valid schema, data
+  end
+
+  def test_schema_from_file_with_spaces
+    data = { "first" => "john" }
+    schema = "test/schemas/ref john with spaces schema.json"
     assert_valid schema, data
   end
 end