Fix create image by category. Fix origin save. Add path to category in

BaseName

Author: trabem

BaseImagable.php

@@ -17,7 +17,7 @@
  * @method getOriginal($category, $name, &$imageContent = null)
  * @method delete($category, $name, &$imageContent = null)
  *
- * @author RuslanSaiko
+ * @author Ruslan Saiko <ruslan.saiko.dev@gmail.com>
  */
 class BaseImagable extends Component
 {

Imagable.php

@@ -2,7 +2,7 @@
 namespace bl\imagable;
 
 /**
- *
+ * @inheritdoc
  * @author Ruslan Saiko <ruslan.saiko.dev@gmail.com>
  */
 class Imagable extends BaseImagable

behaviors/CreateImageBehavior.php

@@ -13,7 +13,7 @@
 /**
  * Description of CreateImageBehavior
  *
- * @author RuslanSaiko
+ * @author Ruslan Saiko <ruslan.saiko.dev@gmail.com>
  */
 class CreateImageBehavior extends Behavior
 {
@@ -57,46 +57,45 @@ public function attach($owner)
      */
     public function create($category, $path)
     {
-        //path to image
+        // Path to image
         $saveImagePath = $this->owner->imagesPath;
-        $categoriesParam = $this->owner->categories;
+
+        $categoryOptions = $this->owner->categories;
+
         $defaultCategoriesSize = $this->owner->baseTemplate;
-        if (!array_key_exists($category, $categoriesParam['category'])) {
-            throw new \UnexpectedValueException("$category not declare");
+        if (!array_key_exists($category, $categoryOptions['category'])) {
+            throw new \UnexpectedValueException(" Category with name $category not specified.");
         }
-        //new path to image
+        // New path to image
         $newPath = implode(DIRECTORY_SEPARATOR, [$saveImagePath, $category]);
 
-        //new image name created with class BaseName
+        // Specifies the full path to the category, for the derived class from BaseName
+        $this->name->pathToCatory = $newPath;
+
+        // New image name created with class BaseName
         $imageName = $this->name->getName(FileHelper::getFileName($path));
         DirectoryHelper::create($newPath, true);
         $image = '';
-        //TODO:refactor here!
-        foreach ($categoriesParam['category'] as $category) {
-            if (isset($category['origin']) && $category['origin']) {
-                $image = $imageName . "-origin." . FileHelper::getFileType($path);
-                list($width, $height, $type, $attr) = getimagesize($path);
-
-                $this->imageCreator->thumbnail($path, $width, $height);
-                $this->imageCreator->save(implode(DIRECTORY_SEPARATOR, [$newPath, $image]));
-
-
-            } elseif (isset($categoriesParam['origin']) && $categoriesParam['origin']) {
-                $image = $imageName . "-origin." . FileHelper::getFileType($path);
-
-                list($width, $height, $type, $attr) = getimagesize($path);
-
-                $this->imageCreator->thumbnail($path, $width, $height);
-                $this->imageCreator->save(implode(DIRECTORY_SEPARATOR, [$newPath, $image]));
-
-            }
+        $categoryOption = $categoryOptions['category'][$category];
+        
+        $categorySizes = $categoryOption['size'];
+        if(empty($categorySizes)) {
+            $categorySizes = $defaultCategoriesSize;
+        }
+        if ((isset($categoryOption['origin']) && $categoryOption['origin'])
+            || (isset($categoryOptions['origin']) && $categoryOptions['origin'])
+        ) {
+            list($width, $height) = getimagesize($path);
+            $categorySizes['origin'] = [
+                'width' => $width,
+                'height' => $height,
+            ];
+        }
 
-            $arr = isset($category['size']) ? $category['size'] : $defaultCategoriesSize;
-            foreach ($arr as $sizeName => $size) {
-                $image = "$imageName-$sizeName." . FileHelper::getFileType($path);
-                $this->imageCreator->thumbnail($path, $size['width'], $size['height']);
-                $this->imageCreator->save(implode(DIRECTORY_SEPARATOR, [$newPath, $image]));
-            }
+        foreach ($categorySizes as $sizeName => $size) {
+            $image = "$imageName-$sizeName." . FileHelper::getFileType($path);
+            $this->imageCreator->thumbnail($path, $size['width'], $size['height']);
+            $this->imageCreator->save(implode(DIRECTORY_SEPARATOR, [$newPath, $image]));
         }
 
         return $imageName;

behaviors/GetImageBehavior.php

@@ -12,7 +12,7 @@
 /**
  * Description of GetImageBehavior
  *
- * @author RuslanSaiko
+ * @author Ruslan Saiko <ruslan.saiko.dev@gmail.com>
  */
 class GetImageBehavior extends Behavior
 {

chainImageThumb/ImageSizeChain.php

@@ -8,7 +8,7 @@
 /**
  * Description of ImageMakeThumb
  *
- * @author RuslanSaiko
+ * @author Ruslan Saiko <ruslan.saiko.dev@gmail.com>
  */
 abstract class ImageSizeChain extends Object
 {

helpers/FileHelper.php

@@ -8,7 +8,7 @@
 /**
  * Description of ImageHelper
  *
- * @author Ruslan
+ * @author Ruslan Saiko <ruslan.saiko.dev@gmail.com>
  */
 class FileHelper extends BaseFileHelper {
 

helpers/base/BaseFileHelper.php

@@ -7,7 +7,7 @@
 /**
  * Description of BaseImageHelper
  *
- * @author Ruslan
+ * @author Ruslan Saiko <ruslan.saiko.dev@gmail.com>
  */
 class BaseFileHelper extends \yii\helpers\BaseFileHelper {
     public static function fileInfo($filePath) {

instances/CreateImageImagine.php

@@ -9,7 +9,7 @@
 
 /**
  * Description of CreateImageImagine
- * @author RuslanSaiko
+ * @author Ruslan Saiko <ruslan.saiko.dev@gmail.com>
  */
 class CreateImageImagine extends Object implements CreateImageInterface
 {

interfaces/CreateImageInterface.php

@@ -6,6 +6,8 @@
 /**
  * Interface CreateImageInterface
  * @package bl\imagable\interfaces
+ *
+ * @author Ruslan Saiko <ruslan.saiko.dev@gmail.com>
  */
 interface CreateImageInterface
 {

name/BaseName.php

@@ -3,14 +3,27 @@
 namespace bl\imagable\name;
 
 /**
- * Description of BaseNameSignature
+ * Base class for name generator
  *
- * @author RuslanSaiko
+ * @author Ruslan Saiko <ruslan.saiko.dev@gmail.com>
  */
 abstract class BaseName extends \yii\base\Object
 {
+    /**
+     * @param $baseName string
+     * @return string
+     */
     abstract public function generate($baseName);
-    
+
+    /**
+     * @var string Full path to the category
+     */
+    public $pathToCatory;
+
+    /**
+     * @param $name string
+     * @return string
+     */
     public function getName($name)
     {
         return $this->generate($name);

name/CRC32Name.php

@@ -5,7 +5,7 @@
 /**
  * Description of CRC32Name
  *
- * @author RuslanSaiko
+ * @author Ruslan Saiko <ruslan.saiko.dev@gmail.com>
  */
 class CRC32Name extends BaseName
 {

name/OriginName.php

@@ -9,7 +9,7 @@
 /**
  * Description of OriginName
  *
- * @author RuslanSaiko
+ * @author Ruslan Saiko <ruslan.saiko.dev@gmail.com>
  */
 class OriginName extends BaseName
 {