Merge pull request #10 from codewithkyle/hotfix-1.2.1

Closes #9 - fixed inline transform function

Author: codewithkyle

CHANGELOG.md

@@ -6,6 +6,14 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this p
 
 ## [Unreleased]
 
+## [1.2.0] - 2021-06-19
+
+### Fixed
+
+- `craft.jitter.transformImage()` bug ([#9](https://github.com/codewithkyle/craft-jitter/issues/9))
+- S3 bucket config bug
+- `craft.jitter.srcset()` removes the temp files it creates
+
 ## [1.2.0] - 2021-06-12
 
 ### Fixed
@@ -49,7 +57,9 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this p
     - delete local files
     - delete S3 files
 
-[Unreleased]: https://github.com/codewithkyle/craft-jitter/compare/v1.1.2...HEAD
+[Unreleased]: https://github.com/codewithkyle/craft-jitter/compare/v1.2.1...HEAD
+[1.2.1]: https://github.com/codewithkyle/craft-jitter/compare/v1.2.0...v1.2.1
+[1.2.0]: https://github.com/codewithkyle/craft-jitter/compare/v1.1.2...v1.2.0
 [1.1.2]: https://github.com/codewithkyle/craft-jitter/compare/v1.1.1...v1.1.2
 [1.1.1]: https://github.com/codewithkyle/craft-jitter/compare/v1.1.0...v1.1.1
 [1.1.0]: https://github.com/codewithkyle/craft-jitter/compare/v1.0.0...v1.1.0

composer.json

@@ -2,7 +2,7 @@
     "name": "codewithkyle/jitter",
     "description": "A just in time image transformation service.",
     "type": "craft-plugin",
-    "version": "1.2.0",
+    "version": "1.2.1",
     "keywords": [
         "craft",
         "cms",

src/services/Transform.php

@@ -58,6 +58,38 @@ public function clearS3BucketCache()
         }
     }
 
+    public function generateURL(array $params): string
+    {
+        $ret = "/jitter/v1/transform?";
+        $asset = Asset::find()->id($params["id"])->one();
+        if (empty($asset))
+        {
+            Craft::error("Failed to find asset with an id of " . $id, __METHOD__);
+        }
+        else
+        {
+            $masterImage = $asset->getCopyOfFile();
+        }
+        if ($masterImage)
+        {
+            $isFrist = true;
+            foreach ($params as $key => $value)
+            {
+                if ($isFrist)
+                {
+                    $ret .= $key . "=" . $value;
+                }
+                else
+                {
+                    $ret .= "&" . $key . "=" . $value;
+                }
+                $isFrist = false;
+            }
+            \unlink($masterImage);
+        }
+        return $ret;
+    }
+
     public function generateSourceSet(string $id, array $images): string
     {        
         $masterImage = null;
@@ -116,6 +148,7 @@ public function generateSourceSet(string $id, array $images): string
                     $ret .= ", ";
                 }
             }
+            \unlink($masterImage);
         }
         return $ret;
     }
@@ -262,14 +295,18 @@ private function checkCache($settings, string $key): array
             if (\file_exists($path))
             {
                 $s3 = $this->connectToS3($settings);
+                $s3Key = $key;
                 if (isset($settings['folder']))
                 {
-                    $key = $settings['folder'] . "/" . $key;
+                    $s3Key = $settings['folder'] . "/" . $s3Key;
                 }
-                $response = $s3->getObject([
-                    "Bucket" => getenv("S3_BUCKET"),
-                    "Key" => $key,
+                $file = $s3->getObject([
+                    "Bucket" => $settings["bucket"],
+                    "Key" => $s3Key,
                 ]);
+                $response["Body"] = $file["Body"];
+                $response["Name"] = $key;
+                $response["ContentType"] = $file["ContentType"];
             }
         }
         else
@@ -282,7 +319,7 @@ private function checkCache($settings, string $key): array
                 $response["ContentType"] = \mime_content_type($path);
             }
         }
-        return $response;
+        return (array)$response;
     }
 
     private function cacheImage($settings, $key, $image): void

src/variables/JitterVariable.php

@@ -11,10 +11,12 @@
 namespace codewithkyle\jitter\variables;
 
 use codewithkyle\jitter\Jitter;
+use codewithkyle\jitter\exceptions\JitterException;
 
 use Craft;
 use craft\elements\Asset;
 
+
 /**
  * Jitter Variable
  *
@@ -34,19 +36,21 @@ class JitterVariable
 
     public function transformImage(Asset $file, $params): string
     {
-        $request = Craft::$app->getRequest();
-        $clientAcceptsWebp = $request->accepts('image/webp');
-        $params = json_decode(json_encode($params), true);
-        $params['id'] = $file->id;
-        $response = Jitter::getInstance()->transform->transformImage($params, $clientAcceptsWebp);
-        if ($response['success'])
+        $url = "";
+        try
         {
-            return $response['url'];
+            $request = Craft::$app->getRequest();
+            $clientAcceptsWebp = $request->accepts('image/webp');
+            $params = json_decode(json_encode($params), true);
+            $params['id'] = $file->id;
+            $file = Jitter::getInstance()->transform->transformImage($params, $clientAcceptsWebp);
+            $url = Jitter::getInstance()->transform->generateURL($params);
         }
-        else
+        catch (JitterException $e)
         {
-            Craft::error($response['error'], __METHOD__);
+            Craft::error($e->getMessage(), __METHOD__);
         }
+        return $url;
     }
 
     public function srcset(Asset $file, array $params): string