Cleanup the way handlers work

Author: Torann

config/hunt.php

@@ -21,25 +21,27 @@
         ],
 
         'retries' => 1,
+
+        'handler' => null,
     ],
 
     /*
     |--------------------------------------------------------------------------
-    | Amazon Elasticsearch Service
+    | Handlers
     |--------------------------------------------------------------------------
     |
-    | Sign all requests made to AWS by simply setting up the config with your
-    | AWS settings like the following.
-    |
-    | 'aws_config' => [
-    |    'key' => env('AWS_KEY'),
-    |    'secret' => env('AWS_SECRET'),
-    |    'region' => env('AWS_REGION'),
-    | ],
+    | Use this to handle certain aspects of a Elasticsearch request.
     |
     */
 
-    'aws_config' => null,
+    'handlers' => [
+        'aws' => [
+            'class' => \LaravelHunt\Handlers\AwsSignature::class,
+            'key' => env('AWS_KEY'),
+            'secret' => env('AWS_SECRET'),
+            'region' => env('AWS_REGION', 'us-east-1'),
+        ],
+    ],
 
     /*
     |--------------------------------------------------------------------------

src/Hunter.php

@@ -45,12 +45,7 @@ public function __construct(array $config = [])
         $this->config = $config;
         $this->multilingual = $this->config('multilingual', false);
 
-        // AWS Elasticsearch enabled
-        if ($aws = $this->config('aws_config', null)) {
-            $this->config['config']['handler'] = new AwsSignature($aws);
-        }
-
-        $this->elasticsearch = ClientBuilder::fromConfig($this->config('config'));
+        $this->elasticsearch = ClientBuilder::fromConfig($this->getElasticSearchConfig());
     }
 
     /**
@@ -646,4 +641,30 @@ public function getIndexName()
     {
         return $this->config('index', 'default');
     }
+
+    /**
+     * Get Elasticsearch settings.
+     *
+     * @return array
+     */
+    protected function getElasticSearchConfig()
+    {
+        // Get all settings
+        $settings = $this->config('config');
+
+        // Get a handler if one is set
+        if ($config = $this->config('handlers.' . $this->config('config.handler'), null)) {
+
+            // Get handler class
+            $handler = Arr::pull($config, 'class');
+
+            // Create handler instance
+            $settings['handler'] = new $handler($config);
+        }
+        else {
+            unset($settings['handler']);
+        }
+
+        return $settings;
+    }
 }