Fixes #14 - Images not Auto Uploading

src/Exceptions/InvalidImageFieldException.php

@@ -1,7 +1,7 @@
 <?php
+
 namespace QCod\ImageUp\Exceptions;
 
 class InvalidImageFieldException extends \Exception
 {
-
 }

src/HasImageUploads.php

@@ -217,14 +217,17 @@ public function getImageFieldOptions($field = null)
     {
         // get first option if no field provided
         if (is_null($field)) {
-            $options = array_first($this->getDefinedImageFields());
+            $imagesFields = $this->getDefinedImageFields();
 
-            if (!$options) {
+            if (!$imagesFields) {
                 throw new InvalidImageFieldException(
                     'No image fields are defined in $imageFields array on model.'
                 );
             }
 
+            $fieldKey = array_first(array_keys($imagesFields));
+            $options = is_int($fieldKey) ? [] : array_first($imagesFields);
+
             return $options;
         }
 
@@ -235,7 +238,7 @@ public function getImageFieldOptions($field = null)
             );
         }
 
-        return array_get($this->getDefinedImageFields(), $field);
+        return array_get($this->getDefinedImageFields(), $field, []);
     }
 
     /**
@@ -262,9 +265,13 @@ public function getImageFieldName($field = null)
             return $field;
         }
 
+        $imagesFields = $this->getDefinedImageFields();
+        $fieldKey = array_first(array_keys($imagesFields));
+
         // return first field name
-        $fieldKey = array_keys($this->getDefinedImageFields());
-        return array_first($fieldKey);
+        return is_int($fieldKey)
+            ? $imagesFields[$fieldKey]
+            : $fieldKey;
     }
 
     /**
@@ -466,21 +473,26 @@ protected function validationFactory()
      */
     protected function autoUpload()
     {
-        foreach ($this->getDefinedImageFields() as $field => $options) {
+        foreach ($this->getDefinedImageFields() as $key => $val) {
+            $field = is_numeric($key) ? $val : $key;
+            $options = array_wrap($val);
+
             // check if global upload is allowed, then in override in option
             $autoUploadAllowed = array_get($options, 'auto_upload', $this->canAutoUploadImages());
 
-            if (is_array($options) && count($options) && $autoUploadAllowed) {
-                // get the input file name
-                $requestFileName = array_get($options, 'file_input', $field);
-
-                // if request has the file upload it
-                if (request()->hasFile($requestFileName)) {
-                    $this->uploadImage(
-                        request()->file($requestFileName),
-                        $field
-                    );
-                }
+            if (! $autoUploadAllowed) {
+                continue;
+            }
+
+            // get the input file name
+            $requestFileName = array_get($options, 'file_input', $field);
+
+            // if request has the file upload it
+            if (request()->hasFile($requestFileName)) {
+                $this->uploadImage(
+                    request()->file($requestFileName),
+                    $field
+                );
             }
         }
     }

src/ImageUpServiceProvider.php

@@ -18,7 +18,8 @@ public function boot()
         ]);
 
         $this->mergeConfigFrom(
-            __DIR__.'/../config/imageup.php', 'imageup'
+            __DIR__.'/../config/imageup.php',
+            'imageup'
         );
     }
 
@@ -29,6 +30,5 @@ public function boot()
      */
     public function register()
     {
-
     }
 }

tests/Controllers/UserController.php

@@ -11,14 +11,49 @@ class UserController extends Controller
     public function store(Request $request)
     {
         $user = new User();
+
         $fieldOption = [
             'avatar' => ['width' => 200],
             'cover' => ['width' => 400, 'height' => 400]
         ];
+
         $user->setImagesField($fieldOption);
+        $user->forceFill($request->all())->save();
+
+        return $user;
+    }
+
+    public function storeImagesWithoutOptions(Request $request)
+    {
+        $user = new User();
+
+        $fieldOption = [
+            'avatar',
+            'cover'
+        ];
 
+        $user->setImagesField($fieldOption);
         $user->forceFill($request->all())->save();
 
         return $user;
     }
