hikidoc 0.0.4 → 0.0.6

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 27cec17d6692baec7703efada8f3797f70bcbf17
+  data.tar.gz: 032cab997e685c3330942506f263bc2e0616d49a
+SHA512:
+  metadata.gz: 824abf9b36727cefb838c1b29b5548b0c2d1f21d5e1823f6e9fa17e1bcc4c37489e6e72d5b91b32ff4d25c3dc1f3f32632374641f98adeade01d550b2cf5add1
+  data.tar.gz: 57aad57567d009f90f3dcc5e109a00436b608ddba285f9f63bb22f22ee4793081c6b8173d06dd74b9a0fd73dd10a06905af6183cb020e8c28f19a30bb594cf5f

data/.gitignore

@@ -0,0 +1,17 @@
+*.gem
+*.rbc
+.bundle
+.config
+.yardoc
+Gemfile.lock
+InstalledFiles
+_yardoc
+coverage
+doc/
+lib/bundler/man
+pkg
+rdoc
+spec/reports
+test/tmp
+test/version_tmp
+tmp

data/Gemfile

@@ -0,0 +1,4 @@
+source 'https://rubygems.org'
+
+# Specify your gem's dependencies in hikidoc.gemspec
+gemspec

data/NEWS

@@ -0,0 +1,30 @@
+! NEWS
+
+!! Changes 0.0.6 from 0.0.5: 2010-08-28
+
+* fix missing NEWS.ja for packaging
+
+!! Changes 0.0.5 from 0.0.4: 2010-08-26
+
+* fix a bug: strings after non-WikiName expression are ignored
+* new text decoration ``monospaced text``
+* fix rake failure with Hoe 1.9.0 or later
+* add syntax highlighting with google-code-prettify
+
+!! Changes 0.0.4 from 0.0.3: 2009-08-17
+
+* escape collectly in inline_plugin same as block_plugin does.
+* fix a DoS vulnerability processing a plugin expression.
+
+!! Changes 0.0.3 from 0.0.2: 2008-08-25
+
+* fix warning message "Could not find main page README.txt" at installation via gem
+
+!! Changes 0.0.2 from 0.0.1: 2008-08-11
+
+* fix a bug: an inline that is inside of a modifier inline do not works
+* add a option "--no-wikiname" to `hikidoc' command
+* correct URI scheme behavior of InterWikiName
+* add some tests
+* add a Rake task "coverage" (requires rcov)
+

data/NEWS.ja

@@ -0,0 +1,30 @@
+! NEWS.ja
+
+!! 0.0.5����0.0.6���ѹ���: 2010-08-28
+
+* �ѥå���������NEWS.ja��ϳ��Ƥ��ޤ��Τ���
+
+!! 0.0.4����0.0.5���ѹ���: 2010-08-26
+
+* Ʊ��Ԥ˴ޤޤ����WikiNameɽ���ʹߤ�ʸ�������Ϥ���ʤ��Х�����
+* ������ʸ���ν���``����ɽ��``���ɲ�
+* Hoe 1.9.0 �ޤ��Ϥ���ʹߤ�rake�����Ԥ����������
+* google-code-prettify�ǤΥ��󥿥å����ϥ��饤�Ȥ��ɲ�
+
+!! 0.0.3����0.0.4���ѹ���: 2009-08-17
+
+* inline_plugin��block_pluginƱ�ͤ˥��������פ���褦�˽���
+* �ץ饰����ɽ���β��ˤ�����DoS�ȼ������Ф��뽤��
+
+!! 0.0.2����0.0.3���ѹ���: 2008-08-25
+
+* gem����Υ��󥹥ȡ������"Could not find main page README.txt"�Ȥ����ٹ��å����������Ϥ����������
+
+!! 0.0.1����0.0.2���ѹ���: 2008-08-11
+
+* �����ϥ���饤����Υ���饤��ˡ��Ÿ������ʤ��Х�����
+* hikidoc���ޥ�ɤ�--no-wikiname���ץ������ɲ�
+* InterWikiName��URI scheme�Ȥ��ư�����Τ�http(s),file,ftp�˸��ꤹ��褦����
+* �ƥ��Ȥ򶯲�
+* Rake������coverage���ɲá���rcov��
+

data/README

@@ -51,6 +51,7 @@ The following softwares use the HikiDoc library or the HikiDoc format.
 :[[lily|http://lily.sourceforge.jp/]]:a simple CMS
 :[[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
+:[[mail2weblog|http://sourceforge.jp/projects/mail2weblog/wiki/FrontPage]]:a blog system via mobile phone email
 
 !! License
 

data/README.ja

@@ -48,6 +48,7 @@ Subversion
 :[[lily|http://lily.sourceforge.jp/]]:����ץ�� CMS (Web �����ȹ��ۥ����ƥ�)
 :[[Text::HikiDoc|http://search.cpan.org/perldoc?Text::HikiDoc]]:Perl �ˤ�� HikiDoc �μ���
 :[[PikiDoc|http://github.com/moro/piki_doc/]]:HikiDoc�Ρ֥ץ饰����׵�ǽ���ɲäǤ���饤�֥��Ǥ�
+:[[mail2weblog|http://sourceforge.jp/projects/mail2weblog/wiki/FrontPage]]:�ⵡǽ�᡼����Ʒ���֥���
 
 !! �饤����
 

data/Rakefile

@@ -1,84 +1,8 @@
-# -*- ruby -*-
+require "bundler/gem_tasks"
+require 'rake/testtask'
 
-require 'rubygems'
-require 'hoe'
-
-require 'find'
-
-base_dir = File.expand_path(File.dirname(__FILE__))
-$LOAD_PATH.unshift(File.join(base_dir, 'lib'))
-require 'hikidoc'
-
-truncate_base_dir = Proc.new do |x|
-  x.gsub(/\A#{Regexp.escape(base_dir + File::SEPARATOR)}/, '')
-end
-
-manifest = File.join(base_dir, "Manifest.txt")
-manifest_contents = []
-base_dir_included_components = %w(COPYING README README.ja Rakefile
-                                  TextFormattingRules TextFormattingRules.ja
-                                  setup.rb)
-excluded_components = %w(.svn doc log pkg)
-Find.find(base_dir) do |target|
-  target = truncate_base_dir[target]
-  components = target.split(File::SEPARATOR)
-  if components.size == 1 and !File.directory?(target)
-    next unless base_dir_included_components.include?(components[0])
-  end
-  Find.prune if (excluded_components - components) != excluded_components
-  manifest_contents << target if File.file?(target)
-end
-
-File.open(manifest, "w") do |f|
-  f.puts manifest_contents.sort.join("\n")
-end
-at_exit do
-  FileUtils.rm_f(manifest)
-end
-
-ENV["VERSION"] ||= HikiDoc::VERSION
-project = Hoe.new('hikidoc', HikiDoc::VERSION) do |project|
-  project.author = ['Kazuhiko']
-  project.email = ['kazuhiko@fdiary.net']
-  project.description = project.paragraphs_of('README', 2).join
-  project.summary = project.description.split(/(\.)/, 3)[0, 2].join
-  project.url = 'http://rubyforge.org/projects/hikidoc/'
-  project.test_globs = ['test/test_*.rb']
-  project.rdoc_pattern = /(?:^(?:lib|bin)|\AREADME\z)/
-  project.changes = File.read("NEWS").split(/^!! .*$/)[1].strip
-end
-
-desc 'Tag the repository for release.'
-task :tag do
-  version = HikiDoc::VERSION
-  message = "Released HikiDoc #{version}!"
-  base = "svn+ssh://rubyforge.org/var/svn/hikidoc/"
-  sh 'svn', 'copy', '-m', message, "#{base}trunk", "#{base}tags/#{version}"
-end
-
-begin
-  require 'rcov/rcovtask'
-
-  desc "Analyze code coverage of the unit tests."
-  Rcov::RcovTask.new(:coverage) do |t|
-    t.test_files = FileList[project.test_globs]
-    t.verbose = true
-    t.rcov_opts << "--text-report"
-    begin
-      require "rubygems"
-      t.rcov_opts << "--exclude=^#{Regexp.escape(Gem.dir)}"
-    rescue LoadError
-    end
-  end
-rescue LoadError
-end
-
-
-# Fix Hoe's uncustomizable options
-rdoc_main = "lib/hikidoc.rb"
-project.spec.rdoc_options.each do |option|
-  option.replace(rdoc_main) if option == "README.txt"
-end
-ObjectSpace.each_object(Rake::RDocTask) do |task|
-  task.main = rdoc_main if task.main == "README.txt"
+Rake::TestTask.new do |t|
+  t.libs << "test"
+  t.test_files = FileList['test/**/*_test.rb']
+  t.verbose = true
 end

data/TextFormattingRules

@@ -126,17 +126,21 @@ Text surrounded by sets of three single quotes (''') is strongly emphasised.
 
 Text surrounded by sets of double equal signs (===) is struck out.
 
+Text surrounded by sets of double backquotes (``) is inline literal.
+
 *Example statement
 
  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!
+ If you write like this, it becomes ``monospaced text``.
 
 *Example output
 
 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!
+If you write like this, it becomes ``monospaced text``.
 
 !Headings
 

data/TextFormattingRules.ja

@@ -126,17 +126,21 @@ http://jp.rubyist.net/theme/clover/clover_h1.png
 
 ��=��2�ĤǤϤ������ʬ�ϼ�����ˤʤ�ޤ���
 
+��`��2�ĤǤϤ������ʬ������ɽ���ˤʤ�ޤ���
+
 *������
 
  ���Τ褦�ˤ����''��Ĵ''�ˤʤ�ޤ���
  �����ơ����Τ褦�ˤ����'''����˶�Ĵ'''����ޤ���
  ==���뤤����==����ˡ����ä����⥵�ݡ��Ȥ��Ƥ��ޤ���
