improved oembed detection. some sites use <meta> instead <link>

Author: oscarotero

src/Providers/OEmbed.php

@@ -195,27 +195,30 @@ public function getHeight()
 
     /**
      * Extract oembed information from the <link rel="alternate"> elements
+     * Note: Some sites use <meta rel="alternate"> instead
      *
      * @param \DOMDocument $html
      *
      * @return string|null
      */
     protected static function getEndPointFromDom(\DOMDocument $html)
     {
-        foreach (Utils::getLinks($html) as $link) {
-            list($rel, $href, $element) = $link;
+        foreach (['link', 'meta'] as $tagName) {
+            foreach (Utils::getLinks($html, $tagName) as $link) {
+                list($rel, $href, $element) = $link;
 
-            if (empty($href)) {
-                continue;
-            }
+                if (empty($href)) {
+                    continue;
+                }
 
-            if ($rel === 'alternate') {
-                switch (strtolower($element->getAttribute('type'))) {
-                    case 'application/json+oembed':
-                    case 'application/xml+oembed':
-                    case 'text/json+oembed':
-                    case 'text/xml+oembed':
-                        return $href;
+                if ($rel === 'alternate') {
+                    switch (strtolower($element->getAttribute('type'))) {
+                        case 'application/json+oembed':
+                        case 'application/xml+oembed':
+                        case 'text/json+oembed':
+                        case 'text/xml+oembed':
+                            return $href;
+                    }
                 }
             }
         }

src/Utils.php

@@ -31,14 +31,15 @@ public static function getMetas(\DOMDocument $html)
      * Extract all link elements from html
      *
      * @param \DOMDocument $html
+     * @param string       $tagName
      *
      * @return array with subarrays [rel, href, element]
      */
-    public static function getLinks(\DOMDocument $html)
+    public static function getLinks(\DOMDocument $html, $tagName = 'link')
     {
         $links = [];
 
-        foreach ($html->getElementsByTagName('link') as $link) {
+        foreach ($html->getElementsByTagName($tagName) as $link) {
             if ($link->hasAttribute('rel') && $link->hasAttribute('href')) {
                 $rel = trim(strtolower($link->getAttribute('rel')));
                 $href = $link->getAttribute('href');

tests/ViddlerTest.php

@@ -0,0 +1,14 @@
+<?php
+class ViddlerTest extends PHPUnit_Framework_TestCase
+{
+    public function testOne()
+    {
+        $info = Embed\Embed::create('http://www.viddler.com/v/bdce8c7');
+
+        $this->assertEquals($info->title, 'Viddler Platform Overview');
+        $this->assertEquals($info->type, 'video');
+        $this->assertEquals($info->code, '<iframe width="620" height="349" src="http://viddler.com/embed/bdce8c7" frameborder="0" allowfullscreen></iframe>');
+        $this->assertEquals($info->providerName, 'Viddler');
+        $this->assertEquals($info->providerUrl, 'http://viddler.com/');
+    }
+}