tests, removed old adapters, fixes, etc

Author: oscarotero

demo/index.php

@@ -173,12 +173,8 @@ function getResolverOption($name, $default = null)
                 $options['oembedParameters'] = $options['oembedParameters'] ? json_decode($options['oembedParameters'], true) : array();
             }
 
-            $resolverOptions = isset($_GET['resolver']) ? (array) $_GET['resolver'] : array();
-            
-            Embed\Request::setResolverConfig($resolverOptions);
-
-            $url = new Embed\Request($_GET['url']);
-            $info = Embed\Embed::create($url, $options);
+            $request = new Embed\Request(new Embed\Url($_GET['url'], null, isset($_GET['resolver']) ? (array) $_GET['resolver'] : null));
+            $info = Embed\Embed::create($request, $options);
             ?>
 
             <?php if (empty($info)): ?>
@@ -301,7 +297,7 @@ function getResolverOption($name, $default = null)
                     <td>
                         <ul>
                         <?php
-                        foreach ($url->getRequestInfo() as $name => $value) {
+                        foreach ($request->getRequestInfo() as $name => $value) {
                             if (is_array($value)) {
                                 $value = print_r($value, true);
                             }
@@ -319,7 +315,7 @@ function getResolverOption($name, $default = null)
                 <tr>
                     <th>Content</th>
                     <td>
-                        <pre><?php echo htmlspecialchars($url->getContent(), ENT_IGNORE); ?></pre>
+                        <pre><?php echo htmlspecialchars($request->getContent(), ENT_IGNORE); ?></pre>
                     </td>
                 </tr>
             </table>

src/Adapters/Adapter.php

@@ -61,8 +61,8 @@ public function __construct(Request $request, array $options = null)
 
         $this->initProviders($request);
 
-        if ($request->getUrl() !== $this->url) {
-            $this->initProviders($request->createSubRequest($this->url));
+        if ($request->url->getUrl() !== $this->url) {
+            $this->initProviders($request->createRequest($this->url));
         }
     }
 
@@ -142,7 +142,7 @@ public function getUrlFromProviders($name)
      */
     public function getTitle()
     {
-        return $this->getFromProviders('title') ?: $this->request->getUrl();
+        return $this->getFromProviders('title') ?: $this->request->url->getUrl();
     }
 
     /**
@@ -158,7 +158,7 @@ public function getDescription()
      */
     public function getUrl()
     {
-        return $this->getUrlFromProviders('url') ?: $this->request->getUrl();
+        return $this->getUrlFromProviders('url') ?: $this->request->url->getUrl();
     }
 
     /**

src/Adapters/Cadenaser.php

@@ -83,7 +83,7 @@ protected function initProviders(Request $request)
 
         if (($id = $this->getId($request->getStartingUrl()))) {
             if ($this->options['facebookAccessToken']) {
-                $api = $request->createSubRequest('https://graph.facebook.com/'.$id);
+                $api = $request->createRequest('https://graph.facebook.com/'.$id);
                 $api->setParameter('access_token', $this->options['facebookAccessToken']);
 
                 if ($json = $api->getJsonContent()) {

src/Adapters/Facebook.php

@@ -13,6 +13,7 @@ class File extends Adapter implements AdapterInterface
 {
     private static $contentTypes = array(
         'video/ogg' => array('video', 'videoHtml'),
+        'application/ogg' => array('video', 'videoHtml'),
         'video/ogv' => array('video', 'videoHtml'),
         'video/webm' => array('video', 'videoHtml'),
         'video/mp4' => array('video', 'videoHtml'),
@@ -98,8 +99,8 @@ public function getImages()
     public function getProviderIcons()
     {
         return array(
-            $this->request->getAbsolute('/favicon.ico'),
-            $this->request->getAbsolute('/favicon.png'),
+            $this->request->url->getAbsolute('/favicon.ico'),
+            $this->request->url->getAbsolute('/favicon.png'),
         );
     }
 }

src/Adapters/File.php

@@ -24,8 +24,9 @@ public static function check(Request $request)
      */
     public function getCode()
     {
-        if (($id = $this->request->getDirectory(1))) {
-            return Viewers::iframe('//giphy.com/embed/'.$id, $this->width.'px', $this->height.'px');
+        if (($url = $this->providers['TwitterCards']->get('player'))) {
+            $url = str_replace('/twitter/iframe', '?html5=true', $url);
+            return Viewers::iframe($url, $this->width.'px', $this->height.'px');
         }
     }
 }

src/Adapters/Giphy.php

@@ -29,7 +29,7 @@ protected function initProviders(Request $request)
         parent::initProviders($request);
 
         $this->api = new Provider();
-        $api = $request->createSubRequest($request->getUrl().'.json');
+        $api = $request->createRequest($request->url->getUrl().'.json');
 
         if (($json = $api->getJsonContent())) {
             $this->api->set($json);

src/Adapters/Github.php

@@ -26,7 +26,7 @@ public static function check(Request $request)
      */
     public function getCode()
     {
-        $url = new Url($this->request->getUrl());
+        $url = new Url($this->request->url->getUrl());
 
         $url->setParameter('output', 'embed');
         $url->setParameter('s', '');

src/Adapters/Google.php

@@ -15,8 +15,7 @@ class Mit extends Webpage implements AdapterInterface
     public static function check(Request $request)
     {
         return $request->match(array(
-            'http://media.mit.edu/video/view/*',
-            'http://www.media.mit.edu/video/view/*',
+            'http://video.mit.edu/watch/*',
         ));
     }
 
@@ -25,7 +24,25 @@ public static function check(Request $request)
      */
     public function getCode()
     {
-        return Viewers::iframe(str_replace('/video/view/', '/video/embed/', $this->getUrl()));
+        $url = $this->getUrl();
+        $url = preg_replace('|(/watch/[\w-]+)-([\d]+)|', '/embed/$2', $url);
+        return Viewers::iframe($url, $this->getWidth(), $this->getHeight());
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getWidth()
+    {
+        return 600;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getHeight()
+    {
+        return 337;
     }
 
     /**
@@ -35,4 +52,12 @@ public function getProviderName()
     {
         return 'MIT Media Lab';
     }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getType()
+    {
+        return 'video';
+    }
 }