facwparser 0.0.7 → 0.0.8

data/lib/facwparser/element.rb

@@ -122,7 +122,9 @@ module Facwparser
           "</table>\n"
       end
     end
-    class TableHeaders < ElementBase
+    class TableRow < ElementBase
+    end
+    class TableHeaders < TableRow
       attr_reader :elements
       def initialize(source, value)
         super(source)
@@ -134,7 +136,7 @@ module Facwparser
           "</tr>"
       end
     end
-    class TableData < ElementBase
+    class TableData < TableRow
       attr_reader :elements
       def initialize(source, value)
         super(source)
@@ -220,6 +222,11 @@ module Facwparser
           "</blockquote>\n"
       end
     end
+    class Nop < MacroBase
+      def render_html(options)
+        "\n"
+      end
+    end
 
     class InlineElementBase < ElementBase
       attr_reader :text
@@ -307,7 +314,7 @@ module Facwparser
       end
       def render_html(options)
         jira_browse_url = (options && options['jira_browse_url']) || ''
-        return '<a href="' + CGI.escapeHTML(jira_browse_url + @options) +'">' + CGI.escapeHTML(@options) + '</a>'
+        render_html_by_name_and_value(['a', {'href' => jira_browse_url + @options}], @options)
       end
     end
 

data/lib/facwparser/parser.rb

@@ -7,18 +7,18 @@ require File.dirname(__FILE__) + '/element'
 module Facwparser
   module Parser
     def self.parse(content, options = {})
-      elements = parse1(content, options)
+      elements = parse_block(content, options)
       process_elements(elements, options)
     end
 
     def self.process_elements(elements, options)
       processed = add_list_elements(elements, options)
       processed = add_table_elements(processed, options)
-      processed = add_toc(processed, options)
+      processed = add_headings_to_toc(processed, options)
       processed
     end
 
-    def self.add_toc(elements, options)
+    def self.add_headings_to_toc(elements, options)
       tocs = elements.select{ |e| e.class == Element::TocMacro}
       if !tocs.empty?
         headings = elements.select{ |e| e.class == Element::Heading && e.level == 1}
