facwparser 0.0.2 → 0.0.3

data/lib/facwparser/element.rb

@@ -19,12 +19,24 @@ module Facwparser
       def render_html(options)
         raise "TODO: render_html is not implemented: " + self.class.to_s + "\n"
       end
+      def render_text(options)
+        CGI.unescapeHTML(render_html(options).strip.gsub(/<\/?[^>]*>/, ""))
+      end
       private
       def render_html_by_name_and_value(name, value, element_join_char = '')
-        ["<#{CGI.escapeHTML name}>", CGI.escapeHTML(value), "</#{CGI.escapeHTML name}>"].join(element_join_char)
+        if name.is_a? Array
+          ["<#{CGI.escapeHTML name[0]} " + name[1].map{|k,v| CGI.escapeHTML(k) + '="' + CGI.escapeHTML(v) + '"' + ">"}.join(' '), CGI.escapeHTML(value), "</#{CGI.escapeHTML name[0]}>"].join(element_join_char)
+        else
+          ["<#{CGI.escapeHTML name}>", CGI.escapeHTML(value), "</#{CGI.escapeHTML name}>"].join(element_join_char)
+        end
       end
-      def render_html_by_name_and_childlen(name, children, options, childlen_join_char = '', element_join_char = '')
-        ["<#{CGI.escapeHTML name}>", children.map {|c| c.render_html(options) }.join(childlen_join_char), "</#{CGI.escapeHTML name}>"].join(element_join_char)
+      def render_html_by_name_and_children(name, children, options, children_join_char = '', element_join_char = '')
+        if name.is_a? Array
+          ["<#{CGI.escapeHTML name[0]} " + name[1].map{|k,v| CGI.escapeHTML(k) + '="' + CGI.escapeHTML(v) + '"' + ">"}.join(' '),
+            children.map {|c| c.render_html(options) }.join(children_join_char), "</#{CGI.escapeHTML name[0]}>"].join(element_join_char)
+        else
+          ["<#{CGI.escapeHTML name}>", children.map {|c| c.render_html(options) }.join(children_join_char), "</#{CGI.escapeHTML name}>"].join(element_join_char)
+        end
       end
     end
 
@@ -39,7 +51,7 @@ module Facwparser
             "</blockquote>\n"
         else
           @children ||= Parser.parse_value(@source, options)
-          render_html_by_name_and_childlen('p', @children, options) + "\n"
+          render_html_by_name_and_children('p', @children, options) + "\n"
         end
       end
     end
@@ -50,6 +62,7 @@ module Facwparser
     end
     class Heading < ElementBase
       attr_reader :level, :value
+      attr_accessor :id
       def initialize(source, level, value)
         super(source)
         @level = level
@@ -57,7 +70,12 @@ module Facwparser
       end
       def render_html(options)
         @children = Parser.parse_value value, options
-        render_html_by_name_and_childlen("h#{level}", @children, options) + "\n"
+
+        if @id
+          render_html_by_name_and_children(["h#{level}", {'id' => @id}], @children, options) + "\n"
+        else
+          render_html_by_name_and_children("h#{level}", @children, options) + "\n"
+        end
       end
     end
     class List < ElementBase
@@ -72,7 +90,7 @@ module Facwparser
         self
       end
       def render_html(options)
-        (render_html_by_name_and_childlen(@type == '#' ? 'ol' : 'ul', @children, options, "\n", "\n") + "\n").gsub("\n\n", "\n")
+        (render_html_by_name_and_children(@type == '#' ? 'ol' : 'ul', @children, options, "\n", "\n") + "\n").gsub("\n\n", "\n")
       end
     end
     class ListItem < ElementBase
@@ -85,7 +103,7 @@ module Facwparser
       end
       def render_html(options)
         @children ||= Parser.parse_value value, options
-        render_html_by_name_and_childlen('li', @children, options)
+        render_html_by_name_and_children('li', @children, options)
       end
     end
     class Table < ElementBase
@@ -99,9 +117,9 @@ module Facwparser
       end
       def render_html(options)
         "<table>\n" +
