bugfixes, added test for tumblr redirect

oscarotero · Jun 18, 2018 · 46e1980 · 46e1980
1 parent 28e14bf
commit 46e1980
Show file tree

Hide file tree

Showing 7 changed files with 20 additions and 15 deletions.
diff --git a/src/Adapters/Howcast.php b/src/Adapters/Howcast.php
@@ -28,7 +28,10 @@ public function getCode()
         $this->width = null;
         $this->height = null;
 
-        $dom = $this->getResponse()->getHtmlContent();
+        if (!($dom = $this->getResponse()->getHtmlContent())) {
+            return;
+        }
+
         // #embedModal textarea
         $textarea = Utils::xpathQuery($dom, "descendant-or-self::*[@id = 'embedModal']/descendant-or-self::*/textarea");
 

diff --git a/src/Providers/OEmbed/DOM.php b/src/Providers/OEmbed/DOM.php
@@ -32,7 +32,7 @@ public static function create(Adapter $adapter)
      *
      * @param Response $response
      */
-    public function __construct(Response $response)
+    protected function __construct(Response $response)
     {
         $this->response = $response;
     }

diff --git a/src/Providers/OEmbed/Embedly.php b/src/Providers/OEmbed/Embedly.php
@@ -29,7 +29,7 @@ public static function create(Adapter $adapter)
      * @param Response $response
      * @param string   $key
      */
-    private function __construct(Response $response, $key)
+    protected function __construct(Response $response, $key)
     {
         $this->response = $response;
         $this->key = $key;

diff --git a/src/Providers/OEmbed/EndPoint.php b/src/Providers/OEmbed/EndPoint.php
@@ -32,7 +32,7 @@ public static function create(Adapter $adapter)
      *
      * @param Response $response
      */
-    private function __construct(Response $response)
+    protected function __construct(Response $response)
     {
         $this->response = $response;
     }

diff --git a/src/Providers/OEmbed/Iframely.php b/src/Providers/OEmbed/Iframely.php
@@ -29,7 +29,7 @@ public static function create(Adapter $adapter)
      * @param Response $response
      * @param string   $key
      */
-    private function __construct(Response $response, $key)
+    protected function __construct(Response $response, $key)
     {
         $this->response = $response;
         $this->key = $key;

diff --git a/src/Providers/OEmbed/Tumblr.php b/src/Providers/OEmbed/Tumblr.php
@@ -20,21 +20,12 @@ class Tumblr extends EndPoint implements EndPointInterface
     public static function create(Adapter $adapter)
     {
         $response = $adapter->getResponse();
+
         if ($response->getStartingUrl()->match(static::$pattern)) {
             return new static($response);
         }
     }
 
-    /**
-     * Constructor.
-     *
-     * @param Response $response
-     */
-    private function __construct(Response $response)
-    {
-        $this->response = $response;
-    }
-
     /**
      * {@inheritdoc}
      */

diff --git a/tests/TumblrTest.php b/tests/TumblrTest.php
@@ -16,4 +16,15 @@ public function testOne()
             ]
         );
     }
+
+    public function testRedirect()
+    {
+        $this->assertEmbed(
+            'https://t.umblr.com/redirect?z=https%3A%2F%2Fcm.engineering%2Fhow-to-test-accessibility-of-emails-b68fed03f5f4&t=YmJlOWJlMDE2MTBhNjgzMGQ3OWI4YjcyYTc3ZGVmODVlMjQxZWU0OCxEMHp1MXlSVg%3D%3D&b=t%3ABS0dIKxiGtP4rIANih2MqA&p=http%3A%2F%2Ftoday.uxdesign.cc%2Fpost%2F174967774408%2Fhow-to-test-accessibility-of-emails',
+            [
+                'title' => 'How to test accessibility of emails – Campaign Monitor Engineering',
+                'url' => 'https://cm.engineering/how-to-test-accessibility-of-emails-b68fed03f5f4',
+            ]
+        );
+    }
 }