Improvements in Sources and added Embedly support

Author: oscarotero

Embed/Adapters/Adapter.php

@@ -17,7 +17,8 @@ abstract class Adapter {
 		'getBiggerImage' => false,
 		'getBiggerIcon' => false,
 		'facebookAccessToken' => null,
-		'soundcloudClientId' => null
+		'soundcloudClientId' => null,
+		'embedlyKey' => null
 	);
 
 	abstract protected function initProviders (Url $Url);

Embed/Adapters/Webpage.php

@@ -14,6 +14,7 @@
 use Embed\Providers\TwitterCards;
 use Embed\Providers\Dcterms;
 use Embed\Providers\Facebook;
+use Embed\Providers\Embedly;
 
 class Webpage extends Adapter implements AdapterInterface {
 	static public function check (Url $Url) {
@@ -34,6 +35,8 @@ protected function initProviders (Url $Url) {
 			$this->providers['OEmbed'] = new OEmbed(new Url($Url->getAbsolute($this->providers['Html']->get('oembed'))));
 		} else if (($OEmbed = OEmbedImplementations::create($Url))) {
 			$this->providers['OEmbed'] = $OEmbed;
+		} else if ($this->options['embedlyKey'] && ($OEmbed = Embedly::create($Url, $this->options['embedlyKey']))) {
+			$this->providers['OEmbed'] = $OEmbed;
 		}
 
 		$this->providers = array_reverse($this->providers);

Embed/Providers/Embedly.php

@@ -4,7 +4,6 @@
 use Embed\Url;
 
 class Embedly {
-	static public $api_key;
 	static public $patterns = array(
 		'http://*yfrog.*/*',
 		'http://twitter.com/*/status/*/photo/*',
@@ -640,12 +639,8 @@ class Embedly {
 		'http://www.gogoyoko.com/song/*'
 	);
 
-	static public function setApiKey ($key) {
-		static::$api_key = $key;
-	}
-
-	static public function create (Url $Url) {
-		if (!static::$api_key) {
+	static public function create (Url $Url, $api_key) {
+		if (!$api_key) {
 			return false;
 		}
 
@@ -655,7 +650,7 @@ static public function create (Url $Url) {
 			$EndPoint->setParameter(array(
 				'url' => $Url->getUrl(),
 				'format' => 'json',
-				'key' => static::$api_key
+				'key' => $api_key
 			));
 
 			return new OEmbed($EndPoint);

Embed/Sources/Feed.php

@@ -69,14 +69,21 @@ static protected function getRssItems (\SimpleXMLElement $Items) {
 		foreach ($Items as $Item) {
 			$item = array(
 				'url' => null,
+				'originUrl' => null,
 				'pubdate' => null
 			);
 
 			$item['url'] = (string)$Item->link;
+			$item['originUrl'] = ((string)$Item->origLink ?: (string)$Item->comments);
+			
 			$item['pubdate'] = ((string)$Item->pubdate ?: (string)$Item->pubDate);
 
 			if (!$item['pubdate'] && isset($namespaces['dc']) && ($Children = $Item->children($namespaces['dc']))) {
-				$item['pubdate'] = $Children->date;
+				$item['pubdate'] = (string)$Children->date;
+			}
+
+			if (!$item['originUrl'] && isset($namespaces['feedburner']) && ($Children = $Item->children($namespaces['feedburner']))) {
+				$item['originUrl'] = (string)$Children->origLink;
 			}
 
 			if ($item['url']) {
@@ -118,6 +125,7 @@ static protected function getAtomEntries (\SimpleXMLElement $Entries) {
 		foreach ($Entries as $Entry) {
 			$item = array(
 				'url' => null,
+				'originUrl' => null,
 				'pubdate' => null
 			);
 
@@ -138,6 +146,15 @@ static protected function getAtomEntries (\SimpleXMLElement $Entries) {
 				}
 			}
 
+			foreach ($Entry->link as $link) {
+				$attributes = $link->attributes();
+
+				if (!empty($attributes->href) && ((string)$attributes->rel === 'comments')) {
+					$item['originUrl'] = (string)$attributes->href;
+					break;
+				}
+			}
+
 			if (!$item['url']) {
 				if ($Entry->link) {
 					$attributes = $link->attributes();

test-sources.php

@@ -74,6 +74,9 @@
 				<?php foreach ($Source->items as $url): ?>
 				<li>
 					<a href="<?php echo $url['url']; ?>"><?php echo $url['url']; ?></a> | <a href="test.php?url=<?php echo urlencode($url['url']); ?>" target="_blank">Test</a><br>
+					<?php if ($url['originUrl']): ?>
+					<a href="<?php echo $url['originUrl']; ?>"><?php echo $url['originUrl']; ?></a> | <a href="test.php?url=<?php echo urlencode($url['originUrl']); ?>" target="_blank">Test origin Url</a><br>
+					<?php endif; ?>
 					<time><?php echo $url['pubdate']; ?></time>
 				</li>
 				<?php endforeach ?>

test.php

@@ -71,6 +71,7 @@ function getOption ($name, $default = null) {
 				</p>
 				<p>
 				<label>Facebook access token: <input type="text" name="options[facebookAccessToken]" value="<?php echo getOption('facebookAccessToken'); ?>"></label><br>
+				<label>Embedly key: <input type="text" name="options[embedlyKey]" value="<?php echo getOption('embedlyKey'); ?>"></label><br>
 				<label>Soundcloud client id: <input type="text" name="options[soundcloudClientId]" value="<?php echo getOption('soundcloudClientId', 'YOUR_CLIENT_ID'); ?>"></label>
 				</p>
 			</fieldset>