fixed url redirections. close #33

oscarotero · Jul 9, 2014 · b05e635 · b05e635
1 parent 8444efa
commit b05e635
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 10 deletions.
diff --git a/Embed/Embed.php b/Embed/Embed.php
@@ -19,9 +19,6 @@ public static function create($url, array $options = null)
             throw new \InvalidArgumentException("Embed::create only accepts instances of Embed\\Request or strings");
         }
 
-        //Resolve special redirections
-        UrlRedirect::resolve($url);
-
         if (!$url->isValid()) {
             return false;
         }

diff --git a/Embed/Request.php b/Embed/Request.php
@@ -61,14 +61,14 @@ public function setUrl($url)
         if ($url instanceof RequestResolvers\RequestResolverInterface) {
             $this->resolver = $url;
         } else {
-            $this->resolver = new self::$resolverClass($url);
+            $this->resolver = new self::$resolverClass(UrlRedirect::resolve($url));
         }
 
         if (self::$resolverConfig) {
             $this->resolver->setConfig(self::$resolverConfig);
         }
 
-        $this->parseUrl($url);
+        $this->parseUrl($this->getUrl());
         $this->updateUrl();
     }
 

diff --git a/Embed/UrlRedirect.php b/Embed/UrlRedirect.php
@@ -16,21 +16,23 @@ class UrlRedirect
     /**
      * Resolve the url redirection
      * 
-     * @param Url $url Url to resolve
+     * @param string $oldUrl Url to resolve
      * 
-     * @return boolean True if the url has changed, false if not
+     * @return string The new url
      */
-    public static function resolve(Url $url)
+    public static function resolve($oldUrl)
     {
+        $url = new Url($oldUrl);
+
         foreach (static::$urls as $method => $matches) {
             if ($url->match($matches)) {
                 static::$method($url);
 
-                return true;
+                break;
             }
         }
 
-        return false;
+        return $url->getUrl();
     }
 
 

diff --git a/tests/EmbedTest.php b/tests/EmbedTest.php
@@ -138,5 +138,14 @@ public function testRedirections()
                 'image' => 'http://www.heise.de/imgs/18/1/2/6/2/0/9/3/urn-newsml-dpa-com-20090101-140212-99-03856_large_4_3-2f16ffb85099e6ad.jpeg'
             )
         );
+
+
+        $info1 = Embed\Embed::create('http://rd.io/x/Q1IjXC8s');
+        $info2 = Embed\Embed::create('http://www.rdio.com/artist/Soundgarden/album/Superunknown/');
+        $this->assertEquals($info1->code, $info2->code);
+
+        $info1 = Embed\Embed::create('https://twitter.com/#!/twitter/status/99530515043983360');
+        $info2 = Embed\Embed::create('https://twitter.com/twitter/status/99530515043983360');
+        $this->assertEquals($info1->code, $info2->code);
     }
 }