facwparser 0.0.3 → 0.0.4

data/lib/facwparser/element.rb

@@ -124,9 +124,9 @@ module Facwparser
     end
     class TableHeaders < ElementBase
       attr_reader :elements
-      def initialize(source)
+      def initialize(source, value)
         super(source)
-        @elements = source[2..-3].split('||')
+        @elements = value[2..-3].split('||')
       end
       def render_html(options)
         "<tr>" +
@@ -136,11 +136,11 @@ module Facwparser
     end
     class TableData < ElementBase
       attr_reader :elements
-      def initialize(source)
+      def initialize(source, value)
         super(source)
         @elements = []
         element = ''
-        s = StringScanner.new(source[1..-2])
+        s = StringScanner.new(value[1..-2])
         in_link = false
         while s.rest?
           case
@@ -195,7 +195,7 @@ module Facwparser
         @value = value
       end
       def render_html(options)
-        render_html_by_name_and_value('pre', @value, "\n") + "\n"
+        render_html_by_name_and_value(['pre', {'class' => 'noformat'}] , @value, "\n") + "\n"
       end
     end
     class CodeMacro < MacroBase
@@ -260,9 +260,7 @@ module Facwparser
 
     class Strike < InlineElementBase
       def render_html(options)
-        '<span style="text-decoration: line-through;">' +
-          CGI.escapeHTML(@text) +
-          '</span>'
+        render_html_by_name_and_value(['span', {'style' => 'text-decoration: line-through;'}] , @text)
       end
     end
 
@@ -278,13 +276,13 @@ module Facwparser
       end
     end
 
-    class SUP < InlineElementBase
+    class Sup < InlineElementBase
       def render_html(options)
         render_html_by_name_and_value('sup', @text)
       end
     end
 
-    class SUB < InlineElementBase
+    class Sub < InlineElementBase
       def render_html(options)
         render_html_by_name_and_value('sub', @text)
       end
@@ -341,6 +339,9 @@ module Facwparser
     end
 
     class Br < InlineElementBase
+      def initialize(source)
+        super(source, source)
+      end
       def render_html(options)
         '<br>'
       end

data/lib/facwparser/parser.rb

@@ -12,7 +12,6 @@ module Facwparser
     end
 
     def self.process_elements(elements, options)
-      # TODO toc
       processed = add_list_elements(elements, options)
       processed = add_table_elements(processed, options)
       processed = add_toc(processed, options)