+ �ޤ��ޤ������Τ褦�ˤ����''����ɽ��''�ˤʤ�ޤ���
 
 *������
 
 ���Τ褦�ˤ����''��Ĵ''�ˤʤ�ޤ���
 �����ơ����Τ褦�ˤ����'''����˶�Ĵ'''����ޤ���
 ==���뤤����==����ˡ����ä����⥵�ݡ��Ȥ��Ƥ��ޤ���
+�ޤ��ޤ������Τ褦�ˤ����''����ɽ��''�ˤʤ�ޤ���
 
 !����
 

data/hikidoc.gemspec

@@ -0,0 +1,23 @@
+# coding: utf-8
+lib = File.expand_path('../lib', __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require 'hikidoc'
+
+Gem::Specification.new do |spec|
+  spec.name          = "hikidoc"
+  spec.version       = HikiDoc::VERSION
+  spec.authors       = ['Kazuhiko', "SHIBATA Hiroshi"]
+  spec.email         = ['kazuhiko@fdiary.net', "shibata.hiroshi@gmail.com"]
+  spec.description   = %q{'HikiDoc' is a text-to-HTML conversion tool for web writers.}
+  spec.summary       = %q{'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).}
+  spec.homepage      = "https://github.com/hiki/hikidoc"
+  spec.license       = "MIT"
+
+  spec.files         = `git ls-files`.split($/)
+  spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
+  spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
+  spec.require_paths = ["lib"]
+
+  spec.add_development_dependency "bundler"
+  spec.add_development_dependency "rake"
+end

data/lib/hikidoc.rb

@@ -1,4 +1,4 @@
-# -*- coding: utf-8; -*-
+# -*- coding: utf-8 -*-
 # Copyright (c) 2005, Kazuhiko <kazuhiko@fdiary.net>
 # Copyright (c) 2007 Minero Aoki
 # All rights reserved.
@@ -38,7 +38,7 @@ rescue LoadError
 end
 
 class HikiDoc
-  VERSION = "0.0.4" # FIXME
+  VERSION = "0.0.6" # FIXME
 
   class Error < StandardError
   end
@@ -408,7 +408,7 @@ class HikiDoc
 
       link, uri, mod, wiki_name = m[1, 4]
       if wiki_name and wiki_name[0, 1] == "^"
-        pending_str = m.pre_match + wiki_name[1..-1]
+        pending_str = m.pre_match + wiki_name[1..-1] + str
         next
       end
 
@@ -437,7 +437,7 @@ class HikiDoc
   end
 
   def compile_bracket_link(link)
-    if m = /\A(?>[^|\\]+|\\.)*\|/.match(link)
+    if m = /\A(.*)\|/.match(link)
       title = m[0].chop
       uri = m.post_match
       fixed_uri = fix_uri(uri)
@@ -479,23 +479,26 @@ class HikiDoc
   IMAGE_EXTS = %w(.jpg .jpeg .gif .png)
 
   def image?(uri)
-    IMAGE_EXTS.include?(File.extname(uri).downcase)
+    IMAGE_EXTS.include?(uri[/\.[^.]+\z/].to_s.downcase)
   end
 
   STRONG = "'''"
   EM = "''"
   DEL = "=="
+  TT = "``"
 
   STRONG_RE = /'''.+?'''/
   EM_RE     = /''.+?''/
   DEL_RE    = /==.+?==/
+  TT_RE    = /``.+?``/
 
-  MODIFIER_RE = Regexp.union(STRONG_RE, EM_RE, DEL_RE)
+  MODIFIER_RE = Regexp.union(STRONG_RE, EM_RE, DEL_RE, TT_RE)
 
   MODTAG = {
     STRONG => "strong",
     EM     => "em",
-    DEL    => "del"
+    DEL    => "del",
+    TT     => 'tt'
   }
 
   def compile_modifier(str)
@@ -525,6 +528,8 @@ class HikiDoc
       return str[0, 2], str[2...-2]
     when /\A==/
       return str[0, 2], str[2...-2]
+    when /\A``/
+      return str[0, 2], str[2...-2]
     else
       raise UnexpectedError, "must not happen: #{str.inspect}"
     end
@@ -673,6 +678,8 @@ class HikiDoc
           @f.puts convertor.convert(str)
           return
         rescue NameError, RuntimeError
+          @f.puts %Q|<pre class="prettyprint">#{text(str)}</pre>|
+          return
         end
       end
       preformatted(text(str))
@@ -722,6 +729,10 @@ class HikiDoc
       "<del>#{item}</del>"
     end
 
+    def tt(item)
+      "<tt>#{item}</tt>"
+    end
+
     def text(str)
       escape_html(str)
     end

data/test/{test_hikidoc.rb → hikidoc_test.rb}

@@ -226,6 +226,8 @@ TEST}}
                    "[[Hiki|http:hikiwiki.html]]")
     assert_convert(%Q|<p><img src="http://hikiwiki.org/img.png" alt="img.png" /></p>\n|,
                    "http://hikiwiki.org/img.png")
