RedCloth 4.1.9-x86-mswin32-60 → 4.2.0-x86-mswin32-60

data/spec/differs/inline.rb

@@ -0,0 +1,48 @@
+require "spec/runner/differs/load-diff-lcs"
+require 'pp'
+
+module RedClothDiffers
+  unless defined?(Inline)
+    class Inline
+      def initialize(options)
+        @options = options
+      end
+      
+      DIFF_ASCII_COLORS = {
+        "=" => "\e[0m",
+        "+" => "\e[42m",
+        "-" => "\e[41m",
+        "!" => "\e[43m"
+      }
+
+      def diff_as_string(data_new, data_old)
+        output = "\e[0m"
+        last_action = nil
+        sdiff = Diff::LCS.sdiff(data_old, data_new)
+        sdiff.each do |change|
+          unless change.action == last_action
+            output << DIFF_ASCII_COLORS[change.action]
+            last_action = change.action
+          end
+          output << case change.action
+          when "+"
+            change.new_element
+          when "-"
+            change.old_element
+          when "="
+            change.old_element
+          when "!"
+            change.old_element
+          end
+        end
+        
+        output
+      end  
+
+      def diff_as_object(target,expected)
+        diff_as_string(PP.pp(target,""), PP.pp(expected,""))
+      end
+    end
+
+  end
+end

data/{test/test_erb.rb → spec/erb_spec.rb}

@@ -1,13 +1,10 @@
-#!/usr/bin/env ruby
+require File.dirname(__FILE__) + '/spec_helper'
 
-require File.join(File.dirname(__FILE__), 'helper')
-
-class TestErb < Test::Unit::TestCase
-
-  def test_redcloth_erb
+describe "ERB helper" do
+  it "should add a textile tag to ERB" do
     template = %{<%=t "This new ERB tag makes is so _easy_ to use *RedCloth*" %>}
     expected = %{<p>This new <span class="caps">ERB</span> tag makes is so <em>easy</em> to use <strong>RedCloth</strong></p>}
-    assert_equal expected, ERB.new(template).result
+    
+    ERB.new(template).result.should == expected
   end
-
-end
+end

data/spec/extension_spec.rb

