Merge pull request #2 from tombabolewski/develop

Develop

Author: tombabolewski

README.md

@@ -1,2 +1,72 @@
 # openiai
+
+*Version:* `0.1.3`
+
+This library is yet unfinished. Use it only at your own risk.
+Feel free to contribute.
+
+
+## Summary
+
 Open IAI API PHP wrapper library.
+
+This is a Laravel library that lets you easily connect to IdoSell Shop API 
+and make requests. It aims to cover the whole API (all gates and methods,
+ which are automatically looked for).
+                   
+
+## Requirements
+* PHP 7.2
+* Laravel 5.8
+* ext-json
+* ext-soap
+
+## Installation
+
+Simply use Composer to install this package, either by executing CLI command
+in your project directory:
+
+```bash
+composer require tombabolewski/openiai
+```
+
+or by adding the following line to your `composer.json` file in `require`
+section:
+
+```json
+"require" : {
+  "tombabolewski/openiai" : "^0.1.3"
+}
+```
+
+Next, you should add the Service Provider to your `config/app.php` file.
+Just add the following line to the `providers` array, preferably at the end:
+
+```php
+'providers' => [
+    // (...)
+    Tombabolewski/Openiai/OpeniaiServiceProvider::class,
+],
+```
+
+If you would like, you can also add an alias to the `aliases` array like that:
+```php
+'aliases' => [
+    // (...)
+    'Openiai' => Tombabolewski/Openiai/Client::class
+],
+```
+
+
+## Usage
+
+Section under construction ;]
+
+Example:
+```php
+//Create openiai client instance
+$client = app()->make('Openiai');
+
+//Get all products
+$products = $client->Products->get();
+```

composer.json

@@ -1,35 +1,38 @@
 {
-    "name": "tombabolewski/openiai",
-    "description": "Open IAI API PHP wrapper library",
-    "type": "library",
-    "support": {
-        "source": "https://github.com/tombabolewski/openiai",
-        "issues": "https://github.com/ltombabolewski/openiai/issues"
-    },
-    "require": {
-        "php": ">=7.1",
-        "ext-json": "*",
-        "laravel/laravel": "5.8",
-        "league/csv": "^9.3",
-        "guzzle/http": "^3.9"
-    },
-    "license": "MIT",
-    "authors": [
-        {
-            "name": "Thomas Lucifer Babolewski",
-            "email": "spootek@gmail.com"
-        }
-    ],
-    "autoload": {
-        "psr-4": {
-            "Tombabolewski\\Openiai\\": "src/"
-        }
-    },
-    "extra": {
-        "laravel" : {
-            "providers": [
-                "Tomabolewski\\Openiai\\Providers\\openiaiServiceProvider"
-            ]
-        }
+  "name": "tombabolewski/openiai",
+  "description": "Open IAI API PHP wrapper library",
+  "type": "library",
+  "support": {
+    "source": "https://github.com/tombabolewski/openiai",
+    "issues": "https://github.com/tombabolewski/openiai/issues"
+  },
+  "require": {
+    "php": ">=7.2",
+    "ext-json": "*",
+    "laravel/laravel": "5.8",
+    "league/csv": "^9.3",
+    "guzzle/http": "^3.9"
+  },
+  "license": "MIT",
+  "authors": [
+    {
+      "name": "Tomasz Babolewski",
+      "email": "spootek@gmail.com"
     }
+  ],
+  "autoload": {
+    "psr-4": {
+      "Tombabolewski\\Openiai\\": "src/"
+    }
+  },
+  "extra": {
+    "laravel": {
+      "providers": [
+        "Tombabolewski\\Openiai\\OpeniaiServiceProvider"
+      ],
+      "aliases": {
+        "OpenIAI": "Tombabolewski\\Openiai\\Facade"
+      }
+    }
+  }
 }

src/ApiGate.php

@@ -3,12 +3,22 @@
 
 namespace Tombabolewski\Openiai;
 
-use Guzzle\Http\Client as HttpClient;
+use Tombabolewski\Openiai\Structure\ApiVersion;
 
 class Client
 {
-    public function __construct()
+    protected $version;
+
+    public function __construct($version = 0)
     {
+        if (!$version) {
+            $version = config('API_DEFAULT_VERSION');
+        }
+        $this->setVersion($version);
+    }
 
+    public function setVersion($versionSignature)
+    {
+        $this->version = new ApiVersion($versionSignature);
     }
 }

src/ApiMethod.php

@@ -1,7 +1,7 @@
 <?php
 
 
-namespace Tombabolewski\Openiai;
+namespace Tombabolewski\Openiai\Exception;
 use Exception;
 
 class ApiException extends Exception

src/ApiVersion.php

@@ -10,6 +10,6 @@ class Facade extends BaseFacade
 {
     public static function getFacadeAccessor()
     {
-        return 'IAI';
+        return 'openiai';
     }
 }

src/Client.php

@@ -3,8 +3,9 @@
 namespace App\Providers;
 
 use Illuminate\Support\ServiceProvider;
+use Tombabolewski\Openiai\Client;
 
-class openiaiServiceProvider extends ServiceProvider
+class OpeniaiServiceProvider extends ServiceProvider
 {
     /**
      * Register services.
@@ -13,7 +14,7 @@ class openiaiServiceProvider extends ServiceProvider
      */
     public function register()
     {
-        //
+        $this->mergeConfigFrom(__DIR__ . '/config/openiai.php', 'openiai');
     }
 
     /**
@@ -23,6 +24,11 @@ public function register()
      */
     public function boot()
     {
-        //
+        $this->publishes([
+            __DIR__ . '/config/openiai.php' => config_path('openiai.php'),
+        ]);
+        $this->app->bind('openiai', function ($app) {
+            return new Client();
+        });
     }
 }

src/ApiException.php src/Exception/ApiException.phpsrc/ApiException.php renamed to src/Exception/ApiException.php

@@ -1,7 +1,7 @@
 <?php
 
 
-namespace Tombabolewski\Openiai;
+namespace Tombabolewski\Openiai\Response;
 
 
 use Exception;
@@ -53,7 +53,7 @@ public function offsetGet($offset)
         if (!$this->offsetExists($offset)) {
             throw new Exception('Offset does not exist');
         }
-        if ($this->current()->getPage() === $offset) {
+        if ($this->current()->getPage() !== $offset) {
             $this->currentPage = $this->getParentMethod()->exec($offset, $this->requestParams);
         }
         return $this->current();
@@ -114,8 +114,9 @@ public function current()
     public function next()
     {
         $nextPage = $this->getParentMethod()->getPage() + 1;
-        if (!$this->offsetExists($nextPage))
-        $this->currentPage = $this->getParentMethod()->exec($nextPage, $this->requestParams);
+        if (!$this->offsetExists($nextPage)){
+            $this->currentPage = $this->getParentMethod()->exec($nextPage, $this->requestParams);
+        }
     }
 
     /**
@@ -138,7 +139,8 @@ public function key()
      */
     public function valid()
     {
-        return isset($this->currentPage) && !is_null($this->currentPage);
+        return isset($this->currentPage)
+            && !is_null($this->currentPage);
     }
 
     /**