+    assert_convert(%Q|<p><img src="http://hikiwiki.org:80/img.png" alt="img.png" /></p>\n|,
+                   "http://hikiwiki.org:80/img.png")
     assert_convert(%Q|<p><a href="http://hikiwiki.org/ja/?c=edit;p=Test">| +
                    %Q|http://hikiwiki.org/ja/?c=edit;p=Test</a></p>\n|,
                    "http://hikiwiki.org/ja/?c=edit;p=Test")
@@ -246,6 +248,8 @@ TEST}}
                    "[[&]]")
     assert_convert(%Q|<p><a href="aa">aa</a>bb<a href="cc">cc</a></p>\n|,
                    "[[aa]]bb[[cc]]")
+    assert_convert(%Q!<p><a href="aa">a|a</a></p>\n!,
+                   "[[a|a|aa]]")
   end
 
   def test_inter_wiki_name
@@ -295,6 +299,8 @@ TEST}}
                    "^WikiName",
                    :use_wiki_name => false,
                    :use_not_wiki_name => false)
+    assert_convert("<p>foo WikiName bar</p>\n",
+                   "foo ^WikiName bar")
   end
 
   def test_use_wiki_name_option
@@ -359,6 +365,9 @@ TEST}}
     assert_convert("<dl>\n<dt>foo</dt>\n" +
                    "<dd><strong>bar</strong></dd>\n</dl>\n",
                    ":foo:'''bar'''")
