Merge pull request #113 from mikemeier/master

Fix Writers could not handle targets with sub-directories

Author: aztech-dev

src/Resource/Writer/FilesystemWriter.php

@@ -7,13 +7,17 @@
 
 class FilesystemWriter implements ResourceWriter
 {
-
     /**
      * @param ResourceReader $reader
      * @param string $target
      */
     public function writeFromReader(ResourceReader $reader, $target)
     {
+        $directory = dirname($target);
+        if (!is_dir($directory)) {
+            mkdir($directory, 0777, true);
+        }
+
         file_put_contents($target, $reader->getContentsAsStream());
     }
 }

src/Resource/Writer/StreamWriter.php

@@ -13,6 +13,11 @@ class StreamWriter implements ResourceWriter
      */
     public function writeFromReader(ResourceReader $reader, $target)
     {
+        $directory = dirname($target);
+        if (!is_dir($directory)) {
+            mkdir($directory, 0777, true);
+        }
+
         $targetResource = fopen($target, 'w+');
         $sourceResource = $reader->getContentsAsStream();
 

tests/Tests/Resource/FilesystemWriterTest.php

@@ -0,0 +1,22 @@
+<?php
+
+namespace Alchemy\Zippy\Tests\Resource;
+
+use Alchemy\Zippy\Resource\Reader\Stream\StreamReader;
+use Alchemy\Zippy\Resource\Resource;
+use Alchemy\Zippy\Resource\Writer\FilesystemWriter;
+use Alchemy\Zippy\Tests\TestCase;
+
+class FilesystemWriterTest extends TestCase
+{
+    public function testWriteFromReader()
+    {
+        $resource = new Resource(fopen(__FILE__, 'r'), fopen(__FILE__, 'r'));
+        $reader = new StreamReader($resource);
+
+        $streamWriter = new FilesystemWriter();
+        
+        $streamWriter->writeFromReader($reader, sys_get_temp_dir().'/stream/writer/test.php');
+        $streamWriter->writeFromReader($reader, sys_get_temp_dir().'/test.php');
+    }
+}

tests/Tests/Resource/StreamWriterTest.php

@@ -0,0 +1,22 @@
+<?php
+
+namespace Alchemy\Zippy\Tests\Resource;
+
+use Alchemy\Zippy\Resource\Reader\Stream\StreamReader;
+use Alchemy\Zippy\Resource\Resource;
+use Alchemy\Zippy\Resource\Writer\StreamWriter;
+use Alchemy\Zippy\Tests\TestCase;
+
+class StreamWriterTest extends TestCase
+{
+    public function testWriteFromReader()
+    {
+        $resource = new Resource(fopen(__FILE__, 'r'), fopen(__FILE__, 'r'));
+        $reader = new StreamReader($resource);
+
+        $streamWriter = new StreamWriter();
+
+        $streamWriter->writeFromReader($reader, sys_get_temp_dir().'/stream/writer/test.php');
+        $streamWriter->writeFromReader($reader, sys_get_temp_dir().'/test.php');
+    }
+}