@@ -3,7 +3,7 @@ # Copyright (C) 2009 Christian Neukirchen <purl.org/net/chneukirchen> # # Challis is freely distributable under the terms of an MIT-style license. -# See COPYING or http://www.opensource.org/licenses/mit-license.php. +# See README or <http://www.opensource.org/licenses/mit-license.php>. class Challis < String def pfmt(t) @@ -34,14 +34,14 @@ class Challis < String depth = 0 to_close = [] - (split(/\n\n+|(?=^(?: )*(?:\* |# |=+ ))|(---.*?^---)|^(\{\{[\w:. -]+)|^(\}\})/m).map { |par| + (split(/\n\n+|(?=^(?: )*(?:\* |# |=+ ))|^(---.*?^---)|^(\{\{[\w:. -]+)|^(\}\})/m).map { |par| case par when /\A---html\n(.*)^---/m: $1 when /\A---\n(.*)^---/m: %Q{<pre><code>#{prefmt $1}</code></pre>} when /\A\{\{([\w:. -]+)\z/: %Q{<div class="#{$1}">} when "}}": %Q{</div>} when /\A\s*\z/: nil # ignore - when /\A((?: )*)((?:\* |# |" |.*:: ?|=+ )?)(.*)/m #/ + when /\A((?: )*)((?:\* |# |" |.*::(?: |$)|=+ )?)(.*)/m #/ indent, type, text = $1, $2, $3 new_depth = indent.size/2 lib/challis.rb @@ -1,3 +1,4 @@ +require 'bacon' require 'challis' describe "Challis" do @@ -356,4 +357,16 @@ IN <p>Foo.</p></div> OUT end + + should "not fail on special cases" do + fmt(<<'IN', <<'OUT') +These are---I think---long dashes. + +Test::Unit +IN +<p>These are---I think---long dashes.</p> + +<p>Test::Unit</p> +OUT + end end test/spec_challis.rb 83f0f572c9fb9508f5e93b6597d4b1407fef58b4 Christian Neukirchen chneukirchen@gmail.com http://github.com/chneukirchen/challis/commit/7dbf50794b70b1c3b280ba7f98a0014a11458988 7dbf50794b70b1c3b280ba7f98a0014a11458988 2009-05-23T17:26:06-07:00 2009-05-23T17:26:06-07:00 Fix small issues 8b7106fd9f2dc730cb22202504ff1d1218983db0 Christian Neukirchen chneukirchen@gmail.com