Merge branch 'feature/tags'

Author: oscarotero

README.md

@@ -39,6 +39,7 @@ $info->title; //The page title
 $info->description; //The page description
 $info->url; //The canonical url
 $info->type; //The page type (link, video, image, rich)
+$info->tags; //The page keywords (tags)
 
 $info->images; //List of all images found in the page
 $info->image; //The image choosen as main image

demo/index.php

@@ -80,6 +80,7 @@ function printCode($code, $asHtml = true)
     'description' => 'printText',
     'url' => 'printUrl',
     'type' => 'printText',
+    'tags' => 'printArray',
     'imagesUrls' => 'printArray',
     'code' => 'printCode',
     'source' => 'printUrl',
@@ -98,6 +99,7 @@ function printCode($code, $asHtml = true)
     'description' => 'printText',
     'url' => 'printUrl',
     'type' => 'printText',
+    'tags' => 'printArray',
     'image' => 'printImage',
     'imageWidth' => 'printText',
     'imageHeight' => 'printText',

src/Adapters/Adapter.php

@@ -15,13 +15,14 @@
  * @property null|string  $description
  * @property null|string  $url
  * @property null|string  $type
+ * @property array        $tags
  * @property array        $images
  * @property null|string  $image
- * @property null|int $imageWidth
- * @property null|int $imageHeight
+ * @property null|int     $imageWidth
+ * @property null|int     $imageHeight
  * @property null|string  $code
- * @property null|int $width
- * @property null|int $height
+ * @property null|int     $width
+ * @property null|int     $height
  * @property null|float   $aspectRatio
  * @property null|string  $authorName
  * @property null|string  $authorUrl
@@ -201,6 +202,14 @@ public function getType()
 
         return 'link';
     }
+    
+    /**
+     * {@inheritdoc}
+     */
+    public function getTags()
+    {
+        return Utils::getAllValues(Utils::getData($this->providers, 'tags'));
+    }
 
     /**
      * {@inheritdoc}

src/Adapters/AdapterInterface.php

@@ -81,7 +81,7 @@ public function getImageHeight();
 
     /**
      * Gets the aspect ratio of the embedded widget
-     * (useful to make it flexible).
+     * (useful to make it responsive).
      *
      * @return float|null
      */

src/Adapters/N500px.php

@@ -59,5 +59,7 @@ public function run()
         //order is important
         $this->addProvider('oembed', new Providers\OEmbed());
         $this->addProvider('opengraph', new Providers\OpenGraph());
+        $this->addProvider('html', new Providers\Html());
+
     }
 }

src/Bag.php

@@ -90,6 +90,22 @@ public function getAll()
      */
     public function has($name)
     {
+        if (strpos($name, '[') !== false) {
+            $names = explode('[', str_replace(']', '', $name));
+            $key = array_shift($names);
+            $item = isset($this->parameters[$key]) ? $this->parameters[$key] : [];
+
+            foreach ($names as $key) {
+                if (!isset($item[$key])) {
+                    return false;
+                }
+
+                $item = $item[$key];
+            }
+
+            return isset($item);
+        }
+
         return isset($this->parameters[$name]);
     }
 }

src/DataInterface.php

@@ -30,6 +30,13 @@ public function getDescription();
      */
     public function getType();
 
+    /**
+     * Gets the tags of the url
+     *
+     * @return array
+     */
+    public function getTags();
+
     /**
      * Gets the source url (feed, api, etc).
      *

src/Providers/Html.php

@@ -65,6 +65,29 @@ public function getType()
         return $this->bag->has('video_src') ? 'video' : null;
     }
 
+    /**
+     * {@inheritdoc}
+     */
+    public function getTags()
+    {
+        $keywords = $this->bag->get('keywords');
+
+        if (!$keywords) {
+            return [];
+        }
+
+        //some sites, contains the keywords separated by commas
+        if (strpos($keywords, ',')) {
+            $keywords = explode(',', $keywords);
+        //and others by spaces (ex: youtube)
+        } else {
+            $keywords = explode(' ', $keywords);
+        }
+
+        return array_filter(array_map('trim', $keywords));
+    }
+
+
     /**
      * {@inheritdoc}
      */

src/Providers/OEmbed.php

@@ -101,6 +101,21 @@ public function getType()
         }
     }
 
+    /**
+     * {@inheritdoc}
+     */
+    public function getTags()
+    {
+        if ($this->bag->has('meta[keywords]')) {
+            //it means we are using iframe.ly api
+            return array_map('trim', explode(',',$this->bag->get('meta[keywords]')));
+        }
+        
+        return [];
+
+        
+    }
+
     /**
      * {@inheritdoc}
      */

src/Providers/OpenGraph.php

@@ -33,6 +33,8 @@ public function run()
 
             if ($name === 'image') {
                 $this->bag->add('images', $value);
+            } else if (strpos($name, ':tag') !== false) {
+                $this->bag->add('tags', $value);
             } else {
                 $this->bag->set($name, $value);
             }
@@ -126,6 +128,14 @@ public function getUrl()
         return $this->bag->get('url');
     }
 
+    /**
+     * {@inheritdoc}
+     */
+    public function getTags()
+    {
+        return $this->bag->get('tags') ?: [];
+    }
+
     /**
      * {@inheritdoc}
      */