fixed #31

Author: oscarotero

Embed/Request.php

@@ -68,8 +68,7 @@ public function setUrl($url)
             $this->resolver->setConfig(self::$resolverConfig);
         }
 
-        $this->parseUrl($this->resolver->getLatestUrl());
-
+        $this->parseUrl($url);
         $this->updateUrl();
     }
 
@@ -85,6 +84,19 @@ public function getUrl()
     }
 
 
+    /**
+     * Check if the url match with a specific pattern. The patterns only accepts * and ?
+     *
+     * @param string|array $patterns The pattern or an array with various patterns
+     *
+     * @return boolean True if the url match, false if not
+     */
+    public function match($patterns)
+    {
+        return static::urlMatches($this->getStartingUrl(), $patterns) || static::urlMatches($this->getUrl(), $patterns);
+    }
+
+
     /**
      * Return the http request info (for debug purposes)
      *
@@ -289,9 +301,7 @@ private function updateUrl()
     {
         $url = $this->buildUrl();
 
-        if (($this->resolver->getStartingUrl() !== $url) && ($this->resolver->getLatestUrl() !== $url)) {
-            $this->resolver->setUrl($url);
-            $this->htmlContent = $this->jsonContent = $this->xmlContent = null;
-        }
+        $this->resolver->setUrl($url);
+        $this->htmlContent = $this->jsonContent = $this->xmlContent = null;
     }
 }

Embed/Url.php

@@ -51,21 +51,7 @@ public function getUrl()
      */
     public function match($patterns)
     {
-        $url = $this->getUrl();
-
-        if (!is_array($patterns)) {
-            $patterns = array($patterns);
-        }
-
-        foreach ($patterns as $pattern) {
-            $pattern = str_replace(array('\\*', '\\?'), array('.+', '?'), preg_quote($pattern, '|'));
-
-            if (preg_match('|^'.$pattern.'$|i', $url)) {
-                return true;
-            }
-        }
-
-        return false;
+        return static::urlMatches($this->getUrl(), $patterns);
     }
 
 
@@ -378,4 +364,29 @@ public function getAbsolute($url)
 
         return $this->getScheme().'://'.$this->getHost().$this->getPath().$url;
     }
+
+
+    /**
+     * Check if the url match with a specific pattern. The patterns only accepts * and ?
+     *
+     * @param string|array $patterns The pattern or an array with various patterns
+     *
+     * @return boolean True if the url match, false if not
+     */
+    protected static function urlMatches($url, $patterns)
+    {
+        if (!is_array($patterns)) {
+            $patterns = array($patterns);
+        }
+
+        foreach ($patterns as $pattern) {
+            $pattern = str_replace(array('\\*', '\\?'), array('.+', '?'), preg_quote($pattern, '|'));
+
+            if (preg_match('|^'.$pattern.'$|i', $url)) {
+                return true;
+            }
+        }
+
+        return false;
+    }
 }

Embed/UrlRedirect.php

@@ -8,7 +8,8 @@ class UrlRedirect
 {
     protected static $urls = array(
         'google' => 'https?://www.google.com/url*',
-        'googleTranslator' => 'https?://translate.google.com/translate*'
+        'googleTranslator' => 'https?://translate.google.com/translate*',
+        'hashBang' => '*#!*'
     );
 
 
@@ -57,4 +58,17 @@ protected static function googleTranslator(Url $url)
             $url->setUrl($urlString);
         }
     }
+
+
+    /**
+     * Resolve an url with hashbang
+     * 
+     * @param Url $url
+     */
+    protected static function hashBang(Url $url)
+    {
+        if (($path = preg_replace('|^(/?!)|', '', $url->getFragment()))) {
+            $url->setPath($url->getPath().$path);
+        }
+    }
 }