Skip to content

add block quote level #14

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.

Sign up for GitHub

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

Open
mawi12345 wants to merge 2 commits into
base: master
Choose a base branch
from
Open

add block quote level #14

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a93b0d5
add block quote level
mawi12345 Nov 22, 2013
b496716
add BlockQuoteExtensionsTest
mawi12345 Nov 28, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions src/Ciconia/Extension/Core/BlockQuoteExtension.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ public function register(Markdown $markdown)
/**
* @param Text $text
*/
public function processBlockQuote(Text $text)
public function processBlockQuote(Text $text, array $options = array(), $level = 1)
{
$text->replace('{
(?:
Expand All @@ -52,18 +52,18 @@ public function processBlockQuote(Text $text)
\n* # blanks
)+
)
}mx', function (Text $bq) {
}mx', function (Text $bq) use ($options, $level) {
$bq->replace('/^[ \t]*>[ \t]?/m', '');
$bq->replace('/^[ \t]+$/m', '');

$this->markdown->emit('block', array($bq));
$this->markdown->emit('block', array($bq, $options, ($level + 1)));

//$bq->replace('/^/', ' ');
$bq->replace('|\s*<pre>.+?</pre>|s', function (Text $pre) {
return $pre->replace('/^ /m', '');
});

return $this->getRenderer()->renderBlockQuote($bq) . "\n\n";
return $this->getRenderer()->renderBlockQuote($bq, array('level' => $level)) . "\n\n";
});
}

Expand Down
110 changes: 110 additions & 0 deletions test/Ciconia/Extension/BlockQuoteExtensionTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,110 @@
<?php
use Ciconia\Ciconia;
use Ciconia\Renderer\RendererInterface;
use Ciconia\Renderer\HtmlRenderer;

/**
* Tests Ciconia\Extensions\Core\BlockQuoteExtension
*
* @author Martin Wind <mawi1988@gmail.com>
*/
class BlockQuoteExtensionsTest extends PHPUnit_Framework_TestCase
{
/**
* get an block quote aware HtmlRenderer
*
* @return RendererInterface
*/
protected function getBlockQuoteLevelRenderer()
{
$renderer = $this->getMock('Ciconia\Renderer\HtmlRenderer', array('renderBlockQuote'));
$renderer->expects($this->any())
->method('renderBlockQuote')
->will($this->returnCallback(
function($content, $options) {
return '<blockquote data-level="'.$options['level'].'">'.$content.'</blockquote>';
}
));
return $renderer;
}

/**
* run an simple block quote aware test
*
* @param string $name
* @param string $markdown
* @param string $expectedHtml
*/
protected function runBlockQuoteLevelTest($name, $markdown, $expectedHtml)
{
$renderer = $this->getBlockQuoteLevelRenderer();
$ciconia = new Ciconia($renderer);
$html = str_replace("\n", '', $ciconia->render($markdown));
$expectedHtml = str_replace(array("\n", "\t"), '', $expectedHtml);
$this->assertEquals($expectedHtml, $html, sprintf('%s failed', $name));
}

/**
* Test an level 2 block quote
*/
public function testBlockQuoteLevel2()
{
$this->runBlockQuoteLevelTest('block qoute level 2',
'> level 1 line 1
level 1 line 2
>> level 2 line 1',

'<blockquote data-level="1">
<p>level 1 line 1 level 1 line 2</p>
<blockquote data-level="2">
<p>level 2 line 1</p>
</blockquote>
</blockquote>');
}

/**
* Test an level 3 block quote
*/
public function testBlockQuoteLevel2Multiline()
{
$this->runBlockQuoteLevelTest('block qoute level 2 multiline',
'> level 1 line 1
> level 1 line 2
>> level 2 line 1
>> level 2 line 2
>>> level 3 line 1',

'<blockquote data-level="1">
<p>level 1 line 1 level 1 line 2</p>
<blockquote data-level="2">
<p>level 2 line 1 level 2 line 2</p>
<blockquote data-level="3">
<p>level 3 line 1</p>
</blockquote>
</blockquote>
</blockquote>');
}

/**
* Test an nested block quote
*/
public function testBlockQuoteLevelNested()
{
$this->runBlockQuoteLevelTest('nested block quote and level',
'> level 1 line 1
> > level 2 line 1
> > level 2 line 1
> > > level 3 line 1
> > > level 3 line 1',

'<blockquote data-level="1">
<p>level 1 line 1</p>
<blockquote data-level="2">
<p>level 2 line 1 level 2 line 1</p>
<blockquote data-level="3">
<p>level 3 line 1 level 3 line 1</p>
</blockquote>
</blockquote>
</blockquote>');
}
}