pseudohikiparser 0.0.3.develop → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4194b79f711194dc48b8b09a13302ec50dd9f20d
-  data.tar.gz: 1b91b097c191eb63711aae1f62bf92788943310e
+  metadata.gz: 32c71494df02c4ef6701259bd2f7731e2ec14508
+  data.tar.gz: fb7bceffb5fc2f9d67c6959bd71485862e71bff2
 SHA512:
-  metadata.gz: 7bc7d683db890fc147c1149480481af8df86ac9738e39958f251c9aee2eb5a6792ac2fe3e6465b7af798d31f1eccedda273a47ecba99608eda344772eb04548b
-  data.tar.gz: a0b647bc3512f1ca38a3fadec0a2a77560c7d7b457a564a49cc40b901f00754d6eaa82c37c7f0a01e8234d341252d5e4ee9502adfc53f0a024feabad60bbcbf2
+  metadata.gz: 2a3a20edf96dba9d41d837dc44009f4b1bb6eb6136476abd08cfaf882bcde8a213ded999647f2a067548b7b3f089e768390399d7e8f69fdccdbb6f4bcdff871b
+  data.tar.gz: 14cb9c5b77e7e4cdc9f153e91c0c8d2f4ae85a292637dcfa5c55d0982ef5b3adb3faa92e140184f318e33b76c00e1106affabf252c270d38e3d4aeca1e369ca5

data/lib/pseudohiki/blockparser.rb

@@ -37,14 +37,14 @@ module PseudoHiki
     end
 
     class BlockStack < TreeStack
-      def pop_with_breaker(breaker=nil)
-        self.current_node.parse_leafs(breaker)
-        pop
+      def pop
+        self.current_node.parse_leafs
+        super
       end
     end
 
     class BlockLeaf < BlockStack::Leaf
-      attr_accessor :nominal_level, :node_id, :decorator
+      attr_accessor :nominal_level, :node_id
 
       def self.head_re=(head_regex)
         @self_head_re = head_regex
@@ -84,7 +84,7 @@ module PseudoHiki
         super(stack)
       end
 
-      def parse_leafs(breaker)
+      def parse_leafs
         parsed = InlineParser.parse(self.join)
         self.clear
         self.concat(parsed)
@@ -134,10 +134,6 @@ module PseudoHiki
         first.nominal_level if first # @cached_nominal_level ||= (first.nominal_level if first)
       end
 
-      def decorator
-        first.decorator if first
-      end
-
       def push_self(stack)
         @stack = stack
         super(stack)
@@ -147,7 +143,7 @@ module PseudoHiki
         not (kind_of?(breaker.block) and nominal_level == breaker.nominal_level)
       end
 
-      def parse_leafs(breaker); end
+      def parse_leafs; end
 
       def in_link_tag?(preceding_str)
         preceding_str[-2, 2] == "[[".freeze or preceding_str[-1, 1] == "|".freeze
@@ -159,7 +155,7 @@ module PseudoHiki
 
       def add_leaf(line, blockparser)
         leaf = create_leaf(line, blockparser)
-        blockparser.stack.pop_with_breaker(leaf) while blockparser.breakable?(leaf)
+        blockparser.stack.pop while blockparser.breakable?(leaf)
         blockparser.stack.push leaf
       end
 
@@ -171,8 +167,8 @@ module PseudoHiki
     end
 
     class NonNestedBlockNode < BlockNode
-      def parse_leafs(breaker)
-        self.each {|leaf| leaf.parse_leafs(breaker) }
+      def parse_leafs
+        self.each {|leaf| leaf.parse_leafs }
       end
     end
 