-        render_html_by_name_and_childlen('thead', @children.take(1), options, "\n", "\n") + "\n" +
-        render_html_by_name_and_childlen('tbody', @children.drop(1), options, "\n", "\n") + "\n" +
-        "</table>\n"
+          render_html_by_name_and_children('thead', @children.take(1), options, "\n", "\n") + "\n" +
+          render_html_by_name_and_children('tbody', @children.drop(1), options, "\n", "\n") + "\n" +
+          "</table>\n"
       end
     end
     class TableHeaders < ElementBase
@@ -112,8 +130,8 @@ module Facwparser
       end
       def render_html(options)
         "<tr>" +
-          @elements.map { |e| render_html_by_name_and_childlen('th', Parser.parse_value(e, options), options) }.join() +
-        "</tr>"
+          @elements.map { |e| render_html_by_name_and_children('th', Parser.parse_value(e, options), options) }.join() +
+          "</tr>"
       end
     end
     class TableData < ElementBase
@@ -148,31 +166,27 @@ module Facwparser
         end
         @elements << element if !element.empty?
       end
-      def render_html(options)
-        "<tr>" +
-          @elements.map { |e| render_html_by_name_and_childlen('td', Parser.parse_value(e, options), options) }.join() +
-        "</tr>"
-      end
+
+        def render_html(options)
+          "<tr>" +
+            @elements.map { |e| render_html_by_name_and_children('td', Parser.parse_value(e, options), options) }.join() +
+            "</tr>"
+        end
     end
 
     class MacroBase < ElementBase
     end
     class TocMacro < MacroBase
+      attr_accessor :headings
       def initialize(source, options = nil)
         super(source)
         @options = options
       end
       def render_html(options)
-        "TODO: table of contents Macro\n"
-      end
-    end
-    class PagetreeMacro < MacroBase
-      def initialize(source, options = nil)
-        super(source)
-        @options = options
-      end
-      def render_html(options)
-        "TODO: pagetree macro\n"
+        "<ul>\n" +
+          @headings.map{|h| '<li><a href="#%s">%s</a></li>' %
+            [CGI.escapeHTML(h.id), CGI.escapeHTML(h.render_text(options))]}.join("\n") +
+              "\n</ul>\n"
       end
     end
     class NoformatMacro < MacroBase
@@ -226,26 +240,29 @@ module Facwparser
         elsif @text =~ /\A(?:https?|ftp|file):.+\z/
           return '<a href="' + CGI.escapeHTML(@text) +'">' + CGI.escapeHTML(@text) + '</a>'
         else
-          return '[' + CGI.escapeHTML(@text) + ']'
+          url_prefix = (options && options['url_prefix']) || '/'
+          return '<a href="' + CGI.escapeHTML(url_prefix + @text) +'">' + CGI.escapeHTML(@text) + '</a>'
         end
       end
     end
 
-    class Bold < InlineElementBase
+    class Strong < InlineElementBase
       def render_html(options)
-        render_html_by_name_and_value('b', @text)
+        render_html_by_name_and_value('strong', @text)
       end
     end
 
-    class Italic < InlineElementBase
+    class Emphasis < InlineElementBase
       def render_html(options)
-        render_html_by_name_and_value('i', @text)
+        render_html_by_name_and_value('em', @text)
       end
     end
 
     class Strike < InlineElementBase
       def render_html(options)
-        render_html_by_name_and_value('s', @text)
+        '<span style="text-decoration: line-through;">' +
+          CGI.escapeHTML(@text) +
+          '</span>'
       end
     end
 
@@ -273,9 +290,9 @@ module Facwparser
       end
     end
 
-    class TT < InlineElementBase
+    class Monospace < InlineElementBase
       def render_html(options)
-        render_html_by_name_and_value('tt', @text)
+        render_html_by_name_and_value('code', @text)
       end
     end
 
@@ -304,7 +321,7 @@ module Facwparser
         @options = options
       end
       def render_html(options)
-        return '<font color="' + CGI.escapeHTML(@options) +'">'
+        return '<span style="color: ' + CGI.escapeHTML(@options) +'">'
       end
     end
 