@@ -63,9 +63,8 @@ module Facwparser
       processed = []
       table = nil
       elements.each { |e|
-        case
-        when e.class == Element::TableHeaders || e.class == Element::TableData
-          if e.class == Element::TableHeaders || !table
+        if e.is_a?(Element::TableRow)
+          if e.is_a?(Element::TableHeaders) || !table
             table = Element::Table.new
             processed << table
           end
@@ -78,7 +77,7 @@ module Facwparser
       processed
     end
 
-    def self.parse1(content, options)
+    def self.parse_block(content, options)
       s = StringScanner.new(content.gsub("\r", '').gsub(/[\t\f]/, ' ') + "\n")
 
       elements = []
@@ -116,6 +115,7 @@ module Facwparser
           elements << Element::QuoteMacro.new(s[0], s[1])
         when s.scan(/ *\n/)
           p = nil
+          elements << Element::Nop.new(s[0])
         when s.scan(/(.+)\n/)
           if p
             p.append(s[0])

data/lib/facwparser/version.rb

@@ -1,3 +1,3 @@
 module Facwparser
-  VERSION = '0.0.7'
+  VERSION = '0.0.8'
 end

data/tests/units/element/test_jira.rb

@@ -0,0 +1,16 @@
+# -*- encoding: utf-8 -*-
+require 'test/unit'
+require File.dirname(__FILE__) + '/../../../lib/facwparser/element'
+
+
+class TestJira < Test::Unit::TestCase
+
+  def test_toc_1
+    jira = Facwparser::Element::JiraMacro.new('{jira:TICKET-<}', 'TICKET-<')
+
+    assert_equal(%Q{<a href="TICKET-&lt;">TICKET-&lt;</a>},
+                 jira.render_html({}))
+    assert_equal(%Q{<a href="http://jira/browse/TICKET-&lt;">TICKET-&lt;</a>},
+                 jira.render_html({'jira_browse_url' => 'http://jira/browse/'}))
+  end
+end

data/tests/units/element/test_nop.rb

@@ -0,0 +1,13 @@
+#!/usr/bin/env ruby
+# -*- encoding: utf-8 -*-
+require 'test/unit'
+require File.dirname(__FILE__) + '/../../../lib/facwparser/element'
+
+class TestNop < Test::Unit::TestCase
+
+  def test_nop_1
+    nop = Facwparser::Element::Nop.new("\n")
+    assert_equal(%Q{\n},
+                 nop.render_html({}))
+  end
+end

data/tests/units/parser/test_add_headings_to_toc.rb

@@ -0,0 +1,24 @@
+# -*- encoding: utf-8 -*-
+require 'test/unit'
+require File.dirname(__FILE__) + '/../../../lib/facwparser/parser'
+
+
+class TestAddHeadingsToToc < Test::Unit::TestCase
+
+  def test_add_headings_to_toc_1
+    toc = Facwparser::Element::TocMacro.new('{toc}');
+    pre = [
+      toc,
+      Facwparser::Element::Heading.new('h1. hoge', 1, 'hoge'),
+      Facwparser::Element::Heading.new('h2. hige', 2, 'hige'),
+      Facwparser::Element::Heading.new('h1. huge', 1, 'huge'),
+    ]
+    Facwparser::Parser.add_headings_to_toc(pre, {})
+    assert_equal([
+      Facwparser::Element::Heading.new('h1. hoge', 1, 'hoge'),
+      Facwparser::Element::Heading.new('h1. huge', 1, 'huge'),
+    ], toc.headings)
+
+  end
+
+end

data/tests/units/parser/test_add_list_elements.rb

@@ -24,5 +24,23 @@ class TestAddListElements < Test::Unit::TestCase
 
   end
 
+  def test_add_list_elements_2
+    pre = [
+        Facwparser::Element::ListItem.new("* 4\n", '*', '4'),
+        Facwparser::Element::Nop.new("\n"),
+        Facwparser::Element::ListItem.new("* 5\n", '*', '5'),
+      ]
+
+      assert_equal([
+        Facwparser::Element::List.new('*').push(
+          Facwparser::Element::ListItem.new("* 4\n", '*', '4')),
+        Facwparser::Element::Nop.new("\n"),
+        Facwparser::Element::List.new('*').push(
+          Facwparser::Element::ListItem.new("* 5\n", '*', '5')),
+    ], Facwparser::Parser.add_list_elements(pre, {}))
+
+  end
+
+
 end
 

data/tests/units/parser/test_add_table_elements.rb

@@ -0,0 +1,48 @@
+# -*- encoding: utf-8 -*-
+require 'test/unit'
+require File.dirname(__FILE__) + '/../../../lib/facwparser/parser'
+
+
+class TestAddTableElements < Test::Unit::TestCase
+
+  def test_add_table_elements_1
+    pre = [
+        Facwparser::Element::TableHeaders.new('||head1||head2||', '||head1||head2||'),
+        Facwparser::Element::TableData.new('|3|4|', '|3|4|' ),
+        Facwparser::Element::TableData.new('|5|6|', '|5|6|' ),
+      ]
+
+      assert_equal([
+        Facwparser::Element::Table.new.push(
+          Facwparser::Element::TableHeaders.new('||head1||head2||', '||head1||head2||' )).push(
+          Facwparser::Element::TableData.new('|3|4|', '|3|4|' )).push(
+        Facwparser::Element::TableData.new('|5|6|', '|5|6|' )),
+    ], Facwparser::Parser.add_table_elements(pre, {}))
+
+  end
+
+  def test_add_table_elements_2
+    pre = [
+        Facwparser::Element::TableHeaders.new('||head1||head2||', '||head1||head2||'),
+        Facwparser::Element::TableData.new('|3|4|', '|3|4|' ),
+        Facwparser::Element::TableData.new('|5|6|', '|5|6|' ),
+        Facwparser::Element::TableHeaders.new('||head1||head2||', '||head1||head2||'),
+        Facwparser::Element::TableData.new('|3|4|', '|3|4|' ),
+        Facwparser::Element::TableData.new('|5|6|', '|5|6|' ),
+      ]
+
+      assert_equal([
+        Facwparser::Element::Table.new.push(
+          Facwparser::Element::TableHeaders.new('||head1||head2||', '||head1||head2||' )).push(
+          Facwparser::Element::TableData.new('|3|4|', '|3|4|' )).push(
+        Facwparser::Element::TableData.new('|5|6|', '|5|6|' )),
+        Facwparser::Element::Table.new.push(
+          Facwparser::Element::TableHeaders.new('||head1||head2||', '||head1||head2||' )).push(
+          Facwparser::Element::TableData.new('|3|4|', '|3|4|' )).push(
+        Facwparser::Element::TableData.new('|5|6|', '|5|6|' )),
+    ], Facwparser::Parser.add_table_elements(pre, {}))
+
+  end
+
+end
+

data/tests/units/parser/{test_parse1.rb → test_parse_block.rb}

@@ -5,7 +5,7 @@ require File.dirname(__FILE__) + '/../../../lib/facwparser/parser'
 
 class TestParse1 < Test::Unit::TestCase
 
-  def test_parse1_p
+  def test_parse_block_p
     source =<<EOS
 ほげ
 
@@ -17,14 +17,17 @@ EOS
     assert_equal(
       [
         Facwparser::Element::P.new("ほげ\n"),
+        Facwparser::Element::Nop.new("\n"),
         Facwparser::Element::P.new("ほげほげ\n"),
+        Facwparser::Element::Nop.new("\n"),
         Facwparser::Element::P.new("ほげほげげほ\nにゃ\n"),
+        Facwparser::Element::Nop.new("\n"),
       ],
-      Facwparser::Parser.parse1(source, {}))
+      Facwparser::Parser.parse_block(source, {}))
 
   end
 
