Merge pull request #15 from vormkracht10/test-adding-filename-from-url

Add filename to url, helper functions and test

composer.json

@@ -25,7 +25,10 @@
     "autoload": {
         "psr-4": {
             "Vormkracht10\\UploadcareTransformations\\": "src"
-        }
+        },
+        "files": [
+            "src/helpers.php"
+        ]
     },
     "autoload-dev": {
         "psr-4": {

src/UploadcareTransformation.php

@@ -10,6 +10,7 @@ class UploadcareTransformation extends Transformations
     protected array $transformations;
     protected string $url;
     protected string $baseUrl;
+    protected ?string $filename = null;
 
     public function __construct(string $uuid, string $cdnUrl = 'https://ucarecdn.com/')
     {
@@ -18,11 +19,26 @@ public function __construct(string $uuid, string $cdnUrl = 'https://ucarecdn.com
         $this->baseUrl = $cdnUrl;
     }
 
-    public function getUrl()
+    public function filename(string $filename)
     {
-        $url = $this->baseUrl . $this->uuid;
+        $this->filename = $filename;
 
-        return $this->applyTransformations($url);
+        return $this;
+    }
+
+    public function getUrl(): string
+    {
+        $url = $this->applyTransformations($this->baseUrl . $this->uuid);
+
+        if (! str_ends_with($url, '/')) {
+            $url .= '/';
+        }
+
+        if ($this->filename) {
+            $url = rtrim($url, '/') . '/' . $this->filename;
+        }
+
+        return $url;
     }
 
     public function __toString()

src/helpers.php

@@ -0,0 +1,17 @@
+<?php
+
+use Vormkracht10\UploadcareTransformations\UploadcareTransformation;
+
+if (! function_exists('uploadcare')) {
+    function uploadcare(string $uuid, string $cdnUrl = 'https://ucarecdn.com/'): UploadcareTransformation
+    {
+        return new UploadcareTransformation($uuid, $cdnUrl);
+    }
+}
+
+if (! function_exists('uc')) {
+    function uc(string $uuid, string $cdnUrl = 'https://ucarecdn.com/'): UploadcareTransformation
+    {
+        return uploadcare($uuid, $cdnUrl);
+    }
+}

tests/GenerateUrlTest.php

@@ -1,33 +1,41 @@
 <?php
 
-use Vormkracht10\UploadcareTransformations\UploadcareTransformation;
 
 it('can generate a url without cdn', function () {
     $uuid = '12a3456b-c789-1234-1de2-3cfa83096e25';
-    $transformation = (new UploadcareTransformation($uuid));
+    $transformation = uploadcare($uuid);
 
-    $url = $transformation->crop(320, '50p', 'center')->setFill('#ffffff')->getUrl();
+    $url = (string) $transformation->crop(320, '50p', 'center')->setFill('#ffffff');
 
-    expect($url)->toBe('https://ucarecdn.com/12a3456b-c789-1234-1de2-3cfa83096e25/crop/320x50p/center/set_fill/#ffffff');
+    expect($url)->toBe('https://ucarecdn.com/12a3456b-c789-1234-1de2-3cfa83096e25/crop/320x50p/center/set_fill/#ffffff/');
 });
 
 it('can generate a url with cdn', function () {
     $uuid = '12a3456b-c789-1234-1de2-3cfa83096e25';
     $cdnUrl = 'https://example.com/cdn/';
 
-    $transformation = (new UploadcareTransformation($uuid, $cdnUrl));
+    $transformation = uploadcare($uuid, $cdnUrl);
 
-    $url = $transformation->crop(320, '50p', 'center')->setFill('#ffffff')->getUrl();
+    $url = (string) $transformation->crop(320, '50p', 'center')->setFill('#ffffff');
 
-    expect($url)->toBe('https://example.com/cdn/12a3456b-c789-1234-1de2-3cfa83096e25/crop/320x50p/center/set_fill/#ffffff');
+    expect($url)->toBe('https://example.com/cdn/12a3456b-c789-1234-1de2-3cfa83096e25/crop/320x50p/center/set_fill/#ffffff/');
 });
 
 it('can generate a url using Conver to SRGB and ICC profile size threshold', function () {
     $uuid = '12a3456b-c789-1234-1de2-3cfa83096e25';
 
-    $transformation = (new UploadcareTransformation($uuid));
+    $transformation = uploadcare($uuid);
 
-    $url = $transformation->convertToSRGB('fast')->iccProfileSizeThreshold(10)->getUrl();
+    $url = (string) $transformation->convertToSRGB('fast')->iccProfileSizeThreshold(10);
 
-    expect($url)->toBe('https://ucarecdn.com/12a3456b-c789-1234-1de2-3cfa83096e25/max_icc_size/10/srgb/fast');
+    expect($url)->toBe('https://ucarecdn.com/12a3456b-c789-1234-1de2-3cfa83096e25/max_icc_size/10/srgb/fast/');
+});
+
+it('can generate a url including filename with transformations', function () {
+    $uuid = '12a3456b-c789-1234-1de2-3cfa83096e25';
+    $transformation = uploadcare($uuid);
+
+    $url = (string) $transformation->crop(320, '50p', 'center')->filename('test.jpg');
+
+    expect($url)->toBe('https://ucarecdn.com/12a3456b-c789-1234-1de2-3cfa83096e25/crop/320x50p/center/test.jpg');
 });