resolve #160

Run composer install in Travis CI before tests

.gitignore

@@ -1,3 +0,0 @@
-.DS_Store
-.idea
-nbproject

.travis.yml

@@ -1,8 +1,10 @@
 language: php
 
 php:
+  - 5.6
   - 5.5
   - 5.4
   - 5.3
   - 5.2
   - hhvm
+  

README.md

@@ -2,19 +2,16 @@
 
 Better [Markdown](http://en.wikipedia.org/wiki/Markdown) parser for PHP.
 
-***
-
-[ [demo](http://parsedown.org/demo) ] [ [tests](http://parsedown.org/tests/) ]
-
-***
+- [Demo](http://parsedown.org/demo)
+- [Tests](http://parsedown.org/tests/)
 
 ### Features
 
-* [fast](http://parsedown.org/speed)
-* [consistent](http://parsedown.org/consistency)
+* [Fast](http://parsedown.org/speed)
+* [Consistent](http://parsedown.org/consistency)
 * [GitHub Flavored](https://help.github.com/articles/github-flavored-markdown)
-* friendly to international input
-* [tested](https://travis-ci.org/erusev/parsedown) in PHP 5.2, 5.3, 5.4, 5.5 and [hhvm](http://www.hhvm.com/)
+* [Tested](https://travis-ci.org/erusev/parsedown) in PHP 5.2, 5.3, 5.4, 5.5, 5.6 and [hhvm](http://www.hhvm.com/)
+* Extensible
 
 ### Installation
 
@@ -22,10 +19,8 @@ Include `Parsedown.php` or install [the composer package](https://packagist.org/
 
 ### Example
 
-```php
-$text = 'Hello _Parsedown_!';
+``` php
+$Parsedown = new Parsedown();
 
-$result = Parsedown::instance()->parse($text);
-
-echo $result; # prints: <p>Hello <em>Parsedown</em>!</p>
+echo $Parsedown->text('Hello _Parsedown_!'); # prints: <p>Hello <em>Parsedown</em>!</p>
 ```

phpunit.xml.dist

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit colors="true">
+<phpunit bootstrap="test/bootstrap.php" colors="true">
 	<testsuites>
 		<testsuite>
-			<file>tests/Test.php</file>
+			<file>test/Test.php</file>
 		</testsuite>
 	</testsuites>
 </phpunit>

test/Test.php

@@ -0,0 +1,65 @@
+<?php
+
+class Test extends PHPUnit_Framework_TestCase
+{
+    public function __construct($name = null, array $data = array(), $dataName = '')
+    {
+        $this->dataDir = dirname(__FILE__).'/data/';
+
+        parent::__construct($name, $data, $dataName);
+    }
+
+    private $dataDir;
+
+    /**
+     * @dataProvider data
+     */
+    function test_($filename)
+    {
+        $markdown = file_get_contents($this->dataDir . $filename . '.md');
+
+        $expectedMarkup = file_get_contents($this->dataDir . $filename . '.html');
+
+        $expectedMarkup = str_replace("\r\n", "\n", $expectedMarkup);
+        $expectedMarkup = str_replace("\r", "\n", $expectedMarkup);
+
+        $actualMarkup = Parsedown::instance()->text($markdown);
+
+        $this->assertEquals($expectedMarkup, $actualMarkup);
+    }
+
+    function data()
+    {
+        $data = array();
+
+        $Folder = new DirectoryIterator($this->dataDir);
+
+        foreach ($Folder as $File)
+        {
+            /** @var $File DirectoryIterator */
+
+            if ( ! $File->isFile())
+            {
+                continue;
+            }
+
+            $filename = $File->getFilename();
+
+            $extension = pathinfo($filename, PATHINFO_EXTENSION);
+
+            if ($extension !== 'md')
+            {
+                continue;
+            }
+
+            $basename = $File->getBasename('.md');
+
+            if (file_exists($this->dataDir . $basename . '.html'))
+            {
+                $data []= array($basename);
+            }
+        }
+
+        return $data;
+    }
+}

test/bootstrap.php

@@ -0,0 +1,3 @@
+<?php
+
+include 'Parsedown.php';

test/data/aesthetic_table.html

@@ -0,0 +1,18 @@
+<table>
+<thead>
+<tr>
+<th>header 1</th>
+<th>header 2</th>
+</tr>
+</thead>
+<tbody>
+<tr>
+<td>cell 1.1</td>
+<td>cell 1.2</td>
+</tr>
+<tr>
+<td>cell 2.1</td>
+<td>cell 2.2</td>
+</tr>
+</tbody>
+</table>

test/data/aesthetic_table.md

@@ -0,0 +1,4 @@
+| header 1 | header 2 |
+| -------- | -------- |
+| cell 1.1 | cell 1.2 |
+| cell 2.1 | cell 2.2 |

test/data/aligned_table.html

@@ -0,0 +1,21 @@
+<table>
+<thead>
+<tr>
+<th align="left">header 1</th>
+<th align="center">header 2</th>
+<th align="right">header 2</th>
+</tr>
+</thead>
+<tbody>
+<tr>
+<td align="left">cell 1.1</td>
+<td align="center">cell 1.2</td>
+<td align="right">cell 1.3</td>
+</tr>
+<tr>
+<td align="left">cell 2.1</td>
+<td align="center">cell 2.2</td>
+<td align="right">cell 2.3</td>
+</tr>
+</tbody>
+</table>

test/data/aligned_table.md

@@ -0,0 +1,4 @@
+| header 1 | header 2 | header 2 |
+| :------- | :------: | -------: |
+| cell 1.1 | cell 1.2 | cell 1.3 |
+| cell 2.1 | cell 2.2 | cell 2.3 |

test/data/code_block.md

@@ -0,0 +1,10 @@
+    <?php
+
+    $message = 'Hello World!';
+    echo $message;
+
+---
+
+    > not a quote
+    - not a list item
+    [not a reference]: http://foo.com

test/data/code_span.html

@@ -0,0 +1,6 @@
+<p>a <code>code span</code></p>
+<p><code>this is also a codespan</code> trailing text</p>
+<p><code>and look at this one!</code></p>
+<p>single backtick in a code span: <code>`</code></p>
+<p>backtick-delimited string in a code span: <code>`foo`</code></p>
+<p><code>sth `` sth</code></p>

test/data/code_span.md

@@ -0,0 +1,11 @@
+a `code span`
+
+`this is also a codespan` trailing text
+
+`and look at this one!`
+
+single backtick in a code span: `` ` ``
+
+backtick-delimited string in a code span: `` `foo` ``
+
+`sth `` sth`

test/data/deeply_nested_list.html

@@ -0,0 +1,12 @@
+<ul>
+<li>li
+<ul>
+<li>li
+<ul>
+<li>li</li>
+<li>li</li>
+</ul></li>
+<li>li</li>
+</ul></li>
+<li>li</li>
+</ul>

test/data/deeply_nested_list.md

@@ -0,0 +1,6 @@
+- li
+    - li
+        - li
+        - li
+    - li
+- li

test/data/email.html

@@ -0,0 +1 @@
+<p>my email is <a href="mailto:me@example.com">me@example.com</a></p>

test/data/email.md

@@ -0,0 +1 @@
+my email is <me@example.com>

test/data/html_entity.html

@@ -0,0 +1 @@
+<p>&amp; &copy; &#123;</p>

test/data/html_entity.md

@@ -0,0 +1 @@
+& © {

test/data/html_simple.html

@@ -0,0 +1,28 @@
+<p>Headings:</p>
+<h2 id="overview">Overview</h2>
+<p>blah</p>
+<H2 id="block">Block Elements</H2>
+<p>blah</p>
+<h3 id="span">
+      Span Elements
+</h3>
+<p>blah</p>
+<p>Hr's:</p>
+<hr>
+<p>blah</p>
+<hr/>
+<p>blah</p>
+<hr />
+<p>blah</p>
+<hr>   
+<p>blah</p>
+<hr/>  
+<p>blah</p>
+<hr /> 
+<p>blah</p>
+<hr class="foo" id="bar" />
+<p>blah</p>
+<hr class="foo" id="bar"/>
+<p>blah</p>
+<hr class="foo" id="bar" >
+<p>blah</p>

test/data/html_simple.md

@@ -0,0 +1,39 @@
+Headings:
+
+<h2 id="overview">Overview</h2>
+blah
+<H2 id="block">Block Elements</H2>
+blah
+<h3 id="span">
+      Span Elements
+</h3>
+blah
+
+Hr's:
+
+<hr>
+blah
+
+<hr/>
+blah
+
+<hr />
+blah
+
+<hr>   
+blah
+
+<hr/>  
+blah
+
+<hr /> 
+blah
+
+<hr class="foo" id="bar" />
+blah
+
+<hr class="foo" id="bar"/>
+blah
+
+<hr class="foo" id="bar" >
+blah

test/data/image_title.html

@@ -0,0 +1 @@
+<p><img alt="alt" src="/md.png" title="title" /></p>

test/data/image_title.md

@@ -0,0 +1 @@
+![alt](/md.png "title")

test/data/reference_title.html

@@ -0,0 +1,2 @@
+<p><a href="http://example.com" title="example title">double quotes</a> and <a href="http://example.com" title="example title">single quotes</a> and <a href="http://example.com" title="example title">parentheses</a></p>
+<p>[invalid title]: <a href="http://example.com">http://example.com</a> example title</p>

test/data/reference_title.md

@@ -0,0 +1,6 @@
+[double quotes] and [single quotes] and [parentheses]
+
+[double quotes]: http://example.com "example title"
+[single quotes]: http://example.com 'example title'
+[parentheses]: http://example.com (example title)
+[invalid title]: http://example.com example title

test/data/simple_table.html

@@ -0,0 +1,37 @@
+<table>
+<thead>
+<tr>
+<th>header 1</th>
+<th>header 2</th>
+</tr>
+</thead>
+<tbody>
+<tr>
+<td>cell 1.1</td>
+<td>cell 1.2</td>
+</tr>
+<tr>
+<td>cell 2.1</td>
+<td>cell 2.2</td>
+</tr>
+</tbody>
+</table>
+<hr />
+<table>
+<thead>
+<tr>
+<th align="left">header 1</th>
+<th>header 2</th>
+</tr>
+</thead>
+<tbody>
+<tr>
+<td align="left">cell 1.1</td>
+<td>cell 1.2</td>
+</tr>
+<tr>
+<td align="left">cell 2.1</td>
+<td>cell 2.2</td>
+</tr>
+</tbody>
+</table>

test/data/simple_table.md

@@ -0,0 +1,11 @@
+header 1 | header 2
+-------- | --------
+cell 1.1 | cell 1.2
+cell 2.1 | cell 2.2
+
+---
+
+header 1 | header 2
+:------- | --------
+cell 1.1 | cell 1.2
+cell 2.1 | cell 2.2

test/data/sparse_dense_list.html

@@ -0,0 +1,7 @@
+<ul>
+<li>
+<p>li</p>
+</li>
+<li>li</li>
+<li>li</li>
+</ul>

test/data/sparse_dense_list.md

@@ -0,0 +1,4 @@
+- li
+
+- li
+- li

test/data/special_characters.html

@@ -1,5 +1,4 @@
 <p>AT&amp;T has an ampersand in their name</p>
-<p>AT&amp;T is another way to write it</p>
 <p>this &amp; that</p>
 <p>4 &lt; 5 and 6 > 5</p>
 <p><a href="http://example.com/autolink?a=1&amp;b=2">http://example.com/autolink?a=1&amp;b=2</a></p>

test/data/special_characters.md

@@ -1,7 +1,5 @@
 AT&T has an ampersand in their name
 
-AT&T is another way to write it
-
 this & that
 
 4 < 5 and 6 > 5

test/data/table_inline_markdown.html

@@ -0,0 +1,18 @@
+<table>
+<thead>
+<tr>
+<th><em>header</em> 1</th>
+<th>header 2</th>
+</tr>
+</thead>
+<tbody>
+<tr>
+<td><em>cell</em> 1.1</td>
+<td><del>cell</del> 1.2</td>
+</tr>
+<tr>
+<td><code>cell</code> 2.1</td>
+<td>cell 2.2</td>
+</tr>
+</tbody>
+</table>

test/data/table_inline_markdown.md

@@ -0,0 +1,4 @@
+| _header_ 1   | header 2     |
+| ------------ | ------------ |
+| _cell_ 1.1   | ~~cell~~ 1.2 |
+| `cell` 2.1   | cell 2.2     |

test/data/text_reference.html

@@ -3,5 +3,6 @@
 <p>[one][404] with no definition</p>
 <p><a href="http://example.com">multiline
 one</a> defined on 2 lines</p>
-<p><a href="http://example.com">one</a> with an upper case label</p>
+<p><a href="http://example.com">one</a> with a mixed case label and an upper case definition</p>
+<p><a href="http://example.com">one</a> with the a label on the next line</p>
 <p><a href="http://example.com"><code>link</code></a></p>

test/data/text_reference.md

@@ -11,8 +11,11 @@
 [multiline
 one][website] defined on 2 lines
 
-[one][label] with an upper case label
+[one][Label] with a mixed case label and an upper case definition
 
 [LABEL]: http://example.com
 
+[one]
+[1] with the a label on the next line
+
 [`link`][website]