Adding Google Manager

ARCANEDEV · Feb 19, 2018 · 124fb16 · 124fb16
1 parent 5ad0f5d
commit 124fb16
Show file tree

Hide file tree

Showing 16 changed files with 281 additions and 99 deletions.
diff --git a/composer.json b/composer.json
@@ -17,13 +17,13 @@
     "license": "MIT",
     "require": {
         "php":               ">=7.0",
-        "arcanedev/support": "~4.2.0"
+        "arcanedev/support": "~4.2.0",
+        "guzzlehttp/guzzle": "~6.0"
     },
     "require-dev": {
         "orchestra/testbench": "~3.5.0",
         "phpunit/phpcov":      "~4.0",
-        "phpunit/phpunit":     "~6.0",
-        "guzzlehttp/guzzle":   "~6.0"
+        "phpunit/phpunit":     "~6.0"
     },
     "autoload": {
         "psr-4": {
@@ -34,8 +34,5 @@
         "psr-4": {
             "Arcanedev\\GeoLocation\\Tests\\": "tests/"
         }
-    },
-    "suggest": {
-        "guzzlehttp/guzzle": "(~6.0) Required if you're going to use the Google webservices."
     }
 }
diff --git a/config/geo-location.php b/config/geo-location.php
@@ -0,0 +1,47 @@
+<?php
+
+return [
+
+    /* -----------------------------------------------------------------
+     |  Services
+     | -----------------------------------------------------------------
+     */
+
+    'services' => [
+
+        // GOOGLE
+        //-----------------------------------------------------
+        'google' => [
+
+            'directions' => [
+                'service' => Arcanedev\GeoLocation\Google\Directions\DirectionsService::class,
+                'options' => [
+                    'key' => env('GOOGLE_MAPS_DIRECTIONS_KEY'),
+                ],
+            ],
+
+            'distance-matrix' => [
+                'service' => Arcanedev\GeoLocation\Google\DistanceMatrix\DistanceMatrixService::class,
+                'options' => [
+                    'key' => env('GOOGLE_MAPS_DISTANCE_MATRIX_KEY'),
+                ],
+            ],
+
+            'elevation' => [
+                'service' => Arcanedev\GeoLocation\Google\Elevation\ElevationService::class,
+                'options' => [
+                    'key' => env('GOOGLE_MAPS_ELEVATION_KEY'),
+                ],
+            ],
+
+            'geocoding' => [
+                'service' => Arcanedev\GeoLocation\Google\Geocoding\GeocodingService::class,
+                'options' => [
+                    'key' => env('GOOGLE_MAPS_GEOCODING_KEY'),
+                ],
+            ],
+        ],
+
+    ],
+
+];
diff --git a/src/Contracts/GoogleManager.php b/src/Contracts/GoogleManager.php
@@ -0,0 +1,43 @@
+<?php namespace Arcanedev\GeoLocation\Contracts;
+
+/**
+ * Interface  GoogleManager
+ *
+ * @package   Arcanedev\GeoLocation\Contracts
+ * @author    ARCANEDEV <[email protected]>
+ */
+interface GoogleManager
+{
+    /* -----------------------------------------------------------------
+     |  Main Methods
+     | -----------------------------------------------------------------
+     */
+
+    /**
+     * Create the google directions service.
+     *
+     * @return \Arcanedev\GeoLocation\Google\AbstractService
+     */
+    public function createDirectionsDriver();
+
+    /**
+     * Create the google distance matrix service.
+     *
+     * @return \Arcanedev\GeoLocation\Google\AbstractService
+     */
+    public function createDistanceMatrixDriver();
+
+    /**
+     * Create the google elevation service.
+     *
+     * @return \Arcanedev\GeoLocation\Google\AbstractService
+     */
+    public function createElevationDriver();
+
+    /**
+     * Create the google geocoding service.
+     *
+     * @return \Arcanedev\GeoLocation\Google\AbstractService
+     */
+    public function createGeocodingDriver();
+}
diff --git a/src/GeoLocationServiceProvider.php b/src/GeoLocationServiceProvider.php
@@ -34,7 +34,13 @@ public function register()
     {
         parent::register();
 
-        //
+        $this->registerConfig();
+
+        $this->bind(\GuzzleHttp\ClientInterface::class, \GuzzleHttp\Client::class);
+
+        $this->singleton(Contracts\GoogleManager::class, function ($app) {
+            return new Google\GoogleManager($app);
+        });
     }
 
     /**
@@ -44,7 +50,7 @@ public function boot()
     {
         parent::boot();
 
-        //
+        $this->publishConfig();
     }
 
     /**
@@ -55,7 +61,7 @@ public function boot()
     public function provides()
     {
         return [
-            //
+            Contracts\GoogleManager::class,
         ];
     }
 }
diff --git a/src/Google/AbstractService.php b/src/Google/AbstractService.php
@@ -2,6 +2,7 @@
 
 use Arcanedev\GeoLocation\Contracts\Entities\Coordinates\Position;
 use GuzzleHttp\ClientInterface;
+use Illuminate\Support\Arr;
 use Psr\Http\Message\ResponseInterface;
 
 /**
@@ -32,10 +33,12 @@ abstract class AbstractService
      * GoogleDistanceMatrix constructor.
      *
      * @param  \GuzzleHttp\ClientInterface  $client
+     * @param  array                        $options
      */
