facwparser 0.0.8 → 0.0.9

data/lib/facwparser/parser.rb

@@ -6,6 +6,9 @@ require File.dirname(__FILE__) + '/element'
 
 module Facwparser
   module Parser
+
+    SPECIAL_CHARACTERS_REGEX = %w( [ ] \\ * + _ ? { } ! ^ ~ - ).map{|e| Regexp.escape(e)}.join
+
     def self.parse(content, options = {})
       elements = parse_block(content, options)
       process_elements(elements, options)
@@ -19,9 +22,9 @@ module Facwparser
     end
 
     def self.add_headings_to_toc(elements, options)
-      tocs = elements.select{ |e| e.class == Element::TocMacro}
+      tocs = elements.select{ |e| e.is_a?(Element::TocMacro)}
       if !tocs.empty?
-        headings = elements.select{ |e| e.class == Element::Heading && e.level == 1}
+        headings = elements.select{ |e| e.is_a?(Element::Heading) && e.level == 1}
         id = 0
         headings.each { |h|
           h.id = 'heading_' + id.to_s
@@ -37,7 +40,7 @@ module Facwparser
       list_stack = []
       elements.each { |e|
         case
-        when e.class == Element::ListItem
+        when e.is_a?(Element::ListItem)
           while list_stack.size > e.level
             list_stack.pop
           end
@@ -131,16 +134,13 @@ module Facwparser
     end
 
     def self.unescape_text(text)
-      text.gsub(/\\([\[\]\*+_?{}!^~-])/) {
+      text.gsub(/\\([#{SPECIAL_CHARACTERS_REGEX}])/o) {
         $1
       }
     end
 
     def self.parse_value(value, options)
 
-      #jira
-      #img
-
       children = []
 
       value.split("\n").each { |l|
@@ -175,11 +175,11 @@ module Facwparser
             children << Element::ColorMacroStart.new(s[0], unescape_text(s[1]))
           when s.scan(/\{color\}/)
             children << Element::ColorMacroEnd.new(s[0])
-          when s.scan(/[^\[\a^\\*+_?{}!-]+/)
-            children << Element::Text.new(s[0], unescape_text(s[0]))
           when s.scan(/\\\\/)
             children << Element::Br.new(s[0])
-          when s.scan(/\\[\[\]\*+_?{}!^~-]/)
+          when s.scan(/\\([#{SPECIAL_CHARACTERS_REGEX}])/o)
+            children << Element::Text.new(s[0], s[1])
+          when s.scan(/[^#{SPECIAL_CHARACTERS_REGEX}]+/o)
             children << Element::Text.new(s[0], unescape_text(s[0]))
           else
             children << Element::Text.new(s.rest, unescape_text(s.rest))

data/lib/facwparser/version.rb

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

data/tests/units/parser/test_unescape_text.rb

@@ -0,0 +1,27 @@
+# -*- encoding: utf-8 -*-
+require 'test/unit'
+require File.dirname(__FILE__) + '/../../../lib/facwparser/parser'
+
+
+class TestUnescapeText < Test::Unit::TestCase
+
+  def test_unescape_text
+
+    %w( [ ] \\ * + _ ? { } ! ^ ~ - ).each { |e|
+      assert_equal(e, Facwparser::Parser.unescape_text('\\' + e))
+    }
+
+    assert_equal('hogehoge', Facwparser::Parser.unescape_text('hogehoge'))
+    assert_equal('hoge[]', Facwparser::Parser.unescape_text('hoge\[\]'))
+    assert_equal('hoge\\', Facwparser::Parser.unescape_text('hoge\\\\'))
+    assert_equal('hoge*', Facwparser::Parser.unescape_text('hoge\*'))
+    assert_equal('hoge+_?{}', Facwparser::Parser.unescape_text('hoge\+\_\?\{\}'))
+    assert_equal('hoge!^~-', Facwparser::Parser.unescape_text('hoge\!\^\~\-'))
+
+    assert_equal('hoge[]', Facwparser::Parser.unescape_text('hoge[]'))
+    assert_equal('hoge\\', Facwparser::Parser.unescape_text('hoge\\'))
+    assert_equal('hoge*', Facwparser::Parser.unescape_text('hoge*'))
+    assert_equal('hoge+_?{}', Facwparser::Parser.unescape_text('hoge+_?{}'))
+    assert_equal('hoge!^~-', Facwparser::Parser.unescape_text('hoge!^~-'))
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: facwparser
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-27 00:00:00.000000000 Z
+date: 2013-03-06 00:00:00.000000000 Z
 dependencies: []
 description: Fuxxing Atlassian Confluence Wiki Parser
 email:
@@ -63,6 +63,7 @@ files:
 - tests/units/parser/test_add_table_elements.rb
 - tests/units/parser/test_parse_block.rb
 - tests/units/parser/test_parse_value.rb
+- tests/units/parser/test_unescape_text.rb
 homepage: https://github.com/haruyama/facwparser
 licenses: []
 post_install_message: 
@@ -88,3 +89,4 @@ signing_key:
 specification_version: 3
 summary: Parser of Atlassian Confluence Wiki Markup.
 test_files: []
+has_rdoc: