Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Reorganized the code to functional modules #66

Merged
merged 14 commits into from
Dec 16, 2014
Merged
Next Next commit
Moved Markdown classes to a Markdown module
  • Loading branch information
mnapoli committed Dec 12, 2014
commit 22df3900e056a780c13d75679c60a70e0a8db398
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php

namespace Couscous\Model\File;
namespace Couscous\Module\Markdown\Model;

use Couscous\Model\File;
use Couscous\Model\Metadata;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<?php

namespace Couscous\Step\Markdown;
namespace Couscous\Module\Markdown\Step;

use Couscous\Model\File\MarkdownFile;
use Couscous\Module\Markdown\Model\MarkdownFile;
use Couscous\Model\Repository;
use Couscous\Step\StepInterface;
use Symfony\Component\Console\Output\OutputInterface;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<?php

namespace Couscous\Step\Markdown;
namespace Couscous\Module\Markdown\Step;

use Couscous\Model\File\MarkdownFile;
use Couscous\Module\Markdown\Model\MarkdownFile;
use Couscous\Model\Repository;
use Couscous\Step\StepInterface;
use Mni\FrontYAML\Parser;
Expand All @@ -28,7 +28,7 @@ public function __construct(Parser $markdownParser)
public function __invoke(Repository $repository, OutputInterface $output)
{
/** @var MarkdownFile[] $markdownFiles */
$markdownFiles = $repository->findFilesByType('Couscous\Model\File\MarkdownFile');
$markdownFiles = $repository->findFilesByType('Couscous\Module\Markdown\Model\MarkdownFile');

foreach ($markdownFiles as $file) {
$document = $this->markdownParser->parse($file->getContent());
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<?php

namespace Couscous\Step\Markdown;
namespace Couscous\Module\Markdown\Step;

use Couscous\Model\File\MarkdownFile;
use Couscous\Module\Markdown\Model\MarkdownFile;
use Couscous\Model\Repository;
use Couscous\Step\StepInterface;
use Symfony\Component\Console\Output\OutputInterface;
Expand All @@ -17,7 +17,7 @@ class ProcessMarkdownFileName implements StepInterface
public function __invoke(Repository $repository, OutputInterface $output)
{
/** @var MarkdownFile[] $markdownFiles */
$markdownFiles = $repository->findFilesByType('Couscous\Model\File\MarkdownFile');
$markdownFiles = $repository->findFilesByType('Couscous\Module\Markdown\Model\MarkdownFile');

foreach ($markdownFiles as $markdownFile) {
$repository->removeFile($markdownFile);
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<?php

namespace Couscous\Step\Markdown;
namespace Couscous\Module\Markdown\Step;

use Couscous\Model\File\MarkdownFile;
use Couscous\Module\Markdown\Model\MarkdownFile;
use Couscous\Model\Repository;
use Couscous\Step\StepInterface;
use Symfony\Component\Console\Output\OutputInterface;
Expand All @@ -21,7 +21,7 @@ class ProcessMarkdownLinks implements StepInterface
public function __invoke(Repository $repository, OutputInterface $output)
{
/** @var MarkdownFile[] $markdownFiles */
$markdownFiles = $repository->findFilesByType('Couscous\Model\File\MarkdownFile');
$markdownFiles = $repository->findFilesByType('Couscous\Module\Markdown\Model\MarkdownFile');

foreach ($markdownFiles as $file) {
$file->content = preg_replace(
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<?php

namespace Couscous\Step\Markdown;
namespace Couscous\Module\Markdown\Step;

use Couscous\Model\File\HtmlFile;
use Couscous\Model\File\MarkdownFile;
use Couscous\Module\Markdown\Model\MarkdownFile;
use Couscous\Model\Repository;
use Couscous\Step\StepInterface;
use Mni\FrontYAML\Parser;
Expand All @@ -29,7 +29,7 @@ public function __construct(Parser $markdownParser)
public function __invoke(Repository $repository, OutputInterface $output)
{
/** @var MarkdownFile[] $markdownFiles */
$markdownFiles = $repository->findFilesByType('Couscous\Model\File\MarkdownFile');
$markdownFiles = $repository->findFilesByType('Couscous\Module\Markdown\Model\MarkdownFile');

foreach ($markdownFiles as $markdownFile) {
$htmlFile = $this->renderFile($markdownFile);
Expand Down
10 changes: 5 additions & 5 deletions src/config.php
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,11 @@
'Couscous\Step\Template\ValidateTemplateDirectory',
'Couscous\Step\Assets\RunBowerInstall',
'Couscous\Step\Template\LoadAssets',
'Couscous\Step\Markdown\LoadMarkdownFiles',
'Couscous\Step\Markdown\ParseMarkdownFrontMatter',
'Couscous\Step\Markdown\ProcessMarkdownFileName',
'Couscous\Step\Markdown\ProcessMarkdownLinks',
'Couscous\Step\Markdown\RenderMarkdown',
'Couscous\Module\Markdown\Step\LoadMarkdownFiles',
'Couscous\Module\Markdown\Step\ParseMarkdownFrontMatter',
'Couscous\Module\Markdown\Step\ProcessMarkdownFileName',
'Couscous\Module\Markdown\Step\ProcessMarkdownLinks',
'Couscous\Module\Markdown\Step\RenderMarkdown',
'Couscous\Step\Template\AddPageListToLayoutVariables',
'Couscous\Step\Template\ProcessTwigLayouts',
'Couscous\Step\WriteFiles',
Expand Down
4 changes: 2 additions & 2 deletions tests/UnitTest/Model/RepositoryTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

use Couscous\Model\File;
use Couscous\Model\File\HtmlFile;
use Couscous\Model\File\MarkdownFile;
use Couscous\Module\Markdown\Model\MarkdownFile;
use Couscous\Model\Repository;

/**
Expand Down Expand Up @@ -67,7 +67,7 @@ public function it_should_return_files_by_type()
$repository->addFile($file1);
$repository->addFile($file2);

$markdownFiles = $repository->findFilesByType('Couscous\Model\File\MarkdownFile');
$markdownFiles = $repository->findFilesByType('Couscous\Module\Markdown\Model\MarkdownFile');
$this->assertSame(['file1' => $file1], $markdownFiles);

$htmlFiles = $repository->findFilesByType('Couscous\Model\File\HtmlFile');
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
<?php

namespace Couscous\Tests\UnitTest\Step\Markdown;
namespace Couscous\Tests\UnitTest\Module\Markdown\Step;

use Couscous\Model\File\LazyFile;
use Couscous\Model\File\MarkdownFile;
use Couscous\Module\Markdown\Model\MarkdownFile;
use Couscous\Model\Repository;
use Couscous\Step\Markdown\ProcessMarkdownFileName;
use Couscous\Module\Markdown\Step\ProcessMarkdownFileName;
use Symfony\Component\Console\Output\NullOutput;

/**
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
<?php

namespace Couscous\Tests\UnitTest\Step\Markdown;
namespace Couscous\Tests\UnitTest\Module\Markdown\Step;

use Couscous\Model\File\MarkdownFile;
use Couscous\Module\Markdown\Model\MarkdownFile;
use Couscous\Model\Repository;
use Couscous\Step\Markdown\ProcessMarkdownLinks;
use Couscous\Module\Markdown\Step\ProcessMarkdownLinks;
use Symfony\Component\Console\Output\NullOutput;

/**
Expand Down