radiant 0.9.0.rc2 → 0.9.1

data/vendor/extensions/markdown_filter/vendor/kramdown/test/run_tests.rb

@@ -44,6 +44,7 @@ Dir[arg].each {|f| fwidth = [fwidth, f.length + 10].max }.each do |file|
 
   html_file = file.sub('.text', '.html')
   opts_file = file.sub('.text', '.options')
+  opts_file = File.join(File.dirname(file), 'options') if !File.exist?(opts_file)
   options = File.exist?(opts_file) ? YAML::load(File.read(opts_file)) : {:auto_ids => false, :filter_html => [], :footnote_nr => 1}
   doc = Kramdown::Document.new(File.read(file), options)
   begin

data/vendor/extensions/markdown_filter/vendor/kramdown/test/test_files.rb

@@ -23,16 +23,77 @@
 require 'test/unit'
 require 'kramdown'
 require 'yaml'
+require 'tmpdir'
 
 class TestFiles < Test::Unit::TestCase
 
-  Dir[File.dirname(__FILE__) + '/testcases/**/*.text'].each do |file|
-    define_method('test_' + file.tr('.', '_')) do
-      html_file = file.sub('.text', '.html')
-      opts_file = file.sub('.text', '.options')
-      options = File.exist?(opts_file) ? YAML::load(File.read(opts_file)) : {:auto_ids => false, :filter_html => [], :footnote_nr => 1}
-      doc = Kramdown::Document.new(File.read(file), options)
-      assert_equal(File.read(html_file), doc.to_html, "Failed test #{file}")
+  # Generate test methods for kramdown-to-xxx conversion
+  Dir[File.dirname(__FILE__) + '/testcases/**/*.text'].each do |text_file|
+    basename = text_file.sub(/\.text$/, '')
+    opts_file = text_file.sub(/\.text$/, '.options')
+    (Dir[basename + ".*"] - [text_file, opts_file]).each do |output_file|
+      output_format = File.extname(output_file)[1..-1]
+      next if !Kramdown::Converter.const_defined?(output_format[0..0].upcase + output_format[1..-1])
+      define_method('test_' + text_file.tr('.', '_') + "_to_#{output_format}") do
+        opts_file = File.join(File.dirname(text_file), 'options') if !File.exist?(opts_file)
+        options = File.exist?(opts_file) ? YAML::load(File.read(opts_file)) : {:auto_ids => false, :filter_html => [], :footnote_nr => 1}
+        doc = Kramdown::Document.new(File.read(text_file), options)
+        assert_equal(File.read(output_file), doc.send("to_#{output_format}"))
+      end
+    end
+  end
+
+  # Generate test methods for html-to-html conversion
+  `tidy -v 2>&1`
+  if $?.exitstatus != 0
+    warn("Skipping html-to-html tests because tidy executable is missing")
+  else
+    EXCLUDE_HTML_FILES = ['test/testcases/block/06_codeblock/whitespace.html', # bc of span inside pre
+                          'test/testcases/block/09_html/simple.html' # bc of xml elements
+                         ]
+    Dir[File.dirname(__FILE__) + '/testcases/**/*.html'].each do |html_file|
+      next if EXCLUDE_HTML_FILES.any? {|f| html_file =~ /#{f}$/}
+      define_method('test_' + html_file.tr('.', '_') + "_to_html") do
+        doc = Kramdown::Document.new(File.read(html_file), :input => 'html', :auto_ids => false, :footnote_nr => 1)
+        assert_equal(tidy_output(File.read(html_file)), tidy_output(doc.to_html))
+      end
+    end
+  end
+
+  def tidy_output(out)
+    result = IO.popen("tidy -q -raw 2>/dev/null", 'r+') do |io|
+      io.write(out)
+      io.close_write
+      io.read
+    end
+    if $?.exitstatus == 2
+      raise "Problem using tidy"
+    end
+    result
+  end
+
+  # Generate test methods for text-to-latex conversion and compilation
+  `latex -v 2>&1`
+  if $?.exitstatus != 0
+    warn("Skipping latex compilation tests because latex executable is missing")
+  else
+    EXCLUDE_LATEX_FILES = ['test/testcases/span/01_link/image_in_a.text', # bc of image link
+                           'test/testcases/span/01_link/imagelinks.text', # bc of image links
+                           'test/testcases/span/04_footnote/markers.text', # bc of footnote in header
+                          ]
+    Dir[File.dirname(__FILE__) + '/testcases/**/*.text'].each do |text_file|
+      next if EXCLUDE_LATEX_FILES.any? {|f| text_file =~ /#{f}$/}
+      define_method('test_' + text_file.tr('.', '_') + "_to_latex_compilation") do
+        latex =  Kramdown::Document.new(File.read(text_file),
+                                                          :auto_ids => false, :footnote_nr => 1,
+                                                          :template => 'document').to_latex
+        result = IO.popen("latex -output-directory='#{Dir.tmpdir}' 2>/dev/null", 'r+') do |io|
+          io.write(latex)
+          io.close_write
+          io.read
+        end
+        assert($?.exitstatus == 0, result.scan(/^!(.*\n.*)/).join("\n"))
+      end
     end
   end
 

data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/block/04_header/with_auto_id_prefix.html

@@ -0,0 +1,3 @@
+<h1 id="hallo_header-1">Header 1</h1>
+
+<h1 id="hallo_section">123</h1>

data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/block/04_header/with_auto_id_prefix.options

@@ -0,0 +1,2 @@
+:auto_ids: true
+:auto_id_prefix: hallo_

data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/block/04_header/with_auto_id_prefix.text

@@ -0,0 +1,3 @@
+# Header 1
+
+# 123

data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/block/08_list/item_ial.html

@@ -0,0 +1,9 @@
+<ul>
+  <li class="cls">IAL at first
+continued</li>
+  <li>another </li>
+  <li class="cls">IAL at last
+    <pre><code>code
+</code></pre>
+  </li>
+</ul>

data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/block/08_list/item_ial.text

@@ -0,0 +1,5 @@
+*   {:.cls} IAL at first
+    continued
+* another {:.cls}
+* {:.cls} IAL at last
+      code

data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/block/08_list/mixed.html

@@ -15,7 +15,9 @@
   <li>
     <p>item2</p>
   </li>
-  <li>item3</li>
+  <li>
+    <p>item3</p>
+  </li>
 </ul>
 
 <p>With tabs/spaces, no paras:</p>
@@ -35,7 +37,9 @@
   <li>
     <p>item2</p>
   </li>
-  <li>item3</li>
+  <li>
+    <p>item3</p>
+  </li>
 </ol>
 
 <p>Nested, without paras:</p>
@@ -97,7 +101,9 @@
       <li>now</li>
     </ul>
   </li>
-  <li>item3</li>
+  <li>
+    <p>item3</p>
+  </li>
 </ol>
 
 <p>Mixed tabs and spaces:</p>

data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/block/08_list/special_cases.html

@@ -27,3 +27,52 @@ here
 <p>A paragraph
   1. followed not by ol
 - followed not by ul</p>
+
+<p>A compact list:</p>
+
+<ul>
+  <li>compact</li>
+  <li>list</li>
+  <li>items</li>
+</ul>
+
+<p>A normal list:</p>
+
+<ul>
+  <li>
+    <p>not</p>
+  </li>
+  <li>
+    <p>compact</p>
+  </li>
+  <li>
+    <p>but here</p>
+  </li>
+</ul>
+<p>A normal list:</p>
+
+<ul>
+  <li>
+    <p>not</p>
+  </li>
+  <li>
+    <p>compact</p>
+  </li>
+  <li>
+    <p>here</p>
+  </li>
+</ul>
+
+<p>A normal list:</p>
+
+<ul>
+  <li>
+    <p>not</p>
+  </li>
+  <li>
+    <p>compact</p>
+  </li>
+  <li>
+    <p>here</p>
+  </li>
+</ul>

data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/block/08_list/special_cases.text

@@ -17,3 +17,32 @@
 A paragraph
   1. followed not by ol
 - followed not by ul
+
+A compact list:
+
+* compact
+* list
+* items
+
+A normal list:
+
+* not
+
+* compact
+
+* but here
+A normal list:
+
+* not
+
+* compact
+
+* here
+
+A normal list:
+
+* not
+
+* compact
+
+* here

data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/block/09_html/comment.html

@@ -11,3 +11,8 @@ Blah
 Blah
 -->
 <p>para</p>
+
+<blockquote>
+  <p>This is</p>
+  <!-- a comment -->
+</blockquote>

data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/block/09_html/comment.text

@@ -10,3 +10,6 @@ para2
 Blah
 Blah
 --> para
+
+> This is
+> <!-- a comment -->

data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/block/09_html/content_model/tables.html

@@ -2,8 +2,8 @@
   <tr>
     <th><em>Usage</em></th>
     <th>
-      <p>Output</p>
-    </th>
+Output
+  </th>
   </tr>
   <tr>
     <td>Some <em>data</em></td>

data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/block/09_html/html_to_native/code.html

@@ -0,0 +1,10 @@
+<p>This is a <code>code span with &lt;entities&gt; that should be preserved</code>.
+This is a <code>simple code</code> span.</p>
+
+<p>Some <code>&lt;</code></p>
+
+<pre><code>Some very important &lt; thing
+</code></pre>
+
+<pre><code>Some code&sdot;&sdot;
+</code></pre>

data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/block/09_html/html_to_native/code.text

@@ -0,0 +1,9 @@
+This is a <code>code span <b>with</b> &lt;entities&gt; that should be preserved</code>.
+This is a <code>simple code</code> span.
+
+<p>Some <code>&lt;</code></p>
+
+<pre>Some very important <b>&lt;</b> thing</pre>
+
+<pre><code>Some code<span>&sdot;</span>&sdot;
+</code></pre>

data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/block/09_html/html_to_native/comment.html

@@ -0,0 +1,7 @@
+<div>
+  <!--comment-->
+  <!--
+Blah
+Blah
+-->
+</div>

data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/block/09_html/html_to_native/comment.text

@@ -0,0 +1,8 @@
+<div>
+  <!--comment-->
+
+  <!--
+Blah
+Blah
+-->
+</div>

data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/block/09_html/html_to_native/emphasis.html

@@ -0,0 +1 @@
+<p>This is <em>sized<strong>hallo</strong></em>.</p>

data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/block/09_html/html_to_native/emphasis.text

@@ -0,0 +1 @@
+This is <em>sized<strong>hallo</strong></em>.

data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/block/09_html/html_to_native/entity.html

@@ -0,0 +1 @@
+<p>This is *raw* HTML text containing &lt; entities!</p>

data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/block/09_html/html_to_native/entity.text

@@ -0,0 +1 @@
+<p>This is *raw* HTML text containing &lt; entities!</p>

data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/block/09_html/html_to_native/header.html

@@ -0,0 +1,6 @@
+<h1 id="some-headerhere">Some <em class="cls">header</em>here!</h1>
+<h2 id="test">hallo</h2>
+<h3 id="hallo">hallo</h3>
+<h4 id="hallo-1">hallo</h4>
+<h5 id="hallo-2">hallo</h5>
+<h6 id="hallo-3">hallo</h6>

data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/block/09_html/html_to_native/header.options

@@ -0,0 +1,2 @@
+:auto_ids: true
+:html_to_native: true

data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/block/09_html/html_to_native/header.text

@@ -0,0 +1,6 @@
+<h1>Some <em class='cls'>header</em>here!</h1>
+<h2 id="test">hallo</h2>
+<h3>hallo</h3>
+<h4>hallo</h4>
+<h5>hallo</h5>
+<h6>hallo</h6>

data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/block/09_html/html_to_native/list_dl.html

@@ -0,0 +1,8 @@
+<dl>
+  <dt>kram</dt>
+  <dd>down</dd>
+  <dt>kram</dt>
+  <dd>down</dd>
+  <dt>kram</dt>
+  <dd>down</dd>
+</dl>

data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/block/09_html/html_to_native/list_dl.text

@@ -0,0 +1,8 @@
+<dl>
+  <dt>kram</dt>
+  <dd>down</dd>
+  <dt>kram</dt>
+  <dd>down</dd>
+  <dt>kram</dt>
+  <dd>down</dd>
+</dl>

data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/block/09_html/html_to_native/list_ol.html

@@ -0,0 +1,15 @@
+<ol>
+  <li>This is a simple list item</li>
+  <li>
+    <p>Followed by another</p>
+  </li>
+  <li>
+    <p>Followed by</p>
+    <p>a para list item</p>
+  </li>
+  <li>and a normal one</li>
+  <li>
+    <p>and</p>
+    <p>a para</p>
+  </li>
+</ol>

data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/block/09_html/html_to_native/list_ol.text

@@ -0,0 +1,17 @@
+<ol>
+  <li>This is a simple list item</li>
+  <li>
+    <p>Followed by another</p>
+  </li>
+  <li>
+    <p>Followed by</p>
+
+    <p>a para list item</p>
+  </li>
+  <li>and a normal one</li>
+  <li>
+    <p>and</p>
+
+    <p>a para</p>
+  </li>
+</ol>

data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/block/09_html/html_to_native/list_ul.html

@@ -0,0 +1,19 @@
+<ul>
+  <li>This is a simple list item</li>
+  <li>
+    <p>Followed by another</p>
+  </li>
+  <li>
+    <p>Followed by</p>
+    <p>a para list item</p>
+  </li>
+  <li>and a normal one</li>
+  <li>
+    <p>and</p>
+    <p>a para</p>
+  </li>
+</ul>
+
+<ul>
+  <li>multi line list item</li>
+</ul>

data/vendor/extensions/markdown_filter/vendor/kramdown/test/testcases/block/09_html/html_to_native/list_ul.text

@@ -0,0 +1,22 @@
+<ul>
+  <li>This is a simple list item</li>
+  <li>
+    <p>Followed by another</p>
+  </li>
+  <li>
+    <p>Followed by</p>
+
+    <p>a para list item</p>
+  </li>
+  <li>and a normal one</li>
+  <li>
+    <p>and</p>
+
+    <p>a para</p>
+  </li>
+</ul>
+
+<ul>
+  <li>multi line
+list item</li>
+</ul>