trac-wiki 0.1.12 → 0.2.16

data/.gitignore

@@ -0,0 +1,2 @@
+trac-wiki-*.gem
+*.swp

data/Gemfile

@@ -1,3 +1,4 @@
 source 'https://rubygems.org/'
 gemspec
 gem 'iconv'
+gem 'sanitize'

data/Gemfile.lock

@@ -0,0 +1,26 @@
+PATH
+  remote: .
+  specs:
+    trac-wiki (0.2.12)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    bacon (1.2.0)
+    iconv (1.0.3)
+    mini_portile (0.5.2)
+    nokogiri (1.6.1)
+      mini_portile (~> 0.5.0)
+    rake (10.0.4)
+    sanitize (2.0.6)
+      nokogiri (>= 1.4.4)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  bacon
+  iconv
+  rake
+  sanitize
+  trac-wiki!

data/lib/trac-wiki.rb

@@ -1,4 +1,5 @@
 require 'trac-wiki/parser'
+require 'trac-wiki/tree'
 require 'trac-wiki/version'
 
 module TracWiki

data/lib/trac-wiki/parser.rb

@@ -45,7 +45,7 @@ module TracWiki
     attr_accessor :allowed_schemes
 
     attr_accessor :headings
-
+    attr_writer :base
 
     # Disable url escaping for local links
     # Escaping: [[/Test]] --> %2FTest
@@ -61,6 +61,12 @@ module TracWiki
     attr_writer :math
     def math?; @math; end
 
+    # allow {{{! ... html ... }}}
+    # html will be sanitized
+    # {{{!\n html here  \n}}}\n
+    attr_writer :raw_html
+    def raw_html?; @raw_html; end
+
     attr_writer :edit_heading
     def edit_heading?; @edit_heading; end
 
@@ -79,6 +85,12 @@ module TracWiki
 
     # when id_from_heading, non ascii char are transliterated to ascii
     attr_writer :id_translit
