RubyGems - pseudohikiparser - Versions diffs - 0.0.5 → 0.0.6.develop - Mend

pseudohikiparser 0.0.5 → 0.0.6.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 (28) hide show

checksums.yaml +4 -4
data/bin/pseudohiki2html +1 -20
data/lib/htmlelement/htmltemplate.rb +39 -1
data/lib/htmlelement.rb +15 -1
data/lib/pseudohiki/autolink.rb +1 -1
data/lib/pseudohiki/blockparser.rb +119 -18
data/lib/pseudohiki/converter.rb +9 -19
data/lib/pseudohiki/htmlformat.rb +88 -23
data/lib/pseudohiki/htmlplugin.rb +3 -3
data/lib/pseudohiki/inlineparser.rb +29 -18
data/lib/pseudohiki/markdownformat.rb +71 -64
data/lib/pseudohiki/plaintextformat.rb +25 -25
data/lib/pseudohiki/shim.rb +30 -0
data/lib/pseudohiki/sinatra_helpers.rb +23 -0
data/lib/pseudohiki/treestack.rb +4 -4
data/lib/pseudohiki/utils.rb +2 -2
data/lib/pseudohiki/version.rb +1 -1
data/lib/pseudohikiparser.rb +2 -0
data/test/test_blockparser.rb +67 -0
data/test/test_htmlelement.rb +34 -0
data/test/test_htmlelement_utils.rb +11 -0
data/test/test_htmlformat.rb +413 -0
data/test/test_htmltemplate.rb +84 -0
data/test/test_inlineparser.rb +4 -4
data/test/test_markdownformat.rb +157 -4
data/test/test_plaintextformat.rb +85 -0
data/test/test_pseudohiki2html.rb +24 -7
metadata +8 -6

data/test/test_markdownformat.rb CHANGED Viewed

@@ -420,10 +420,10 @@ TEXT
     md_text = <<TEXT
 1. item 1
-1. item 2
-  2. item 2-1
+2. item 2
+  1. item 2-1
   2. item 2-2
-    3. item 2-2-1
+    1. item 2-2-1
 TEXT
@@ -508,7 +508,7 @@ TEXT
 ## heading
 1. item 1
-  2. item 1-1
+  1. item 1-1
 a paragraph for testing a striked through ~~string with an _emphasis_ in it.~~
@@ -518,6 +518,159 @@ TEXT
     assert_equal(md_text, @formatter.format(tree).to_s)
   end
+  def test_decorator_for_verbatim
+    text = <<TEXT
+//@code[ruby]
+ def bonjour!
+   puts "Bonjour!"
+ end
+TEXT
+    gfm_text =<<TEXT
+```ruby
+def bonjour!
+  puts "Bonjour!"
+end
+```
+TEXT
+    md_text = <<TEXT
+    def bonjour!
+      puts "Bonjour!"
+    end
+TEXT
+    tree = BlockParser.parse(text.lines.to_a)
+    assert_equal(gfm_text, @gfm_formatter.format(tree).to_s)
+    assert_equal(md_text, @formatter.format(tree).to_s)
+  end
+  def test_decorator_for_verbatim_block
+    text = <<TEXT
+//@code[ruby]
+<<<
+def bonjour!
+  puts "Bonjour!"
+end
+>>>
+TEXT
+    gfm_text =<<TEXT
+```ruby
+def bonjour!
+  puts "Bonjour!"
+end
+```
+TEXT
+    md_text = <<TEXT
+    def bonjour!
+      puts "Bonjour!"
+    end
+TEXT
+    tree = BlockParser.parse(text.lines.to_a)
+    assert_equal(gfm_text, @gfm_formatter.format(tree).to_s)
+    assert_equal(md_text, @formatter.format(tree).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, @gfm_formatter.format(tree).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, @gfm_formatter.format(tree).to_s)
+  end
   def test_collect_headings
     text = <<TEXT
 !![main-heading] heading

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

@@ -253,21 +253,35 @@ TEXT
     assert_equal(toc_in_html, toc)
   end
-  def test_html_composer_create_style
-    expected_style = <<STYLE
+  def test_embed_css_into_html
+    expected_html = <<HTML
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
+  "http://www.w3.org/TR/html4/loose.dtd">
+<html lang="en">
+<head>
+<meta content="en" http-equiv="Content-Language">
+<meta content="text/html; charset=UTF-8" http-equiv="Content-Type">
+<meta content="text/javascript" http-equiv="Content-Script-Type">
+<title>wikipage</title>
+<link href="default.css" rel="stylesheet" type="text/css">
 <style type="text/css">
+<!--
 h1 {
     margin-left: 0.5em;
 }
+-->
 </style>
-STYLE
+</head>
+<body>
+</body>
+</html>
+HTML
-    set_argv("-c test_data/css/test.css wikipage.txt")
+    set_argv("-C #{File.join(File.dirname(__FILE__), "test_data/css/test.css")} wikipage.txt")
     options = OptionManager.new
     options.parse_command_line_options
-    test_data = File.join(File.dirname(__FILE__), "test_data/css/test.css")
-    style = PageComposer::HtmlComposer.new(options).create_style(test_data).to_s
-    assert_equal(expected_style, style)
+    html = PageComposer.new(options).compose_html("").to_s
+    assert_equal(expected_html, html)
   end
   def test_compose_html
@@ -281,6 +295,9 @@ STYLE
 <link href="css/with_toc.css" rel="stylesheet" type="text/css" />
 </head>
 <body>
+<div class="skip-link">
+<a href="#contents">Skip to Content</a><!-- end of skip-link -->
+</div>
 <section id="main">
 <section id="toc">
 <h2>table of contents</h2>

metadata CHANGED Viewed

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pseudohikiparser
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6.develop
 platform: ruby
 authors:
 - HASHIMOTO, Naoki
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-01-03 00:00:00.000000000 Z
+date: 2016-09-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -90,6 +90,8 @@ files:
 - lib/pseudohiki/inlineparser.rb
 - lib/pseudohiki/markdownformat.rb
 - lib/pseudohiki/plaintextformat.rb
+- lib/pseudohiki/shim.rb
+- lib/pseudohiki/sinatra_helpers.rb
 - lib/pseudohiki/treestack.rb
 - lib/pseudohiki/utils.rb
 - lib/pseudohiki/version.rb
@@ -111,7 +113,7 @@ files:
 - test/test_utils.rb
 homepage: https://github.com/nico-hn/PseudoHikiParser/wiki
 licenses:
-- BSD 2-Clause license
+- BSD-2-Clause
 metadata: {}
 post_install_message:
 rdoc_options: []
@@ -124,12 +126,12 @@ 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
+rubygems_version: 2.6.6
 signing_key:
 specification_version: 4
 summary: 'PseudoHikiParser: a parser of texts in a Hiki like notation.'