-  def test_parse1_heading
+  def test_parse_block_heading
     source =<<EOS
 h1. ほげ
 
@@ -35,15 +38,17 @@ EOS
     assert_equal(
       [
         Facwparser::Element::Heading.new("h1. ほげ\n", 1, "ほげ"),
+        Facwparser::Element::Nop.new("\n"),
         Facwparser::Element::P.new("ほげほげ\n"),
         Facwparser::Element::Heading.new("h3.  ほげほげげほ\n", 3, "ほげほげげほ"),
         Facwparser::Element::P.new("にゃ\n"),
+        Facwparser::Element::Nop.new("\n"),
       ],
-      Facwparser::Parser.parse1(source, {}))
+      Facwparser::Parser.parse_block(source, {}))
 
   end
 
-  def test_parse1_horizontal_rule
+  def test_parse_block_horizontal_rule
     source =<<EOS
 1
 ----
@@ -59,14 +64,16 @@ EOS
         Facwparser::Element::P.new("1\n"),
         Facwparser::Element::HorizontalRule.new("----\n"),
         Facwparser::Element::P.new("2\n---\n3\n"),
+        Facwparser::Element::Nop.new("\n"),
         Facwparser::Element::HorizontalRule.new("-----\n"),
         Facwparser::Element::P.new("4\n"),
+        Facwparser::Element::Nop.new("\n"),
       ],
-      Facwparser::Parser.parse1(source, {}))
+      Facwparser::Parser.parse_block(source, {}))
 
   end
 
-  def test_parse1_list_item
+  def test_parse_block_list_item
     source =<<EOS
 1
 - 2
@@ -83,12 +90,13 @@ EOS
         Facwparser::Element::ListItem.new("** 4\n", '**', '4'),
         Facwparser::Element::ListItem.new("### 5\n", '###', '5'),
         Facwparser::Element::ListItem.new("#*#* 6\n", '#*#*', '6'),
+        Facwparser::Element::Nop.new("\n"),
       ],
-      Facwparser::Parser.parse1(source, {}))
+      Facwparser::Parser.parse_block(source, {}))
 
   end
 
-  def test_parse1_table
+  def test_parse_block_table
     source =<<EOS
 1
 ||2||3||
@@ -101,12 +109,13 @@ EOS
         Facwparser::Element::TableHeaders.new("||2||3||\n", '||2||3||'),
         Facwparser::Element::TableData.new("|4|5|\n", '|4|5|'),
         Facwparser::Element::P.new("6\n"),
+        Facwparser::Element::Nop.new("\n"),
       ],
-      Facwparser::Parser.parse1(source, {}))
+      Facwparser::Parser.parse_block(source, {}))
 
   end
 
