improve fragment resolving for extend

Author: janmentzel

src/JsonSchema/Uri/UriResolver.php

@@ -54,15 +54,17 @@ public function parse($uri)
      */
     public function generate(array $components)
     {
-        $uri = $components['scheme'] . '://' 
-             . $components['authority']
+        $uri = '';
+        if(!empty($components['scheme'])) $uri = $components['scheme'] . '://';
+
+        $uri .= $components['authority']
              . $components['path'];
-        
-        if (array_key_exists('query', $components)) {
-            $uri .= $components['query'];
+
+        if (array_key_exists('query', $components) && !empty($components['query'])) {
+            $uri .= '?'.$components['query'];
         }
-        if (array_key_exists('fragment', $components)) {
-            $uri .= $components['fragment'];
+        if (array_key_exists('fragment', $components) && !empty($components['fragment'])) {
+            $uri .= '#'.$components['fragment'];
         }
 
         return $uri;
@@ -87,10 +89,28 @@ public function resolve($uri, $baseUri = null)
         $basePath = $baseComponents['path'];
 
         $baseComponents['path'] = self::combineRelativePathWithBasePath($path, $basePath);
-        
+        if(!empty($components['fragment'])) $baseComponents['fragment'] = $components['fragment'];
+
+        return $this->generate($baseComponents);
+    }
+
+    public function resolveWithoutFragment($uri, $baseUri = null)
+    {
+        $components = $this->parse($uri);
+        $path = $components['path'];
+
+        if (! empty($components['scheme'])) {
+            return $uri;
+        }
+        $baseComponents = $this->parse($baseUri);
+        $basePath = $baseComponents['path'];
+
+        $baseComponents['path'] = self::combineRelativePathWithBasePath($path, $basePath);
+
+        unset($baseComponents['fragment']);
+
         return $this->generate($baseComponents);
     }
-    
     /**
      * Tries to glue a relative path onto an absolute one
      * 
@@ -99,11 +119,12 @@ public function resolve($uri, $baseUri = null)
      * @return string Merged path
      * @throws UriResolverException 
      */
-    private static function combineRelativePathWithBasePath($relativePath, $basePath)
+    static function combineRelativePathWithBasePath($relativePath, $basePath)
     {
         $relativePath = self::normalizePath($relativePath);
         $basePathSegments = self::getPathSegments($basePath);
-        
+
+        if($relativePath == '') return $basePath;
         preg_match('|^/?(\.\./(?:\./)*)*|', $relativePath, $match);
         $numLevelUp = strlen($match[0]) /3 + 1;
         if ($numLevelUp >= count($basePathSegments)) {

tests/JsonSchema/Tests/Uri/UriResolverTest.php

@@ -0,0 +1,73 @@
+<?php
+
+namespace JsonSchema\Tests\Uri;
+
+use JsonSchema\Uri\UriResolver;
+
+class UriResolverTest extends \PHPUnit_Framework_TestCase {
+
+	function testParseWithFragment() {
+		$resolver = new UriResolver();
+		$this->assertEquals(
+			array('scheme' => 'file', 'authority' => '', 'path' => '/the/directory', 'query'=>'', 'fragment' => '/the/fragment')
+			,$resolver->parse('file:///the/directory#/the/fragment')
+		);
+	}
+
+	function testParseWithQuery() {
+		$resolver = new UriResolver();
+		$this->assertEquals(
+			array('scheme' => 'file', 'authority' => '', 'path' => '/the/directory', 'query'=>'the=query&key=val')
+			,$resolver->parse('file:///the/directory?the=query&key=val')
+		);
+	}
+
+	function testParseWithHttp() {
+		$resolver = new UriResolver();
+		$this->assertEquals(
+			array('scheme' => 'http', 'authority' => 'localhost:1234', 'path' => '/the/directory')
+			,$resolver->parse('http://localhost:1234/the/directory')
+		);
+	}
+
+	function testParseFragmentOnly() {
+		$resolver = new UriResolver();
+		$this->assertEquals(
+			array('scheme' => '', 'authority' => '', 'path' => '', 'query'=>'', 'fragment' => '/theFragment')
+			,$resolver->parse('#/theFragment')
+		);
+	}
+
+	function testResolveWithBothHttp() {
+		$resolver = new UriResolver();
+		$this->setExpectedException('JsonSchema\Exception\UriResolverException', "Unable to resolve URI '/the/path' from base ''");
+		$this->assertEquals('http://localhost:1234/the/path', $resolver->resolve('/the/path', 'http://localhost:1234'));
+	}
+
+	function testResolveWithValidHttpBaseUri() {
+		$resolver = new UriResolver();
+
+		$this->assertEquals('http://localhost:1234/the/other/schema.json' , $resolver->resolve('/the/other/schema.json'   , 'http://localhost:1234/'));
+		$this->assertEquals('http://localhost:1234/other/foo.json'        , $resolver->resolve('/other/foo.json' , 'http://localhost:1234/schema.json'));
+		$this->assertEquals('http://localhost:1234/foo.json#/fragment'    , $resolver->resolve('/foo.json#/fragment' , 'http://localhost:1234/schma.json'));
+		$this->assertEquals('http://localhost:1234/three/dirs/bar.json'   , $resolver->resolve('bar.json' , 'http://localhost:1234/three/dirs/schema.json'));
+		$this->assertEquals('http://localhost:1234/sourceSchema.json#/localTarget'    , $resolver->resolve('#/localTarget' , 'http://localhost:1234/sourceSchema.json#/sourceNode'));
+	}
+
+	function testResolveWithValidFileBaseUri() {
+		$resolver = new UriResolver();
+		$this->assertEquals('file:///base/uri/foo.json', $resolver->resolve('foo.json', 'file:///base/uri/dir.json'));
+		$this->assertEquals('file:///other-dir/foo.json', $resolver->resolve('file:///other-dir/foo.json', 'file:///base/uri/dir.json'));
+
+	}
+
+	function testCombineRelativePathWithBasePath() {
+		$this->assertEquals('/foo/bar/boo', UriResolver::combineRelativePathWithBasePath('boo', '/foo/bar/'));
+		$this->assertEquals('/foo/bar/'   , UriResolver::combineRelativePathWithBasePath('', '/foo/bar/'));
+		$this->assertEquals('/foo/bar'       , UriResolver::combineRelativePathWithBasePath('', '/foo/bar'));
+		// ??? imho /boo
+		$this->assertEquals('/foo/bar/boo' , UriResolver::combineRelativePathWithBasePath('/boo', '/foo/bar/'));
+		$this->assertEquals('/foo.json' , UriResolver::combineRelativePathWithBasePath('', '/foo.json'));
+
+	}
+}