Initial release

Author: ruslansteiger

CHANGELOG.md

@@ -2,6 +2,6 @@
 
 All notable changes to `laravel-cloudinary` will be documented in this file.
 
-## 0.0.0 - 2021-xx-xx
+## 0.0.0 - 2021-05-24
 
-- initial release
+- Initial release

README.md

@@ -15,7 +15,7 @@ wip
 You can install the package via composer:
 
 ```bash
-composer require codebar-ag/laravel-cloudinary
+composer require codebar-ag/laravel-flysystem-cloudinary
 ```
 
 Add the following environment variables to your `.env` file:

composer.json

@@ -1,13 +1,13 @@
 {
-    "name": "codebar-ag/laravel-cloudinary",
+    "name": "codebar-ag/laravel-flysystem-cloudinary",
     "description": "Cloudinary integration with Laravel",
     "keywords": [
         "laravel",
         "codebar-ag",
         "cloudinary",
         "laravel-cloudinary"
     ],
-    "homepage": "https://github.com/codebar-ag/laravel-cloudinary",
+    "homepage": "https://github.com/codebar-ag/laravel-flysystem-cloudinary",
     "license": "MIT",
     "authors": [
         {
@@ -39,12 +39,12 @@
     },
     "autoload": {
         "psr-4": {
-            "CodebarAg\\Cloudinary\\": "src"
+            "CodebarAg\\FlysystemCloudinary\\": "src"
         }
     },
     "autoload-dev": {
         "psr-4": {
-            "CodebarAg\\Cloudinary\\Tests\\": "tests"
+            "CodebarAg\\FlysystemCloudinary\\Tests\\": "tests"
         }
     },
     "scripts": {
@@ -59,7 +59,7 @@
     "extra": {
         "laravel": {
             "providers": [
-                "CodebarAg\\Cloudinary\\CloudinaryServiceProvider"
+                "CodebarAg\\FlysystemCloudinary\\FlysystemCloudinaryServiceProvider"
             ]
         }
     },

config/cloudinary.php renamed to config/flysystem-cloudinary.php

@@ -6,8 +6,8 @@
     |--------------------------------------------------------------------------
     | Cloudinary Configuration
     |--------------------------------------------------------------------------
-    |
     */
 
-    'folder' => env('CLOUDINARY_FOLDER', null),
+//    'folder' => env('CLOUDINARY_FOLDER'),
+
 ];

phpunit.xml.dist

@@ -33,13 +33,4 @@
             <clover outputFile="build/logs/clover.xml"/>
         </report>
     </coverage>
-    <logging>
-        <junit outputFile="build/report.junit.xml"/>
-    </logging>
-    <php>
-        <env name="TWILIO_URL" value="https://verify.twilio.com/v2/Services"/>
-        <env name="TWILIO_ACCOUNT_SID" value="ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX"/>
-        <env name="TWILIO_AUTH_TOKEN" value="XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX"/>
-        <env name="TWILIO_SERVICE_SID" value="VAXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX"/>
-    </php>
 </phpunit>

src/Events/CloudinaryResponseLog.php renamed to src/Events/FlysystemCloudinaryResponseLog.php

@@ -1,13 +1,13 @@
 <?php
 
-namespace CodebarAg\Cloudinary\Events;
+namespace CodebarAg\FlysystemCloudinary\Events;
 
 use Cloudinary\Api\ApiResponse;
 use Illuminate\Broadcasting\InteractsWithSockets;
 use Illuminate\Foundation\Events\Dispatchable;
 use Illuminate\Queue\SerializesModels;
 
-class CloudinaryResponseLog
+class FlysystemCloudinaryResponseLog
 {
     use Dispatchable;
     use InteractsWithSockets;

src/CloudinaryAdapter.php renamed to src/FlysystemCloudinaryAdapter.php

@@ -1,16 +1,17 @@
 <?php
 
-namespace CodebarAg\Cloudinary;
+namespace CodebarAg\FlysystemCloudinary;
 
+use Cloudinary\Api\ApiResponse;
 use Cloudinary\Api\Exception\ApiError;
 use Cloudinary\Api\Exception\NotFound;
 use Cloudinary\Cloudinary;
-use CodebarAg\Cloudinary\Events\CloudinaryResponseLog;
+use CodebarAg\FlysystemCloudinary\Events\FlysystemCloudinaryResponseLog;
 use Illuminate\Support\Str;
-use League\Flysystem\AdapterInterface;
+use League\Flysystem\Adapter\AbstractAdapter;
 use League\Flysystem\Config;
 
-class CloudinaryAdapter implements AdapterInterface
+class FlysystemCloudinaryAdapter extends AbstractAdapter
 {
     public function __construct(
         public Cloudinary $cloudinary,
@@ -49,7 +50,7 @@ public function writeStream($path, $resource, Config $config): array | false
             return false;
         }
 
-        event(new CloudinaryResponseLog($response));
+        event(new FlysystemCloudinaryResponseLog($response));
 
         [
             'bytes' => $bytes,
@@ -90,7 +91,7 @@ public function rename($path, $newpath): bool
             return false;
         }
 
-        event(new CloudinaryResponseLog($response));
+        event(new FlysystemCloudinaryResponseLog($response));
 
         return true;
     }
@@ -104,7 +105,18 @@ public function copy($path, $newpath): bool
     /** @inheritdoc */
     public function delete($path): bool
     {
-        // TODO: Implement delete() method.
+        try {
+            $response = $this
+                ->cloudinary
+                ->uploadApi()
+                ->destroy($path);
+        } catch (NotFound) {
+            return false;
+        }
+
+        event(new FlysystemCloudinaryResponseLog($response));
+
+        return true;
     }
 
     /** @inheritdoc */
@@ -141,7 +153,7 @@ public function has($path): array | bool | null
             return false;
         }
 
-        event(new CloudinaryResponseLog($response));
+        event(new FlysystemCloudinaryResponseLog($response));
 
         return true;
     }
@@ -193,4 +205,23 @@ public function getVisibility($path): array | false
     {
         // TODO: Implement getVisibility() method.
     }
+
+    public function getUrl(string $path): string
+    {
+        $options = [
+            'type' => 'upload',
+        ];
+
+        /** @var ApiResponse $response */
+        $response = $this
+            ->cloudinary
+            ->uploadApi()
+            ->explicit($path, $options);
+
+        event(new FlysystemCloudinaryResponseLog($response));
+
+        ['url' => $url] = $response->getArrayCopy();
+
+        return $url;
+    }
 }