-  def test_parse1_toc_1
+  def test_parse_block_toc_1
     source =<<EOS
 1
 {toc}
@@ -117,12 +126,13 @@ EOS
         Facwparser::Element::P.new("1\n"),
         Facwparser::Element::TocMacro.new("{toc}\n"),
         Facwparser::Element::P.new("2\n"),
+        Facwparser::Element::Nop.new("\n"),
       ],
-      Facwparser::Parser.parse1(source, {}))
+      Facwparser::Parser.parse_block(source, {}))
 
   end
 
-  def test_parse1_toc_2
+  def test_parse_block_toc_2
     source =<<EOS
 1
 {toc:maxLevel=3}
@@ -133,12 +143,13 @@ EOS
         Facwparser::Element::P.new("1\n"),
         Facwparser::Element::TocMacro.new("{toc:maxLevel=3}\n", 'maxLevel=3'),
         Facwparser::Element::P.new("2\n"),
+        Facwparser::Element::Nop.new("\n"),
       ],
-      Facwparser::Parser.parse1(source, {}))
+      Facwparser::Parser.parse_block(source, {}))
 
   end
 
-  def test_parse1_noformat
+  def test_parse_block_noformat
     source =<<EOS
 1
 {noformat}
@@ -152,12 +163,13 @@ EOS
         Facwparser::Element::P.new("1\n"),
         Facwparser::Element::NoformatMacro.new("{noformat}\n2\n3\n{noformat}\n", "2\n3\n"),
         Facwparser::Element::P.new("4\n"),
+        Facwparser::Element::Nop.new("\n"),
       ],
-      Facwparser::Parser.parse1(source, {}))
+      Facwparser::Parser.parse_block(source, {}))
 
   end
 
-  def test_parse1_code
+  def test_parse_block_code
     source =<<EOS
 1
 {code:ruby}
@@ -171,12 +183,13 @@ EOS
         Facwparser::Element::P.new("1\n"),
         Facwparser::Element::CodeMacro.new("{code:ruby}\na = 1 + 2\n3\n{code}\n", 'ruby', "a = 1 + 2\n3\n"),
         Facwparser::Element::P.new("4\n"),
+        Facwparser::Element::Nop.new("\n"),
       ],
-      Facwparser::Parser.parse1(source, {}))
+      Facwparser::Parser.parse_block(source, {}))
 
   end
 
-  def test_parse1_quote
+  def test_parse_block_quote
     source =<<EOS
 1
 {quote}
@@ -190,8 +203,9 @@ EOS
         Facwparser::Element::P.new("1\n"),
         Facwparser::Element::QuoteMacro.new("{quote}\n2\n3\n{quote}\n", "2\n3\n"),
         Facwparser::Element::P.new("4\n"),
+        Facwparser::Element::Nop.new("\n"),
       ],
-      Facwparser::Parser.parse1(source, {}))
+      Facwparser::Parser.parse_block(source, {}))
 
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: facwparser
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-26 00:00:00.000000000 Z
+date: 2013-02-27 00:00:00.000000000 Z
 dependencies: []
 description: Fuxxing Atlassian Confluence Wiki Parser
 email:
@@ -39,10 +39,12 @@ files:
 - tests/units/element/test_emphasis.rb
 - tests/units/element/test_heading.rb
 - tests/units/element/test_horizontal_rule.rb
+- tests/units/element/test_jira.rb
 - tests/units/element/test_list.rb
 - tests/units/element/test_list_item.rb
 - tests/units/element/test_monospace.rb
 - tests/units/element/test_noformat.rb
+- tests/units/element/test_nop.rb
 - tests/units/element/test_p.rb
 - tests/units/element/test_q.rb
 - tests/units/element/test_quote.rb
@@ -56,8 +58,10 @@ files:
 - tests/units/element/test_text.rb
 - tests/units/element/test_toc.rb
 - tests/units/element/test_under.rb
+- tests/units/parser/test_add_headings_to_toc.rb
 - tests/units/parser/test_add_list_elements.rb
-- tests/units/parser/test_parse1.rb
+- tests/units/parser/test_add_table_elements.rb
+- tests/units/parser/test_parse_block.rb
 - tests/units/parser/test_parse_value.rb
 homepage: https://github.com/haruyama/facwparser
 licenses: []