@@ -192,11 +188,11 @@ module PseudoHiki
 
     module BlockElement
       {
-        BlockLeaf => %w(DescLeaf VerbatimLeaf TableLeaf CommentOutLeaf BlockNodeEnd HrLeaf DecoratorLeaf),
+        BlockLeaf => %w(DescLeaf VerbatimLeaf TableLeaf CommentOutLeaf BlockNodeEnd HrLeaf),
         NonNestedBlockLeaf => %w(QuoteLeaf ParagraphLeaf),
         NestedBlockLeaf => %w(HeadingLeaf),
         ListTypeLeaf => %w(ListLeaf EnumLeaf),
-        BlockNode => %w(DescNode VerbatimNode TableNode CommentOutNode HrNode DecoratorNode),
+        BlockNode => %w(DescNode VerbatimNode TableNode CommentOutNode HrNode),
         NonNestedBlockNode => %w(QuoteNode ParagraphNode),
         NestedBlockNode => %w(HeadingNode),
         ListTypeBlockNode => %w(ListNode EnumNode),
@@ -221,43 +217,15 @@ module PseudoHiki
       attr_accessor :in_block_tag
 
       def add_leaf(line, blockparser)
-        return @stack.pop_with_breaker if LINE_PAT::VERBATIM_END =~ line
+        return @stack.pop if LINE_PAT::VERBATIM_END =~ line
         return super(line, blockparser) unless @in_block_tag
         line = " ".concat(line) if BlockElement::BlockNodeEnd.head_re =~ line and not @in_block_tag
         @stack.push BlockElement::VerbatimLeaf.create(line, @in_block_tag)
       end
     end
 
-    class BlockElement::DecoratorNode
-      DECORATOR_PAT = /\A(?:([^\[\]:]+))?(?:\[([^\[\]]+)\])?(?::\s*(\S.*))?/o
-
-      class DecoratorItem < Struct.new(:string, :type, :id, :value)
-        def initialize(*args)
-          super
-          self.value = InlineParser.parse(self.value) if self.value
-        end
-      end
-
-      def parse_leafs(breaker)
-        decorator = {}
-        breaker.decorator = decorator
-        @stack.remove_current_node.each do |leaf|
-          m = DECORATOR_PAT.match(leaf.join)
-          return nil unless m
-          item = DecoratorItem.new(*(m.to_a))
-          decorator[item.type||:id] = item
-        end
-      end
-
-      def breakable?(breaker)
-        return super if breaker.kind_of?(BlockElement::DecoratorLeaf)
-        parse_leafs(breaker)
-        @stack.current_node.breakable?(breaker)
-      end
-    end
-
     class BlockElement::QuoteNode
-      def parse_leafs(breaker)
+      def parse_leafs
         self[0] = BlockParser.parse(self[0])
       end
     end
@@ -315,8 +283,7 @@ module PseudoHiki
      [ParagraphLeaf, ParagraphNode],
      [HrLeaf, HrNode],
      [ListLeaf, ListNode],
-     [EnumLeaf, EnumNode],
-     [DecoratorLeaf, DecoratorNode]
+     [EnumLeaf, EnumNode]
     ].each do |leaf, node|
       ParentNode[leaf] = node
     end
@@ -334,7 +301,6 @@ module PseudoHiki
        ['!', HeadingLeaf],
        ['""', QuoteLeaf],
        ['||', TableLeaf],
-       ['//@', DecoratorLeaf],
        ['//', CommentOutLeaf],
        ['----\s*$', HrLeaf]
       ].each do |head, leaf|
@@ -373,7 +339,7 @@ module PseudoHiki
     def read_lines(lines)
       each_line = lines.respond_to?(:each_line) ? :each_line : :each
       lines.send(each_line) {|line| @stack.current_node.add_leaf(line, self) }
-      @stack.pop_with_breaker
+      @stack.pop
     end
   end
 end

data/lib/pseudohiki/htmlformat.rb

@@ -61,7 +61,6 @@ module PseudoHiki
 
     def visit(tree)
       htmlelement = create_self_element(tree)
-      decorate(htmlelement, tree)
       push_visited_results(htmlelement, tree)
       htmlelement
     end
@@ -79,21 +78,6 @@ module PseudoHiki
       chunks.push tree
     end
 
-    def decorate(htmlelement, tree)
-      each_decorator(htmlelement, tree) do |element, decorator|
-        element[CLASS] = HtmlElement.escape(decorator[CLASS].id) if decorator[CLASS]
-        if id_item = decorator[ID]||decorator[:id]
-          element[ID] = HtmlElement.escape(id_item.id).upcase
-        end
-      end
-    end
-
-    def each_decorator(element, tree)
-      return unless element.kind_of? HtmlElement
-      return unless tree.kind_of? BlockParser::BlockNode and tree.decorator
-      tree.decorator.tap {|decorator| yield element, decorator }
-    end
-
     class ListLeafNodeFormatter < self
       def create_self_element(tree)
         super(tree).tap do |element|
@@ -192,14 +176,6 @@ module PseudoHiki
 
     #for BlockParser
 
-    class << Formatter[TableNode]
-      def decorate(htmlelement, tree)
-        each_decorator(htmlelement, tree) do |element, decorator|
-          htmlelement["summary"] = HtmlElement.escape(decorator["summary"].value.join) if decorator["summary"]
-        end
-      end
-    end
-
     class << Formatter[VerbatimNode]
       def visit(tree)
         create_self_element.tap do |element|

data/lib/pseudohiki/markdownformat.rb

@@ -284,14 +284,13 @@ module PseudoHiki
     class VerbatimNodeFormatter < self
       def visit(tree)
         element = super(tree)
-        @language_name = language_name(tree)
         return gfm_verbatim(element) if @options.gfm_style
         md_verbatim(element)
       end
 
       def gfm_verbatim(element)
         element.tap do |lines|
-          lines.unshift "```#{@language_name + $/}"
+          lines.unshift "```#{$/}"
           lines.push "```#{$/ * 2}"
         end
       end
@@ -299,12 +298,6 @@ module PseudoHiki
       def md_verbatim(element)
         element.join.gsub(/^/o, "    ").sub(/    \Z/o, "").concat $/
       end
-
-      def language_name(tree)
-        tree.decorator.tap do |decorator|
-          return decorator ? decorator["code"].id : ""
-        end
-      end
     end
 
     class QuoteNodeFormatter < self

data/lib/pseudohiki/version.rb

@@ -1,3 +1,3 @@
 module PseudoHiki
