Merge pull request #10 from cloudinary/CLOUDINARY-4

Cloudinary 4

Author: Pini

Core/CloudinaryImageProvider.php

@@ -92,7 +92,11 @@ public function upload(Image $image)
      */
     public function retrieveTransformed(Image $image, Transformation $transformation)
     {
-        $imagePath = \cloudinary_url($image->getId(), ['transformation' => $transformation->build(), 'secure' => true]);
+        $imagePath = \cloudinary_url($image->getId(), [
+            'transformation' => $transformation->build(),
+            'secure' => true,
+            'sign_url' => $this->configuration->getUseSignedUrls()
+        ]);
 
         if ($this->configuration->getUseRootPath()) {
             $imagePath = str_replace(".com/{$this->configuration->getCloud()}/image/upload/", ".com/{$this->configuration->getCloud()}/", $imagePath);

Core/Image/Transformation.php

@@ -23,14 +23,14 @@ class Transformation
 
     public function __construct()
     {
-        $this->crop = 'pad';
+        $this->crop = 'lpad';
         $this->flags = [];
     }
 
     public function withGravity(Gravity $gravity)
     {
         $this->gravity = $gravity;
-        $this->crop = ((string)$gravity) ? 'crop' : 'pad';
+        $this->crop = ((string)$gravity) ? 'crop' : 'lpad';
         return $this;
     }
 

Core/Image/Transformation/Crop.php

@@ -4,7 +4,7 @@
 
 class Crop
 {
-    const PAD = 'pad';
+    const PAD = 'lpad';
     const FIT = 'fit';
 
     private $value;

Model/Configuration.php

@@ -40,6 +40,7 @@ class Configuration implements ConfigurationInterface
     const CONFIG_PATH_SECURE_BASE_URL = "web/secure/base_url";
     const CONFIG_PATH_UNSECURE_BASE_URL = "web/unsecure/base_url";
     const CONFIG_PATH_USE_SECURE_IN_FRONTEND = "web/secure/use_in_frontend";
+    const CONFIG_PATH_USE_SIGNED_URLS = 'cloudinary/advanced/use_signed_urls';
 
     const USE_FILENAME = true;
     const UNIQUE_FILENAME = false;
@@ -158,7 +159,7 @@ public function getCdnSubdomainStatus()
      */
     public function getUserPlatform()
     {
-        return sprintf(self::USER_PLATFORM_TEMPLATE, '1.6.4', '2.0.0');
+        return sprintf(self::USER_PLATFORM_TEMPLATE, '1.6.5', '2.0.0');
     }
 
     /**
@@ -279,6 +280,14 @@ public function getUseRootPath()
         return (bool) $this->configReader->getValue(self::CONFIG_PATH_REMOVE_VERSION_NUMBER);
     }
 
+    /**
+     * @return bool
+     */
+    public function getUseSignedUrls()
+    {
+        return (bool) $this->configReader->getValue(self::CONFIG_PATH_USE_SIGNED_URLS);
+    }
+
     /**
      * @method getMediaBaseUrl
      * @return string

Plugin/ImageHelper.php

@@ -2,16 +2,16 @@
 
 namespace Cloudinary\Cloudinary\Plugin;
 
-use Cloudinary\Cloudinary\Core\Image\Transformation;
+use Cloudinary\Cloudinary\Core\ConfigurationInterface;
 use Cloudinary\Cloudinary\Core\Image\ImageFactory;
-use Cloudinary\Cloudinary\Core\Image\Transformation\Dimensions;
+use Cloudinary\Cloudinary\Core\Image\Transformation;
 use Cloudinary\Cloudinary\Core\Image\Transformation\Crop;
+use Cloudinary\Cloudinary\Core\Image\Transformation\Dimensions;
 use Cloudinary\Cloudinary\Core\UrlGenerator;
-use Cloudinary\Cloudinary\Core\ConfigurationInterface;
-use Magento\Catalog\Api\Data\ProductInterface;
-use Magento\Catalog\Helper\Image as CatalogImageHelper;
 use Cloudinary\Cloudinary\Model\Transformation as TransformationModel;
 use Cloudinary\Cloudinary\Model\TransformationFactory;
+use Magento\Catalog\Api\Data\ProductInterface;
+use Magento\Catalog\Helper\Image as CatalogImageHelper;
 
 class ImageHelper
 {
@@ -158,7 +158,7 @@ private function createTransformation(CatalogImageHelper $helper)
         $transform = $this->configuration->getDefaultTransformation()->withDimensions($dimensions);
 
         if ($this->keepFrame) {
-            $transform->withCrop(Crop::fromString('pad'))
+            $transform->withCrop(Crop::fromString('lpad'))
                 ->withDimensions(Dimensions::squareMissingDimension($dimensions));
         } else {
             $transform->withCrop(Crop::fromString('fit'));

composer.json

@@ -2,7 +2,7 @@
     "name": "cloudinary/cloudinary-magento2",
     "description": "Cloudinary Magento 2 Integration.",
     "type": "magento2-module",
-    "version": "1.6.4",
+    "version": "1.6.5",
     "minimum-stability": "dev",
     "license": "MIT",
     "repositories": {

etc/adminhtml/system.xml

@@ -77,6 +77,11 @@
                     <comment>Remove "/image/upload/" from URLs</comment>
                     <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
                 </field>
+                <field id="use_signed_urls" translate="label comment" type="select" sortOrder="2" showInDefault="1" showInWebsite="0" showInStore="0" canRestore="1">
+                    <label>Use signed URLs</label>
+                    <comment>A signed Cloudinary image delivery URL is a dynamic URL that has its signature validated before making it available for view</comment>
+                    <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
+                </field>
             </group>
         </section>
     </system>

etc/module.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
-  <module name="Cloudinary_Cloudinary" setup_version="1.6.4">
+  <module name="Cloudinary_Cloudinary" setup_version="1.6.5">
       <sequence>
           <module name="Magento_ProductVideo"/>
       </sequence>