fixed tests, added suppport for google maps

Author: oscarotero

src/Adapters/Google.php

@@ -7,26 +7,46 @@
 
 use Embed\Request;
 use Embed\Utils;
+use Embed\Url;
+use Embed\Providers\Api;
 
 class Google extends Webpage implements AdapterInterface
 {
+    protected $mode;
+
     /**
      * {@inheritdoc}
      */
     public static function check(Request $request)
     {
         return $request->isValid() && $request->match([
-            //'https://maps.google.*',
-            //'https://www.google.*/maps*',
+            'https://maps.google.*',
+            'https://www.google.*/maps*',
             'https://drive.google.com/file/*/view',
         ]);
     }
 
+    /**
+     * {@inheritdoc}
+     */
+    public function run()
+    {
+        if ($this->request->match('*/maps/*')) {
+            $this->addProvider('google', new Api\GoogleMaps());
+        }
+
+        parent::run();
+    }
+
     /**
      * {@inheritdoc}
      */
     public function getCode()
     {
+        if (($google = $this->getProvider('google'))) {
+            return $google->getCode();
+        }
+
         $url = $this->request->createUrl()
             ->withDirectoryPosition(3, 'preview')
             ->withQueryParameters([]);

src/Providers/Api/GoogleMaps.php

@@ -0,0 +1,80 @@
+<?php
+
+namespace Embed\Providers\Api;
+
+use Embed\Utils;
+use Embed\Providers\Provider;
+use Embed\Providers\ProviderInterface;
+
+/**
+ * Provider to use the API of google
+ */
+class GoogleMaps extends Provider implements ProviderInterface
+{
+    protected $mode;
+    protected $config = [
+        'key' => null,
+    ];
+
+    /**
+     * {@inheritdoc}
+     */
+    public function run()
+    {
+        $mode = $this->request->getDirectoryPosition(1);
+
+        switch ($mode) {
+            case 'place':
+            case 'dir':
+            case 'search':
+                $this->mode = $mode;
+                break;
+        }
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getTitle()
+    {
+        if ($this->mode === 'place') {
+            return $this->request->getDirectoryPosition(2);
+        }
+
+        if ($this->mode === 'dir') {
+            return $this->request->getDirectoryPosition(2).' / '.$this->request->getDirectoryPosition(3);
+        }
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getCode()
+    {
+        if (empty($this->config['key'])) {
+            return;
+        }
+
+        switch ($this->mode) {
+            case 'place':
+            case 'search':
+                return Utils::iframe($this->request->createUrl()
+                    ->withPath('maps/embed/v1/'.$this->mode)
+                    ->withQueryParameters([
+                        'q' => $this->request->getDirectoryPosition(2),
+                        'key' => $this->config['key']
+                    ])
+                );
+
+            case 'dir':
+                return Utils::iframe($this->request->createUrl()
+                    ->withPath('maps/embed/v1/directions')
+                    ->withQueryParameters([
+                        'origin' => $this->request->getDirectoryPosition(2),
+                        'destination' => $this->request->getDirectoryPosition(3),
+                        'key' => $this->config['key']
+                    ])
+                );
+        }
+    }
+}

src/Url.php

@@ -262,7 +262,7 @@ public function getSlicePath($offset, $length = null)
      */
     public function getPath()
     {
-        $path = !empty($this->info['path']) ? '/'.implode('/', $this->info['path']).'/' : '/';
+        $path = !empty($this->info['path']) ? '/'.implode('/', array_map('urlencode', $this->info['path'])).'/' : '/';
 
         if (isset($this->info['file'])) {
             $path .= $this->info['file'];
@@ -509,6 +509,8 @@ private function setPath($path)
 
         if (isset($parts['dirname'])) {
             foreach (explode('/', str_replace(DIRECTORY_SEPARATOR, '/', $parts['dirname'])) as $dir) {
+                $dir = trim(urldecode($dir));
+
                 if ($dir !== '') {
                     $this->info['path'][] = $dir;
                 }

tests/BandcampTest.php

@@ -10,7 +10,7 @@ public function testOne()
                 'title' => "Coquin L'éléphant, by Jean Jean",
                 'description' => 'from the album Symmetry',
                 'type' => 'video',
-                'code' => '<iframe src="https://bandcamp.com/EmbeddedPlayer/v=2/track=2592086951/size=large/linkcol=0084B4/notracklist=true/twittercard=true/" frameborder="0" allowTransparency="true" style="border:none;overflow:hidden;width:350;height:467;"></iframe>',
+                'code' => '<iframe src="https://bandcamp.com/EmbeddedPlayer/v=2/track=2592086951/size=large/tracklist=false/artwork=small/" frameborder="0" allowTransparency="true" style="border:none;overflow:hidden;width:400;height:120;"></iframe>',
                 'width' => 400,
                 'height' => 120,
                 'providerName' => 'Jean Jean',

tests/FacebookTest.php

@@ -14,7 +14,7 @@ public function testOne()
     fjs.parentNode.insertBefore(js, fjs);
 }(document, 'script', 'facebook-jssdk'));</script>
 
-<div class="fb-post" data-href="https://www.facebook.com/permalink.php?story_fbid=827163017327807&id=149460691764713" data-width="500"></div>
+<div class="fb-post" data-href="https://www.facebook.com/asociaciondag/posts/827163017327807" data-width="500"></div>
 EOT;
 
         $this->assertEmbed(

tests/GoogleTest.php

@@ -2,15 +2,13 @@
 
 class GoogleTest extends TestCaseBase
 {
-    //the embed code for gmaps does not work. Need to investigate.
-    public function noTestMap()
+    public function testMap()
     {
         $this->assertEmbed(
             'https://www.google.es/maps/place/Tordoia,+A+Coru%C3%B1a/@43.0871207,-8.5710004,12z/data=!3m1!4b1!4m2!3m1!1s0xd2ef4006f1ef489:0x404f58273ca55a0',
             [
-                'title' => 'Google Maps',
-                'type' => 'rich',
-                'code' => '<iframe src="https://www.google.es/maps/place/Tordoia,+A+Coru%C3%B1a/@43.0871207,-8.5710004,12z/data=!3m1!4b1!4m2!3m1!1s0xd2ef4006f1ef489:0x404f58273ca55a0?output=embed&amp;s=" frameborder="0" allowTransparency="true" style="border:none;overflow:hidden;width:600px;height:400px;"></iframe>',
+                'title' => 'Tordoia, A Coruña',
+                'type' => 'link',
                 'providerName' => 'Google Maps',
             ]
         );