fixed url path parsing. related #119

Author: oscarotero

src/Url.php

@@ -519,31 +519,30 @@ private function setPath($path)
             return;
         }
 
-        $parts = pathinfo($path);
+        $file = substr(strrchr($path, '/'), 1);
 
-        $this->info['path'] = [];
-
-        if (isset($parts['dirname'])) {
-            foreach (explode('/', str_replace(DIRECTORY_SEPARATOR, '/', $parts['dirname'])) as $dir) {
-                $dir = trim(urldecode($dir));
+        if ($file !== '') {
+            $path = substr($path, 0, -strlen($file));
+        }
 
-                if ($dir !== '') {
-                    $this->info['path'][] = $dir;
-                }
+        if ($file) {
+            if (preg_match('/(.*)\.([\w]+)$/', $file, $match)) {
+                $this->info['file'] = $match[1];
+                $this->info['extension'] = $match[2];
+            } else {
+                $this->info['file'] = $file;
+                $this->info['extension'] = null;
             }
         }
 
-        $this->info['file'] = isset($parts['filename']) ? $parts['filename'] : null;
-        $this->info['extension'] = isset($parts['extension']) ? $parts['extension'] : null;
-        $this->info['content'] = null;
-
-        // bugfix /wiki/Supernatural_(U.S._TV_series) is parsed as:
-        // path: /wiki/
-        // file: Supernatural_(U.S
-        // extension: _TV_series)
-        if (!empty($this->info['extension']) && !preg_match('/^\w+$/', $this->info['extension'])) {
-            $this->info['file'] .= '.'.$this->info['extension'];
-            $this->info['extension'] = null;
+        $this->info['path'] = [];
+
+        foreach (explode('/', $path) as $dir) {
+            $dir = trim(urldecode($dir));
+
+            if ($dir !== '') {
+                $this->info['path'][] = $dir;
+            }
         }
     }
 }

tests/UrlTest.php

@@ -8,7 +8,12 @@ public function testParser()
             'http://vimeo.com//69912181?' => 'http://vimeo.com/69912181',
             'http://vimeo.com//69912181' => 'http://vimeo.com/69912181',
             'http://vimeo.com/69912181' => 'http://vimeo.com/69912181',
+            'http://vimeo.com/69912181/' => 'http://vimeo.com/69912181/',
             'https://www.tumblr.com/oembed/1.0' => 'https://www.tumblr.com/oembed/1.0',
+            'https://www.tumblr.com/oembed/1.0/' => 'https://www.tumblr.com/oembed/1.0/',
+            'https://www.tumblr.com/oembed//1.0//' => 'https://www.tumblr.com/oembed/1.0/',
+            'https://animoto.com/oembeds/create.xml?automated=true&options=start_hq' => 'https://animoto.com/oembeds/create.xml?automated=true&options=start_hq',
+            'http://static2.politico.com/dims4/default/28fb355/2147483647/resize/1160x%3E/quality/90/?url=http%3A%2F%2Fs3-origin-images.politico.com%2F2013%2F12%2F18%2F131218_george_w_bush_barack_obama_ap_60' => 'http://static2.politico.com/dims4/default/28fb355/2147483647/resize/1160x%3E/quality/90/?url=http%3A%2F%2Fs3-origin-images.politico.com%2F2013%2F12%2F18%2F131218_george_w_bush_barack_obama_ap_60'
         ];
 
         foreach ($urls as $url => $expected_url) {