+    assert_convert("<dl>\n<dt>foo</dt>\n" +
+                   "<dd><tt>bar</tt></dd>\n</dl>\n",
+                   ":foo:``bar``")
   end
 
   def test_definition_with_modifier_link
@@ -370,6 +379,10 @@ TEST}}
                    "<strong><a href=\"http://hikiwiki.org/\">Hiki</a></strong>" +
                    "</dd>\n</dl>\n",
                    ":Website:'''[[Hiki|http://hikiwiki.org/]]'''")
+    assert_convert("<dl>\n<dt>Website</dt>\n<dd>" +
+                   "<tt><a href=\"http://hikiwiki.org/\">Hiki</a></tt>" +
+                   "</dd>\n</dl>\n",
+                   ":Website:``[[Hiki|http://hikiwiki.org/]]``")
   end
 
   def test_table
@@ -409,6 +422,10 @@ TEST}}
                    "'''foo''' and '''bar'''")
     assert_convert("<p><em>foo</em> and <em>bar</em></p>\n",
                    "''foo'' and ''bar''")
+    assert_convert("<p><tt>foo</tt></p>\n",
+                   "``foo``")
+    assert_convert("<p><tt>foo==bar</tt>baz==</p>\n",
+                   "``foo==bar``baz==")
   end
 
   def test_nested_modifier