src/CloudinaryServiceProvider.php renamed to src/FlysystemCloudinaryServiceProvider.php

@@ -1,28 +1,29 @@
 <?php
 
-namespace CodebarAg\Cloudinary;
+namespace CodebarAg\FlysystemCloudinary;
 
+use Cloudinary\Cloudinary;
 use Illuminate\Foundation\Application;
 use Illuminate\Support\Facades\Storage;
 use League\Flysystem\Filesystem;
 use Spatie\LaravelPackageTools\Package;
 use Spatie\LaravelPackageTools\PackageServiceProvider;
 
-class CloudinaryServiceProvider extends PackageServiceProvider
+class FlysystemCloudinaryServiceProvider extends PackageServiceProvider
 {
     public function configurePackage(Package $package): void
     {
         $package
-            ->name('laravel-cloudinary')
-            ->hasConfigFile('cloudinary');
+            ->name('laravel-flysystem-cloudinary')
+            ->hasConfigFile('flysystem-cloudinary');
     }
 
     public function bootingPackage(): void
     {
         Storage::extend('cloudinary', function (Application $app, array $config) {
-            $cloudinary = new \Cloudinary\Cloudinary($config);
+            $cloudinary = new Cloudinary($config);
 
-            return new Filesystem(new CloudinaryAdapter($cloudinary));
+            return new Filesystem(new FlysystemCloudinaryAdapter($cloudinary));
         });
     }
 }

tests/Feature/ExampleTest.php

@@ -0,0 +1,14 @@
+<?php
+
+namespace CodebarAg\FlysystemCloudinary\Tests\Feature;
+
+use CodebarAg\FlysystemCloudinary\Tests\TestCase;
+
+class ExampleTest extends TestCase
+{
+    /** @test */
+    public function it_does_test()
+    {
+        $this->assertTrue(true);
+    }
+}

tests/TestCase.php

@@ -1,16 +1,16 @@
 <?php
 
-namespace CodebarAg\Cloudinary\Tests;
+namespace CodebarAg\FlysystemCloudinary\Tests;
 
-use CodebarAg\Cloudinary\CloudinaryServiceProvider;
+use CodebarAg\FlysystemCloudinary\FlysystemCloudinaryServiceProvider;
 use Orchestra\Testbench\TestCase as Orchestra;
 
 class TestCase extends Orchestra
 {
     protected function getPackageProviders($app): array
     {
         return [
-            CloudinaryServiceProvider::class,
+            FlysystemCloudinaryServiceProvider::class,
         ];
     }