Merge pull request #2 from nswdpc/cherrypick-improvements

Cherrypick improvements

Author: tardinha

composer.json

@@ -27,5 +27,15 @@
     "require-dev": {
         "phpunit/phpunit": "^9.5",
         "friendsofphp/php-cs-fixer": "^3"
+    },
+    "autoload": {
+        "psr-4": {
+            "NSWDPC\\Elemental\\Models\\Image\\Tests\\": [
+                "tests/"
+            ],
+            "NSWDPC\\Elemental\\Models\\Image\\": [
+                "src/Models/Elements/"
+            ]
+        }
     }
 }

src/Models/Elements/ElementalImage.php src/Models/Elements/ElementImage.phpsrc/Models/Elements/ElementalImage.php renamed to src/Models/Elements/ElementImage.php

@@ -24,6 +24,14 @@ class ElementImage extends BaseElement
 
     private static $allowed_file_types = ["jpg", "jpeg", "gif", "png", "webp"];
 
+    const WIDTH_FULL = 'full';
+    const WIDTH_CONTAINER = 'container';
+
+    const HEIGHT_SMALL = 'small';
+    const HEIGHT_MEDIUM = 'medium';
+    const HEIGHT_LARGE = 'large';
+    const HEIGHT_ORIGINAL = 'original';
+
     public function getType()
     {
         return _t(__CLASS__ . ".BlockType", "Image");
@@ -65,18 +73,18 @@ public function getCMSFields()
                     "Width",
                     _t(__CLASS__ . ".WIDTH", "Width"),
                     [
-                        "container" => _t(__CLASS__ . ".CONTAINER_WIDTH", "Content width"),
-                        "full" => _t(__CLASS__ . ".BROWSER_WIDTH", "Browser width")
+                        self::WIDTH_CONTAINER => _t(__CLASS__ . ".CONTAINER_WIDTH", "Content width"),
+                        self::WIDTH_FULL => _t(__CLASS__ . ".BROWSER_WIDTH", "Browser width")
                     ]
                 ),
                 DropdownField::create(
                     "Height",
                     _t(__CLASS__ . ".HEIGHT", "Height"),
                     [
-                        "small" => _t(__CLASS__ . ".HEIGHT_SMALL", "Small"),
-                        "medium" => _t(__CLASS__ . ".HEIGHT_MEDIUM", "Medium"),
-                        "large" => _t(__CLASS__ . ".HEIGHT_LARGE", "Large"),
-                        "original" => _t(__CLASS__ . ".HEIGHT_ORIGINAL", "Original")
+                        self::HEIGHT_SMALL => _t(__CLASS__ . ".HEIGHT_SMALL", "Small"),
+                        self::HEIGHT_MEDIUM => _t(__CLASS__ . ".HEIGHT_MEDIUM", "Medium"),
+                        self::HEIGHT_LARGE => _t(__CLASS__ . ".HEIGHT_LARGE", "Large"),
+                        self::HEIGHT_ORIGINAL => _t(__CLASS__ . ".HEIGHT_ORIGINAL", "Original")
                     ]
                 ),
                 UploadField::create(
@@ -96,7 +104,7 @@ public function getCMSFields()
                 ),
                 TextareaField::create(
                     'Caption',
-                    'Caption'
+                    _t(__CLASS__ . ".CAPTION", "Caption")
                 )
             ]);
         });

templates/NSWDPC/Elemental/Models/Image/ElementImage.ss

@@ -1 +1,11 @@
-<img src="{$Image.URL}" alt="<% if $Title %>{$Title.XML}<% end_if %>">
+<% if $Image %>
+    <% if $ShowTitle %>
+        <h2>$Title</h2>
+    <% end_if %>
+    <div class="image">
+        {$Image}
+    </div>
+    <% if $Caption %>
+        <p class="caption">{$Caption}</p>
+    <% end_if %>
+<% end_if %>

tests/ElementImageTest.php

@@ -0,0 +1,47 @@
+<?php
+
+namespace NSWDPC\Elemental\Models\Image\Tests;
+
+use SilverStripe\Dev\SapphireTest;
+use SilverStripe\Core\Config\Config;
+use NSWDPC\Elemental\Models\Image\ElementImage;
+
+class ElementImageTest extends SapphireTest
+{
+
+    protected $usesDatabase = true;
+
+    public function testAllowedFileTypes()
+    {
+        $allowed = ["jpg", "jpeg"];
+        Config::modify()->set(
+            ElementImage::class,
+            'allowed_file_types',
+            $allowed
+        );
+        $element = ElementImage::create();
+        $this->assertEquals( $allowed, $element->getAllowedFileTypes() );
+    }
+
+    public function testDimensions()
+    {
+        $width = ElementImage::WIDTH_CONTAINER;
+        $height = ElementImage::HEIGHT_LARGE;
+        $element = ElementImage::create([
+            'Width' => $width,
+            'Height' => $height
+        ]);
+        $this->assertEquals( $width, $element->Width );
+        $this->assertEquals( $height, $element->Height );
+    }
+
+    public function testCaption()
+    {
+        $caption = 'Test caption';
+        $element = ElementImage::create([
+            'Caption' => $caption
+        ]);
+        $this->assertEquals( $caption, $element->Caption );
+    }
+
+}