hikidoc 0.0.1 → 0.0.2

data/lib/hikidoc.rb

@@ -37,7 +37,7 @@ rescue LoadError
 end
 
 class HikiDoc
-  VERSION = "0.0.1" # FIXME
+  VERSION = "0.0.2" # FIXME
 
   class Error < StandardError
   end
@@ -330,9 +330,9 @@ class HikiDoc
 
   def compile_indented_pre(f)
     lines = f.span(INDENTED_PRE_RE)\
-        .map {|line| rstrip(line.sub(INDENTED_PRE_RE, "")) }\
-        .map {|line| @output.text(line) }
-    @output.preformatted restore_plugin_block(lines.join("\n"))
+        .map {|line| rstrip(line.sub(INDENTED_PRE_RE, "")) }
+    text = restore_plugin_block(lines.join("\n"))
+    @output.preformatted(@output.text(text))
   end
 
   BLOCK_PRE_OPEN_RE = /\A<<<\s*(\w+)?/
@@ -468,7 +468,7 @@ class HikiDoc
   end
 
   def fix_uri(uri)
-    if %r|://| !~ uri and /\Amailto:/ !~ uri
+    if /\A(?:https?|ftp|file):(?!\/\/)/ =~ uri
       uri.sub(/\A\w+:/, "")
     else
       uri
@@ -506,7 +506,7 @@ class HikiDoc
       when chunk = m[1]
         mod, s = split_mod(chunk)
         mid = MODTAG[mod]
-        buf << @output.__send__(mid, compile_modifier(s))
+        buf << @output.__send__(mid, compile_inline(s))
       else
         raise UnexpectedError, "must not happen"
       end

data/test/test_hikidoc.rb

@@ -47,6 +47,32 @@ class HikiDocTestCase < Test::Unit::TestCase
                    options)
   end
 
+  def test_multi_line_plugin
+    assert_convert(<<-END_OF_EXPECTED, <<-END_OF_INPUT)
+<div class="plugin">{{&lt;&lt;TEST2
+ test2
+TEST2}}</div>
+                   END_OF_EXPECTED
+{{<<TEST2
+ test2
+TEST2}}
+                   END_OF_INPUT
+
+    assert_convert(<<-END_OF_EXPECTED, <<-END_OF_INPUT)
+<div class="plugin">{{&lt;&lt;TEST
+&lt;&lt;&lt;
+here is not pre but plugin.
+&gt;&gt;&gt;
+TEST}}</div>
+                   END_OF_EXPECTED
+{{<<TEST
+<<<
+here is not pre but plugin.
+>>>
+TEST}}
+                   END_OF_INPUT
+  end
+
   def test_blockquote
     assert_convert("<blockquote><p>hoge</p>\n</blockquote>\n",
                    %Q|""hoge\n|)
@@ -119,6 +145,10 @@ class HikiDocTestCase < Test::Unit::TestCase
                    " foo\n bar\n")
     assert_convert("<pre>&lt;foo&gt;</pre>\n",
                    " <foo>")
+    assert_convert("<pre>{{_:a/a}}</pre>\n",
+                   " {{_:a/a}}")
+    assert_convert("<pre>[[_:a/a]]</pre>\n",
+                   " [[_:a/a]]")
   end
 
   def test_multi_pre
@@ -132,6 +162,12 @@ class HikiDocTestCase < Test::Unit::TestCase
                    "<<<\n<foo>\n>>>")
   end
 
+  def test_multi_pre_with_plugin
+    assert_convert("<pre>{{{}}}</pre>\n" +
+                   "<div class=\"plugin\">{{'test'}}</div>\n",
+                   "<<<\n{{{}}}\n>>>\n{{'test'}}")
+  end
+
   def test_comment
     assert_convert("", "// foo")
     assert_convert("", "// foo\n")
@@ -189,6 +225,13 @@ class HikiDocTestCase < Test::Unit::TestCase
                    "[[aa]]bb[[cc]]")
   end
 
+  def test_inter_wiki_name
+    assert_convert("<p><a href=\"scheme:keyword\">scheme:keyword</a></p>\n",
+                   "[[scheme:keyword]]")
+    assert_convert("<p><a href=\"scheme:keyword\">label</a></p>\n",
+                   "[[label|scheme:keyword]]")
+  end
+
   def test_wiki_name
     assert_convert("<p><a href=\"WikiName\">WikiName</a></p>\n",
                    "WikiName")