+
+    public function storeImagesWithMixedOptions(Request $request)
+    {
+        $user = new User();
+
+        $fieldOption = [
+            'avatar',
+            'cover' => [
+                'width' => 400,
+                'height' => 400,
+                'auto_upload' => false
+            ],
+        ];
+
+        $user->setImagesField($fieldOption);
+        $user->forceFill($request->except('cover'))->save();
+
+        return $user;
+    }
 }

tests/Hooks/CopyImageHook.php

@@ -15,4 +15,4 @@ public function handle($image)
             'public'
         );
     }
-}
+}

tests/Hooks/ResizeToFiftyHook.php

@@ -8,4 +8,4 @@ public function handle($image)
     {
         $image->resize(50, 50);
     }
-}
+}

tests/ImageResizeTest.php

@@ -7,8 +7,8 @@
 
 class ImageResizeTest extends TestCase
 {
-    protected  $testImage = __DIR__ . '/images/test1200x1200.png';
-    protected  $newImage;
+    protected $testImage = __DIR__ . '/images/test1200x1200.png';
+    protected $newImage;
     protected $user;
 
     protected function setUp()
@@ -26,7 +26,7 @@ protected function tearDown()
     {
         parent::tearDown();
 
-        if( $this->newImage ) {
+        if ($this->newImage) {
             $this->newImage->destroy();
         }
     }
@@ -37,7 +37,7 @@ protected function tearDown()
     *
     * @test
     */
-    function it_resize_image_based_on_width_given()
+    public function it_resize_image_based_on_width_given()
     {
         $this->newImage = $this->user->resizeImage($this->testImage, ['width' => 300]);
 
@@ -49,7 +49,7 @@ function it_resize_image_based_on_width_given()
     *
     * @test
     */
-    function it_resize_image_by_height()
+    public function it_resize_image_by_height()
     {
         $this->newImage = $this->user->resizeImage($this->testImage, ['height' => 200]);
 
@@ -61,14 +61,16 @@ function it_resize_image_by_height()
     *
     * @test
     */
-    function it_crops_image_in_given_width_and_height()
+    public function it_crops_image_in_given_width_and_height()
     {
-        $this->newImage = $this->user->resizeImage($this->testImage,
+        $this->newImage = $this->user->resizeImage(
+            $this->testImage,
             [
                 'width' => 150,
                 'height' => 150,
                 'crop' => true
-            ]);
+            ]
+        );
 
         $this->assertEquals(150, $this->newImage->width());
         $this->assertEquals(150, $this->newImage->height());
@@ -79,14 +81,16 @@ function it_crops_image_in_given_width_and_height()
      *
      * @test
      */
-    function it_crops_in_x_and_y_if_crop_is_set_to_array_of_coordinates()
+    public function it_crops_in_x_and_y_if_crop_is_set_to_array_of_coordinates()
     {
-        $this->newImage = $this->user->resizeImage($this->testImage,
+        $this->newImage = $this->user->resizeImage(
+            $this->testImage,
             [
                 'width' => 100,
                 'height' => 100,
                 'crop' => [25, 10]
-            ]);
+            ]
+        );
 
         $this->assertEquals(100, $this->newImage->width());
         $this->assertEquals(100, $this->newImage->height());
@@ -97,14 +101,16 @@ function it_crops_in_x_and_y_if_crop_is_set_to_array_of_coordinates()
     *
     * @test
     */
-    function it_can_override_the_crop_x_and_y_coordinates()
+    public function it_can_override_the_crop_x_and_y_coordinates()
     {
-        $this->newImage = $this->user->cropTo(10, 0)->resizeImage($this->testImage,
+        $this->newImage = $this->user->cropTo(10, 0)->resizeImage(
+            $this->testImage,
             [
                 'width' => 100,
                 'height' => 100,
                 'crop' => [25, 10]
-            ]);
+            ]
+        );
 
         $this->assertEquals(100, $this->newImage->width());
         $this->assertEquals(100, $this->newImage->height());
@@ -115,7 +121,7 @@ function it_can_override_the_crop_x_and_y_coordinates()
     *
     * @test
     */
-    function it_do_not_resize_if_width_and_height_are_not_provided()
+    public function it_do_not_resize_if_width_and_height_are_not_provided()
     {
         $this->newImage = $this->user->resizeImage($this->testImage, []);