RubyGems - pseudohikiparser - Versions diffs - 0.0.3 → 0.0.4.develop - Mend

pseudohikiparser 0.0.3 → 0.0.4.develop

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (27) hide show

checksums.yaml +4 -4
data/README.ja.md +132 -8
data/README.md +134 -10
data/lib/htmlelement.rb +42 -42
data/lib/pseudohiki/autolink.rb +60 -0
data/lib/pseudohiki/blockparser.rb +233 -125
data/lib/pseudohiki/converter.rb +140 -81
data/lib/pseudohiki/htmlformat.rb +156 -82
data/lib/pseudohiki/htmlplugin.rb +9 -28
data/lib/pseudohiki/inlineparser.rb +21 -24
data/lib/pseudohiki/markdownformat.rb +94 -98
data/lib/pseudohiki/plaintextformat.rb +67 -57
data/lib/pseudohiki/sinatra_helpers.rb +23 -0
data/lib/pseudohiki/treestack.rb +4 -4
data/lib/pseudohiki/utils.rb +1 -2
data/lib/pseudohiki/version.rb +1 -1
data/lib/pseudohikiparser.rb +49 -28
data/test/test_autolink.rb +104 -0
data/test/test_blockparser.rb +78 -11
data/test/test_htmlformat.rb +436 -0
data/test/test_htmlplugin.rb +43 -0
data/test/test_markdownformat.rb +156 -3
data/test/test_plaintextformat.rb +85 -0
data/test/test_pseudohiki2html.rb +82 -0
data/test/test_pseudohikiparser.rb +286 -0
data/test/test_utils.rb +1 -1
metadata +22 -4

data/test/test_plaintextformat.rb CHANGED Viewed

@@ -265,4 +265,89 @@ TEXT
     assert_equal(expected_text_in_verbose_mode, PlainTextFormat.format(tree, { :verbose_mode => true }).to_s)
     assert_equal(expected_text, PlainTextFormat.format(tree, { :verbose_mode => false }).to_s)
   end
+  def test_without_sectioning_node
+        text = <<TEXT
+! Main title
+!! first title in header
+paragraph
+!! second title in header
+paragraph2
+!! first subtitle in main part
+paragraph3
+paragraph4
+TEXT
+    expected_text = <<HTML
+ Main title
+ first title in header
+paragraph
+ second title in header
+paragraph2
+ first subtitle in main part
+paragraph3
+paragraph4
+HTML
+    tree = BlockParser.parse(text.lines.to_a)
+    assert_equal(expected_text, PlainTextFormat.format(tree, { :verbose_mode => false }).to_s)
+  end
+  def test_sectioning_node
+        text = <<TEXT
+! Main title
+//@begin[header]
+!! first title in header
+paragraph
+!! second title in header
+paragraph2
+//@end[header]
+!! first subtitle in main part
+paragraph3
+//@begin[#footer]
+paragraph4
+//@end[#footer]
+TEXT
+    expected_text = <<HTML
+ Main title
+ first title in header
+paragraph
+ second title in header
+paragraph2
+ first subtitle in main part
+paragraph3
+paragraph4
+HTML
+    tree = BlockParser.parse(text.lines.to_a)
+    assert_equal(expected_text, PlainTextFormat.format(tree, { :verbose_mode => false }).to_s)
+  end
 end

data/test/test_pseudohiki2html.rb CHANGED Viewed

@@ -4,6 +4,7 @@ require 'stringio'
 require 'shellwords'
 require 'minitest/autorun'
 require 'pseudohiki/converter'
+require 'pseudohiki/autolink'
 def set_argv(command_line_str)
   ARGV.replace Shellwords.split(command_line_str)
@@ -378,4 +379,85 @@ GFM
     assert_equal(output, html)
   end