@@ -423,6 +440,8 @@ TEST}}
                    "[['''Hiki'''|http://hikiwiki.org/]]")
     assert_convert("<p><strong><a href=\"http://hikiwiki.org/\">Hiki</a></strong></p>\n",
                    "'''[[Hiki|http://hikiwiki.org/]]'''")
+    assert_convert("<p><tt><a href=\"http://hikiwiki.org/\">Hiki</a></tt></p>\n",
+                   "``[[Hiki|http://hikiwiki.org/]]``")
   end
 
   def test_pre_and_plugin
@@ -437,18 +456,34 @@ TEST}}
   def test_plugin_in_modifier
     assert_convert("<p><strong><span class=\"plugin\">{{foo}}</span></strong></p>\n",
                    "'''{{foo}}'''")
+    assert_convert("<p><tt><span class=\"plugin\">{{foo}}</span></tt></p>\n",
+                   "``{{foo}}``")
   end
 
-  if Object.const_defined?(:Syntax)
-
-    def test_syntax_ruby
+  def test_syntax_ruby
+    if Object.const_defined?(:Syntax)
       assert_convert("<pre><span class=\"keyword\">class </span><span class=\"class\">A</span>\n  <span class=\"keyword\">def </span><span class=\"method\">foo</span><span class=\"punct\">(</span><span class=\"ident\">bar</span><span class=\"punct\">)</span>\n  <span class=\"keyword\">end</span>\n<span class=\"keyword\">end</span></pre>\n",
                      "<<< ruby\nclass A\n  def foo(bar)\n  end\nend\n>>>")
       assert_convert("<pre><span class=\"keyword\">class </span><span class=\"class\">A</span>\n  <span class=\"keyword\">def </span><span class=\"method\">foo</span><span class=\"punct\">(</span><span class=\"ident\">bar</span><span class=\"punct\">)</span>\n  <span class=\"keyword\">end</span>\n<span class=\"keyword\">end</span></pre>\n",
                      "<<< Ruby\nclass A\n  def foo(bar)\n  end\nend\n>>>")
       assert_convert("<pre><span class=\"punct\">'</span><span class=\"string\">a&lt;&quot;&gt;b</span><span class=\"punct\">'</span></pre>\n",
                      "<<< ruby\n'a<\">b'\n>>>")
+
+      # redefine method for below tests
+      class << Syntax::Convertors::HTML
+	def for_syntax(syntax)
+	  raise
+	end
+      end
     end
+
+    # use google-code-prettify
+    assert_convert("<pre class=\"prettyprint\">class A\n  def foo(bar)\n  end\nend</pre>\n",
+                   "<<< ruby\nclass A\n  def foo(bar)\n  end\nend\n>>>")
+    assert_convert("<pre class=\"prettyprint\">class A\n  def foo(bar)\n  end\nend</pre>\n",
+                   "<<< Ruby\nclass A\n  def foo(bar)\n  end\nend\n>>>")
+    assert_convert("<pre class=\"prettyprint\">'a&lt;\"&gt;b'</pre>\n",
+                   "<<< ruby\n'a<\">b'\n>>>")
   end
 
   def test_plugin_in_pre_with_header