Prepare version 2.9.1-alpha.4.

Author: bgaillard

README.md

@@ -84,6 +84,9 @@ The following builds are available :
 
 ## Release history
 
+### 2.9.1-alpha.4 (2016-08-25)
+ * Add `\Gomoob\MetadataExtractor\Metadata\Photoshop\DuckyDirectory` class.
+
 ### 2.9.1-alpha.3 (2016-08-25)
  * Add `\Gomoob\MetadataExtractor\Metadata\Bmp\BmpHeaderDescriptor` to begin management of BMP files ; 
  * Add `\Gomoob\MetadataExtractor\Metadata\Bmp\BmpHeaderDirectory` to begin management of BMP files ; 

composer.json

@@ -1,7 +1,7 @@
 {
 	"name" : "gomoob/php-metadata-extractor",
 	"description" : "PHP wrapper to easily call the Java metadata-extrator library.",
-	"version" : "2.9.1-alpha.3",
+	"version" : "2.9.1-alpha.4",
 	"license" : "MIT",
 	"type" : "library",
 	"keywords" : [

composer.lock

@@ -1,6 +1,6 @@
 {
   "name": "gomoob-php-metadata-extractor",
-  "version": "2.9.1-alpha.3",
+  "version": "2.9.1-alpha.4",
   "license": "MIT",
   "repository" : {
     "type" : "git",

package.json

@@ -35,6 +35,7 @@
 use Gomoob\MetadataExtractor\Metadata\Exif\Makernotes\CanonMakernoteDirectory;
 use Gomoob\MetadataExtractor\Metadata\Exif\GpsDirectory;
 use Gomoob\MetadataExtractor\Metadata\Png\PngDirectory;
+use Gomoob\MetadataExtractor\Metadata\Photoshop\DuckyDirectory;
 
 /**
  * Reads metadata from any supported file format.
@@ -685,6 +686,9 @@ private static function createDirectoryWithName($directoryName)
             case 'Canon Makernote':
                 $directory = new CanonMakernoteDirectory();
                 break;
+            case 'Ducky':
+                $directory = new DuckyDirectory();
+                break;
             case 'Exif IFD0':
                 $directory = new ExifIFD0Directory();
                 break;

src/main/php/Gomoob/MetadataExtractor/Imaging/ImageMetadataReader.php

@@ -0,0 +1,51 @@
+<?php
+
+/**
+ * gomoob/php-metadata-extractor
+ *
+ * @copyright Copyright (c) 2016, GOMOOB SARL (http://gomoob.com)
+ * @license   http://www.opensource.org/licenses/mit-license.php MIT (see the LICENSE.md file)
+ */
+namespace Gomoob\MetadataExtractor\Metadata\Photoshop;
+
+use Gomoob\MetadataExtractor\Metadata\Directory;
+use Gomoob\MetadataExtractor\Metadata\TagDescriptor;
+
+/**
+ * Holds the data found in Photoshop "ducky" segments, created during Save-for-Web.
+ *
+ * @author Baptiste GAILLARD ([email protected])
+ */
+class DuckyDirectory extends Directory
+{
+    const TAG_QUALITY = 1;
+    const TAG_COMMENT = 2;
+    const TAG_COPYRIGHT = 3;
+
+    private static $tagNameMap = [
+        self::TAG_QUALITY => 'Quality',
+        self::TAG_COMMENT => 'Comment',
+        self::TAG_COPYRIGHT => 'Copyright'
+    ];
+    
+    public function __construct()
+    {
+        $this->setDescriptor(new TagDescriptor($this));
+    }
+    
+    /**
+     * {@inheritDoc}
+     */
+    public function getName()
+    {
+        return 'Ducky';
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    protected function getTagNameMap()
+    {
+        return static::$tagNameMap;
+    }
+}

src/main/php/Gomoob/MetadataExtractor/Metadata/Photoshop/DuckyDirectory.php

@@ -2,14 +2,13 @@
 
 /**
  * Copyright 2016 SARL GOMOOB. All rights reserved.
-*/
+ */
 namespace Gomoob\MetadataExtractor\Imaging\ImageMetadataReader;
 
 use Gomoob\MetadataExtractor\Imaging\ImageMetadataReader;
 
 use PHPUnit\Framework\TestCase;
 
-use Gomoob\MetadataExtractor\Metadata\Exif\ExifIFD0Directory;
 use Gomoob\MetadataExtractor\Metadata\Bmp\BmpHeaderDirectory;
 use Gomoob\MetadataExtractor\Metadata\File\FileMetadataDirectory;
 

src/test/php/Gomoob/MetadataExtractor/Imaging/ImageMetadataReader/SixteenColor10x10Test.php

@@ -0,0 +1,55 @@
+<?php
+
+/**
+ * Copyright 2016 SARL GOMOOB. All rights reserved.
+*/
+namespace Gomoob\MetadataExtractor\Imaging\ImageMetadataReader;
+
+use Gomoob\MetadataExtractor\Imaging\ImageMetadataReader;
+
+use PHPUnit\Framework\TestCase;
+
+use Gomoob\MetadataExtractor\Metadata\Jpeg\JpegDirectory;
+use Gomoob\MetadataExtractor\Metadata\Jfif\JfifDirectory;
+use Gomoob\MetadataExtractor\Metadata\Photoshop\DuckyDirectory;
+use Gomoob\MetadataExtractor\Metadata\Adobe\AdobeJpegDirectory;
+use Gomoob\MetadataExtractor\Metadata\File\FileMetadataDirectory;
+
+/**
+ * Test case used to test the {@link ImageMetadataReader} class with the `spongebob_happy.jpg` test file.
+ *
+ * @author Baptiste GAILLARD ([email protected])
+ * @group ImageMetadataReader.SixteenColor10x10Test
+ */
+class SpongeBobHappyTest extends TestCase
+{
+    /**
+     * Test method for {@link ImageMetadataReader#readMetadata($file)} and `spongebob_happy.jpg`.
+     */
+    public function testReadMetadata()
+    {
+        $metadata = ImageMetadataReader::readMetadata(realpath(TEST_RESOURCES_DIRECTORY . '/spongebob_happy.jpg'));
+
+        // Checks 'JPEG' directory
+        $directory = $metadata->getDirectories()[0];
+        $this->assertInstanceOf(JpegDirectory::class, $directory);
+
+        // Checks 'JFIF' directory
+        $directory = $metadata->getDirectories()[1];
+        $this->assertInstanceOf(JfifDirectory::class, $directory);
+
+        // Checks 'Ducky' directory
+        $directory = $metadata->getDirectories()[2];
+        $this->assertInstanceOf(DuckyDirectory::class, $directory);
+        
+        // Checks 'Adobe JPEG' directory
+        $directory = $metadata->getDirectories()[3];
+        $this->assertInstanceOf(AdobeJpegDirectory::class, $directory);
+        
+        // Checks 'File' directory
+        $directory = $metadata->getDirectories()[4];
+        $this->assertInstanceOf(FileMetadataDirectory::class, $directory);
+
+        // TODO: Continue testing
+    }
+}