+  def test_with_wikiname
+    current_auto_linker = BlockParser.auto_linker
+    set_argv("--with-wikiname wikipage.txt")
+    options = OptionManager.new
+    options.set_options_from_command_line
+    assert_equal(AutoLink::WikiName, BlockParser.auto_linker.class)
+    BlockParser.auto_linker = current_auto_linker
+  end
+  def test_no_automatical_link_in_verbatim
+    verbatim_block_text = <<TEXT.each_line.to_a
+a link in a paragraph http://www.example.org/
+<<<
+http://www.example.org/
+>>>
+TEXT
+    expected_html = <<HTML
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html>
+<html lang="en" xml:lang="en" xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta charset="UTF-8" />
+<title>wikipage</title>
+<link href="css/with_toc.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+<p>
+a link in a paragraph <a href="http://www.example.org/">http://www.example.org/</a>
+</p>
+<pre>
+<a href="http://www.example.org/">http://www.example.org/</a>
+</pre>
+</body>
+</html>
+HTML
+    expected_html_without_auto_link = <<HTML
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html>
+<html lang="en" xml:lang="en" xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta charset="UTF-8" />
+<title>wikipage</title>
+<link href="css/with_toc.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+<p>
+a link in a paragraph http://www.example.org/
+</p>
+<pre>
+http://www.example.org/
+</pre>
+</body>
+</html>
+HTML
+    set_argv("-fh5 -c css/with_toc.css wikipage.txt")
+    options = OptionManager.new
+    options.set_options_from_command_line
+    composed_html = PageComposer.new(options).compose_html(verbatim_block_text).to_s
+    assert_equal(expected_html, composed_html)
+    set_argv("-fh5 -c css/with_toc.css wikipage.txt")
+    options = OptionManager.new
+    options.set_options_from_command_line
+    current_auto_linker = BlockParser.auto_linker
+    BlockParser.auto_linker = AutoLink::Off
+    Xhtml5Format.auto_link_in_verbatim = false
+    composed_html_without_auto_link = PageComposer.new(options).compose_html(verbatim_block_text).to_s
+    assert_equal(expected_html_without_auto_link, composed_html_without_auto_link)
+    BlockParser.auto_linker = current_auto_linker
+    Xhtml5Format.auto_link_in_verbatim = true
+  end
 end

data/test/test_pseudohikiparser.rb CHANGED Viewed

@@ -1,6 +1,7 @@
 #!/usr/bin/env ruby
 require 'minitest/autorun'
 require 'pseudohikiparser'
+require 'pseudohiki/autolink'
 class TC_MarkDownFormat < MiniTest::Unit::TestCase
   include PseudoHiki
