further improvements in URI resolution, according to the discussion in #17

Author: erosb

core/src/main/java/org/everit/json/schema/loader/internal/ReferenceResolver.java

@@ -64,7 +64,9 @@ private String handlePathIdAttr() {
       if (parentScopeURL.getPort() > -1) {
         newIdBuilder.append(":").append(parentScopeURL.getPort());
       }
-      newIdBuilder.append("/").append(encounteredSegment);
+      newIdBuilder.append(removeTrailingSegmentFrom(parentScopeURL.getPath()))
+          .append("/")
+          .append(encounteredSegment);
       return newIdBuilder.toString();
     } catch (MalformedURLException e1) {
       return concat();
@@ -80,6 +82,13 @@ private String nonfragmentIdAttr() {
     }
   }
 
+  private String removeTrailingSegmentFrom(final String path) {
+    if (path.isEmpty() || "/".equals(path)) {
+      return "";
+    }
+    return path.substring(0, path.lastIndexOf('/'));
+  }
+
   private String resolve() {
     if (encounteredSegment.startsWith("#")) {
       return concat();

core/src/test/java/org/everit/json/schema/loader/SchemaLoaderTest.java

@@ -291,7 +291,7 @@ public void pointerResolution() {
     ObjectSchema actual = (ObjectSchema) SchemaLoader.load(get("pointerResolution"));
     ObjectSchema rectangleSchema = (ObjectSchema) ((ReferenceSchema) actual.getPropertySchemas()
         .get("rectangle"))
-            .getReferredSchema();
+        .getReferredSchema();
     Assert.assertNotNull(rectangleSchema);
     ReferenceSchema aRef = (ReferenceSchema) rectangleSchema.getPropertySchemas().get("a");
     Assert.assertTrue(aRef.getReferredSchema() instanceof NumberSchema);
@@ -312,6 +312,8 @@ public void remotePointerResulion() {
     SchemaClient httpClient = Mockito.mock(SchemaClient.class);
     Mockito.when(httpClient.get("http://example.org/asd")).thenReturn(asStream("{}"));
     Mockito.when(httpClient.get("http://example.org/otherschema.json")).thenReturn(asStream("{}"));
+    Mockito.when(httpClient.get("http://example.org/folder/subschemaInFolder.json")).thenReturn(
+        asStream("{}"));
     SchemaLoader.load(get("remotePointerResolution"), httpClient);
     // Mockito.verify(httpClient);
   }

core/src/test/java/org/everit/json/schema/loader/internal/ReferenceResolverTest.java

@@ -32,6 +32,11 @@ public static List<Object[]> params() {
     return Arrays.asList(
         parList("fragment id", "http://x.y.z/root.json#foo", "http://x.y.z/root.json", "#foo"),
         parList("rel path", "http://example.org/foo", "http://example.org/bar", "foo"),
+        parList("file name change", "http://x.y.z/schema/child.json",
+            "http://x.y.z/schema/parent.json",
+            "child.json"),
+        parList("file name after folder path", "http://x.y.z/schema/child.json",
+            "http://x.y.z/schema/", "child.json"),
         parList("new root", "http://bserver.com", "http://aserver.com/",
             "http://bserver.com"));
   }

core/src/test/resources/org/everit/jsonvalidator/testschemas.json

@@ -275,6 +275,12 @@
 				"properties" : {
 					"prop" : {"$ref" : "otherschema.json"}
 				}
+			},
+			"folderChange" : {
+				"id" : "http://example.org/folder/",
+				"properties" : {
+					"schemaInFolder" : {"$ref" : "subschemaInFolder.json"}
+				}
 			}
 		}
 	}

tests/src/test/java/org/everit/json/schema/IntegrationTest.java

@@ -53,8 +53,7 @@ public static List<Object[]> params() {
         new ResourcesScanner());
     Set<String> paths = refs.getResources(Pattern.compile(".*\\.json"));
     for (String path : paths) {
-      if (path.indexOf("/optional/") > -1 || path.indexOf("/remotes/") > -1
-          || path.endsWith("refRemote.json")) {
+      if (path.indexOf("/optional/") > -1 || path.indexOf("/remotes/") > -1) {
         continue;
       }
       String fileName = path.substring(path.lastIndexOf('/') + 1);