-    public function __construct(ClientInterface $client)
+    public function __construct(ClientInterface $client, array $options = [])
     {
         $this->setHttpClient($client);
+        $this->setOptions($options);
     }
 
     /* -----------------------------------------------------------------
@@ -57,6 +60,16 @@ public function setHttpClient(ClientInterface $client)
         return $this;
     }
 
+    /**
+     * Set the options.
+     *
+     * @param  array  $options
+     */
+    protected function setOptions(array $options)
+    {
+        $this->setKey(Arr::get($options, 'key'));
+    }
+
     /**
      * Set the API Key.
      *

diff --git a/src/Google/Directions/DirectionsService.php b/src/Google/Directions/DirectionsService.php
@@ -2,7 +2,6 @@
 
 use Arcanedev\GeoLocation\Contracts\Entities\Coordinates\Position;
 use Arcanedev\GeoLocation\Google\AbstractService;
-use GuzzleHttp\ClientInterface;
 use Psr\Http\Message\ResponseInterface;
 
 /**
@@ -41,23 +40,6 @@ class DirectionsService extends AbstractService
      */
     protected $destination;
 
-    /* -----------------------------------------------------------------
-     |  Constructor
-     | -----------------------------------------------------------------
-     */
-
-    /**
-     * DirectionsService constructor.
-     *
-     * @param  \GuzzleHttp\ClientInterface  $client
-     */
-    public function __construct(ClientInterface $client)
-    {
-        parent::__construct($client);
-
-        $this->setKey(getenv('GOOGLE_MAPS_DIRECTIONS_KEY'));
-    }
-
     /* -----------------------------------------------------------------
      |  Getters & Setters
      | -----------------------------------------------------------------

diff --git a/src/Google/DistanceMatrix/DistanceMatrixService.php b/src/Google/DistanceMatrix/DistanceMatrixService.php
@@ -2,7 +2,6 @@
 
 use Arcanedev\GeoLocation\Contracts\Entities\Coordinates\Position;
 use Arcanedev\GeoLocation\Google\AbstractService;
-use GuzzleHttp\ClientInterface;
 use InvalidArgumentException;
 use Psr\Http\Message\ResponseInterface;
 
@@ -37,23 +36,6 @@ class DistanceMatrixService extends AbstractService
     /** @var string */
     protected $units = 'metric';
 
-    /* -----------------------------------------------------------------
-     |  Constructor
-     | -----------------------------------------------------------------
-     */
-
-    /**
-     * GoogleDistanceMatrix constructor.
-     *
-     * @param  \GuzzleHttp\ClientInterface  $client
-     */
-    public function __construct(ClientInterface $client)
-    {
-        parent::__construct($client);
-
-        $this->setKey(getenv('GOOGLE_MAPS_DISTANCE_MATRIX_KEY'));
-    }
-
     /* -----------------------------------------------------------------
      |  Getters & Setters
      | -----------------------------------------------------------------

diff --git a/src/Google/Elevation/ElevationService.php b/src/Google/Elevation/ElevationService.php
@@ -2,7 +2,6 @@
 
 use Arcanedev\GeoLocation\Contracts\Entities\Coordinates\Position as PositionContract;
 use Arcanedev\GeoLocation\Google\AbstractService;
-use GuzzleHttp\ClientInterface;
 use Psr\Http\Message\ResponseInterface;
 
 /**
@@ -20,23 +19,6 @@ class ElevationService extends AbstractService
 
     const BASE_URL = 'https://maps.googleapis.com/maps/api/elevation/json';
 
-    /* -----------------------------------------------------------------
-     |  Constructor
-     | -----------------------------------------------------------------
-     */
-
-    /**
-     * ElevationService constructor.
-     *
-     * @param  \GuzzleHttp\ClientInterface  $client
-     */
-    public function __construct(ClientInterface $client)
-    {
-        parent::__construct($client);
-
-        $this->setKey(getenv('GOOGLE_MAPS_ELEVATION_KEY'));
-    }
-
     /* -----------------------------------------------------------------
      |  Main Methods
      | -----------------------------------------------------------------

diff --git a/src/Google/Geocoding/GeocodingService.php b/src/Google/Geocoding/GeocodingService.php
@@ -3,7 +3,6 @@
 use Arcanedev\GeoLocation\Contracts\Entities\Coordinates\Position as PositionContract;
 use Arcanedev\GeoLocation\Entities\Coordinates\Position;
 use Arcanedev\GeoLocation\Google\AbstractService;
-use GuzzleHttp\ClientInterface;
 use Psr\Http\Message\ResponseInterface;
 
 /**
@@ -23,23 +22,6 @@ class GeocodingService extends AbstractService
 
     const BASE_URL = 'https://maps.googleapis.com/maps/api/geocode/json';
 
-    /* -----------------------------------------------------------------
-     |  Constructor
-     | -----------------------------------------------------------------
-     */
-
-    /**
-     * GoogleDistanceMatrix constructor.
-     *
-     * @param  \GuzzleHttp\ClientInterface  $client
-     */
-    public function __construct(ClientInterface $client)
-    {
-        parent::__construct($client);
-
-        $this->setKey(getenv('GOOGLE_MAPS_GEOCODING_KEY'));
-    }
-
     /* -----------------------------------------------------------------
      |  Main Methods
      | -----------------------------------------------------------------