BBRedCloth 0.8.8 → 0.9.0.alpha1

data/test/code.yml

@@ -96,7 +96,10 @@ in: |-
   <notextile>
   # *test*
 html: |-
-  # *test*
+  <p><notextile></p>
+  <ol>
+  	<li><strong>test</strong></li>
+  </ol>
 valid_html: false
 ---
 name: unfinished script tag
@@ -140,9 +143,7 @@ html: |-
   <pre><code>./foo.pl%
   &lt;p&gt;foo outputs an HTML paragraph&lt;/p&gt;</code>
 
-  <code>&lt;p&gt;block of code keeps going until a different block signature is encountered&lt;/p&gt;</code>
-
-  </pre>
+  <code>&lt;p&gt;block of code keeps going until a different block signature is encountered&lt;/p&gt;</code></pre>
   <p>And then go back with a normal paragraph.</p>
 ---
 name: extended block code preserves leading whitespace after blank line
@@ -167,9 +168,7 @@ html: |-
   <code>    def baz
           'baz'
       end
-  end</code>
-  
-  </pre>
+  end</code></pre>
   <p>That&#8217;s it!</p>
 ---
 name: block code containing code avoids nesting code tags
@@ -227,3 +226,12 @@ valid_html: false
 name: code containing parentheses
 in: 'p. @some_method(some_params, some => test);@ Oh dear this fails'
 html: '<p><code>some_method(some_params, some =&gt; test);</code> Oh dear this fails</p>'
+---
+name: code preserves initial square brackets
+description: usually square brackets are used for the language (English, French, Spanish...), but that doesn't make sense for code and apparently is needed for some computer languages.
+in: @[project]_dff.skjd@ 
+html: <p><code>[project]_dff.skjd</code></p>
+---
+name: following also bracketed code in same line
+in: "Some [@code@] and some [@more code@]."
+html: "<p>Some <code>code</code> and some <code>more code</code>.</p>"

data/test/html.yml

@@ -30,6 +30,21 @@ html: |-
   if you break.</li>
   </ul>
 ---
+name: line breaks
+desc: Explicit HTML line breaks are not double-broken
+in: |-
+  I spoke.<br />
+  And none replied.
+html: |-
+  <p>I spoke.<br />
+  And none replied.</p>
+html_no_breaks: |-
+  <p>I spoke.<br />
+  And none replied.</p>
+lite_mode_html: |-
+  I spoke.<br />
+  And none replied.
+---
 name: mixing of textile and XHTML
 in: |-
   <img src="test.jpg" alt="test" />
@@ -310,4 +325,26 @@ name: objects in paragraphs are not modified
 in: |-
   <p><object width="340" height="280"><param name="movie" value="http://www.youtube.com/v/iUbK1cBHm6E"></param><param name="wmode" value="opaque"></param><param name="allowScriptAccess" value="sameDomain"></param><embed src="http://www.youtube.com/v/iUbK1cBHm6E" type="application/x-shockwave-flash" width="340" height="280" wmode="opaque" allowScriptAccess="sameDomain"></embed></object></p>
 html: |-
-  <p><object width="340" height="280"><param name="movie" value="http://www.youtube.com/v/iUbK1cBHm6E"></param><param name="wmode" value="opaque"></param><param name="allowScriptAccess" value="sameDomain"></param><embed src="http://www.youtube.com/v/iUbK1cBHm6E" type="application/x-shockwave-flash" width="340" height="280" wmode="opaque" allowScriptAccess="sameDomain"></embed></object></p>
+  <p><object width="340" height="280"><param name="movie" value="http://www.youtube.com/v/iUbK1cBHm6E"></param><param name="wmode" value="opaque"></param><param name="allowScriptAccess" value="sameDomain"></param><embed src="http://www.youtube.com/v/iUbK1cBHm6E" type="application/x-shockwave-flash" width="340" height="280" wmode="opaque" allowScriptAccess="sameDomain"></embed></object></p>
+---
+name: in code escaped properly
+in: "<pre><code>some <b>bold</b> text</code></pre>"
+html: "<pre><code>some &lt;b&gt;bold&lt;/b&gt; text</code></pre>"
+---
+name: in code with class attribute escaped properly
+in: "<pre><code class='myclass'>some <b>bold</b> text</code></pre>"
+html: "<pre><code class='myclass'>some &lt;b&gt;bold&lt;/b&gt; text</code></pre>"
+---
+name: notextile beginning the line
+in: |-
+  <notextile><a href="http://a.com">Sir Bobby Robson</a></notextile>, is a famous footballer
+html: |-
+  <p><a href="http://a.com">Sir Bobby Robson</a>, is a famous footballer</p>
+---
+name: br tag with class
+in: "br(clear). "
+html: "<br class=\"clear\" />"
+---
+name: hr tag with class
+in: "hr(clear). "
+html: "<hr class=\"clear\" />"

