Refactored ApiClient

Changed make to static method, added possibility of passing just name (or path) in configuration to fill CallApi constructor with those data. Or passing it manually directly to make() method. Using WrongConfigException when wrong number of parameters will be passed to make(). And of course updated test.

Author: Mateusz Gostański

src/ApiClient.php

@@ -2,17 +2,20 @@
 
 namespace Grixu\ApiClient;
 
+use Grixu\ApiClient\Exceptions\WrongConfigException;
+
 class ApiClient
 {
-    private CallApiAction $callApiAction;
-
-    public function __construct()
+    public static function make(...$config): CallApi
     {
-        $this->callApiAction = new CallApiAction();
-    }
+        if (count($config) === 1 && is_array(config($config[0]))) {
+            $config = config($config[0]);
+        }
 
-    public function make(string $url)
-    {
-        return $this->callApiAction->execute($url);
+        if (empty($config) || count($config) < 4) {
+            throw new WrongConfigException();
+        }
+
+        return new CallApi(...$config);
     }
 }

tests/ApiClientTest.php

@@ -4,6 +4,7 @@
 
 use Grixu\ApiClient\ApiClient;
 use Grixu\ApiClient\ApiClientServiceProvider;
+use Grixu\ApiClient\Exceptions\WrongConfigException;
 use Illuminate\Support\Facades\Http;
 use Orchestra\Testbench\TestCase;
 
@@ -16,6 +17,26 @@ protected function getPackageProviders($app)
 
     /** @test */
     public function normal_pass()
+    {
+        $this->createHttpFake();
+        $obj = $this->createTestObj();
+        $result = $obj->call(env('TEST_BASE_URL'));
+
+        $this->assertNotEmpty($result);
+    }
+
+    protected function createTestObj()
+    {
+        return ApiClient::make(
+            env('TEST_BASE_URL'),
+            env('TEST_OAUTH'),
+            env('TEST_CLIENT_ID'),
+            env('TEST_CLIENT_KEY'),
+            'test'
+        );
+    }
+
+    protected function createHttpFake()
     {
         Http::fake(
             [
@@ -35,10 +56,47 @@ public function normal_pass()
 
             ]
         );
+    }
+
+    /**
+     * @test
+     * @environment-setup apiConfig
+     */
+    public function with_config_name()
+    {
+        $this->createHttpFake();
 
-        $obj = new ApiClient();
-        $result = $obj->make(config('api-client.base_url'));
+        $obj = ApiClient::make('project.api');
+        $result = $obj->call(env('TEST_BASE_URL'));
 
         $this->assertNotEmpty($result);
     }
+
+    protected function apiConfig($app)
+    {
+        $app->config->set(
+            'project',
+            [
+                'api' => [
+                    'baseUrl',
+                    'oAuthUrl',
+                    'id',
+                    'key',
+                    'cache'
+                ]
+            ]
+        );
+    }
+
+    /** @test */
+    public function wrong_options_passed()
+    {
+        try {
+            ApiClient::make('lol', 'lol');
+
+            $this->assertTrue(false);
+        } catch (WrongConfigException $e) {
+            $this->assertTrue(true);
+        }
+    }
 }