Merge pull request #49 from codebar-ag/feature-geturl

Feature Optimise

Author: StanBarrows

.gitignore

@@ -3,6 +3,7 @@
 .php_cs.cache
 .php-cs-fixer.cache
 .phpunit.result.cache
+.phpunit.cache
 build
 composer.lock
 coverage

src/FlysystemCloudinaryAdapter.php

@@ -520,7 +520,30 @@ private function extractExtraMetadata(array $metadata): array
         return $extracted;
     }
 
-    public function getUrl(string $path): string|false
+    /**
+     * Get the URL of an image with optional transformation parameters
+     *
+     * @return string
+     */
+    public function getUrl(string|array $path): string|false
+    {
+        $options = [];
+
+        if (is_array($path)) {
+            $options = $path['options'] ?? [];
+            $path = $path['path'];
+        }
+
+        $path = $this->ensureFolderIsPrefixed(trim($path, '/'));
+
+        try {
+            return (string) $this->cloudinary->image($path)->toUrl(implode(',', $options));
+        } catch (NotFound) {
+            return false;
+        }
+    }
+
+    public function getUrlViaRequest(string $path): string|false
     {
         $path = $this->ensureFolderIsPrefixed(trim($path, '/'));
 

tests/Feature/AdapterTest.php

@@ -269,7 +269,7 @@
     Event::assertDispatched(FlysystemCloudinaryResponseLog::class, 4);
 });
 
-it('can get url', function () {
+it('can get url via request', function () {
     Http::fake();
     $mock = $this->mock(Cloudinary::class, function (MockInterface $mock) {
         $mock->shouldReceive('uploadApi->explicit')->once()->andReturn(new ApiResponse([
@@ -279,8 +279,77 @@
     });
     $adapter = new FlysystemCloudinaryAdapter($mock);
 
-    $url = $adapter->getUrl('::path::');
+    $url = $adapter->getUrlViaRequest('::path::');
 
     $this->assertSame('::secure-url::', $url);
     Event::assertDispatched(FlysystemCloudinaryResponseLog::class, 2);
 });
+
+it('can get url', function () {
+    // Secure URL
+
+    $cloudinary = new Cloudinary([
+        'cloud_name' => env('CLOUDINARY_CLOUD_NAME'),
+        'api_key' => env('CLOUDINARY_API_KEY'),
+        'api_secret' => env('CLOUDINARY_API_SECRET'),
+        'url' => [
+            'secure' => true,
+        ],
+    ]);
+
+    $adapter = new FlysystemCloudinaryAdapter($cloudinary);
+
+    $url = $adapter->getUrl('::path::');
+
+    expect($url)
+        ->toContain('https://', '::path::')
+        ->not->toContain('http://');
+
+    // Unsecure URL
+
+    $cloudinary = new Cloudinary([
+        'cloud_name' => env('CLOUDINARY_CLOUD_NAME'),
+        'api_key' => env('CLOUDINARY_API_KEY'),
+        'api_secret' => env('CLOUDINARY_API_SECRET'),
+        'url' => [
+            'secure' => false,
+        ],
+    ]);
+
+    $adapter = new FlysystemCloudinaryAdapter($cloudinary);
+
+    $url = $adapter->getUrl('::path::');
+
+    expect($url)->toContain('http://', '::path::')
+        ->not->toContain('https://');
+});
+
+it('can get url with option', function () {
+    // Secure URL
+
+    $cloudinary = new Cloudinary([
+        'cloud_name' => env('CLOUDINARY_CLOUD_NAME'),
+        'api_key' => env('CLOUDINARY_API_KEY'),
+        'api_secret' => env('CLOUDINARY_API_SECRET'),
+        'url' => [
+            'secure' => true,
+        ],
+    ]);
+
+    $adapter = new FlysystemCloudinaryAdapter($cloudinary);
+
+    $url = $adapter->getUrl([
+        'path' => '::path::',
+        'options' => [
+            'w_64',
+            'h_64',
+            'c_fill',
+            'auto',
+        ],
+    ]);
+
+    expect($url)
+        ->toContain('https://', '::path::')
+        ->toContain('w_64', 'h_64', 'c_fill', 'auto')
+        ->not->toContain('http://');
+});