data/test/images.yml

@@ -252,3 +252,54 @@ latex: |+
 name: image attributes has single quote html entity in alt and title
 in: "!/pictures/bacon.jpg(The fox said: 'Have some chunky bacon')!"
 html: '<p><img src="/pictures/bacon.jpg" title="The fox said: &#39;Have some chunky bacon&#39;" alt="The fox said: &#39;Have some chunky bacon&#39;" /></p>'
+---
+name: in square brackets
+in:  This is an [!image.jpg!] you see.
+html: <p>This is an <img src="image.jpg" alt="" /> you see.</p>
+disable_inline_images: <p>This is an [!image.jpg!] you see.</p>
+---
+name: with link in square brackets
+in:  This is an [!image.jpg!:http://example.com/] you see.
+html: <p>This is an <a href="http://example.com/"><img src="image.jpg" alt="" /></a> you see.</p>
+disable_inline_images: <p>This is an [!image.jpg!:<a href="http://example.com">http://example.com</a>/] you see.</p>
+---
+name: url containing parentheses
+in: "!http://commons.wikimedia.org/wiki/File:Rubis_sur_calcite_2(Vietnam).jpg!"
+html: |-
+  <p><img src="http://commons.wikimedia.org/wiki/File:Rubis_sur_calcite_2(Vietnam).jpg" alt="" /></p>
+disable_inline_images: "<p>!<a href=\"http://commons.wikimedia.org/wiki/File:Rubis_sur_calcite_2(Vietnam).jpg\">http://commons.wikimedia.org/wiki/File:Rubis_sur_calcite_2(Vietnam).jpg</a>!</p>"
+---
+name: with alt and url containing parentheses
+in: "!http://commons.wikimedia.org/wiki/File:Rubis_sur_calcite_2(Vietnam).jpg(a big rock)!"
+html: |-
+  <p><img src="http://commons.wikimedia.org/wiki/File:Rubis_sur_calcite_2(Vietnam).jpg" title="a big rock" alt="a big rock" /></p>
+#TODO: below is non-ideal
+disable_inline_images: "<p>!<a href=\"http://commons.wikimedia.org/wiki/File:Rubis_sur_calcite_2(Vietnam).jpg(a\">http://commons.wikimedia.org/wiki/File:Rubis_sur_calcite_2(Vietnam).jpg(a</a> big rock)!</p>"
+---
+name: with link that contains parentheses
+in: "!image.jpg(Alt text with (parentheses).)!"
+html: |-
+  <p><img src="image.jpg" title="Alt text with (parentheses)." alt="Alt text with (parentheses)." /></p>
+disable_inline_images: "<p>!image.jpg(Alt text with (parentheses).)!</p>"
+---
+name: with link and title and text afterward
+in: "!/image_r.jpg(description)!:image.jpg text."
+html: |-
+  <p><a href="image.jpg"><img src="/image_r.jpg" title="description" alt="description" /></a> text.</p>
+disable_inline_images: "<p>!/image_r.jpg(description)!:image.jpg text.</p>"
+---
+name: CVE-2012-6684
+in: |-
+  "!<javascript:alert(1)(2)!:javascript:prompt(document.domain)"
+html: |- #unfiltered is still allowed
+  <p>&#8220;<a href="javascript:prompt(document.domain)"><img src="javascript:alert(1)" title="2" alt="2" /></a>&#8221;</p>
+filtered_html: <p>&#8220;2&#8221;</p>
+sanitized_html: <p>&#8220;2&#8221;</p>
+---
+name: CVE-2012-6684 2
+in: |-
+  "!<jAvascript:alert(1)(2)!:jAvascript:prompt(document.domain)"
+html: |- #unfiltered is still allowed
+  <p>&#8220;<a href="jAvascript:prompt(document.domain)"><img src="jAvascript:alert(1)" title="2" alt="2" /></a>&#8221;</p>
+filtered_html: <p>&#8220;2&#8221;</p>
+sanitized_html: <p>&#8220;2&#8221;</p>

data/test/links.yml

@@ -185,10 +185,14 @@ name: trailing period stays outside link
 in: '"Link":/foo.html.'
 html: "<p><a href=\"/foo.html\">Link</a>.</p>"
 ---
-name: parenthetical statement as a link
+name: whose text is a parenthetical statement
 in: '"(just in case you were wondering)":http://slashdot.org/'
 html: '<p><a href="http://slashdot.org/">(just in case you were wondering)</a></p>'
 ---
+name: that has a class and whose text is a parenthetical statement
+in: '"(myclass) (just in case you were wondering)":http://slashdot.org/'
+html: '<p><a href="http://slashdot.org/" class="myclass">(just in case you were wondering)</a></p>'
+---
 name: link containing parentheses
 in: '"It is (very) fortunate that this works":http://slashdot.org/'
 html: '<p><a href="http://slashdot.org/">It is (very) fortunate that this works</a></p>'
@@ -273,3 +277,33 @@ in: |-
   "My wife, Tipper, and I will donate 100% of the proceeds of the award to the "Alliance For Climate Protection":http://www.looktothestars.org/charity/638-alliance-for-climate-protection," said Gore in an email. "I am deeply honored to receive the Nobel Peace Prize."
 html: |-
   <p>&#8220;My wife, Tipper, and I will donate 100% of the proceeds of the award to the <a href="http://www.looktothestars.org/charity/638-alliance-for-climate-protection">Alliance For Climate Protection</a>,&#8221; said Gore in an email. &#8220;I am deeply honored to receive the Nobel Peace Prize.&#8221;</p>
+---
+name: with caps in the title
+in: |-
+  "British Skin Foundation (BSF)":http://www.britishskinfoundation.org.uk
+html: |-
+  <p><a href="http://www.britishskinfoundation.org.uk" title="BSF">British Skin Foundation</a></p>
+---
+name: containing HTML tags with quotes
+in: |-
+  "<r:attachment:image name="checkmark.gif" alt="Apply online" />*apply online*":/admissions/apply/
+html: |-
+  <p><a href="/admissions/apply/"><r:attachment:image name="checkmark.gif" alt="Apply online" /><strong>apply online</strong></a></p>
+---
+# putting this here as I didn't port rspec
+name: CVE-2012-6684
+in: |-
+  ["clickme":javascript:alert(%27XSS%27)]
+html: |- #unfiltered is still allowed
+  <p><a href="javascript:alert(%27XSS%27)">clickme</a></p>
+filtered_html: <p>clickme</p>
+sanitized_html: <p>clickme</p>
+---
+# putting this here as I didn't port rspec
+name: CVE-2012-6684 2
+in: |-
+  ["clickme":jAvascript:alert(%27XSS%27)]
+html: |- #unfiltered is still allowed
+  <p><a href="jAvascript:alert(%27XSS%27)">clickme</a></p>
+filtered_html: <p>clickme</p>
+sanitized_html: <p>clickme</p>

data/test/lists.yml

@@ -280,4 +280,183 @@ html: |-
   <ul>
   	<li>One</li>
   	<li>Two</li>
-  </ul>
+  </ul>
+---
+name: unordered list with leading spaces
+in: " * notice the leading space\n * RedCloth 3.0.4 used to accept it\n * Now we do too"
+html: |-
+  <ul>
+  	<li>notice the leading space</li>
+  	<li>RedCloth 3.0.4 used to accept it</li>
+  	<li>Now we do too</li>
+  </ul>
+---
+name: ordered list with leading spaces
+in: " # notice the leading space\n # RedCloth 3.0.4 used to accept it\n # Now we do too"
+html: |-
+  <ol>
+  	<li>notice the leading space</li>
+  	<li>RedCloth 3.0.4 used to accept it</li>
+  	<li>Now we do too</li>
+  </ol>
+---
+name: unordered with classes
+in: |-
+  *(class-one) one
+  *(class-two) two
+  *(class-three) three
+html: |-
+  <ul>
+  	<li class="class-one">one</li>
+  	<li class="class-two">two</li>
+  	<li class="class-three">three</li>
+  </ul>
+---
+name: unordered with alignments
+in: |-
+  *< one
+  *> two
+  *<> three
+  *= four
+html: |-
+  <ul>
+  	<li style="text-align:left;">one</li>
+  	<li style="text-align:right;">two</li>
+  	<li style="text-align:justify;">three</li>
+  	<li style="text-align:center;">four</li>
+  </ul>
+---
+name: with attributes that apply to the whole list
+in: |-
+  (class#id)# one
+  # two
+  # three
+html: |-
+  <ol class="class" id="id">
+  	<li>one</li>
+  	<li>two</li>
+  	<li>three</li>
+  </ol>
+---
+name: with id on the list
+in: |-
+  (#my-id)# one
+  # two
+  # three
+html: |-
+  <ol id="my-id">
+  	<li>one</li>
+  	<li>two</li>
+  	<li>three</li>
+  </ol>
+---
+name: with class on the list
+in: |-
+  (my-class)# one
+  # two
+  # three
+html: |-
+  <ol class="my-class">
+  	<li>one</li>
+  	<li>two</li>
+  	<li>three</li>
+  </ol>
+---
+name: with id on the list item
+in: |-
+  # one
+  #(#my-item) two
+  # three
+html: |-
+  <ol>
+  	<li>one</li>
+  	<li id="my-item">two</li>
+  	<li>three</li>
+  </ol>
+---
+name: with attributes that apply to the first list item
+in: |-
+  #(class#id) one
+  # two
+  # three
+html: |-
+  <ol>
+  	<li class="class" id="id">one</li>
+  	<li>two</li>
+  	<li>three</li>
+  </ol>
+---
+name: changed from textism basics
+desc: "This was in Textism basics, but when I changed the format of list styles, I removed it"
+in: |-
+  {color:blue}# one
+  # two
+  # three
+html: |-
+  <ol style="color:blue;">
+  	<li>one</li>
+  	<li>two</li>
+  	<li>three</li>
+  </ol>
+---
+name: changed from threshold list attributes
+desc: "Was: 'Attributes applied to the first list item will apply to the list itself.' but then we changed it"
+in: |-
+  *{color:red} Item one
+  * Item two
+  * Item three
+html: |-
+  <ul>
+  	<li style="color:red;">Item one</li>
+  	<li>Item two</li>
+  	<li>Item three</li>
+  </ul>
+---
+name: with one padding-left increment
+in: "(# one"
+html: |-
+  <ol style="padding-left:1em;">
+  	<li>one</li>
+  </ol>
+---
+name: with one padding-left increment and class
+in: "((myclass)# one"
+html: |-
+  <ol style="padding-left:1em;" class="myclass">
+  	<li>one</li>
+  </ol>
+---
+name: with two padding-left increments
+in: "((# two"
+html: |-
+  <ol style="padding-left:2em;">
+  	<li>two</li>
+  </ol>
+---
+name: with one padding-right increment
+in: ")# one"
+html: |-
+  <ol style="padding-right:1em;">
+  	<li>one</li>
+  </ol>
+---
+name: with padding-left and padding-right increments
+in: "()# two"
+html: |-
+  <ol style="padding-left:1em;padding-right:1em;">
+  	<li>two</li>
+  </ol>
+---
+name: with padding-left and padding-right increments switched
+in: ")(# two"
+html: |-
+  <ol style="padding-left:1em;padding-right:1em;">
+  	<li>two</li>
+  </ol>
+---
+name: with padding-left and padding-right increments and class
+in: "()(myclass)# two"
+html: |-
+  <ol style="padding-left:1em;padding-right:1em;" class="myclass">
+  	<li>two</li>
+  </ol>

data/test/table.yml

@@ -265,3 +265,89 @@ html: |-
   		<td>3</td>
   	</tr>
   </table>
+---
+name: with cell attributes
+in: |[en]. lang-ok|{color:red;}. style-ok|(myclass). class-ok|
+html: |-
+  <table>
+  	<tr>
+  		<td lang="en">lang-ok</td>
+  		<td style="color:red;">style-ok</td>
+  		<td class="myclass">class-ok</td>
+  	</tr>
+  </table>
+---
+name: with improper cell attributes
+in: |[en]lang-bad|{color:red;}style-bad|(myclass)class-bad|
+html: |-
+  <table>
+  	<tr>
+  		<td>[en]lang-bad</td>
+  		<td>{color:red;}style-bad</td>
+  		<td>(myclass)class-bad</td>
+  	</tr>
+  </table>
+---
+name: with line breaks in the cell
+in: |-
+  |a|b
+  b|
+  |c
+  c|d|
+html: |-
+  <table>
+  	<tr>
+  		<td>a</td>
+  		<td>b<br />
+  b</td>
+  	</tr>
+  	<tr>
+  		<td>c<br />
+  c</td>
+  		<td>d</td>
+  	</tr>
+  </table>
+---
+name: with missing cells
+desc: This is improper formatting, so as long as it doesn't choke, I don't care how it is handled
+in: |-
+  |a|b|
+  |a|
+  |a|b|
+html: |-
+  <table>
+  	<tr>
+  		<td>a</td>
+  		<td>b</td>
+  	</tr>
+  	<tr>
+  		<td>a</td>
+  	</tr>
+  	<tr>
+  		<td>a</td>
+  		<td>b</td>
+  	</tr>
+  </table>
+---
+name: with empty cells
+desc: cells can be empty. Textile2 skips empties, but we don't want to do that.
+in: |-
+  ||b|
+  |a||
+  |a| |
+html: |-
+  <table>
+  	<tr>
+  		<td></td>
+  		<td>b</td>
+  	</tr>
+  	<tr>
+  		<td>a</td>
+  		<td></td>
+  	</tr>
+  	<tr>
+  		<td>a</td>
+  		<td> </td>
+  	</tr>
+  </table>
+