@@ -277,13 +320,33 @@ class HikiDocTestCase < Test::Unit::TestCase
   end
 
   def test_definition_with_link
-    assert_convert(%Q|<dl>\n<dt><a href="http://hikiwiki.org/">Hiki</a></dt>\n<dd>Website</dd>\n</dl>\n|,
+    assert_convert("<dl>\n<dt><a href=\"http://hikiwiki.org/\">Hiki</a></dt>\n" +
+                   "<dd>Website</dd>\n</dl>\n",
                    ":[[Hiki|http://hikiwiki.org/]]:Website")
+    assert_convert("<dl>\n<dt>a</dt>\n" +
+                   "<dd><a href=\"http://hikiwiki.org/\">Hiki</a></dd>\n" +
+                   "</dl>\n",
+                   ":a:[[Hiki|http://hikiwiki.org/]]")
   end
 
   def test_definition_with_modifier
-    assert_convert(%Q|<dl>\n<dt><strong>foo</strong></dt>\n<dd>bar</dd>\n</dl>\n|,
+    assert_convert("<dl>\n<dt><strong>foo</strong></dt>\n" +
+                   "<dd>bar</dd>\n</dl>\n",
                    ":'''foo''':bar")
+    assert_convert("<dl>\n<dt>foo</dt>\n" +
+                   "<dd><strong>bar</strong></dd>\n</dl>\n",
+                   ":foo:'''bar'''")
+  end
+
+  def test_definition_with_modifier_link
+    assert_convert("<dl>\n<dt>" +
+                   "<strong><a href=\"http://hikiwiki.org/\">Hiki</a></strong>" +
+                   "</dt>\n<dd>Website</dd>\n</dl>\n",
+                   ":'''[[Hiki|http://hikiwiki.org/]]''':Website")
+    assert_convert("<dl>\n<dt>Website</dt>\n<dd>" +
+                   "<strong><a href=\"http://hikiwiki.org/\">Hiki</a></strong>" +
+                   "</dd>\n</dl>\n",
+                   ":Website:'''[[Hiki|http://hikiwiki.org/]]'''")
   end
 
   def test_table
@@ -335,6 +398,8 @@ class HikiDocTestCase < Test::Unit::TestCase
   def test_modifier_and_link
     assert_convert("<p><a href=\"http://hikiwiki.org/\"><strong>Hiki</strong></a></p>\n",
                    "[['''Hiki'''|http://hikiwiki.org/]]")
+    assert_convert("<p><strong><a href=\"http://hikiwiki.org/\">Hiki</a></strong></p>\n",
+                   "'''[[Hiki|http://hikiwiki.org/]]'''")
   end
 
   def test_pre_and_plugin
@@ -363,6 +428,13 @@ class HikiDocTestCase < Test::Unit::TestCase
     end
   end
 
+  def test_plugin_in_pre_with_header
+    assert_convert("<h1>Title</h1>\n<pre>{{_/a:a}}</pre>\n",
+                   "! Title\n {{_/a:a}}")
+    assert_convert("<h1>Title</h1>\n<pre>{{_/a:a}}\n{{_/a:a}}</pre>\n",
+                   "! Title\n {{_/a:a}}\n {{_/a:a}}")
+  end
+
   private
   def assert_convert(expected, markup, options={}, message=nil)
     assert_equal(expected, HikiDoc.to_xhtml(markup, options), message)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: hikidoc
 version: !ruby/object:Gem::Version 
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors: 
 - Kazuhiko
@@ -9,17 +9,18 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2007-12-31 00:00:00 +09:00
+date: 2008-08-12 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: hoe
+  type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.4.0
+        version: 1.2.1
     version: 
 description: "'HikiDoc' is a text-to-HTML conversion tool for web writers. HikiDoc allows you to write using an easy-to-read, easy-to-write plain text format, then convert it to structurally valid HTML (or XHTML)."
 email: 
@@ -38,6 +39,8 @@ files:
 - TextFormattingRules
 - TextFormattingRules.ja
 - bin/hikidoc
+- coverage/index.html
+- coverage/lib-hikidoc_rb.html
 - lib/hikidoc.rb
 - setup.rb
 - test/run-test.rb
@@ -65,7 +68,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: hikidoc
-rubygems_version: 1.0.1
+rubygems_version: 1.2.0
 signing_key: 
 specification_version: 2
 summary: "'HikiDoc' is a text-to-HTML conversion tool for web writers."