facwparser 0.0.4 → 0.0.5

data/lib/facwparser/element.rb

@@ -195,7 +195,7 @@ module Facwparser
         @value = value
       end
       def render_html(options)
-        render_html_by_name_and_value(['pre', {'class' => 'noformat'}] , @value, "\n") + "\n"
+        render_html_by_name_and_value(['pre', {'class' => 'noformat'}] , @value) + "\n"
       end
     end
     class CodeMacro < MacroBase
@@ -205,9 +205,8 @@ module Facwparser
         @value = value
       end
       def render_html(options)
-        "<pre class=\"#{CGI.escapeHTML(@options[1..-1])}\">\n" +
-          render_html_by_name_and_value('code', @value, "\n") + "\n" +
-          "</pre>" + "\n"
+        "<pre class=\"#{CGI.escapeHTML(@options[1..-1])}\">" +
+          render_html_by_name_and_value('code', @value) + "</pre>" + "\n"
       end
     end
     class QuoteMacro < MacroBase
@@ -334,7 +333,7 @@ module Facwparser
 
     class Text < InlineElementBase
       def render_html(options)
-        CGI.escapeHTML @source
+        CGI.escapeHTML @text
       end
     end
 

data/lib/facwparser/parser.rb

@@ -175,7 +175,7 @@ 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(/[^\[^\\*_+{!-]+/)
+          when s.scan(/[^\[\a^\\*+_?{}!-]+/)
             children << Element::Text.new(s[0], unescape_text(s[0]))
           when s.scan(/\\\\/)
             children << Element::Br.new(s[0])

data/lib/facwparser/version.rb

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

data/tests/units/element/test_code.rb

@@ -7,7 +7,7 @@ class TestCode < Test::Unit::TestCase
 
   def test_code_1
     code = Facwparser::Element::CodeMacro.new("{code:perl}\n*a*\n{code}\n", ':perl', '*a*')
-    assert_equal(%Q{<pre class="perl">\n<code>\n*a*\n</code>\n</pre>\n},
+    assert_equal(%Q{<pre class="perl"><code>*a*</code></pre>\n},
                  code.render_html({}))
   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 class="noformat">\n*a*\n</pre>\n},
+    assert_equal(%Q{<pre class="noformat">*a*</pre>\n},
                  noformat.render_html({}))
   end
 

data/tests/units/parser/test_parse_value.rb

@@ -118,6 +118,10 @@ class TestParseValue < Test::Unit::TestCase
         Facwparser::Element::JiraMacro.new('{jira:SYSTEMRD\-1}', 'SYSTEMRD-1'),
     ], Facwparser::Parser.parse_value('1\\{{jira:SYSTEMRD\\-1}', {}))
 
+    assert_equal([
+                 Facwparser::Element::Text.new('\\-', '-'),
+    ], Facwparser::Parser.parse_value('\\-', {}))
+
   end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: facwparser
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
   prerelease: 
 platform: ruby
 authors: