fixed other width/height issues, repaired tests

Author: oscarotero

src/Adapters/Adapter.php

@@ -215,11 +215,11 @@ public function getSource()
      */
     public function getCode()
     {
-        $allCodes = Utils::getData($this->providers, 'code');
-
+        $this->width = null;
+        $this->height = null;
         $choosen = null;
 
-        foreach ($allCodes as $code) {
+        foreach (Utils::getData($this->providers, 'code') as $code) {
             // <object> and <embed> codes have less priority
             if (strpos($code['value'], '</object>') !== false || strpos($code['value'], '</embed>') !== false) {
                 if (empty($choosen)) {
@@ -237,9 +237,6 @@ public function getCode()
             break;
         }
 
-        $this->width = null;
-        $this->height = null;
-
         if ($choosen) {
             //get the width/height
             foreach ($choosen['providers'] as $provider) {
@@ -434,7 +431,7 @@ public function getImageHeight()
      */
     public function getWidth()
     {
-        $this->code;
+        $this->__get('code');
 
         return $this->width;
     }
@@ -444,7 +441,7 @@ public function getWidth()
      */
     public function getHeight()
     {
-        $this->code;
+        $this->__get('code');
 
         return $this->height;
     }

src/Adapters/File.php

@@ -71,13 +71,13 @@ public function getCode()
 
         switch (self::$contentTypes[$this->request->getMimeType()][1]) {
             case 'videoHtml':
-                return Utils::videoHtml($this->getImage(), $this->getUrl(), $this->getWidth(), $this->getHeight());
+                return Utils::videoHtml($this->image, $this->url, $this->imageWidth, $this->imageHeight);
 
             case 'audioHtml':
-                return Utils::audioHtml($this->getUrl());
+                return Utils::audioHtml($this->url);
 
             case 'google':
-                return Utils::google($this->getUrl());
+                return Utils::google($this->url);
         }
     }
 
@@ -86,10 +86,10 @@ public function getCode()
      */
     public function getImagesUrls()
     {
-        if ($this->getType() === 'photo') {
+        if ($this->type === 'photo') {
             return [
                 [
-                    'value' => $this->getUrl(),
+                    'value' => $this->url,
                     'providers' => ['adapter'],
                 ],
             ];

src/Adapters/Github.php

@@ -47,6 +47,9 @@ public function getUrl()
      */
     public function getCode()
     {
+        $this->width = null;
+        $this->height = null;
+
         if ($this->request->match('https://github.com/*/*/blob/*')) {
             $username = $this->request->getDirectoryPosition(0);
             $repo = $this->request->getDirectoryPosition(1);

src/Adapters/Google.php

@@ -40,6 +40,9 @@ public function run()
      */
     public function getCode()
     {
+        $this->width = null;
+        $this->height = null;
+
         if (($google = $this->getProvider('google'))) {
             return $google->getCode();
         }

src/Adapters/Howcast.php

@@ -24,6 +24,9 @@ public static function check(Request $request)
      */
     public function getCode()
     {
+        $this->width = null;
+        $this->height = null;
+        
         $dom = $this->request->getHtmlContent();
         $modal = $dom->getElementById('embedModal');
 

src/Adapters/Jsfiddle.php

@@ -14,8 +14,10 @@ class Jsfiddle extends Webpage implements AdapterInterface
      */
     public function getCode()
     {
-        $url = $this->getUrl();
+    	$this->width = null;
+        $this->height = null;
 
+        $url = $this->url;
         $embed_url = $url.((substr($url, -1) === '/') ? 'embedded/' : '/embedded/');
 
         return Utils::iframe($embed_url);

src/Adapters/N500px.php

@@ -29,8 +29,26 @@ public function getCode()
         if (is_numeric($this->request->getDirectoryPosition(1))) {
             return Utils::iframe($this->request->createUrl()->withDirectoryPosition(2, 'embed.html'), $this->width, $this->height);
         }
+    }
 
-        return '';
+    /**
+     * {@inheritdoc}
+     */
+    public function getWidth()
+    {
+        if (is_numeric($this->request->getDirectoryPosition(1))) {
+            return $this->imageWidth;
+        }
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getHeight()
+    {
+        if (is_numeric($this->request->getDirectoryPosition(1))) {
+            return $this->imageHeight;
+        }
     }
 
     /**

src/Adapters/Parleys.php

@@ -26,7 +26,23 @@ public function getCode()
     {
         $id = $this->request->getDirectoryPosition(1);
 
-        return '<div data-parleys-presentation="'.$id.'" style="width:100%;height:300px"><script type = "text/javascript" src="//parleys.com/js/parleys-share.js"></script></div>';
+        return '<div data-parleys-presentation="'.$id.'" style="width:'.$this->width.';height:'.$this->height.'px"><script type = "text/javascript" src="//parleys.com/js/parleys-share.js"></script></div>';
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getWidth()
+    {
+        return '100%';
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getHeight()
+    {
+        return 300;
     }
 
     /**

src/Adapters/Pastebin.php

@@ -25,6 +25,9 @@ public static function check(Request $request)
      */
     public function getCode()
     {
+        $this->width = null;
+        $this->height = null;
+
         $embed_url = 'http://pastebin.com/embed_iframe.php?i='.($this->request->getQueryParameter('i') ?: $this->request->getDirectoryPosition(0));
 
         return Utils::iframe($embed_url);

src/Adapters/Spreaker.php

@@ -37,11 +37,27 @@ public function getCode()
                         ->withQueryParameters([
                             'autoplay' => 'false',
                             'episode_id' => $id,
-                        ]), '100%', 131, 'min-width:400px;border:none;overflow:hidden;');
+                        ]), $this->width, $this->height, 'min-width:400px;border:none;overflow:hidden;');
                 }
 
                 break;
             }
         }
     }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getWidth()
+    {
+        return '100%';
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getHeight()
+    {
+        return 131;
+    }
 }