@@ -313,7 +330,7 @@ module Facwparser
         super(source)
       end
       def render_html(options)
-        return '</font>'
+        return '</span>'
       end
     end
 

data/lib/facwparser/parser.rb

@@ -14,7 +14,23 @@ module Facwparser
     def self.process_elements(elements, options)
       # TODO toc
       processed = add_list_elements(elements, options)
-      add_table_elements(processed, options)
+      processed = add_table_elements(processed, options)
+      processed = add_toc(processed, options)
+      processed
+    end
+
+    def self.add_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}
+        id = 0
+        headings.each { |h|
+          h.id = 'heading_' + id.to_s
+          id += 1
+        }
+        tocs.each {|t| t.headings = headings }
+      end
+      elements
     end
 
     def self.add_list_elements(elements, options)
@@ -90,9 +106,6 @@ module Facwparser
         when s.scan(/\{toc(:.*)?\} *\n/)
           p = nil
           elements << Element::TocMacro.new(s[0], s[1] ? s[1][1,] : nil)
-        when s.scan(/\{pagetree(:.*)?\} *\n/)
-          p = nil
-          elements << Element::PagetreeMacro.new(s[0], s[1] ? s[1][1,] : nil)
         when s.scan(/\{noformat\} *\n(?m)(.+?\n)\{noformat\} *\n/)
           p = nil
           elements << Element::NoformatMacro.new(s[0], s[1])
@@ -138,9 +151,9 @@ module Facwparser
           when s.scan(/\[(.+?)(?<!\\)\]/)
             children << Element::A.new(s[0], unescape_text(s[1]))
           when s.scan(/\*(.+?)(?<!\\)\*/)
-            children << Element::Bold.new(s[0], unescape_text(s[1]))
+            children << Element::Strong.new(s[0], unescape_text(s[1]))
           when s.scan(/\_(.+?)(?<!\\)\_/)
-            children << Element::Italic.new(s[0], unescape_text(s[1]))
+            children << Element::Emphasis.new(s[0], unescape_text(s[1]))
           when s.scan(/\-(.+?)(?<!\\)\-/)
             children << Element::Strike.new(s[0], unescape_text(s[1]))
           when s.scan(/\+(.+?)(?<!\\)\+/)
@@ -152,9 +165,11 @@ module Facwparser
           when s.scan(/\?\?(.+?)(?<!\\)\?\?/)
             children << Element::Q.new(s[0], unescape_text(s[1]))
           when s.scan(/\{\{(.+?)(?<!\\)\}\}/)
-            children << Element::TT.new(s[0], unescape_text(s[1]))
+            children << Element::Monospace.new(s[0], unescape_text(s[1]))
           when s.scan(/\!(https?:(?:.+?))(?<!\\)\!/)
             children << Element::Image.new(s[0], unescape_text(s[1]))
+          when s.scan(/\!(\/(?:.+?))(?<!\\)\!/)
+            children << Element::Image.new(s[0], unescape_text(s[1]))
           when s.scan(/\{jira:(.+?)(?<!\\)\}/)
             children << Element::JiraMacro.new(s[0], unescape_text(s[1]))
           when s.scan(/\{color:(.+?)(?<!\\)\}/)

data/lib/facwparser/version.rb

@@ -1,3 +1,3 @@
 module Facwparser
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/lib/facwparser.rb

@@ -3,7 +3,7 @@ require 'facwparser/parser'
 require 'facwparser/render'
 
 module Facwparser
-  def self.to_html(source, options = nil)
+  def self.to_html(source, options = {})
     Render.render_html(Parser.parse(source, options), options) + "\n"
   end
 end

data/tests/units/element/test_a.rb