-  VERSION = "0.0.3.develop"
+  VERSION = "0.0.3"
 end

data/lib/pseudohikiparser.rb

@@ -131,5 +131,3 @@ module PseudoHiki
     end
   end
 end
-
-require 'pseudohiki/sinatra_helpers'if defined? Sinatra

data/test/test_blockparser.rb

@@ -311,35 +311,6 @@ TEXT
     assert_equal([[[["heading"]]]],parsed)
   end
 
-
-  def test_decorator
-    text = <<TEXT
-//@class[section_name]
-!!title of section
-
-//@summary: Summary of the table
-||!header 1||! header 2
-||cell 1||cell 2
-
-a paragraph.
-
-//@class[class_name]
-//@[id_name]
-another paragraph.
-TEXT
-
-    tree = PseudoHiki::BlockParser.parse(text.lines.to_a.map {|line| line.chomp })
-    assert_equal(PseudoHiki::BlockParser::BlockNode, tree.class)
-    assert_equal("section_name", tree[0].decorator["class"].id)
-    assert_equal(PseudoHiki::BlockParser::BlockElement::HeadingNode, tree[0].class)
-    assert_equal([[["title of section"]], [[[["header 1"]], [[" header 2"]]], [[["cell 1"]], [["cell 2"]]]], [[["a paragraph."]]], [[["another paragraph."]]]], tree[0])
-    assert_equal([["Summary of the table"]], tree[0][1].decorator["summary"].value)
-    assert_equal(PseudoHiki::BlockParser::BlockElement::TableNode, tree[0][1].class)
-    assert_equal(nil, tree[0][2].decorator)
-    assert_equal('id_name', tree[0][3].decorator[:id].id)
-    assert_equal('class_name', tree[0][3].decorator["class"].id)
-  end
-
   def test_comment_out_followed_by_a_verbatim_block
     text = <<TEXT
 the first paragraph

data/test/test_htmlformat.rb

@@ -696,69 +696,6 @@ HTML
     assert_equal(xhtml, XhtmlFormat.format(tree).to_s)
   end
 
-  def test_decorator
-    text = <<TEXT
-//@class[section_type]
-!!title of section
-
-a paragraph.
-
-//@class[class_name]
-//@id[id_name]
-another paragraph.
-TEXT
-
-    xhtml = <<HTML
-<div class="section_type">
-<h2>title of section</h2>
-<p>
-a paragraph.</p>
-<p class="class_name" id="ID_NAME">
-another paragraph.</p>
-<!-- end of section_type -->
-</div>
-HTML
-    tree = BlockParser.parse(text.lines.to_a.map {|line| line.chomp })
-    assert_equal(xhtml, XhtmlFormat.format(tree).to_s)
-  end
-
-  def test_decorator_for_table
-    text = <<TEXT
-//@summary: Summary of the table
-||!header 1||! header 2
-||cell 1||cell 2
-TEXT
-
-    xhtml = <<HTML
-<table summary="Summary of the table">
-<tr><th>header 1</th><th> header 2</th></tr>
-<tr><td>cell 1</td><td>cell 2</td></tr>
-</table>
-HTML
-    tree = BlockParser.parse(text.lines.to_a.map {|line| line.chomp })
-    assert_equal(xhtml, XhtmlFormat.format(tree).to_s)
-  end
-
-  def test_decorator_for_verbatim
-    text = <<TEXT
-//@code[ruby]
- def bonjour!
-   puts "Bonjour!"
- end
-TEXT
-
-    xhtml = <<HTML
-<pre>
-def bonjour!
-  puts &quot;Bonjour!&quot;
-end
-</pre>
-HTML
-
-    tree = BlockParser.parse(text.lines.to_a)
-    assert_equal(xhtml, XhtmlFormat.format(tree).to_s)
-  end
-
   def test_comment_out_followed_by_a_verbatim_block
     text = <<TEXT
 the first paragraph

data/test/test_markdownformat.rb

@@ -518,66 +518,6 @@ 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_collect_headings
     text = <<TEXT
 !![main-heading] heading

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pseudohikiparser
 version: !ruby/object:Gem::Version
-  version: 0.0.3.develop
+  version: 0.0.3
 platform: ruby
 authors:
 - HASHIMOTO, Naoki
@@ -74,7 +74,6 @@ 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
@@ -107,9 +106,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: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.2.3

data/lib/pseudohiki/sinatra_helpers.rb

@@ -1,23 +0,0 @@
-#!/usr/bin/env ruby
-
-begin
-  module Sinatra
-    module PseudoHikiParserHelpers
-      XHTML5_CONTENT_TYPE = 'application/xhtml+xml'
-      def phiki(hiki_data, &block)
-        case content_type
-        when XHTML5_CONTENT_TYPE
-          PseudoHiki::Format.to_html5(hiki_data, &block)
-        else
-          PseudoHiki::Format.to_xhtml(hiki_data, &block)
-        end
-      end
-    end
-
-    class Base
-      helpers PseudoHikiParserHelpers
-    end
-  end
-rescue
-  #Sinatra is not available
-end