@@ -0,0 +1,26 @@
+require File.dirname(__FILE__) + '/spec_helper'
+
+# http://www.ralree.info/2006/9/13/extending-redcloth
+module RedClothSmileyExtension
+  def refs_smiley(text)
+    text.gsub!(/(\s)~(:P|:D|:O|:o|:S|:\||;\)|:'\(|:\)|:\()/) do |m|
+      bef,ma = $~[1..2]
+      filename = "/images/emoticons/"+(ma.unpack("c*").join('_'))+".png"
+      "#{bef}<img src='#{filename}' title='#{ma}' class='smiley' />"
+    end
+  end
+end
+
+RedCloth.send(:include, RedClothSmileyExtension)
+
+describe RedClothSmileyExtension do
+  
+  it "should include the extension" do
+    input  = %Q{You're so silly! ~:P}
+
+    html  = %Q{<p>You&#8217;re so silly! <img src='/images/emoticons/58_80.png' title=':P' class='smiley' /></p>}
+
+    RedCloth.new(input).to_html(:textile, :refs_smiley).should == html
+  end
+  
+end

data/{test → spec/fixtures}/basic.yml

@@ -9,6 +9,14 @@ html: |-
   <p>A single paragraph.</p>
   <p>Followed by another.</p>
 ---
+name: blocks with spaces on the blank line in between
+in: "This is line one\n \nThis is line two"
+html: "<p>This is line one</p>\n<p>This is line two</p>"
+---
+name: blocks with tabl on the blank line in between
+in: "This is line one\n\t\nThis is line two"
+html: "<p>This is line one</p>\n<p>This is line two</p>"
+---
 name: block containing block start
 in: |-
   I saw a ship. It ate my elephant.
@@ -43,6 +51,24 @@ html: |-
   <p>When the elephant comes to take a p. you&#8230;</p>
   </blockquote>
 --- 
+name: notextile block
+in: |-
+  Some text:
+  
+  <notextile>
+  <div class="example"><pre>
+  Some code
+  </pre></div>
+  </notextile>
+  
+  Some more text.
+html: |-
+  <p>Some text:</p>
+  <div class="example"><pre>
+  Some code
+  </pre></div>
+  <p>Some more text.</p>
+---
 name: notextile block containing block start
 in: |-
   notextile. I saw a ship. It ate my elephant.
@@ -569,6 +595,10 @@ html: <p>We use <acronym title="Cascading Style Sheets"><span class="caps">CSS</
 lite_mode_html: We use <acronym title="Cascading Style Sheets"><span class="caps">CSS</span></acronym>.
 no_span_caps_html: <p>We use <acronym title="Cascading Style Sheets">CSS</acronym>.</p>
 --- 
+name: two-letter acronyms
+in: It employs AI(artificial intelligence) processing.
+html: <p>It employs <acronym title="artificial intelligence"><span class="caps">AI</span></acronym> processing.</p>
+--- 
 name: tables
 desc: Simple tables can be built by separating fields with pipe characters
 in: |-
@@ -712,7 +742,7 @@ html: |-
   	</tr>
   </table>
 --- 
-name: black attributes applied to a table
+name: block attributes applied to a table
 desc: Table-wide attributes can be applied before the first row of the table.  On its own line, followed by a period.
 in: |-
   table{border:1px solid black}.
@@ -734,7 +764,7 @@ html: |-
   	</tr>
   </table>
 --- 
-name: black attributes applied to a table row
+name: block attributes applied to a table row
 desc: Attributes can be applied to a single row by supplying the attribute before the row starts, using a <code>table</code> modifier and following it by a period.
 in: |-
   |This|is|a|row|
@@ -923,10 +953,66 @@ in: |-
 
   Some more text.
 html: |-
-  <p>Just some <em>_</em> text</p>
+  <p>Just some ___ text</p>
   <hr />
   <p>Some more text.</p>
 ---
 name: lang attribute cannot contain square brackets
 in: "some @[[code]]@"
-html: "<p>some <code>[[code]]</code></p>"
+html: "<p>some <code>[[code]]</code></p>"
+---
+name: pre blocks preserve leading whitespace
+in: |-
+  pre.      Text in a pre block
+  is displayed in a fixed-width
+       font. It preserves
+    s p a c e s, line breaks
+       and ascii bunnies.
+html: |-
+  <pre>     Text in a pre block
+  is displayed in a fixed-width
+       font. It preserves
+    s p a c e s, line breaks
+       and ascii bunnies.</pre>
+---
+name: code blocks preserve leading whitespace
+in: |-
+  bc.   false
+  } else {
+html: |-
+  <pre><code>  false
+  } else {</code></pre>
+---
+name: citation ending with question mark
+in: "??What the Story Morning Glory???"
+html: |-
+  <p><cite>What the Story Morning Glory?</cite></p>
+---
+name: citation including question mark
+in: "??What's the Matter with Kansas? How Conservatives Won the Heart of America?? is a great book!"
+html: |-
+  <p><cite>What&#8217;s the Matter with Kansas? How Conservatives Won the Heart of America</cite> is a great book!</p>
+---
+name: emphasized word including underscore
+in: |-
+  _trythis_ it will keep the empahsis.
+  _and_this_too_ it should keep the emphasis but does not with redcloth.
+html: |-
+  <p><em>trythis</em> it will keep the empahsis.<br />
+  <em>and_this_too</em> it should keep the emphasis but does not with redcloth.</p>
+---
+name: code captures spaces when made explicit with square brackets
+in: "Start a paragraph with [@p. @] (that's p, a period, and a space)."
+html: "<p>Start a paragraph with <code>p. </code> (that&#8217;s p, a period, and a space).</p>"
+---
+name: unrecognized block starting with t not eaten
+in: "tel. 0 700 123 123"
+html: "<p>tel. 0 700 123 123</p>"
+---
+name: bolded number at start of phrase
+in: "*22 watermelons* is my limit"
+html: "<p><strong>22 watermelons</strong> is my limit</p>"
+---
+name: bolded paragraph
+in: "*- I would expect it to be a bolded paragraph.*"
+html: <p><strong>- I would expect it to be a bolded paragraph.</strong></p>

data/{test → spec/fixtures}/code.yml

@@ -2,24 +2,36 @@
 name: inline code
 in: 'This is an empty dictionary: @{}@'
 html: '<p>This is an empty dictionary: <code>{}</code></p>'
+latex: "This is an empty dictionary: \\verb@{}@\n\n"
+---
+name: inline snip
+in: "The ```command``` is here."
+html:  "<p>The <pre><code>command</code></pre>\n is here.</p>"
+latex: "The \\verb`command` is here.\n\n"
 ---
 name: inline code escapement
 in: 'Please type @cat "file.txt" > otherfile.txt@ at the prompt.'
 html: '<p>Please type <code>cat "file.txt" &gt; otherfile.txt</code> at the prompt.</p>'
+latex: "Please type \\verb@cat \"file.txt\" > otherfile.txt@ at the prompt.\n\n"
 ---
 name: inline code escapement with digits
 in: |-
   Regex-based string substitution with Ruby's gsub!: @"123<789".gsub!(/</, "") => "123789"@
 html: |-
   <p>Regex-based string substitution with Ruby&#8217;s gsub!: <code>"123&lt;789".gsub!(/&lt;/, "") =&gt; "123789"</code></p>
+latex: |+
+  Regex-based string substitution with Ruby's gsub!: \verb@"123<789".gsub!(/</, "") => "123789"@
+
 ---
 name: inlne code escapement describing textile paragraph styling 
 in: 'This paragraph is aligned left but if you add this: @p>.@ to the beginning it will be aligned right.'
 html: '<p>This paragraph is aligned left but if you add this: <code>p&gt;.</code> to the beginning it will be aligned right.</p>'
+latex: "This paragraph is aligned left but if you add this: \\verb@p>.@ to the beginning it will be aligned right.\n\n"
 ---
 name: escapes code snippet containing html tag
 in: 'At the top of each page, please put @<h2>Title</h2>@ in the HTML.'
 html: '<p>At the top of each page, please put <code>&lt;h2&gt;Title&lt;/h2&gt;</code> in the <span class="caps">HTML</span>.</p>'
+latex: "At the top of each page, please put \\verb@<h2>Title</h2>@ in the HTML.\n\n"
 ---
 name: escaping in blockcode
 in: 'bc. This is within a block of code, so < and > should be entities.  You can talk about a <p class="foo"> tag if you wish and it will be properly escaped.'
@@ -127,6 +139,13 @@ html: |-
   	<li><code>bar</code></li>
   	<li>and <code>x</code> is also.</li>
   </ul>
+latex: |+
+  \begin{itemize}
+    \item \verb@foo@
+    \item \verb@bar@
+    \item and \verb@x@ is also.
+  \end{itemize}
+
 ---
 name: extended block code
 in: |-
@@ -226,3 +245,13 @@ 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>'
+latex: "\\verb@some_method(some_params, some => test);@ Oh dear this fails\n\n"
+---
+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 → spec/fixtures}/html.yml

@@ -29,6 +29,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" />

data/{test → spec/fixtures}/images.yml

@@ -2,7 +2,8 @@
 in:  This is an !image.jpg!
 html: <p>This is an <img src="image.jpg" alt="" /></p>
 latex: |+
-  This is an \begin{figure}[htp]
+  This is an \begin{figure}
+    \centering
     \includegraphics[]{image.jpg}
   \end{figure}
 
@@ -10,7 +11,8 @@ latex: |+
 in:  This is an !image.jpg(with alt text)!
 html: <p>This is an <img src="image.jpg" title="with alt text" alt="with alt text" /></p>
 latex: |+
-  This is an \begin{figure}[htp]
+  This is an \begin{figure}
+    \centering
     \includegraphics[]{image.jpg}
     \caption{with alt text}
   \end{figure}
@@ -192,7 +194,8 @@ name: image with relative src with dot
 in: "!../../image.jpg!"
 html: <p><img src="../../image.jpg" alt="" /></p>
 latex: |+
-  \begin{figure}[htp]
+  \begin{figure}
+    \centering
     \includegraphics[]{../../image.jpg}
   \end{figure}
 
@@ -225,7 +228,8 @@ name: image attributes has ampersand html entity in alt and title
 in: "!/pictures/cat_and_fox.jpg(Trady Blix & The cartoon fox)!"
 html: '<p><img src="/pictures/cat_and_fox.jpg" title="Trady Blix &amp; The cartoon fox" alt="Trady Blix &amp; The cartoon fox" /></p>'
 latex: |+
-  \begin{figure}[htp]
+  \begin{figure}
+    \centering
     \includegraphics[]{/pictures/cat_and_fox.jpg}
     \caption{Trady Blix \& The cartoon fox}
   \end{figure}
@@ -235,7 +239,8 @@ name: image attributes has double 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: &quot;Have some chunky bacon&quot;" alt="The fox said: &quot;Have some chunky bacon&quot;" /></p>'
 latex: |+
-  \begin{figure}[htp]
+  \begin{figure}
+    \centering
     \includegraphics[]{/pictures/bacon.jpg}
     \caption{The fox said: "Have some chunky bacon"}
   \end{figure}
@@ -266,4 +271,9 @@ html: |-
 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>
+  <p><img src="image.jpg" title="Alt text with (parentheses)." alt="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>

data/{test → spec/fixtures}/links.yml

@@ -282,4 +282,10 @@ 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>
+  <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>

data/{test → spec/fixtures}/lists.yml

@@ -298,4 +298,165 @@ html: |-
   	<li>notice the leading space</li>
   	<li>RedCloth 3.0.4 used to accept it</li>
   	<li>Now we do too</li>
-  </ol>
+  </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>