@@ -16,6 +17,8 @@ the first paragraph with ''inline'' ``tags``
 the second paragraph with ==block== [[inline|#id]] tags
 TEXT
+    @text_with_wikiname = 'a line with WikiName and a [[normal link|http://www.example.org/]]'
   end
   def test_to_html
@@ -139,4 +142,287 @@ HTML
     assert_equal(expected_html_table, table_with_id)
   end
+  def test_format_with_wikiname
+    expected_html_with_wikiname = <<HTML
+<p>
+a line with <a href="WikiName">WikiName</a> and a <a href="http://www.example.org/">normal link</a></p>
+HTML
+    expected_html_without_wikiname = <<HTML
+<p>
+a line with WikiName and a <a href="http://www.example.org/">normal link</a></p>
+HTML
+    assert_equal(expected_html_with_wikiname,
+                 Format.format(@text_with_wikiname, :html, nil, AutoLink::WikiName.new))
+    assert_equal(expected_html_without_wikiname,
+                 Format.format(@text_with_wikiname, :html))
+    BlockParser.auto_linker = AutoLink::WikiName.new
+    assert_equal(expected_html_with_wikiname,
+                 Format.format(@text_with_wikiname, :html))
+    BlockParser.auto_linker = nil
+    assert_equal(expected_html_without_wikiname,
+                 Format.format(@text_with_wikiname, :html))
+  end
+  def test_format_without_auto_link_in_verbatim
+    verbatim_text_with_url = <<TEXT
+ a verbatim line with http://www.example.org/ and WikiName
+TEXT
+    expected_html_without_auto_link_in_verbatim = <<HTML
+<pre>
+a verbatim line with http://www.example.org/ and WikiName
+</pre>
+HTML
+    assert_equal(expected_html_without_auto_link_in_verbatim,
+                 Format.format(verbatim_text_with_url, :html, nil, AutoLink::Off))
+  end
+  def test_format_with_auto_link_in_verbatim
+    verbatim_text_with_url = <<TEXT
+ a verbatim line with http://www.example.org/ and WikiName
+TEXT
+    expected_html_with_auto_link_in_verbatim = <<HTML
+<pre>
+a verbatim line with <a href="http://www.example.org/">http://www.example.org/</a> and WikiName
+</pre>
+HTML
+    assert_equal(expected_html_with_auto_link_in_verbatim,
+                 Format.format(verbatim_text_with_url, :html, nil, AutoLink::URL))
+    assert_equal(expected_html_with_auto_link_in_verbatim,
+                 Format.format(verbatim_text_with_url, :html, nil, nil))
+  end
+  def test_to_html_with_wikiname
+    wikiname_linker = AutoLink::WikiName.new
+    expected_html_with_wikiname = <<HTML
+<p>
+a line with <a href="WikiName">WikiName</a> and a <a href="http://www.example.org/">normal link</a></p>
+HTML
+    expected_html_without_wikiname = <<HTML
+<p>
+a line with WikiName and a <a href="http://www.example.org/">normal link</a></p>
+HTML
+    assert_equal(expected_html_with_wikiname,
+                 Format.to_html(@text_with_wikiname, wikiname_linker))
+    assert_equal(expected_html_without_wikiname,
+                 Format.to_html(@text_with_wikiname))
+    BlockParser.auto_linker = wikiname_linker
+    assert_equal(expected_html_with_wikiname,
+                 Format.to_html(@text_with_wikiname))
+    BlockParser.auto_linker = nil
+    assert_equal(expected_html_without_wikiname,
+                 Format.to_html(@text_with_wikiname))
+  end
+  def test_to_xhtml_with_wikiname
+    wikiname_linker = AutoLink::WikiName.new
+    expected_html_with_wikiname = <<HTML
+<p>
+a line with <a href="WikiName">WikiName</a> and a <a href="http://www.example.org/">normal link</a></p>
+HTML
+    expected_html_without_wikiname = <<HTML
+<p>
+a line with WikiName and a <a href="http://www.example.org/">normal link</a></p>
+HTML
+    assert_equal(expected_html_with_wikiname,
+                 Format.to_xhtml(@text_with_wikiname, wikiname_linker))
+    assert_equal(expected_html_without_wikiname,
+                 Format.to_xhtml(@text_with_wikiname))
+    BlockParser.auto_linker = wikiname_linker
+    assert_equal(expected_html_with_wikiname,
+                 Format.to_xhtml(@text_with_wikiname))
+    BlockParser.auto_linker = nil
+    assert_equal(expected_html_without_wikiname,
+                 Format.to_xhtml(@text_with_wikiname))
+  end
+  def test_to_html5_with_wikiname
+    wikiname_linker = AutoLink::WikiName.new
+    expected_html_with_wikiname = <<HTML
+<p>
+a line with <a href="WikiName">WikiName</a> and a <a href="http://www.example.org/">normal link</a></p>
+HTML
+    expected_html_without_wikiname = <<HTML
+<p>
+a line with WikiName and a <a href="http://www.example.org/">normal link</a></p>
+HTML
+    assert_equal(expected_html_with_wikiname,
+                 Format.to_html5(@text_with_wikiname, wikiname_linker))
+    assert_equal(expected_html_without_wikiname,
+                 Format.to_html5(@text_with_wikiname))
+    BlockParser.auto_linker = wikiname_linker
+    assert_equal(expected_html_with_wikiname,
+                 Format.to_html5(@text_with_wikiname))
+    BlockParser.auto_linker = nil
+    assert_equal(expected_html_without_wikiname,
+                 Format.to_html5(@text_with_wikiname))
+  end
+  def test_to_plain_with_wikiname
+    wikiname_linker = AutoLink::WikiName.new
+    expected_html_with_wikiname = <<HTML
+a line with WikiName and a normal link
+HTML
+    expected_html_without_wikiname = <<HTML
+a line with WikiName and a normal link
+HTML
+    assert_equal(expected_html_with_wikiname,
+                 Format.to_plain(@text_with_wikiname, wikiname_linker))
+    assert_equal(expected_html_without_wikiname,
+                 Format.to_plain(@text_with_wikiname))
+    BlockParser.auto_linker = wikiname_linker
+    assert_equal(expected_html_with_wikiname,
+                 Format.to_plain(@text_with_wikiname))
+    BlockParser.auto_linker = nil
+    assert_equal(expected_html_without_wikiname,
+                 Format.to_plain(@text_with_wikiname))
+  end
+  def test_to_markdown_with_wikiname
+    wikiname_linker = AutoLink::WikiName.new
+    expected_html_with_wikiname = <<HTML
+a line with [WikiName](WikiName) and a [normal link](http://www.example.org/)
+HTML
+    expected_html_without_wikiname = <<HTML
+a line with WikiName and a [normal link](http://www.example.org/)
+HTML
+    assert_equal(expected_html_with_wikiname,
+                 Format.to_markdown(@text_with_wikiname, wikiname_linker))
+    assert_equal(expected_html_without_wikiname,
+                 Format.to_markdown(@text_with_wikiname))
+    BlockParser.auto_linker = wikiname_linker
+    assert_equal(expected_html_with_wikiname,
+                 Format.to_markdown(@text_with_wikiname))
+    BlockParser.auto_linker = nil
+    assert_equal(expected_html_without_wikiname,
+                 Format.to_markdown(@text_with_wikiname))
+  end
+  def test_to_gfm_with_wikiname
+    wikiname_linker = AutoLink::WikiName.new
+    expected_html_with_wikiname = <<HTML
+a line with [WikiName](WikiName) and a [normal link](http://www.example.org/)
+HTML
+    expected_html_without_wikiname = <<HTML
+a line with WikiName and a [normal link](http://www.example.org/)
+HTML
+    assert_equal(expected_html_with_wikiname,
+                 Format.to_gfm(@text_with_wikiname, wikiname_linker))
+    assert_equal(expected_html_without_wikiname,
+                 Format.to_gfm(@text_with_wikiname))
+    BlockParser.auto_linker = wikiname_linker
+    assert_equal(expected_html_with_wikiname,
+                 Format.to_gfm(@text_with_wikiname))
+    BlockParser.auto_linker = nil
+    assert_equal(expected_html_without_wikiname,
+                 Format.to_gfm(@text_with_wikiname))
+  end
+  def test_to_html5_without_auto_link
+    current_linker = BlockParser.auto_linker
+    link_off_linker = AutoLink::Off
+    text_with_urls = <<TEXT
+a link in a paragraph http://www.example.org/
+<<<
+http://www.example.org/
+>>>
+TEXT
+    expected_html_with_links = <<HTML
+<p>
+a link in a paragraph <a href="http://www.example.org/">http://www.example.org/</a>
+</p>
+<pre>
+<a href="http://www.example.org/">http://www.example.org/</a>
+</pre>
+HTML
+    expected_html_without_links = <<HTML
+<p>
+a link in a paragraph http://www.example.org/
+</p>
+<pre>
+http://www.example.org/
+</pre>
+HTML
+    assert_equal(expected_html_without_links,
+                 Format.to_html5(text_with_urls, link_off_linker))
+    assert_equal(expected_html_with_links,
+                 Format.to_html5(text_with_urls))
+    BlockParser.auto_linker = link_off_linker
+    assert_equal(expected_html_without_links,
+                 Format.to_html5(text_with_urls))
+    BlockParser.auto_linker = nil
+    assert_equal(expected_html_with_links,
+                 Format.to_html5(text_with_urls))
+    BlockParser.auto_linker = current_linker
+  end
 end

data/test/test_utils.rb CHANGED Viewed

@@ -28,7 +28,7 @@ TEXT
     tree = PseudoHiki::BlockParser.parse(@input_text)
     nodes = PseudoHiki::Utils::NodeCollector.select(tree) do |node|
       node.kind_of?(PseudoHiki::BlockParser::HeadingLeaf) and
-        node.nominal_level == 2 and
+        node.level == 2 and
         node.node_id
     end

metadata CHANGED Viewed

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pseudohikiparser
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4.develop
 platform: ruby
 authors:
 - HASHIMOTO, Naoki
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-05-10 00:00:00.000000000 Z
+date: 2015-09-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -52,6 +52,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.3.1
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.31'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.31'
 description: PseudoHikiParser is a parser of texts written in a Hiki like notation,
   and coverts them into HTML or other formats.
 email:
@@ -67,6 +81,7 @@ files:
 - bin/pseudohiki2html.rb
 - lib/htmlelement.rb
 - lib/htmlelement/htmltemplate.rb
+- lib/pseudohiki/autolink.rb
 - lib/pseudohiki/blockparser.rb
 - lib/pseudohiki/converter.rb
 - lib/pseudohiki/htmlformat.rb
@@ -74,10 +89,12 @@ files:
 - lib/pseudohiki/inlineparser.rb
 - lib/pseudohiki/markdownformat.rb
 - lib/pseudohiki/plaintextformat.rb
+- lib/pseudohiki/sinatra_helpers.rb
 - lib/pseudohiki/treestack.rb
 - lib/pseudohiki/utils.rb
 - lib/pseudohiki/version.rb
 - lib/pseudohikiparser.rb
+- test/test_autolink.rb
 - test/test_blockparser.rb
 - test/test_htmlelement.rb
 - test/test_htmlformat.rb
@@ -106,9 +123,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 1.8.7
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project:
 rubygems_version: 2.2.3
@@ -127,5 +144,6 @@ test_files:
 - test/test_markdownformat.rb
 - test/test_htmlformat.rb
 - test/test_htmlplugin.rb
+- test/test_autolink.rb
 - test/test_utils.rb
 - test/test_latexformat.rb