Merge pull request CouscousPHP#113 from MontealegreLuis/master

Add images outside the template folder to the current project.
kerro · Jul 21, 2015 · 128f4f3 · 128f4f3
2 parents 513a0d8 + ee72472
commit 128f4f3
Show file tree

Hide file tree

Showing 14 changed files with 79 additions and 2 deletions.
diff --git a/src/Module/Core/Step/AddImages.php b/src/Module/Core/Step/AddImages.php
@@ -0,0 +1,37 @@
+<?php
+
+namespace Couscous\Module\Core\Step;
+
+use Couscous\Model\LazyFile;
+use Couscous\Model\Project;
+use Couscous\Step;
+
+/**
+ * Add images to the project
+ *
+ * @author Matthieu Napoli <matthieu@mnapoli.fr>
+ */
+class AddImages implements Step
+{
+    /**
+     * Add images to the given project.
+     *
+     * @param Project $project
+     */
+    public function __invoke(Project $project)
+    {
+        $files = $project->sourceFiles();
+        $files
+            ->name('*.gif')
+            ->name('*.png')
+            ->name('*.jpg')
+        ;
+
+        $project->watchlist->watchFiles($files);
+
+        foreach ($files as $file) {
+            /** @var SplFileInfo $file */
+            $project->addFile(new LazyFile($file->getPathname(), $file->getRelativePathname()));
+        }
+    }
+}
diff --git a/src/Module/Core/config.php b/src/Module/Core/config.php
@@ -3,8 +3,9 @@
 return [
 
     'steps.after' => DI\add([
-        DI\get('Couscous\Module\Core\Step\ClearTargetDirectory'),
-        DI\get('Couscous\Module\Core\Step\WriteFiles'),
+        DI\link('Couscous\Module\Core\Step\AddImages'),
+        DI\link('Couscous\Module\Core\Step\ClearTargetDirectory'),
+        DI\link('Couscous\Module\Core\Step\WriteFiles'),
     ]),
 
 ];
diff --git a/tests/FunctionalTest/Fixture/images/expected/index.html b/tests/FunctionalTest/Fixture/images/expected/index.html
@@ -0,0 +1,12 @@
+<!DOCTYPE html>
+<html>
+    <head>
+        <title>Documentation</title>
+    </head>
+    <body>
+        <p>Hello, this is a test!</p>
+<p><img src="/logos/couscous.jpg" alt="Couscous logo" title="Couscous logo (.jpg)" /></p>
+<p><img src="/logos/couscous.png" alt="Couscous logo" title="Couscous logo (.png)" /></p>
+<p><img src="/logos/couscous.gif" alt="Couscous logo" title="Couscous logo (.gif)" /></p>
+    </body>
+</html>
diff --git a/tests/FunctionalTest/Fixture/images/expected/logos/couscous.gif b/tests/FunctionalTest/Fixture/images/expected/logos/couscous.gif
diff --git a/tests/FunctionalTest/Fixture/images/expected/logos/couscous.jpg b/tests/FunctionalTest/Fixture/images/expected/logos/couscous.jpg
diff --git a/tests/FunctionalTest/Fixture/images/expected/logos/couscous.png b/tests/FunctionalTest/Fixture/images/expected/logos/couscous.png
diff --git a/tests/FunctionalTest/Fixture/images/source/README.md b/tests/FunctionalTest/Fixture/images/source/README.md
@@ -0,0 +1,8 @@
+Hello, this is a test!
+
+
+![Couscous logo](/logos/couscous.jpg "Couscous logo (.jpg)")
+
+![Couscous logo](/logos/couscous.png "Couscous logo (.png)")
+
+![Couscous logo](/logos/couscous.gif "Couscous logo (.gif)")
diff --git a/tests/FunctionalTest/Fixture/images/source/couscous.yml b/tests/FunctionalTest/Fixture/images/source/couscous.yml
@@ -0,0 +1,2 @@
+exclude:
+    - exclude
diff --git a/tests/FunctionalTest/Fixture/images/source/exclude/excluded.gif b/tests/FunctionalTest/Fixture/images/source/exclude/excluded.gif
diff --git a/tests/FunctionalTest/Fixture/images/source/logos/couscous.gif b/tests/FunctionalTest/Fixture/images/source/logos/couscous.gif
diff --git a/tests/FunctionalTest/Fixture/images/source/logos/couscous.jpg b/tests/FunctionalTest/Fixture/images/source/logos/couscous.jpg
diff --git a/tests/FunctionalTest/Fixture/images/source/logos/couscous.png b/tests/FunctionalTest/Fixture/images/source/logos/couscous.png
diff --git a/tests/FunctionalTest/Fixture/images/source/website/default.twig b/tests/FunctionalTest/Fixture/images/source/website/default.twig
@@ -0,0 +1,9 @@
+<!DOCTYPE html>
+<html>
+    <head>
+        <title>Documentation</title>
+    </head>
+    <body>
+        {{ content|raw }}
+    </body>
+</html>
diff --git a/tests/FunctionalTest/GenerationTest.php b/tests/FunctionalTest/GenerationTest.php
@@ -41,4 +41,12 @@ public function testPageList()
     {
         $this->assertGeneratedWebsite('page-list');
     }
+
+    /**
+     * Test that the images referenced by documentation are copied.
+     */
+    public function testDocumentationImages()
+    {
+        $this->assertGeneratedWebsite('images');
+    }
 }