@@ -97,12 +96,12 @@ module Facwparser
         when s.scan(/([*\-#]+) +(.+)\n/)
           p = nil
           elements << Element::ListItem.new(s[0], s[1], s[2])
-        when s.scan(/\|\|.+\|\| *\n/)
+        when s.scan(/(\|\|.+\|\|) *\n/)
           p = nil
-          elements << Element::TableHeaders.new(s[0])
-        when s.scan(/\|.+\| *\n/)
+          elements << Element::TableHeaders.new(s[0], s[1])
+        when s.scan(/(\|.+\|) *\n/)
           p = nil
-          elements << Element::TableData.new(s[0])
+          elements << Element::TableData.new(s[0], s[1])
         when s.scan(/\{toc(:.*)?\} *\n/)
           p = nil
           elements << Element::TocMacro.new(s[0], s[1] ? s[1][1,] : nil)
@@ -159,9 +158,9 @@ module Facwparser
           when s.scan(/\+(.+?)(?<!\\)\+/)
             children << Element::Under.new(s[0], unescape_text(s[1]))
           when s.scan(/\^(.+?)(?<!\\)\^/)
-            children << Element::SUP.new(s[0], unescape_text(s[1]))
+            children << Element::Sup.new(s[0], unescape_text(s[1]))
           when s.scan(/\~(.+?)(?<!\\)\~/)
-            children << Element::SUB.new(s[0], unescape_text(s[1]))
+            children << Element::Sub.new(s[0], unescape_text(s[1]))
           when s.scan(/\?\?(.+?)(?<!\\)\?\?/)
             children << Element::Q.new(s[0], unescape_text(s[1]))
           when s.scan(/\{\{(.+?)(?<!\\)\}\}/)
@@ -179,7 +178,7 @@ module Facwparser
           when s.scan(/[^\[^\\*_+{!-]+/)
             children << Element::Text.new(s[0], unescape_text(s[0]))
           when s.scan(/\\\\/)
-            children << Element::Br.new(s[0], unescape_text(s[0]))
+            children << Element::Br.new(s[0])
           when s.scan(/\\[\[\]\*+_?{}!^~-]/)
             children << Element::Text.new(s[0], unescape_text(s[0]))
           else

data/lib/facwparser/version.rb

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

data/tests/units/element/test_br.rb

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

data/tests/units/element/test_color_end.rb

@@ -0,0 +1,12 @@
+# -*- encoding: utf-8 -*-
+require 'test/unit'
+require File.dirname(__FILE__) + '/../../../lib/facwparser/element'
+
+class TestColorEnd < Test::Unit::TestCase
+
+  def test_color_end_1
+    ce = Facwparser::Element::ColorMacroEnd.new('{color}')
+    assert_equal(%Q{</span>},
+                 ce.render_html({}))
+  end
+end

data/tests/units/element/test_color_start.rb

@@ -0,0 +1,12 @@
+# -*- encoding: utf-8 -*-
+require 'test/unit'
+require File.dirname(__FILE__) + '/../../../lib/facwparser/element'
+
+class TestColorStart < Test::Unit::TestCase
+
+  def test_color_start_1
+    cs = Facwparser::Element::ColorMacroStart.new('{color:red}', 'red')
+    assert_equal(%Q{<span style="color: red">},
+                 cs.render_html({}))
+  end
+end

data/tests/units/element/test_emphasis.rb

@@ -0,0 +1,12 @@
+# -*- encoding: utf-8 -*-
+require 'test/unit'
+require File.dirname(__FILE__) + '/../../../lib/facwparser/element'
+
+class TestEmphasis < Test::Unit::TestCase
+
+  def test_emphasis_1
+    emphasis = Facwparser::Element::Emphasis.new('_hoge_', 'hoge')
+    assert_equal(%Q{<em>hoge</em>},
+                 emphasis.render_html({}))
+  end
+end

data/tests/units/element/test_monospace.rb

@@ -0,0 +1,12 @@
+# -*- encoding: utf-8 -*-
+require 'test/unit'
+require File.dirname(__FILE__) + '/../../../lib/facwparser/element'
+
+class TestMonospace < Test::Unit::TestCase
+
+  def test_monospace_1
+    monospace = Facwparser::Element::Monospace.new('{{hoge}}', 'hoge')
+    assert_equal(%Q{<code>hoge</code>},
+                 monospace.render_html({}))
+  end
+end

data/tests/units/element/test_noformat.rb

@@ -7,7 +7,7 @@ class TestNoformat < Test::Unit::TestCase
 
   def test_noformat_1
     noformat = Facwparser::Element::NoformatMacro.new("{noformat}\n*a*\n{noformat}\n", '*a*')
-    assert_equal(%Q{<pre>\n*a*\n</pre>\n},
+    assert_equal(%Q{<pre class="noformat">\n*a*\n</pre>\n},
                  noformat.render_html({}))
   end
 

data/tests/units/element/test_q.rb

@@ -0,0 +1,12 @@
+# -*- encoding: utf-8 -*-
+require 'test/unit'
+require File.dirname(__FILE__) + '/../../../lib/facwparser/element'
+
+class TestQ < Test::Unit::TestCase
+
+  def test_q_1
+    q = Facwparser::Element::Q.new('??hoge??', 'hoge')
+    assert_equal(%Q{<q>hoge</q>},
+                 q.render_html({}))
+  end
+end

data/tests/units/element/test_strike.rb

@@ -0,0 +1,12 @@
+# -*- encoding: utf-8 -*-
+require 'test/unit'
+require File.dirname(__FILE__) + '/../../../lib/facwparser/element'
+
+class TestStrike < Test::Unit::TestCase
+
+  def test_strike_1
+    strike = Facwparser::Element::Strike.new('-hoge-', 'hoge')
+    assert_equal(%Q{<span style="text-decoration: line-through;">hoge</span>},
+                 strike.render_html({}))
+  end
+end

data/tests/units/element/test_strong.rb

@@ -0,0 +1,12 @@
+# -*- encoding: utf-8 -*-
+require 'test/unit'
+require File.dirname(__FILE__) + '/../../../lib/facwparser/element'
+
+class TestStrong < Test::Unit::TestCase
+
+  def test_strong_1
+    strong = Facwparser::Element::Strong.new('*hoge*', 'hoge')
+    assert_equal(%Q{<strong>hoge</strong>},
+                 strong.render_html({}))
+  end
+end

data/tests/units/element/test_sub.rb

@@ -0,0 +1,12 @@
+# -*- encoding: utf-8 -*-
+require 'test/unit'
+require File.dirname(__FILE__) + '/../../../lib/facwparser/element'
+
+class TestSub < Test::Unit::TestCase
+
+  def test_sub_1
+    sub = Facwparser::Element::Sub.new('^hoge^', 'hoge')
+    assert_equal(%Q{<sub>hoge</sub>},
+                 sub.render_html({}))
+  end
+end

data/tests/units/element/test_sup.rb

@@ -0,0 +1,12 @@
+# -*- encoding: utf-8 -*-
+require 'test/unit'
+require File.dirname(__FILE__) + '/../../../lib/facwparser/element'
+
+class TestSup < Test::Unit::TestCase
+
+  def test_sup_1
+    sup = Facwparser::Element::Sup.new('^hoge^', 'hoge')
+    assert_equal(%Q{<sup>hoge</sup>},
+                 sup.render_html({}))
+  end
+end

data/tests/units/element/test_table.rb

@@ -7,9 +7,9 @@ class TestTable < Test::Unit::TestCase
 
   def test_table_1
     table = Facwparser::Element::Table.new
-    tr = Facwparser::Element::TableHeaders.new('||hoge||kuke||')
-    td1 = Facwparser::Element::TableData.new('|1|2|')
-    td2 = Facwparser::Element::TableData.new('|3|4|')
+    tr = Facwparser::Element::TableHeaders.new("||hoge||kuke||\n", '||hoge||kuke||')
+    td1 = Facwparser::Element::TableData.new("|1|2|\n", '|1|2|')
+    td2 = Facwparser::Element::TableData.new("|3|4|\n", '|3|4|')
     table.push tr
     table.push td1
     table.push td2

data/tests/units/element/test_table_data.rb

@@ -6,13 +6,13 @@ require File.dirname(__FILE__) + '/../../../lib/facwparser/element'
 class TestTableData < Test::Unit::TestCase
 
   def test_table_data_1
-    td = Facwparser::Element::TableData.new('|hoge|kuke|')
+    td = Facwparser::Element::TableData.new("|hoge|kuke|\n", '|hoge|kuke|')
     assert_equal(%Q{<tr><td>hoge</td><td>kuke</td></tr>},
                  td.render_html({}))
   end
 
   def test_table_data_2
-    td = Facwparser::Element::TableData.new('|hoge|[hoge|http://www.unixuser.org]|')
+    td = Facwparser::Element::TableData.new("|hoge|[hoge|http://www.unixuser.org]|\n", '|hoge|[hoge|http://www.unixuser.org]|')
     assert_equal(%Q{<tr><td>hoge</td><td><a href="http://www.unixuser.org">hoge</a></td></tr>},
                  td.render_html({}))
   end

data/tests/units/element/test_table_headers.rb

@@ -6,13 +6,13 @@ require File.dirname(__FILE__) + '/../../../lib/facwparser/element'
 class TestTableHeaders < Test::Unit::TestCase
 
   def test_table_headers_1
-    tr = Facwparser::Element::TableHeaders.new('||hoge||kuke||')
+    tr = Facwparser::Element::TableHeaders.new("||hoge||kuke|| \n", '||hoge||kuke||')
     assert_equal(%Q{<tr><th>hoge</th><th>kuke</th></tr>},
                  tr.render_html({}))
   end
 
   def test_table_headers_2
-    tr = Facwparser::Element::TableHeaders.new('||hoge||[hoge|http://www.unixuser.org]||')
+    tr = Facwparser::Element::TableHeaders.new("||hoge||[hoge|http://www.unixuser.org]||\n", '||hoge||[hoge|http://www.unixuser.org]||')
     assert_equal(%Q{<tr><th>hoge</th><th><a href="http://www.unixuser.org">hoge</a></th></tr>},
                  tr.render_html({}))
   end

data/tests/units/element/test_text.rb

@@ -0,0 +1,12 @@
+# -*- encoding: utf-8 -*-
+require 'test/unit'
+require File.dirname(__FILE__) + '/../../../lib/facwparser/element'
+
+class TestText < Test::Unit::TestCase
+
+  def test_text_1
+    text = Facwparser::Element::Text.new('hoge>', 'hoge>')
+    assert_equal(%Q{hoge&gt;},
+                 text.render_html({}))
+  end
+end

data/tests/units/element/test_under.rb

@@ -0,0 +1,12 @@
+# -*- encoding: utf-8 -*-
+require 'test/unit'
+require File.dirname(__FILE__) + '/../../../lib/facwparser/element'
+
+class TestUnder < Test::Unit::TestCase
+
+  def test_Under_1
+    under = Facwparser::Element::Under.new('+hoge+', 'hoge')
+    assert_equal(%Q{<u>hoge</u>},
+                 under.render_html({}))
+  end
+end

data/tests/units/parser/test_parse1.rb

@@ -98,8 +98,8 @@ EOS
     assert_equal(
       [
         Facwparser::Element::P.new("1\n"),
-        Facwparser::Element::TableHeaders.new("||2||3||\n"),
-        Facwparser::Element::TableData.new("|4|5|\n"),
+        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::Parser.parse1(source, {}))

data/tests/units/parser/test_parse_value.rb

@@ -87,7 +87,7 @@ class TestParseValue < Test::Unit::TestCase
   def test_parse_value_br
       assert_equal([
         Facwparser::Element::Text.new('1', '1'),
-        Facwparser::Element::Br.new("\\\\", "\\\\"),
+        Facwparser::Element::Br.new('\\\\'),
         Facwparser::Element::Text.new('2', '2')
     ], Facwparser::Parser.parse_value("1\\\\2", {}))
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: facwparser
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-15 00:00:00.000000000 Z
+date: 2013-02-18 00:00:00.000000000 Z
 dependencies: []
 description: Fuxxing Atlassian Confluence Wiki Parser
 email:
@@ -32,18 +32,30 @@ files:
 - sample/confluence2html.rb
 - tests/all_tests.rb
 - tests/units/element/test_a.rb
+- tests/units/element/test_br.rb
 - tests/units/element/test_code.rb
+- tests/units/element/test_color_end.rb
+- tests/units/element/test_color_start.rb
+- tests/units/element/test_emphasis.rb
 - tests/units/element/test_heading.rb
 - tests/units/element/test_horizontal_rule.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_p.rb
+- tests/units/element/test_q.rb
 - tests/units/element/test_quote.rb
+- tests/units/element/test_strike.rb
+- tests/units/element/test_strong.rb
+- tests/units/element/test_sub.rb
+- tests/units/element/test_sup.rb
 - tests/units/element/test_table.rb
 - tests/units/element/test_table_data.rb
 - tests/units/element/test_table_headers.rb
+- tests/units/element/test_text.rb
 - tests/units/element/test_toc.rb
+- tests/units/element/test_under.rb
 - tests/units/parser/test_add_list_elements.rb
 - tests/units/parser/test_parse1.rb
 - tests/units/parser/test_parse_value.rb