@@ -0,0 +1,31 @@
+# -*- encoding: utf-8 -*-
+require 'test/unit'
+require File.dirname(__FILE__) + '/../../../lib/facwparser/element'
+
+
+class TestP < Test::Unit::TestCase
+
+  def test_a_1
+    a = Facwparser::Element::A.new('[hoge|http://www.unixuser.org]', 'hoge|http://www.unixuser.org')
+    assert_equal(%Q{<a href="http://www.unixuser.org">hoge</a>},
+                 a.render_html({}))
+  end
+
+  def test_a_2
+    a = Facwparser::Element::A.new('[http://www.unixuser.org]', 'http://www.unixuser.org')
+    assert_equal(%Q{<a href="http://www.unixuser.org">http://www.unixuser.org</a>},
+                 a.render_html({}))
+  end
+
+  def test_a_3
+    a = Facwparser::Element::A.new('[hoge]', 'hoge')
+    assert_equal(%Q{<a href="/hoge">hoge</a>},
+                 a.render_html({}))
+  end
+
+  def test_a_4
+    a = Facwparser::Element::A.new('[hoge]', 'hoge')
+    assert_equal(%Q{<a href="http://www.unixuser.org/hoge">hoge</a>},
+                 a.render_html({'url_prefix' => 'http://www.unixuser.org/'}))
+  end
+end

data/tests/units/element/test_heading.rb

@@ -15,18 +15,41 @@ class TestHeading < Test::Unit::TestCase
     heading = Facwparser::Element::Heading.new('h3. hoge>', 3, 'hoge>')
     assert_equal("<h3>hoge&gt;</h3>\n",
                  heading.render_html({}))
+    assert_equal(%Q{hoge>},
+                 heading.render_text({}))
   end
 
   def test_heading_3
     heading = Facwparser::Element::Heading.new('h1. hoge[http://www.unixuser.org]', 1, 'hoge[http://www.unixuser.org]')
     assert_equal(%Q{<h1>hoge<a href="http://www.unixuser.org">http://www.unixuser.org</a></h1>\n},
                  heading.render_html({}))
+    assert_equal(%Q{hogehttp://www.unixuser.org},
+                 heading.render_text({}))
   end
 
   def test_heading_4
     heading = Facwparser::Element::Heading.new('h1. hoge [http://www.unixuser.org]', 1, 'hoge [http://www.unixuser.org]')
     assert_equal(%Q{<h1>hoge <a href="http://www.unixuser.org">http://www.unixuser.org</a></h1>\n},
                  heading.render_html({}))
+    assert_equal(%Q{hoge http://www.unixuser.org},
+                 heading.render_text({}))
+  end
+  def test_heading_5
+    heading = Facwparser::Element::Heading.new('h1. hoge[http://www.unixuser.org]', 1, 'hoge[http://www.unixuser.org]')
+    heading.id = 'heading_0'
+    assert_equal(%Q{<h1 id="heading_0">hoge<a href="http://www.unixuser.org">http://www.unixuser.org</a></h1>\n},
+                 heading.render_html({}))
+    assert_equal(%Q{hogehttp://www.unixuser.org},
+                 heading.render_text({}))
+  end
+
+  def test_heading_6
+    heading = Facwparser::Element::Heading.new('h1. hoge[http://www.unixuser.org]', 1, 'hoge[http://www.unixuser.org]')
+    heading.id = 'he<ading_0'
+    assert_equal(%Q{<h1 id="he&lt;ading_0">hoge<a href="http://www.unixuser.org">http://www.unixuser.org</a></h1>\n},
+                 heading.render_html({}))
+    assert_equal(%Q{hogehttp://www.unixuser.org},
+                 heading.render_text({}))
   end
 end
 

data/tests/units/element/test_list_item.rb

@@ -13,7 +13,7 @@ class TestListItem < Test::Unit::TestCase
 
   def test_list_item_2
     li = Facwparser::Element::ListItem.new('## hoge*nyo*', '##', 'hoge*nyo*')
-    assert_equal(%Q{<li>hoge<b>nyo</b></li>},
+    assert_equal(%Q{<li>hoge<strong>nyo</strong></li>},
                  li.render_html({}))
   end
 end

data/tests/units/element/test_toc.rb

@@ -0,0 +1,21 @@
+# -*- encoding: utf-8 -*-
+require 'test/unit'
+require File.dirname(__FILE__) + '/../../../lib/facwparser/element'
+
+
+class TestToc < Test::Unit::TestCase
+
+  def test_toc_1
+    toc = Facwparser::Element::TocMacro.new('{toc}', '')
+    heading1 = Facwparser::Element::Heading.new('h1. hoge', 1, 'hoge')
+    heading1.id = 'heading1'
+    heading2 = Facwparser::Element::Heading.new('h1. kuke', 1, 'kuke')
+    heading2.id = 'heading2'
+
+    toc.headings = [heading1, heading2]
+
+
+    assert_equal(%Q{<ul>\n<li><a href="#heading1">hoge</a></li>\n<li><a href="#heading2">kuke</a></li>\n</ul>\n},
+                 toc.render_html({}))
+  end
+end

data/tests/units/parser/test_parse1.rb

@@ -138,22 +138,6 @@ EOS
 
   end
 
-  def test_parse1_pagetree
-    source =<<EOS
-1
-{pagetree:root=@self}
-2
-EOS
-    assert_equal(
-      [
-        Facwparser::Element::P.new("1\n"),
-        Facwparser::Element::PagetreeMacro.new("{pagetree:root=@self}\n", 'root=@self'),
-        Facwparser::Element::P.new("2\n"),
-      ],
-      Facwparser::Parser.parse1(source, {}))
-
-  end
-
   def test_parse1_noformat
     source =<<EOS
 1

data/tests/units/parser/test_parse_value.rb

@@ -31,18 +31,18 @@ class TestParseValue < Test::Unit::TestCase
       ], Facwparser::Parser.parse_value('[株式会社ミクシィ|https://mixi.co.jp/]', {}))
   end
 
-  def test_parse_value_bold
+  def test_parse_value_strong
       assert_equal([
         Facwparser::Element::Text.new('1', '1'),
-        Facwparser::Element::Bold.new('*hoge*', 'hoge'),
+        Facwparser::Element::Strong.new('*hoge*', 'hoge'),
         Facwparser::Element::Text.new('2', '2')
     ], Facwparser::Parser.parse_value('1*hoge*2', {}))
   end
 
-  def test_parse_value_italic
+  def test_parse_value_emphasis
       assert_equal([
         Facwparser::Element::Text.new('1', '1'),
-        Facwparser::Element::Italic.new('_hoge_', 'hoge'),
+        Facwparser::Element::Emphasis.new('_hoge_', 'hoge'),
         Facwparser::Element::Text.new('2', '2')
     ], Facwparser::Parser.parse_value('1_hoge_2', {}))
   end
@@ -69,6 +69,11 @@ class TestParseValue < Test::Unit::TestCase
         Facwparser::Element::Image.new('!http://www.unixuser.org/!', 'http://www.unixuser.org/'),
         Facwparser::Element::Text.new('2', '2')
     ], Facwparser::Parser.parse_value('1!http://www.unixuser.org/!2', {}))
+      assert_equal([
+        Facwparser::Element::Text.new('1', '1'),
+        Facwparser::Element::Image.new('!/hoge.png!', '/hoge.png'),
+        Facwparser::Element::Text.new('2', '2')
+    ], Facwparser::Parser.parse_value('1!/hoge.png!2', {}))
   end
 
   def test_parse_value_jira_macro

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: facwparser
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-14 00:00:00.000000000 Z
+date: 2013-02-15 00:00:00.000000000 Z
 dependencies: []
 description: Fuxxing Atlassian Confluence Wiki Parser
 email:
@@ -31,6 +31,7 @@ files:
 - lib/facwparser/version.rb
 - sample/confluence2html.rb
 - tests/all_tests.rb
+- tests/units/element/test_a.rb
 - tests/units/element/test_code.rb
 - tests/units/element/test_heading.rb
 - tests/units/element/test_horizontal_rule.rb
@@ -42,6 +43,7 @@ files:
 - tests/units/element/test_table.rb
 - tests/units/element/test_table_data.rb
 - tests/units/element/test_table_headers.rb
+- tests/units/element/test_toc.rb
 - tests/units/parser/test_add_list_elements.rb
 - tests/units/parser/test_parse1.rb
 - tests/units/parser/test_parse_value.rb