Allows better control over result-filename

This fixes #7
heiglandreas · Jun 16, 2017 · e3e2343 · e3e2343
1 parent f9a822d
commit e3e2343
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 1 deletion.
diff --git a/src/Ghostscript.php b/src/Ghostscript.php
@@ -442,7 +442,7 @@ public function getRenderString()
         }
         $string  = self::getGsPath();
         $string .= ' -dSAFER -dQUIET -dNOPLATFONTS -dNOPAUSE -dBATCH';
-        $string .= ' -sOutputFile="' . $this->getOutputFile() . '.' . $this->getDevice()->getFileEnding() . '"';
+        $string .= ' -sOutputFile="' . $this->getOutputFileName() . '"';
         $string .= $this->getDevice()->getParameterString();
         $string .= ' -r' . $this->getResolution();
         if ($this->isTextAntiAliasingSet()) {
@@ -878,6 +878,17 @@ public function setPages($startPage, $endPage = null)
 
         return $this;
     }
+
+    public function getOutputFileName()
+    {
+        $basename = $this->getOutputFile();
+        $lastDot = strrpos('.', basename($basename));
+        if (false === $lastDot) {
+            return $basename . '.' . $this->getDevice()->getFileEnding();
+        }
+
+        return $basename;
+    }
 }
 
 try {

diff --git a/tests/GhostscriptTest.php b/tests/GhostscriptTest.php
@@ -79,6 +79,28 @@ public function testSettingOutfileWorks()
         $this->assertEquals('/some/other/test', $f->getOutputFile());
     }
 
+    /**
+     * @dataProvider settingOutfileIsRepresentedInRenderStringProvider
+     */
+    public function testSettingOutfileIsRepresentedInRenderString($outfile, $expectedResultInRenderString)
+    {
+        $f = new Ghostscript();
+        $f->setDevice(new Png());
+        $f->setInputFile(__DIR__ . '/support/test.pdf');
+        $f->setOutputFile($outfile);
+        $this->assertContains($expectedResultInRenderString, $f->getRenderString());
+    }
+
+    public function settingOutfileIsRepresentedInRenderStringProvider()
+    {
+        return [
+            ['test', __DIR__ . '/support/test'],
+            ['/this/is/a/test', '/this/is/a/test'],
+            ['test.jpeg', __DIR__ . '/support/test.jpeg'],
+            ['/this/is/a/test.jpeg', '/this/is/a/test.jpeg'],
+        ];
+    }
+
     public function testDefaultDevice()
     {
         $f = new Ghostscript();