hikidoc 0.0.3 → 0.0.4

data/README

@@ -17,7 +17,7 @@ Get from the subversion repository http://hikidoc.rubyforge.org/svn/ .
  (eg.)
  svn co http://hikidoc.rubyforge.org/svn/trunk/ hikidoc
 
-!! Installation 
+!! Installation
 
 Run the 'setup.rb' script like so:
 
@@ -33,7 +33,7 @@ See [[TextFormattingRules]].
 
 To subscribe the HikiDoc ML, please send the following mail. English
 posts are also welcome.
-  
+
  To: hikidoc@ml.fdiary.net
  Cc: kazuhiko@fdiary.net
  Subject: subscribe        <- any subject
@@ -44,12 +44,13 @@ HikiDoc ML's archive is available at http://www.fdiary.net/ml/hikidoc/ .
 
 !! Related softwares
 
-The following softwares use the HikiDoc library.
+The following softwares use the HikiDoc library or the HikiDoc format.
 
 :[[tDiary|http://www.tdiary.org/]]:a Weblog/Web-diary software
 :[[Hiki|http://hikiwiki.org/]]:a powerful and fast wiki clone
 :[[lily|http://lily.sourceforge.jp/]]:a simple CMS
-:[[HikiDoc.pm|http://haro.jp/wiki/index.cgi?page=B%27s+Soft#p2]]:HikiDoc by Perl
+:[[Text::HikiDoc|http://search.cpan.org/perldoc?Text::HikiDoc]]:HikiDoc by Perl
+:[[PikiDoc|http://github.com/moro/piki_doc/]]:a library that you can add plugin functions on HikiDoc
 
 !! License
 

data/README.ja

@@ -41,12 +41,13 @@ Subversion
 
 !! ��Ϣ���륽�եȥ�����
 
-�ʲ��Υ��եȥ������� HikiDoc �饤�֥�꤬�Ѥ����Ƥ��ޤ���
+�ʲ��Υ��եȥ������� HikiDoc �饤�֥�ꡢ�ޤ��� HikiDoc �ե����ޥåȤ��Ѥ����Ƥ��ޤ���
 
 :[[tDiary|http://www.tdiary.org/]]:�������������եȥ�����
 :[[Hiki|http://hikiwiki.org/]]:¿��ǽ���Ĺ�®�� Wiki ��������
 :[[lily|http://lily.sourceforge.jp/]]:����ץ�� CMS (Web �����ȹ��ۥ����ƥ�)
-:[[HikiDoc.pm|http://haro.jp/wiki/index.cgi?page=B%27s+Soft#p2]]:Perl �ˤ�� HikiDoc �μ���
+:[[Text::HikiDoc|http://search.cpan.org/perldoc?Text::HikiDoc]]:Perl �ˤ�� HikiDoc �μ���
+:[[PikiDoc|http://github.com/moro/piki_doc/]]:HikiDoc�Ρ֥ץ饰����׵�ǽ���ɲäǤ���饤�֥��Ǥ�
 
 !! �饤����
 

data/TextFormattingRules

@@ -40,7 +40,7 @@ Words in which this condition is met become a WikiName, and a link is automatica
 **WikiNAME     - All of the letters in NAME are uppercase, so this is not a WikiName
 **fooWikiName  - This begins with "foo", which is in all lowercase, so this is not a WikiName
 
-You can disable an auto WikiName link by prepending ''^'' to the WikiName.
+You can disable an auto WikiName link by putting ''^'' to the WikiName.
 
 *Example statement
 
@@ -120,22 +120,22 @@ Lines beginning with spaces or tabs will be treated as preformatted text.
 
 !Text decoration
 
-Text surrounded by sets of two single quotes ('') is emphasized.
+Text surrounded by sets of two single quotes ('') is emphasised.
 
-Text surrounded by sets of three single quotes (''') is strongly emphasized.
+Text surrounded by sets of three single quotes (''') is strongly emphasised.
 
 Text surrounded by sets of double equal signs (===) is struck out.
 
 *Example statement
 
- If you write like this, it becomes ''emphasized''.
- And if you write like this, it becomes '''strongly emphasized'''.
+ If you write like this, it becomes ''emphasised''.
+ And if you write like this, it becomes '''strongly emphasised'''.
  ==This is dull, but== And struck-out text is supported, too!
 
 *Example output
 
-If you write like this, it becomes ''emphasized''.
-And if you write like this, it becomes '''strongly emphasized'''.
+If you write like this, it becomes ''emphasised''.
+And if you write like this, it becomes '''strongly emphasised'''.
 ==This is dull, but== And struck-out text is supported, too!
 
 !Headings
@@ -302,7 +302,7 @@ Comment lines is not outputted.
 
 One can use a plugin by surrounding text with two pairs of brackets.
 Multiple lines parameter is supported.
-When a line contains plugin only, it is becomes a block plugin,
+When a line contains plugin only, it becomes a block plugin,
 which is not surrounded by <p> ... </p>.
 
 *Example statement

data/lib/hikidoc.rb

@@ -1,3 +1,4 @@
+# -*- coding: utf-8; -*-
 # Copyright (c) 2005, Kazuhiko <kazuhiko@fdiary.net>
 # Copyright (c) 2007 Minero Aoki
 # All rights reserved.
@@ -37,7 +38,7 @@ rescue LoadError
 end
 
 class HikiDoc
-  VERSION = "0.0.3" # FIXME
+  VERSION = "0.0.4" # FIXME
 
   class Error < StandardError
   end
@@ -90,7 +91,7 @@ class HikiDoc
   #
 
   def valid_plugin_syntax?(code)
-    /['"]/ !~ code.gsub(/'(?:[^\\']+|\\.)*'|"(?:[^\\"]+|\\.)*"/m, "")
+    /['"]/ !~ code.gsub(/\\\\/, "").gsub(/\\['"]/,"").gsub(/'[^']*'|"[^"]*"/m, "")
   end
 
   def escape_plugin_blocks(text)
@@ -726,7 +727,7 @@ class HikiDoc
     end
 
     def inline_plugin(src)
-      %Q(<span class="plugin">{{#{src}}}</span>)
+      %Q(<span class="plugin">{{#{escape_html(src)}}}</span>)
     end
 
     #

data/test/run-test.rb

@@ -2,8 +2,12 @@
 
 require "test/unit"
 
-if Test::Unit::AutoRunner.respond_to?(:standalone?)
-  exit Test::Unit::AutoRunner.run($0, File.dirname($0))
+if Test::Unit.respond_to?(:setup_argv)
+  Test::Unit::setup_argv{[File.dirname($0)]}
 else
-  exit Test::Unit::AutoRunner.run(false, File.dirname($0))
+  if Test::Unit::AutoRunner.respond_to?(:standalone?)
+    exit Test::Unit::AutoRunner.run($0, File.dirname($0))
+  else
+    exit Test::Unit::AutoRunner.run(false, File.dirname($0))
+  end
 end

data/test/test_hikidoc.rb

@@ -32,6 +32,29 @@ class HikiDocTestCase < Test::Unit::TestCase
   def test_plugin_with_meta_char
     assert_convert("<div class=\"plugin\">{{hoge(\"a\\\"b\")}}</div>\n",
                    '{{hoge("a\\"b")}}')
+    assert_convert("<div class=\"plugin\">{{hoge(\"&lt;a&gt;\")}}</div>\n",
+                   '{{hoge("<a>")}}')
+    assert_convert("<p>a<span class=\"plugin\">{{hoge(\"&lt;a&gt;\")}}</span></p>\n",
+                   'a{{hoge("<a>")}}')
+  end
+
+  def test_plugin_with_default_syntax
+    # test HikiDoc#valid_plugin_syntax?
+    # default syntax checking pairs of quote like "..." or '...'
+    assert_convert(%q!<p>{{'}}</p>! + "\n",
+		   %q!{{'}}!)
+    assert_convert(%q!<div class="plugin">{{''}}</div>! + "\n",
+		   %q!{{''}}!)
+    assert_convert(%q!<p>{{'"}}</p>! + "\n",
+		   %q!{{'"}}!)
+    assert_convert(%q!<div class="plugin">{{'\''}}</div>! + "\n",
+		   %q!{{'\''}}!)
+    assert_convert(%q!<div class="plugin">{{'abc\\\\'}}</div>! + "\n",
+		   %q!{{'abc\\\\'}}!)
+    assert_convert(%q!<div class="plugin">{{\"""}}</div>! + "\n",
+		   %q!{{\"""}}!)
+    assert_convert(%q!<div class="plugin">{{"ab\c"}}</div>! + "\n",
+		   %q!{{"ab\c"}}!)
   end
 
   def test_plugin_with_custom_syntax

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: hikidoc
 version: !ruby/object:Gem::Version 
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors: 
 - Kazuhiko
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-08-26 00:00:00 +09:00
+date: 2009-08-17 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -22,7 +22,10 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 1.7.0
     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)."
+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: 
 - kazuhiko@fdiary.net
 executables: 
@@ -47,6 +50,8 @@ files:
 - test/test_hikidoc.rb
 has_rdoc: true
 homepage: http://rubyforge.org/projects/hikidoc/
+licenses: []
+
 post_install_message: 
 rdoc_options: 
 - --main
@@ -68,9 +73,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: hikidoc
-rubygems_version: 1.2.0
+rubygems_version: 1.3.4
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: "'HikiDoc' is a text-to-HTML conversion tool for web writers."
 test_files: 
 - test/test_hikidoc.rb