Merge pull request #17 from damienalexandre/urlparser

Fix the parser when path is empty

Author: oscarotero

Embed/Url.php

@@ -416,7 +416,7 @@ public function setPath ($path) {
 	 * Return the url path
 	 */
 	public function getPath ($file = false) {
-		$path = isset($this->info['path']) ? '/'.implode('/', $this->info['path']).'/' : '/';
+		$path = isset($this->info['path']) && !empty($this->info['path']) ? '/'.implode('/', $this->info['path']).'/' : '/';
 
 		if ($file && !empty($this->info['file'])) {
 			$path .= $this->info['file'];

tests/EmbedTest.php

@@ -81,4 +81,19 @@ public function testUrls () {
 			)
 		);
 	}
-}
+
+	public function testUrlParser()
+	{
+		$urls = array(
+			'http://vimeo.com//69912181?' => 'http://vimeo.com/69912181',
+			'http://vimeo.com//69912181' => 'http://vimeo.com/69912181',
+			'http://vimeo.com/69912181' => 'http://vimeo.com/69912181',
+		);
+
+		foreach ($urls as $url => $expected_url) {
+			$parsed_url = new Embed\Url($url);
+
+			$this->assertEquals($expected_url, $parsed_url->getUrl());
+		}
+	}
+}