+
+    # string begins with macro
+    MACRO_BEG_REX =  /\A\{\{ ( [\$]?\w+ | \#\w* ) /x
+    MACRO_BEG_INSIDE_REX =  /(.*?)(?<!\{)\{\{ ( \$\w+ | \#\w* | \w+ ) /x
+    # find end of marcro or begin of inner macro
+    MACRO_END_REX =  /\A(.*?) ( \}\} | \{\{ (\$\w+|\#\w*|\w+)  )/mx
     def id_translit?; @id_translit; end
 
     # Create a new Parser instance.
@@ -87,9 +99,14 @@ module TracWiki
       @anames = {}
       @text = text
       @no_escape = nil
+      @base = ''
       options.each_pair {|k,v| send("#{k}=", v) }
+      @base += '/' if !@base.empty? && @base[-1] != '/'
     end
 
+    # th(macroname) -> template_text
+    attr_writer :template_handler
+
     @was_math = false
     def was_math?; @was_math; end
 
@@ -103,7 +120,7 @@ module TracWiki
     # parser.to_html
     # #=> "<p><strong>Hello <em>World</em></strong></p>"
     def to_html
-      @out = ''
+      @tree = TracWiki::Tree.new
       @edit_heading_class = 'editheading'
       @headings = [ {level: 0, sline: 1 } ]
       @p = false
@@ -112,12 +129,13 @@ module TracWiki
       @was_math = false
       @line_no = 1
       parse_block(@text)
-      @out
+      @tree.to_html
     end
 
     def make_toc_html
-      @out = ''
+      @tree = TracWiki::Tree.new
       parse_block(make_toc)
+      @tree.to_html
     end
 
     protected
@@ -130,7 +148,7 @@ module TracWiki
     end
 
     def self.escapeHTML(string)
-      string.gsub(/&/n, '&amp;').gsub(/\"/n, '&quot;').gsub(/>/n, '&gt;').gsub(/</n, '&lt;')
+      string.gsub(/&/, '&amp;').gsub(/\"/, '&quot;').gsub(/>/, '&gt;').gsub(/</, '&lt;')
     end
 
     # Escape any characters with special meaning in URLs using URL
@@ -139,16 +157,16 @@ module TracWiki
       CGI::escape(string)
     end
 
-    def start_tag(tag, args = '', lindent = nil)
+    def start_tag(tag, args = {}, lindent = nil)
       lindent = @stacki.last || -1  if lindent.nil?
 
       @stack.push(tag)
       @stacki.push(lindent)
 
       if tag == 'strongem'
-        @out << '<strong><em>'
+        @tree.tag_beg(:strong).tag_beg(:em)
       else
-        @out << '<' << tag << args << '>'
+        @tree.tag_beg(tag, args)
       end
     end
 
@@ -156,11 +174,11 @@ module TracWiki
       tag = @stack.pop
       tagi = @stacki.pop
       if tag == 'strongem'
-        @out << '</em></strong>'
+        @tree.tag_end(:em).tag_end(:strong);
       elsif tag == 'p'
-        @out << "</p>\n"
+        @tree.tag_end(:p)
       else
-        @out << "</#{tag}>"
+        @tree.tag_end(tag)
       end
     end
 
@@ -169,7 +187,7 @@ module TracWiki
         if @stack.last == tag
           end_tag
         else
-          @out << escape_html(match)
+          @tree.add(match)
         end
       else
         start_tag(tag)
@@ -183,7 +201,8 @@ module TracWiki
 
     def start_paragraph
       if @p
-        @out << ' ' if @out[-1] != ?\s
+        #FIXME: multiple space s
+        @tree.add_spc
       else
         end_paragraph
         start_tag('p')
@@ -210,10 +229,10 @@ module TracWiki
     # make_local_link("LocalLink") #=> "/LocalLink"
     # make_local_link("Wikipedia:Bread") #=> "http://en.wikipedia.org/wiki/Bread"
     def make_local_link(link) #:doc:
-      return link if no_escape?
+      return "#{@base}#{link}" if no_escape?
       link, anch = link.split(/#/, 2)
-      return escape_url(link) if ! anch
-      "#{escape_url(link)}##{escape_url(anch)}"
+      return "#{@base}#{escape_url(link)}" if ! anch
+      "#{@base}#{escape_url(link)}##{escape_url(anch)}"
     end
 
     # Sanatize a direct url (e.g. http://wikipedia.org/). The default
@@ -252,13 +271,14 @@ module TracWiki
     # markup, for example to add html additional attributes or
     # to put divs around the imgs.
     def make_image(uri, attrs='')
-      "<img src=\"#{make_explicit_link(uri)}\"#{make_image_attrs(attrs)}/>"
+      #"<img src=\"#{make_explicit_link(uri)}\"#{make_image_attrs(attrs)}/>"
+      @tree.tag(:img, make_image_attrs(uri, attrs))
     end
 
-    def make_image_attrs(attrs)
-       return '' if ! attrs
-       a = {}
+    def make_image_attrs(uri, attrs)
+       a = {src: make_explicit_link(uri)}
        style = []
+       attrs ||= ''
        attrs.strip.split(/\s*,\s*/).each do |opt|
          case opt
            when /^\d+[^\d]*$/
@@ -277,28 +297,25 @@ module TracWiki
             style.push($1 + ':' + escape_url($3))
          end
        end
-       a['style'] = style.join(';') if ! style.empty?
-       return '' if a.empty?
-       return ' ' + a.map{|k,v| "#{k}=\"#{v}\"" }.sort.join(' ')
+       a[:style] = style.join(';') if ! style.empty?
+       return {}  if a.empty?
+       return a;
     end
 
     def make_headline(level, text, aname)
-      ret = "<h#{level}"
-      if aname
-        ret += " id=\"#{ escape_html(aname) }\""
-      end
-      ret += ">" + escape_html(text)
 
+      hN = "h#{level}".to_sym
+
+      @tree.tag_beg(hN, { id: aname } )
+      parse_inline(text)
       if edit_heading?
-        ret += edit_heading_link(@headings.size - 1)
+        edit_heading_link(@headings.size - 1)
       end
-
-      ret += "</h#{level}>"
-      ret
+      @tree.tag_end(hN)
     end
 
     def edit_heading_link(section)
-        "<a class='#{@edit_heading_class}' href=\"?edit=#{section}\">edit</a>"
+        @tree.tag(:a, { class:  @edit_heading_class, href: "?edit=#{section}"}, "edit")
     end
 
     def make_explicit_link(link)
@@ -329,18 +346,18 @@ module TracWiki
         when /\A(!)?((https?|ftps?):\/\/\S+?)(?=([\]\,.?!:;"'\)]+)?(\s|$))/
           str = $'
           if $1
-            @out << escape_html($2)
+            @tree.add($2)
           else
             if uri = make_direct_link($2)
-              @out << '<a href="' << escape_html(uri) << '">' << escape_html($2) << '</a>'
+              @tree.tag(:a, {href:uri}, $2)
             else
-              @out << escape_html($&)
+              @tree.add($&)
             end
           end
         # [[Image(pic.jpg|tag)]]
         when /\A\[\[Image\(([^,]*?)(,(.*?))?\)\]\]/   # image 
           str = $'
-          @out << make_image($1, $3)
+          make_image($1, $3)
         # [[link]]
         #          [     link1          | text2          ]
         when /\A \[ \s* ([^\[|]*?) \s* (\|\s*(.*?))? \s* \] /mx
@@ -361,58 +378,55 @@ module TracWiki
     def make_link(link, content, whole)
       # specail "link" [[BR]]:
       if link =~ /^br$/i
-        @out << '<br/>'
+        @tree.tag(:br)
         return
       end
       uri = make_explicit_link(link)
       if not uri
-        @out << escape_html(whole)
+        @tree.add(whole)
         return
       end
 
       if no_link?
         if uri !~ /^(ftp|https?):/
-          @out << escape_html(whole)
+          @tree.add(whole)
           return
         end
       end
 
-      @out << '<a href="' << escape_html(uri) << '">'
+      @tree.tag_beg(:a, {href:uri})
       if content
         until content.empty?
           content = parse_inline_tag(content)
         end
       else
-          @out << escape_html(link)
+          @tree.add(link)
       end
-      @out << '</a>'
+      @tree.tag_end(:a)
     end
 
     def parse_inline_tag(str)
       case
       when str =~ /\A\{\{\{(.*?\}*)\}\}\}/     # inline pre (tt)
-        @out << '<tt>' << escape_html($1) << '</tt>'
+        @tree.tag(:tt, $1)
+      when str =~ MACRO_BEG_REX                # macro  {{
+        str, lines = parse_macro($1, $')
+        #print "MACRO.inline(#{$1})"
+        return str
       when str =~ /\A`(.*?)`/                  # inline pre (tt)
-        @out << '<tt>' << escape_html($1) << '</tt>'
-
+        @tree.tag(:tt, $1)
       when math? && str =~ /\A\$(.+?)\$/       # inline math  (tt)
-        @out << '\( ' << escape_html($1) << ' \)'
+        @tree.add("\\( #{$1} \\)")
+        #@tree.add("$#{$1}$")
+        #@tree.tag(:span, {class:'math'},  $1)
         @was_math = true
-
-#      when /\A\[\[Image\(([^|].*?)(\|(.*?))?\)\]\]/   # image 
-#       @out << make_image($1, $3)
-
-#      when /\A\{\{\s*(.*?)\s*(\|\s*(.*?)\s*)?\}\}/
-#        if uri = make_image_link($1)
-#          @out << make_image(uri, $3)
-#        else
-#          @out << escape_html($&)
-#        end                             # link
-
+      when str =~ /\A(\&\w*;)/       # html entity 
+        print "add html ent: #{$1}\n"
+        @tree.add_raw($1)
       when str =~ /\A([:alpha:]|[:digit:])+/
-        @out << $&                      # word
+        @tree.add($&)                      # word
       when str =~ /\A\s+/
-        @out << ' ' if @out[-1] != ?\s  # spaces
+        @tree.add_spc
       when str =~ /\A'''''/
         toggle_tag 'strongem', $&       # bolditallic
       when str =~ /\A\*\*/ || str =~ /\A'''/
@@ -420,25 +434,122 @@ module TracWiki
       when str =~ /\A''/ || str =~ /\A\/\//
         toggle_tag 'em', $&             # italic
       when str =~ /\A\\\\/ || str =~ /\A\[\[br\]\]/i
-        @out << '<br/>'                 # newline
+        @tree.tag(:br)                  # newline
       when str =~ /\A__/
         toggle_tag 'u', $&              # underline
       when str =~ /\A~~/
         toggle_tag 'del', $&            # delete
+      when str =~ /\A~/
+        @tree.add_raw('&nbsp;')         # tilde
 #      when /\A\+\+/
 #        toggle_tag 'ins', $&           # insert
       when str =~ /\A\^/
         toggle_tag 'sup', $&            # ^{}
       when str =~ /\A,,/
         toggle_tag 'sub', $&            # _{}
-      when str =~ /\A!([^\s])/
-        @out << escape_html($1)         # !neco
+      when str =~ /\A!(\{\{|[^\s])/
+        @tree.add($1)                   # !neco !{{
       when str =~ /./
-        @out << escape_html($&)         # ordinal char
+        @tree.add($&)                   # ordinal char
       end
       return $'
     end
 
+    # r: expanded macro + rest of str, count lines taken from str
+    # sideefect: parse result of macro
+    def parse_macro(macro_name, str)
+      begin
+        mac_out, rest, lines = parse_macro_arg(macro_name, str, {})
+        #parse_inline(mac)
+        #@tree.add(mac)
+        #print "MACOUT:'#{mac_out}'\n"
+        return mac_out + rest, lines
+      rescue  Exception => a
+        return "TOO_LONG_EXPANSION_OF_MACRO(#{macro_name})QUIT"
+      end
+    end
+
+    # read to args to }}  (while balancing {{ and }})
+    # ret: (arg, rest, lines)
+    # mac_out  -- string to }} (macros inside expanded)
+    # rest -- str aftrer }}
+    # lines -- howmany \n eaten from str (from begining to }})
+    def parse_macro_arg(macro_name, str, env)
+
+      lines = 0
+      arg = ''
+      # FIXME: MACRO_REX
+      #              prefix  }}...    {{macro_name
+      while str =~ MACRO_END_REX
+        prefix, bracket, sub_macro_name, str = $1, $2, $3, $'
+        arg << prefix
+        lines += prefix.count("\n")
+        if bracket == '}}'
+          #print "prefix: #{prefix}\n"
+          env = do_macro_arg_to_env(arg, env[:depth])
+          return do_macro(macro_name, env), str, lines
+        end
+
+        # we need to go deeper!
+        mac_out, str, l = parse_macro_arg(sub_macro_name, str, env)
+        arg << mac_out
+        lines += l
+      end
+      raise "Error parsing macro near '#{str}' (arg:#{arg}, lines=#{lines})"
+    end
+
+    # expand macro `macro_name` with `args`
+    # afer expansion all {{macros}} will be expanded recursively
+    # r: expanded string
+    def do_macro(macro_name, env)
+      return "!{{toc}}" if macro_name == 'toc'
+      return env[:arg].strip  if macro_name == '#echo'
+      return '' if macro_name == '#'
+
+      return do_macro_var(macro_name, env) if macro_name =~ /^\$/
+
+
+      if ! @template_handler.nil?
+        text = @template_handler.call(macro_name, env)
+        if !text.nil?
+          #print "dep:#{env[:depth]}(#{macro_name}, #{text})\n"
+          if env[:depth] > 32
+             return "TOO_DEEP_RECURSION(`#{text}`)\n"
+             #return "TOO_DEEP_RECURSION"
+          end
+          # FIXME: melo by nahlasit jestli to chce expandovat | wiki expadnovat |raw html
+          #print "temp(#{macro_name}) --> : #{text}\n"
+          text = do_macro_expand_result(text, env)
+          #print "af expand:#{text}\n"
+
+          return text
+        end
+      end
+      "UMACRO(#{macro_name}#{env[:arg]})"
+    end
+
+    def do_macro_var(macro_name, env)
+      "VAR(#{macro_name})"
+    end
+
+    def do_macro_arg_to_env(arg, depth)
+      { arg: arg , depth: (depth||0) + 1  }
+    end
+
+    # template expand
+    def do_macro_expand_result(text, env)
+      ret = ''
+      while text =~ MACRO_BEG_INSIDE_REX
+          prefix, macro_name2, text = $1, $2, $'
+          ret << prefix
+          mac_out, text, lines = parse_macro_arg(macro_name2, text, env)
+          ret << mac_out
+          raise "Too long macro expadion" if ret.size > 1_000_000
+      end
+      return ret + text
+    end
+
+
     def parse_table_row(str)
       start_tag('tr') if !@stack.include?('tr')
       colspan = 1
@@ -457,17 +568,17 @@ module TracWiki
           next
         end
 
-        style = ''
+        style = nil
         if  txt =~ /\S(\s*)$/
               ri = $1.size
               ri += 100 if tail.empty? # do not right when last || omnited
-              style = " style='text-align:right'"  if ri == 0 && le >= 1
-              style = " style='text-align:center'" if le >= 2 && ri >= 2
+              style = 'text-align:right'  if ri == 0 && le >= 1
+              style = 'text-align:center' if le >= 2 && ri >= 2
               #print "le#{le} ri#{ri} st:#{style}\n"
         end
 
-        colspan_txt  =  colspan > 1 ? " colspan='#{colspan}'" : ''
-        start_tag(tdth, style + colspan_txt);
+        colspan =  colspan > 1 ? colspan : nil;
+        start_tag(tdth, { style:style, colspan: colspan});
         colspan = 1
 
         parse_inline(txt.strip) if txt
@@ -510,14 +621,15 @@ module TracWiki
       if @stacki.empty? || @stacki.last <  spc_size
         bullet.gsub!(/\.$/,'')
         ulol = bullet =~ /[-*]/ ? 'ul' : 'ol';
-        attr = ""
-        attr = " type='i'" if bullet =~ /i/i;
-        attr = " type='a'" if bullet =~ /a/i;
 
-        if bullet =~ /^\d+$/ && bullet != '1'
-                attr += " start='#{bullet}'"
-        end
-        start_tag(ulol, attr, spc_size)
+        type = nil
+        type = 'i' if bullet =~ /i/i;
+        type = 'a' if bullet =~ /a/i;
+
+        start = nil
+        start = bullet if bullet =~ /^\d+$/ && bullet != '1'
+
+        start_tag(ulol, {type: type, start: start}, spc_size)
       end
 
       start_tag('li')
@@ -528,7 +640,7 @@ module TracWiki
     def blockquote_level_to(level)
       cur_level = @stack.count('blockquote')
       if cur_level ==  level
-        @out << ' '
+        @tree.add(' ')
         return
       end
       while cur_level < level
@@ -541,100 +653,132 @@ module TracWiki
       end
     end
 
+    def do_math(text)
+      end_paragraph
+      @tree.add("$$#{text}$$\n")
+      @was_math = true
+    end
+    def do_merge(merge_type, who)
+      merge_class = case merge_type[0]
+                      when '<' ; 'merge-mine'
+                      when '=' ; 'merge-split'
+                      when '|' ; 'merge-orig'
+                      when '>' ; 'merge-your'
+                    end
+      end_paragraph
+      @tree.tag(:div, { class: "merge #{merge_class}" }, who)
+    end
+    def do_pre(text)
+      end_paragraph
+      nowikiblock = make_nowikiblock(text)
+      @tree.tag(:pre, nowikiblock)
+    end
+
+    def do_raw_html(text)
+      end_paragraph
+      @tree.add_raw(text)
+    end
+
+    def do_hr
+      end_paragraph
+      @tree.tag(:hr)
+    end
+
+    def do_heading(level, title, aname)
+      aname= aname_nice(aname, title)
+      @headings.last[:eline] = @line_no - 1
+      @headings.push({ :title =>  title, :sline => @line_no, :aname => aname, :level => level, })
+      end_paragraph
+      make_headline(level, title, aname)
+    end
+    def do_table_row(text)
+      if !@stack.include?('table')
+        end_paragraph
+        start_tag('table')
+      end
+      parse_table_row(text)
+    end
+    def do_term(term)
+      start_tag('dl')
+      start_tag('dt')
+      @tree.add(term)
+      end_tag
+      start_tag('dd')
+    end
+
+    def do_citation(level, quote) 
+      start_paragraph if !@stack.include? 'p'
+      blockquote_level_to(level)
+      parse_inline(quote.strip)
+    end
+
+    def do_ord_line(spc_size, text)
+      text.rstrip!
+
+      if @stack.include?('li') || @stack.include?('dl')
+
+        # dl, li continuation
+        parse_inline(' ')
+        parse_inline(text)
+
+      elsif spc_size > 0
+        # quote continuation
+        start_paragraph if !@stack.include? 'p'
+        blockquote_level_to(1)
+        parse_inline(text)
+
+      else
+        # real ordinary line
+        start_paragraph
+        parse_inline(text)
+      end
+    end
+
     def parse_block(str)
+      #print "BLOCK.str(#{str})\n"
       until str.empty?
         case
-        # pre {{{ ... }}}
+        # macro
+        when str =~ MACRO_BEG_REX
+          str, lines = parse_macro($1, $')
+          #print "MACRO.block(#{$1})\n"
+          next
+        # display math $$
         when math? && str =~ /\A\$\$(.*?)\$\$/m
-          end_paragraph
-          nowikiblock = make_nowikiblock($1)
-          @out << "$$" << escape_html(nowikiblock) << "$$\n"
-          @was_math = true
+          do_math($1)
+        # merge
         when merge? && str =~ /\A(<{7}|={7}|>{7}|\|{7}) *(\S*).*$(\r?\n)?/
-          who = $2
-          merge_class = case $1[0]
-                          when '<' ; 'merge-mine'
-                          when '=' ; 'merge-split'
-                          when '|' ; 'merge-orig'
-                          when '>' ; 'merge-your'
-                        end
-          end_paragraph
-          @out << "<div class='merge #{merge_class}'>" << escape_html(who) << "</div>\n"
+          do_merge($1, $2)
+        # raw_html {{{! ... }}}
+        when raw_html? && str =~ /\A\{\{\{!\r?\n(.*?)\r?\n\}\}\}/m
+          do_raw_html($1)
+        # pre {{{ ... }}}
         when str =~ /\A\{\{\{\r?\n(.*?)\r?\n\}\}\}/m
-          end_paragraph
-          nowikiblock = make_nowikiblock($1)
-          @out << '<pre>' << escape_html(nowikiblock) << '</pre>'
-
+          do_pre($1)
         # horizontal rule
         when str =~ /\A\s*-{4,}\s*$/
-          end_paragraph
-          @out << '<hr/>'
-
+          do_hr()
         # heading == Wiki Ruless ==
         # heading == Wiki Ruless ==  #tag
         when str =~ /\A[[:blank:]]*(={1,6})\s*(.*?)\s*=*\s*(#(\S*))?\s*$(\r?\n)?/
-          level = $1.size
-          title= $2
-          aname= aname_nice($4, title)
-          @headings.last[:eline] = @line_no - 1
-          @headings.push({ :title =>  title, :sline => @line_no, :aname => aname, :level => level, })
-          end_paragraph
-          @out << make_headline(level, title, aname)
-
-        # table row
+          do_heading($1.size, $2, $4)
+        # table row ||
         when str =~ /\A[ \t]*\|\|(.*)$(\r?\n)?/
-          if !@stack.include?('table')
-            end_paragraph
-            start_tag('table')
-          end
-          parse_table_row($1)
-
+          do_table_row($1)
         # empty line
         when str =~ /\A\s*$(\r?\n)?/
           end_paragraph
         when str =~ /\A([:\w\s]+)::(\s+|\r?\n)/
-          term = $1
-          start_tag('dl')
-          start_tag('dt')
-          @out << escape_html(term)
-          end_tag
-          start_tag('dd')
-
+          do_term($1)
         # li
         when str =~ /\A(\s*)([*-]|[aAIi\d]\.)\s+(.*?)$(\r?\n)?/
           parse_li_line($1.size, $2, $3)
-
+        # citation
         when str =~ /\A(>[>\s]*)(.*?)$(\r?\n)?/
-          # citation
-          level, quote =  $1.count('>'), $2
-
-          start_paragraph if !@stack.include? 'p'
-          blockquote_level_to(level)
-          parse_inline(quote.strip)
-
-
+          do_citation($1.count('>'), $2)
         # ordinary line
         when str =~ /\A(\s*)(\S+.*?)$(\r?\n)?/
-          spc_size, text =  $1.size, $2
-          text.rstrip!
-
-          if @stack.include?('li') ||@stack.include?('dl')
-
-            # dl, li continuation
-            parse_inline(' ')
-            parse_inline(text)
-
-          elsif spc_size > 0
-            # quote continuation
-            start_paragraph if !@stack.include? 'p'
-            blockquote_level_to(1)
-            parse_inline(text)
-
-          else
-            # real ordinary line
-            start_paragraph
-            parse_inline(text)
-          end
+          do_ord_line($1.size, $2) 
         else # case str
           raise "Parse error at #{str[0,30].inspect}"
         end
@@ -643,7 +787,6 @@ module TracWiki
       end
       end_paragraph
       @headings.last[:eline] = @line_no - 1 
-      @out
     end
 
     def aname_nice(aname, title)
@@ -664,8 +807,5 @@ module TracWiki
       @anames[aname] = true
       aname
     end
-
-
-
   end
 end

data/lib/trac-wiki/tree.rb

@@ -0,0 +1,162 @@
+require 'pp'
+require 'sanitize'
+module TracWiki
+
+    class RawHtml
+      def initialize(text)
+        @text = text
+      end
+      def to_s
+        @text
+      end
+    end
+
+    class Node
+      attr_accessor :tag
+      attr_accessor :par
+      attr_accessor :cont
+      attr_accessor :attrs
+      def initialize(tag_name, par=nil, attrs={}, cont=[])
+        @tag = nil
+        @tag = tag_name.to_sym if tag_name
+        @par = par
+        cont = [ cont ] if cont.is_a? String
+        @cont = cont || []
+        @attrs = attrs || {}
+      end
+
+      def add(cont)
+        @cont << cont
+      end
+    end
+    class Tree
+
+      def initialize
+        @root = Node.new(nil)
+        @cur = @root
+      end
+
+      def tag(tag, attrs = nil, cont = nil)
+        if cont.nil? && ! attrs.is_a?(Hash)
+          # tag(:b, "ahoj") -> tag(:b, {}, "ahoj")
+          cont = attrs
+          attrs = nil
+        end
+        cont = [ cont ] if cont.is_a? String
+        @cur.add(Node.new(tag, @cur, attrs, cont))
+        self
+      end
+
+      def tag_beg(tag_name, attrs = nil, cont = nil)
+        node = Node.new(tag_name, @cur, attrs, cont)
+        @cur.add(node)
+        @cur = node
+        self
+      end
+
+      def tag_end(tag_name)
+        if @cur.tag == tag_name.to_sym
+          @cur = @cur.par
+        else
+          raise "tag_end: cur tag is not <#{tag_name}>, but <#{@cur.tag}>"
+        end
+        self
+      end
+
+      # add space if needed
+      def add_spc
+        if @cur.cont.size > 0
+          last = @cur.cont.last
+          if last.is_a?(String) && last[-1] == ?\s
+            return
+          end
+        end
+        add(' ')
+      end
+
+      def add(cont)
+        @cur.add(cont)
+        self
+      end
+
+      def add_raw(cont)
+        cont_san = Sanitize.clean(cont, san_conf)
+        @cur.add(RawHtml.new(cont_san))
+        self
+      end
+
+
+     def find_par(tag_name, node = nil)
+       node = @cur if node.nil?
+       while ! node.par.nil?
+         if node.tag == tag_name
+            return node.par
+         end
+         node = node.par
+       end
+       nil
+     end
+
+     def to_html
+       tree_to_html(@root)
+     end
+
+     def tree_to_html(node)
+        tag = node.tag
+        if tag.nil?
+          return cont_to_s(node.cont)
+        end
+
+        nl = ""
+        #nl = "\n"  if [:div, :h1, :h2, :h3, :h4, :h5, :p].include? tag
+        nl = "\n"  if [:div, :p].include? tag
+
+        if node.cont.size == 0
+          if [:a, :td, :h1, :h2, :h3, :h4, :h5, :h6,:strong, :script].include? tag
+            return "<#{tag}#{attrs_to_s(node.attrs)}></#{tag}>"
+          end
+          return "<#{tag}#{attrs_to_s(node.attrs)}/>#{nl}"
+        end
+
+        return "<#{tag}#{attrs_to_s(node.attrs)}>#{cont_to_s(node.cont)}</#{tag}>#{nl}"
+     end
+
+     def cont_to_s(cont)
+       cont = [cont] if cont.is_a? String
+       cont.map do |c|
+          if c.is_a? Node
+             tree_to_html(c)
+          elsif c.is_a? RawHtml
+             c.to_s
+          else
+             TracWiki::Parser.escapeHTML(c.to_s)
+          end
+        end.join('')
+      end
+
+     def attrs_to_s(attrs)
+       return '' if attrs.nil? || attrs.size == 0
+       ret = ['']
+       attrs.each_pair do |k,v|
+         ret.push "#{TracWiki::Parser.escapeHTML(k.to_s)}=\"#{TracWiki::Parser.escapeHTML(v.to_s)}\"" if !v.nil?
+       end
+       return ret.sort.join(' ')
+     end
+
+     def san_conf
+        return @san_conf if @san_conf
+        conf = { elements:   ['form', 'input'],
+                 attributes: { 'form'  =>  ['action', 'meth'],
+                               'input' =>  ['type', 'value'],
+                             },
+               }
+                   
+        @san_conf = conf.merge(Sanitize::Config::RELAXED){|k,o,n| o.is_a?(Hash) ? o.merge(n) :
+                                                                  o.is_a?(Array) ? o + n :
+                                                                  n }
+
+        #pp @san_conf
+        @san_conf
+     end
+    end
+end

data/lib/trac-wiki/version.rb

@@ -1,3 +1,3 @@
 module TracWiki
-  VERSION = '0.1.12'
+  VERSION = '0.2.16'
 end

data/test/parser_test.rb

@@ -1,11 +1,30 @@
+# encoding: UTF-8
 require 'trac-wiki'
 require 'pp'
 
 
 class Bacon::Context
   def tc(html, wiki, options = {})
+    #options[:template_handler] = proc {|tname,env| template_handler(tname, env) }
+    options[:template_handler] = self.method(:template_handler)
     TracWiki.render(wiki, options).should.equal html
   end
+
+  def template_handler(tname, env)
+    case tname
+    when 'test'
+      "{{west}}"
+    when 'west'
+      "WEST"
+    when 'deep'
+      "{{deep}}"
+    when 'wide'
+      "0123456789{{wide}}" * 10
+    else
+      nil
+      #"UNK_TEMPL(#{tname})"
+    end
+  end
   def  h(hash, wiki, opts = {})
     parser = TracWiki.parser(wiki, opts)
     parser.to_html
@@ -58,7 +77,8 @@ describe TracWiki::Parser do
   it 'should be toc' do
     tc "<p>{{toc}}</p>\n", "{{toc}}"
     tc "<h2>ahoj</h2><p>{{toc}}</p>\n<h2>ahoj</h2>", "==ahoj==\n{{toc}}\n\n==ahoj==\n"
-    tc "<h2>ahoj</h2><p>{{toc}}</p>\n<h2>ahoj</h2>", "==ahoj==\r\n{{toc}}\r\n\r\n==ahoj==\r\n"
+    #tc "{{toc}}", "{{toc}}"
+    #tc "<h2>ahoj</h2>{{toc}}<h2>ahoj</h2>", "==ahoj==\r\n{{toc}}\r\n\r\n==ahoj==\r\n"
   end
 
   it 'should parse bolditalic' do
@@ -70,6 +90,7 @@ describe TracWiki::Parser do
   end
   it 'should parse monospace' do
     tc "<p>This is <tt>monospace</tt>.</p>\n", "This is {{{monospace}}}."
+    tc "<p>This is not {{{monospace}}}.</p>\n", "This is not !{{{monospace}}}."
     tc "<p>This is <tt>mon**o**space</tt>.</p>\n", "This is {{{mon**o**space}}}."
     tc "<p>This is <tt>mon&lt;o&gt;space</tt>.</p>\n", "This is {{{mon<o>space}}}."
     tc "<p>This is <tt>mon''o''space</tt>.</p>\n", "This is {{{mon''o''space}}}."
@@ -149,6 +170,7 @@ describe TracWiki::Parser do
     tc "<h1>Heading 1</h1>", "= Heading 1 ="
     tc "<h2>Heading 2</h2>", "== Heading 2 =="
     tc "<h3>Heading 3</h3>", "=== Heading 3 ==="
+    tc "<h3>Heading 3\u00a0B</h3>", "=== Heading 3~B ==="
     tc "<h3 id=\"HE3\">Heading 3</h3>", "=== Heading 3 === #HE3"
     tc "<h3 id=\"Heading-3\">Heading 3</h3>", "=== Heading 3 === #Heading-3"
     tc "<h3 id=\"Heading/3\">Heading 3</h3>", "=== Heading 3 === #Heading/3"
@@ -192,6 +214,8 @@ describe TracWiki::Parser do
   it 'should parse links' do
     #  Links
     tc "<p><a href=\"link\">link</a></p>\n", "[[link]]"
+    tc "<p><a href=\"BASE/link\">link</a></p>\n", "[[link]]",  base: 'BASE'
+    tc "<p><a href=\"BASE/link\">link</a></p>\n", "[[link]]",  base: 'BASE/'
     tc "<p><a href=\"link#link\">link#link</a></p>\n", "[[link#link]]"
     tc "<p><a href=\"#link\">#link</a></p>\n", "[[#link]]"
 
@@ -217,7 +241,7 @@ describe TracWiki::Parser do
 
     # WRNING: Parsing markup within a link is optional
     tc "<p><a href=\"Weird+Stuff\"><strong>Weird</strong> <em>Stuff</em></a></p>\n", "[[Weird Stuff|**Weird** ''Stuff'']]"
-    #tc("<p><a href=\"http://example.org/\"><img src='image.jpg'/></a></p>\n", "[[http://example.org/|{{image.jpg}}]]")
+    #tc("<p><a href=\"http://example.org/\"><img src=\"image.jpg\"/></a></p>\n", "[[http://example.org/|{{image.jpg}}]]")
 
     # Inside bold
     tc "<p><strong><a href=\"link\">link</a></strong></p>\n", "**[[link]]**"
@@ -252,6 +276,7 @@ describe TracWiki::Parser do
   it 'should parse paragraphs' do
     # One or more blank lines end paragraphs.
     tc "<p>This is my text.</p>\n<p>This is more text.</p>\n", "This is\nmy text.\n\nThis is\nmore text."
+    tc "<p>This is my text.</p>\n<p>This is more text.</p>\n", "This is \nmy text.\n\nThis is\nmore text."
     tc "<p>This is my text.</p>\n<p>This is more text.</p>\n", "This is\nmy text.\n\n\nThis is\nmore text."
     tc "<p>This is my text.</p>\n<p>This is more text.</p>\n", "This is\nmy text.\n\n\n\nThis is\nmore text."
 
@@ -459,6 +484,7 @@ describe TracWiki::Parser do
   it 'should parse ambiguious bold and lists' do
     tc "<p><strong> bold text </strong></p>\n", "** bold text **"
     tc "<p><blockquote><strong> bold text </strong></blockquote></p>\n", " ** bold text **"
+    tc "<p><blockquote><strong> bold text </strong></blockquote></p>\n", " ** bold\ntext **"
   end
 
   it 'should parse nowiki' do
@@ -498,8 +524,8 @@ describe TracWiki::Parser do
     # Image tags should be escape
     tc("<p><img src=\"image.jpg\"/></p>\n", "[[Image(image.jpg)]]")
     tc("<p><img src=\"image.jpg\"/></p>\n", "[[Image(image.jpg)]]", :no_link=>true)
-    tc("<p><img src=\"image.jpg\" alt=\"a%22tag%22\"/></p>\n", "[[Image(image.jpg,alt=a\"tag\")]]")
-    tc("<p><img src=\"image.jpg\" alt=\"a%22tag%22\"/></p>\n", "[[Image(image.jpg,alt=a\"tag\")]]", :no_link=>true)
+    tc("<p><img alt=\"a%22tag%22\" src=\"image.jpg\"/></p>\n", "[[Image(image.jpg,alt=a\"tag\")]]")
+    tc("<p><img alt=\"a%22tag%22\" src=\"image.jpg\"/></p>\n", "[[Image(image.jpg,alt=a\"tag\")]]", :no_link=>true)
 
     # Malicious links should not be converted.
     tc("<p><a href=\"javascript%3Aalert%28%22Boo%21%22%29\">Click</a></p>\n", "[[javascript:alert(\"Boo!\")|Click]]")
@@ -510,7 +536,7 @@ describe TracWiki::Parser do
     tc "<p>// Not Italic //</p>\n", "!// Not Italic !//"
     tc "<p>* Not Bullet</p>\n", "!* Not Bullet"
     # Following char is not a blank (space or line feed)
-    tc "<p>Hello ~ world</p>\n", "Hello ~ world\n"
+    tc "<p>Hello \u00a0 world</p>\n", "Hello ~ world\n"
     tc "<p>Hello ! world</p>\n", "Hello ! world\n"
     tc "<p>Hello ! world</p>\n", "Hello ! world\n"
     tc "<p>Hello ! world</p>\n", "Hello !\nworld\n"
@@ -550,19 +576,19 @@ describe TracWiki::Parser do
     tc "<table><tr><td>Hello</td><td>World!</td></tr></table>", "||Hello||World!||"
     tc "<table><tr><td>Hello</td><td>World!</td></tr></table>", "||Hello||\\\n||World!||"
     tc "<table><tr><td>He</td><td>llo</td><td>World!</td></tr></table>", "||He||llo||\\\n||World!||"
-    tc "<table><tr><td>Hello</td><td colspan='2'>World!</td></tr></table>", "||Hello||||World!||"
-    tc "<table><tr><td>Hello</td><td colspan='2'>kuk</td><td>World!</td></tr></table>", "||Hello||||kuk||\\\n||World!||"
-    tc "<table><tr><td>1</td><td>2</td><td>3</td></tr><tr><td colspan='2'>1-2</td><td>3</td></tr><tr><td>1</td><td colspan='2'>2-3</td></tr><tr><td colspan='3'>1-2-3</td></tr></table>", "|| 1 || 2 || 3 ||\n|||| 1-2 || 3 ||\n|| 1 |||| 2-3 ||\n|||||| 1-2-3 ||\n"
+    tc "<table><tr><td>Hello</td><td colspan=\"2\">World!</td></tr></table>", "||Hello||||World!||"
+    tc "<table><tr><td>Hello</td><td colspan=\"2\">kuk</td><td>World!</td></tr></table>", "||Hello||||kuk||\\\n||World!||"
+    tc "<table><tr><td>1</td><td>2</td><td>3</td></tr><tr><td colspan=\"2\">1-2</td><td>3</td></tr><tr><td>1</td><td colspan=\"2\">2-3</td></tr><tr><td colspan=\"3\">1-2-3</td></tr></table>", "|| 1 || 2 || 3 ||\n|||| 1-2 || 3 ||\n|| 1 |||| 2-3 ||\n|||||| 1-2-3 ||\n"
 
-    tc "<table><tr><td>table</td><td style='text-align:center'>center</td></tr></table>", "||table||   center  ||"
-    tc "<table><tr><td>table</td><td style='text-align:right'>right</td></tr></table>", "||table||   right||"
-    tc "<table><tr><td>table</td><td style='text-align:center'>center</td><td style='text-align:right'>right</td></tr></table>", "||table||  center  ||   right||"
+    tc "<table><tr><td>table</td><td style=\"text-align:center\">center</td></tr></table>", "||table||   center  ||"
+    tc "<table><tr><td>table</td><td style=\"text-align:right\">right</td></tr></table>", "||table||   right||"
+    tc "<table><tr><td>table</td><td style=\"text-align:center\">center</td><td style=\"text-align:right\">right</td></tr></table>", "||table||  center  ||   right||"
 
     tc "<table><tr><td>Hello, World!</td></tr></table>", "||Hello, World!||"
-    tc "<table><tr><td style='text-align:right'>Hello, Right World!</td></tr></table>", "|| Hello, Right World!||"
-    tc "<table><tr><th style='text-align:right'>Hello, Right World!</th></tr></table>", "||= Hello, Right World!=||"
-    tc "<table><tr><td style='text-align:center'>Hello, Centered World!</td></tr></table>", "||    Hello, Centered World!  ||"
-    tc "<table><tr><th style='text-align:center'>Hello, Centered World!</th></tr></table>", "||=    Hello, Centered World!  =||"
+    tc "<table><tr><td style=\"text-align:right\">Hello, Right World!</td></tr></table>", "|| Hello, Right World!||"
+    tc "<table><tr><th style=\"text-align:right\">Hello, Right World!</th></tr></table>", "||= Hello, Right World!=||"
+    tc "<table><tr><td style=\"text-align:center\">Hello, Centered World!</td></tr></table>", "||    Hello, Centered World!  ||"
+    tc "<table><tr><th style=\"text-align:center\">Hello, Centered World!</th></tr></table>", "||=    Hello, Centered World!  =||"
     # Multiple columns
     tc "<table><tr><td>c1</td><td>c2</td><td>c3</td></tr></table>", "||c1||c2||c3||"
     # Multiple rows
@@ -757,16 +783,16 @@ describe TracWiki::Parser do
 
   it 'should parse image' do
     tc("<p><img src=\"image.jpg\"/></p>\n", "[[Image(image.jpg)]]")
-    tc("<p><img src=\"javascript%3Aimage.jpg\" alt=\"tag\"/></p>\n", "[[Image(javascript:image.jpg,alt=tag)]]")
-    tc("<p><img src=\"image.jpg\" alt=\"tag\"/></p>\n", "[[Image(image.jpg,alt=tag)]]")
+    tc("<p><img alt=\"tag\" src=\"javascript%3Aimage.jpg\"/></p>\n", "[[Image(javascript:image.jpg,alt=tag)]]")
+    tc("<p><img alt=\"tag\" src=\"image.jpg\"/></p>\n", "[[Image(image.jpg,alt=tag)]]")
     tc("<p><img src=\"image.jpg\" width=\"120px\"/></p>\n", "[[Image(image.jpg, 120px )]]")
     tc("<p><img src=\"image.jpg\" width=\"120px\"/></p>\n", "[[Image(image.jpg, \t120px   )]]")
-    tc("<p><img src=\"image.jpg\" align=\"right\"/></p>\n", "[[Image(image.jpg, right)]]")
-    tc("<p><img src=\"image.jpg\" align=\"right\" valign=\"top\"/></p>\n", "[[Image(image.jpg, right,top)]]")
-    tc("<p><img src=\"image.jpg\" align=\"right\" valign=\"top\"/></p>\n", "[[Image(image.jpg, top,right)]]")
+    tc("<p><img align=\"right\" src=\"image.jpg\"/></p>\n", "[[Image(image.jpg, right)]]")
+    tc("<p><img align=\"right\" src=\"image.jpg\" valign=\"top\"/></p>\n", "[[Image(image.jpg, right,top)]]")
+    tc("<p><img align=\"right\" src=\"image.jpg\" valign=\"top\"/></p>\n", "[[Image(image.jpg, top,right)]]")
     tc("<p><img src=\"image.jpg\" valign=\"top\"/></p>\n", "[[Image(image.jpg, top)]]")
     tc("<p><img src=\"image.jpg\" valign=\"top\"/></p>\n", "[[Image(image.jpg, valign=top)]]")
-    tc("<p><img src=\"image.jpg\" align=\"center\"/></p>\n", "[[Image(image.jpg, center)]]")
+    tc("<p><img align=\"center\" src=\"image.jpg\"/></p>\n", "[[Image(image.jpg, center)]]")
     tc("<p><img src=\"image.jpg\" valign=\"middle\"/></p>\n", "[[Image(image.jpg, middle)]]")
     tc("<p><img src=\"image.jpg\" title=\"houhouhou\"/></p>\n", "[[Image(image.jpg, title=houhouhou)]]")
     tc("<p><img src=\"image.jpg\" width=\"120px\"/></p>\n", "[[Image(image.jpg,width=120px)]]")
@@ -807,12 +833,12 @@ describe TracWiki::Parser do
     tc("<p><a href=\"a/b/c\">a/b/c</a></p>\n", "[[a/b/c]]", :no_escape => true)
   end
   it 'should support merge' do
-    tc "<div class='merge merge-orig'>orig</div>\n",     "||||||| orig", :merge => true
-    tc "<div class='merge merge-mine'>mine</div>\n",     "<<<<<<< mine", :merge => true
-    tc "<div class='merge merge-your'>your</div>\n",     ">>>>>>> your", :merge => true
-    tc "<p>bhoj</p>\n<div class='merge merge-your'>your</div>\n<p>ahoj</p>\n",     "bhoj\n>>>>>>> your\nahoj", :merge => true
-    tc "<div class='merge merge-split'></div>\n<p>ahoj</p>\n", "=======\nahoj\n", :merge => true
-    tc "<div class='merge merge-split'>split</div>\n", "======= split", :merge => true
+    tc "<div class=\"merge merge-orig\">orig</div>\n",     "||||||| orig", :merge => true
+    tc "<div class=\"merge merge-mine\">mine</div>\n",     "<<<<<<< mine", :merge => true
+    tc "<div class=\"merge merge-your\">your</div>\n",     ">>>>>>> your", :merge => true
+    tc "<p>bhoj</p>\n<div class=\"merge merge-your\">your</div>\n<p>ahoj</p>\n",     "bhoj\n>>>>>>> your\nahoj", :merge => true
+    tc "<div class=\"merge merge-split\"></div>\n<p>ahoj</p>\n", "=======\nahoj\n", :merge => true
+    tc "<div class=\"merge merge-split\">split</div>\n", "======= split", :merge => true
 
     tc "<h6></h6><p>ahoj</p>\n", "=======\nahoj\n", :merge => false
   end
@@ -853,6 +879,52 @@ kuk
 
 eos
 
+
+  it 'should support macro' do
+    tc "<p>ahoj</p>\n" , "{{#echo \nahoj\n}}"
+    tc "<h2>H2</h2>" , "{{#echo == H2 ==}}"
+    tc "<h2>H2</h2>" , "{{#echo =={{#echo H2}}==}}"
+    tc "<h3 id=\"test\">H3</h3>" , "{{#echo =={{#echo =H3=}}=={{#echo #test}}}}"
+
+    tc "<p>This is correct</p>\n" , "This is {{# NOT}} correct" 
+    tc "<h1>h1</h1>" , "{{# comment }}\n= h1 =\n" 
+    tc "<h1>h1</h1>" , "{{# comment }}\n\n\n= h1 =\n" 
+    tc "<h1>h1</h1>" , "{{# comment }}\n\n\n= h1 =\n{{# Comment2}}\n" 
+
+    tc "<h1>h1</h1>" , "{{# co{{HUU}}mment }}\n\n\n= h1 =\n{{# Comment2}}\n" 
+
+    tc "<p>UMACRO(macr ahoj )</p>\n" , "{{macr\nahoj\n}}"
+    tc "<p>ahoj UMACRO(macrUMACRO(o))</p>\n" , "ahoj {{macr{{o}}}}"
+    tc "<p>ahoj UMACRO(macro)</p>\n" , "ahoj {{macro}}"
+    tc "<p>ahoj {{%macrUMACRO(o)}}</p>\n" , "ahoj {{%macr{{o}}}}"
+    tc "<p>ahoj UMACRO(macrUMACRO(mac <strong>o</strong>))</p>\n" , "ahoj {{macr{{mac **o**}}}}"
+    tc "<p>ahoj VAR($mac)</p>\n" , "ahoj {{$mac|ahoj}}"
+  end
+
+  it 'should do temlate' do
+    tc "<p>1WEST</p>\n", "1{{west}}"
+    tc "<p>2WEST</p>\n", "2{{test}}"
+
+    # macro errors:
+    tc "<p>TOO_DEEP_RECURSION(<tt>{{deep}}</tt>) 3</p>\n", "{{deep}}3"
+    tc "<p>TOO_LONG_EXPANSION_OF_MACRO(wide)QUIT</p>\n", "{{wide}}3"
+    tc "<p>UMACRO(unknown)3</p>\n", "{{unknown}}3"
+  end
+  it 'should support options' do
+    tc "<h3>h1<a class=\"editheading\" href=\"?edit=1\">edit</a></h3>", "=== h1 ==", edit_heading: true
+  end
+  it 'should not html' do
+    tc "<p>{{{! &lt;a&gt;&lt;/a&gt; }}}</p>\n", "{{{!\n<a></a>\n}}}\n"
+    tc '<a></a>', "{{{!\n<a></a>\n}}}\n", raw_html: true
+    tc '<a></a>', "{{{!\n<a></a>\n}}}\n", raw_html: true
+    tc "<form meth=\"POST\" action=\"http://www.example.com\"><input type=\"hidden\" value=\"VAL\"></form>",
+       "{{{!\n<form meth=\"POST\" action=\"http://www.example.com\"><input type=\"hidden\" value=\"VAL\"/></form>\n}}}\n", raw_html: true
+    tc 'alert(444);', "{{{!\n<script>alert(444);</script>\n}}}\n", raw_html: true
+  end
+  it 'should not entity' do
+    tc "<p>\u00a0</p>\n", "&nbsp;"
+    tc "<p>„text“</p>\n", "&bdquo;text&ldquo;"
+  end
   end
 end
 # vim: tw=0

data/test/tree_test.rb

@@ -0,0 +1,35 @@
+# encoding: UTF-8
+
+require 'trac-wiki'
+require 'pp'
+
+class Bacon::Context
+end
+describe TracWiki::Parser do
+ it 'should work' do 
+   t = TracWiki::Tree.new
+   t.tag_beg(:html)
+   t.tag_beg(:body, {hus:'JAN', mistr: nil})
+   t.tag(:div, {ahoj: "ahoj", bhoj: "BHOJ"})
+   t.tag(:br)
+   t.add("bye")
+   t.add_spc
+   t.add("bye ")
+   t.add_spc
+   t.add("bye")
+   t.tag_end(:body)
+   t.tag_end(:html)
+   t.add('\bye')
+   t.add_raw('>')
+   t.add_raw(' ')
+   t.add_raw('„')
+
+   res =  "<html><body hus=\"JAN\"><div ahoj=\"ahoj\" bhoj=\"BHOJ\"/>\n<br/>bye bye bye</body></html>\\bye"
+   res += "&gt;"
+   res += "\u00a0"
+   res += "„"
+
+   #print "\n#{t.to_html}\n#{res}"
+   t.to_html.should.equal res
+ end
+end

metadata

@@ -1,41 +1,46 @@
 --- !ruby/object:Gem::Specification
 name: trac-wiki
 version: !ruby/object:Gem::Version
-  version: 0.1.12
+  version: 0.2.16
+  prerelease: 
 platform: ruby
 authors:
 - Vitas Stradal
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-06 00:00:00.000000000 Z
+date: 2013-12-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bacon
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: TracWiki markup language render (http://trac.edgewall.org/wiki/WikiFormatting
@@ -48,37 +53,42 @@ extensions: []
 extra_rdoc_files:
 - README
 files:
+- .gitignore
 - Gemfile
+- Gemfile.lock
 - README
 - Rakefile
 - bin/trac-wiki.rb
 - lib/trac-wiki.rb
 - lib/trac-wiki/parser.rb
+- lib/trac-wiki/tree.rb
 - lib/trac-wiki/version.rb
 - test/parser_test.rb
+- test/tree_test.rb
 - trac-wiki.gemspec
 homepage: http://github.com/vitstradal/trac-wiki
 licenses:
 - GPL-2
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: trac-wiki
-rubygems_version: 2.0.3
+rubygems_version: 1.8.23
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: Trac Wiki markup language
 test_files: []

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: 5c3c0e79552d6d60ecbb77c54fbaa434d208ca56
-  data.tar.gz: dd2e9ab2b74410c6b3abf6265d43185fcaec19cd
-SHA512:
-  metadata.gz: c173fe3e96fdceaa1e587c2a41e75e50fa731bfb3403270463d3352014e8223dd459ba7df0e5ea9d6377be54d701d19ec3a00dfb3b259583cd70325ab9d5bc15
-  data.tar.gz: b7c6a4d413d44ea1bb30d9e49454420a5ecd639601ea79ef19f80a73e1831c1165bac4d94b9da75757d5ca440fc301ff5a062554329293f8bb5821e41a296e0f