RubyGems - trac-wiki - Versions diffs - 0.2.20 → 0.2.21 - Mend

trac-wiki 0.2.20 → 0.2.21

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (6) hide show

data/lib/trac-wiki/parser.rb CHANGED Viewed

@@ -65,9 +65,8 @@ module TracWiki
     attr_writer :math
     def math?; @math; end
-    # allow {{{! ... html ... }}}
+    # allow some <b> <form> <html>
     # html will be sanitized
-    # {{{!\n html here  \n}}}\n
     attr_writer :raw_html
     def raw_html?; @raw_html; end
@@ -120,7 +119,7 @@ module TracWiki
         '!set'   => proc { |env| env[env.expand_arg(0)] = env.expand_arg(1); '' },
         '!yset'  => proc { |env| env[env.expand_arg(0)] = YAML.load(env.arg(1)); '' },
-        '!html'  => proc { |env| "\n{{{!\n#{env.arg(0)}\n}}}\n" },
+#        '!html'  => proc { |env| "\n{{{!\n#{env.arg(0)}\n}}}\n" },
         '!sub'   => proc { |env| pat = env.expand_arg(1)
                                  pat = Regexp.new(pat[1..-2]) if pat =~ /\A\/.*\/\Z/
                                  env.expand_arg(0).gsub(pat, env.expand_arg(2))
@@ -461,8 +460,9 @@ module TracWiki
     def parse_inline_tag(str)
       case
-      when raw_html? && str =~ /\A\{\{\{!(.*?\}*)\}\}\}/     # inline {{{! raw html }}}
-        do_raw_html($1, true)
+      when raw_html? && str =~ /\A<(\/)?(\w+)(?:([^>]*?))?(\/\s*)?>/     # single inline <html> tag
+        eot, tag, args, closed = $1, $2, $3, $4
+        do_raw_tag(eot, tag, args, closed, $'.size)
       when str =~ /\A\{\{\{(.*?\}*)\}\}\}/     # inline {{{ }}} pre (tt)
         @tree.tag(:tt, $1)
       when str =~ MACRO_BEG_REX                # macro  {{
@@ -658,9 +658,32 @@ module TracWiki
       @tree.tag(:pre, nowikiblock)
     end
-    def do_raw_html(text, inline=false)
-      end_paragraph if !inline
-      @tree.add_raw(text)
+    def do_raw_tag(eot, tag, attrs, closed, tail_size)
+      if !eot
+        end_paragraph if tag == 'p' || tag == 'div'
+        #print "open tag #{tag},'#{attrs}'\n"
+        attrs_h = _parse_attrs_to_hash(attrs)
+        @tree.tag_beg(tag, attrs_h)
+        @tree.tag_end(tag) if closed
+      else
+        #print "close tag #{tag}\n"
+        @tree.tag_end(tag)
+        if tag == 'p' || tag == 'div'
+          end_paragraph
+          start_paragraph if tail_size > 0
+        end
+      end
+    end
+    def _parse_attrs_to_hash(str)
+      ret = {}
+      while str =~ /\A\s*(\w+)\s*=\s*'([^>']*)'/ ||
+            str =~ /\A\s*(\w+)\s*=\s*"([^>"]*)"/ ||
+            str =~ /\A\s*(\w+)\s*=\s*(\S*)/
+       ret[$1] = $2
+       str = $'
+      end
+      ret
     end
     def do_hr
@@ -734,9 +757,6 @@ module TracWiki
         # merge
         when merge? && str =~ /\A(<{7}|={7}|>{7}|\|{7}) *(\S*).*$(\r?\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
           do_pre($1)

data/lib/trac-wiki/tree.rb CHANGED Viewed

@@ -55,12 +55,24 @@ module TracWiki
       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}>"
+        c = @cur
+        ts = tag_name.to_sym
+        while c.tag != ts
+          c = c.par
+          if c.nil?
+            return "no such tag in stack, ingoring "
+          end
         end
+        @cur = c.par
         self
+#        if @cur.tag == tag_name.to_sym
+#          @cur = @cur.par
+#        else
+#          #pp(@root)
+#          raise "tag_end: cur tag is not <#{tag_name}>, but <#{@cur.tag}>"
+#        end
+#        self
       end
       # add space if needed
@@ -80,8 +92,8 @@ module TracWiki
       end
       def add_raw(cont)
-        cont_san = Sanitize.clean(cont, san_conf)
-        @cur.add(RawHtml.new(cont_san))
+        #cont_san = Sanitize.clean(cont, san_conf)
+        @cur.add(RawHtml.new(cont))
         self
       end
@@ -98,27 +110,80 @@ module TracWiki
      end
      def to_html
-       tree_to_html(@root)
+       ret = tree_to_html(@root)
+       #print "bf san:", ret, "\n"
+       #ret = Sanitize.clean(ret, san_conf)
+       #print "af san:", ret, "\n"
+       #ret + "\n"
+       ret
      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
+        nl = ''
+        nl = "\n"  if TAGS_APPEND_NL.include? tag
+        if ! TAGS_ALLOVED.include? tag
+          return '' if node.cont.size == 0
+          return cont_to_s(node.cont)
+        end
         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}>"
+          if TAGS_SKIP_EMPTY.include? tag
+             return ''
+          end
+          if TAGS_FORCE_PAIR.include? tag
+            return "<#{tag}#{attrs_to_s(tag, node.attrs)}></#{tag}>#{nl}"
           end
-          return "<#{tag}#{attrs_to_s(node.attrs)}/>#{nl}"
+          return "<#{tag}#{attrs_to_s(tag, node.attrs)}/>#{nl}"
         end
-        return "<#{tag}#{attrs_to_s(node.attrs)}>#{cont_to_s(node.cont)}</#{tag}>#{nl}"
+        return "<#{tag}#{attrs_to_s(tag, node.attrs)}>#{cont_to_s(node.cont)}</#{tag}>#{nl}"
+     end
+     TAGS_APPEND_NL = [:div, :p]
+     TAGS_FORCE_PAIR = [:a, :td, :h1, :h2, :h3, :h4, :h5, :h6, :div, :strong, :script]
+     TAGS_ALLOVED = [:a,
+                     :h1, :h2, :h3, :h4, :h5, :h6,
+                     :div, :span, :p, :pre,
+                     :li, :ul, :ol, :dl, :dt, :dd,
+                     :b, :tt, :u, :del, :blockquote, :strong, :em, :sup, :sub,
+                     :table,  :tr, :td, :th,
+                     :br , :img, :hr,
+                     :form, :textarea, :input, :select, :option,
+     ]
+     TAGS_SKIP_EMPTY = [ :p  ]
+     ATTRIBUTES_ALLOWED = { :form  =>  [:action, :meth],
+                            :input =>  [:size, :type, :value, :name],
+                            :select => [:multiple, :name],
+                            :option => [:disabled, :selected, :label, :value, :name],
+                            :a     =>  [:name, :href],
+                            :img   =>  [:src, :width, :height, :align, :valign, :style, :alt, :title],
+                            :td    =>  [:colspan, :rowspan, :style],
+                            :th    =>  [:colspan, :rowspan, :style],
+                            :_all  =>  [:class, :id],
+                           }
+     ATTRIBUTE_STYLE_REX = /\A( text-align:(center|right|left) |
+                                margin:    \d+(px|em)? |
+                                ;
+                             )+\Z/x
+     def attrs_to_s(tag, attrs)
+       return '' if attrs.nil? || attrs.size == 0
+       ret = ['']
+       tag_attrs = ATTRIBUTES_ALLOWED[tag] || []
+       attrs.each_pair do |k,v|
+         next if v.nil?
+         k_sym = k.to_sym
+         next if ! ATTRIBUTES_ALLOWED[:_all].include?(k_sym) && ! tag_attrs.include?(k_sym)
+         next if k == :style && v !~ ATTRIBUTE_STYLE_REX
+         #print "style: #{v}\n" if k == :style
+         ret.push "#{TracWiki::Parser.escapeHTML(k.to_s)}=\"#{TracWiki::Parser.escapeHTML(v.to_s)}\""
+       end
+       return ret.sort.join(' ')
      end
      def cont_to_s(cont)
@@ -134,26 +199,20 @@ module TracWiki
         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', 'span', 'div'],
+        conf = { elements:   ['tt', 'form', 'input', 'span', 'div'],
+                 output: :xhtml,
                  attributes: { 'form'  =>  ['action', 'meth'],
                                'input' =>  ['type', 'value'],
-                               'span'  =>  ['class'],
-                               'div'   =>  ['class'],
+                               'span'  =>  ['class', 'id'],
+                               'div'   =>  ['class', 'id'],
+                               'a'     =>  ['class', 'id', 'name', 'href'],
+                               :all    =>  ['class', 'id'],
                              },
                }
-        @san_conf = conf.merge(Sanitize::Config::RELAXED){|k,o,n| o.is_a?(Hash) ? o.merge(n) :
+        @san_conf = Sanitize::Config::RELAXED.merge(conf){|k,o,n| o.is_a?(Hash) ? o.merge(n) :
                                                                   o.is_a?(Array) ? o + n :
                                                                   n }

data/lib/trac-wiki/version.rb CHANGED Viewed

@@ -1,3 +1,3 @@
 module TracWiki
-  VERSION = '0.2.20'
+  VERSION = '0.2.21'
 end

data/test/parser_test.rb CHANGED Viewed

@@ -33,8 +33,6 @@ class Bacon::Context
       "{{deep}}"
     when 'wide'
       "0123456789{{wide}}" * 10
-    when 'fortest'
-      "{{$y.data.a}},({{!for i|y.data|AHOJ({{$i}})\n{{$y.data.$i}};\n}}),{{$y.data.a}}"
     else
       nil
       #"UNK_TEMPL(#{tname})"
@@ -185,7 +183,8 @@ 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>Heading 3\u00a0B</h3>", "=== Heading 3~B ==="
+    tc "<h3>Heading 3&nbsp;B</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"
@@ -551,7 +550,8 @@ 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 \u00a0 world</p>\n", "Hello ~ world\n"
+    #tc "<p>Hello \u00a0 world</p>\n", "Hello ~ world\n"
+    tc "<p>Hello &nbsp; 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"
@@ -939,16 +939,14 @@ eos
     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
+    tc "<p>&lt;b&gt;&lt;/b&gt;</p>\n", "<b></b>\n"
+    tc "<p>&lt;div&gt;&lt;script&gt;alert(666)&lt;/script&gt;&lt;/div&gt;</p>\n", "<div><script>alert(666)</script></div>\n"
   end
   it 'should entity' do
-    tc "<p>\u00a0</p>\n", "&nbsp;"
-    tc "<p>„text“</p>\n", "&bdquo;text&ldquo;"
+    #tc "<p>\u00a0</p>\n", "&nbsp;"
+    #tc "<p>„text“</p>\n", "&bdquo;text&ldquo;"
+    tc "<p>&nbsp;</p>\n", "&nbsp;"
+    tc "<p>&bdquo;text&ldquo;</p>\n", "&bdquo;text&ldquo;"
   end
   it 'should plugin' do
     tc "<p>AHOJTE!</p>\n", "{{!print AHOJTE}}"
@@ -979,30 +977,29 @@ eos
     tc "<p>,TRUE</p>\n", "{{!yset data|[1,2]}},{{!ifdef data.1|TRUE|FALSE}}"
     tc "<p>,TRUE</p>\n", "{{!yset data|{a: 1, b: 2} }},{{!ifdef data.a|TRUE|FALSE}}"
     tc "<p>,FALSE</p>\n", "{{!yset data|{a: 1, b: 2} }},{{!ifdef data.q|TRUE|FALSE}}"
-    tc "<p>,1,(1;2;),1</p>\n", "{{!yset data|{a: 1, b: 2} }},{{$data.a}},({{!for i|data|{{$data.$i}};}}),{{$data.a}}"
-    tc "<p>1,(AHOJ(a) 1; AHOJ(b) 2; ),1</p>\n", "{{fortest data:\n a: 1\n b: 2 }}"
-  end
-  it 'should {{!sub}}' do
-    tc "<p>ahoj_you_one</p>\n", "{{!sub ahoj you one| |_}}"
-    tc "<p>-h-j --- -n-</p>\n", "{{!sub ahoj you one|/[aeiouy]/|-}}"
-    tc "<p>ahoj MATCH(you) one</p>\n", "{{!sub ahoj you one|/(y.u)/|MATCH(\\1)}}"
-  end
-  it 'should {{!html}}' do
-    tc "alert(666)", "{{!html <script>alert(666)</script>}}", raw_html: true
-    tc "<p><b>T</b>E</p>", "{{!html <p><b>T</b>E</p>}}\n", raw_html: true
-    tc "<span>Span</span>", "{{!html <span>Span</span>}}\n", raw_html: true
-    #tc "<span>Span</span>", "**{{!html <span>Span</span>}}**\n", raw_html: true
-    tc "<div class=\"ahoj\">Div</div>", "{{!html <div class=\"ahoj\">Div</div>}}\n", raw_html: true
-    tc "<span>Span</span><span>Span</span>", "{{!html <span>Span</span>}}{{!html <span>Span</span>}}\n", raw_html: true
-    tc "<p>ahoj <span class=\"spanclass\">span</span> bhoj dhoj choj</p>\n", "ahoj {{{!<span class=\"spanclass\">span</span> bhoj}}} dhoj \nchoj\n", raw_html: true
-    tc "<p>ahoj Q<span class=\"spanclass\">span</span> bhojQ dhoj choj</p>\n", "ahoj Q{{{!<span class=\"spanclass\">span</span> bhoj}}}Q dhoj \nchoj\n", raw_html: true
-  end
-#  it 'last test' do
-#    #tc "<p>1,(AHOJ(a) 1; AHOJ(b) 2; ),1</p>\n", "{{fortest data:\n a: 1\n b: 2 }}"
-#
-#  end
+  end
+  it 'should parse html' do
+    tc "<p>alert(666)</p>\n", "<script>alert(666)</script>", raw_html: true
+    tc "<p><b>T</b>E</p>\n", "<p><b>T</b>E</p>", raw_html: true
+    tc "<p><span>Span</span></p>\n", "<span>Span</span>\n", raw_html: true
+    tc "<p><strong><span>Span</span></strong></p>\n", "**<span>Span</span>**\n", raw_html: true
+    tc "<div class=\"ahoj\">Div</div>\n", "<div class=\"ahoj\">Div</div>\n", raw_html: true
+    tc "<p><strong>ahoj</strong></p>\n<div class=\"ahoj\">Div</div>\n", "**ahoj<div class=\"ahoj\">Div</div>\n", raw_html: true
+    tc "<p><span>Span</span><span>Span</span></p>\n", "<span>Span</span><span>Span</span>\n", raw_html: true
+    tc "<p><em><b>boldoitali</b></em>cE</p>\n", "<p>''<b>boldoitali''c</b>E</p>", raw_html: true
+    tc "<p><b>blabla</b></p>\n<p>endE</p>\n", "<p><b>bla</html>bla</p>end</b>E</p>", raw_html: true
+    tc "<p>baf</p>\n", "\n\n\nbaf\n\n\n", raw_html: true
+    tc "<div class=\"ahoj\">Div</div>\n<p>baf</p>\n", "<div class=\"ahoj\">Div</div>\nbaf\n", raw_html: true
+    tc "<p><b>BOLD</b></p>\n", "<b>BOLD</b>\n", raw_html: true
+    tc "<p><br/></p>\n", "<br/>\n", raw_html: true
+    tc "<p><br/></p>\n", "<br></br>\n", raw_html: true
+    tc "<p><b class=\"bclass\">BOLD</b></p>\n", "<b class=\"bclass\">BOLD</b>\n", raw_html: true
+    tc "<p><b class=\"bclass\">BOLD</b></p>\n", "<b bad=\"bad\" class=\"bclass\">BOLD</b>\n", raw_html: true
+    tc "<p><b class=\"bclass\">BOLD</b></p>\n", "<b bad=\"bad\" class=\"bclass\">BOLD</b>\n", raw_html: true
+  end
   end
 end
 # vim: tw=0

data/test/tree_test.rb CHANGED Viewed

@@ -8,26 +8,28 @@ 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_beg(:div, {:class => 'html'})
+   t.tag_beg(:div, {id:'JAN', class: nil})
+   t.tag(:div, {:class =>  "ahoj", id: "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.tag_end(:div)
+   t.tag_end(:div)
    t.add('\bye')
    t.add_raw('&gt;')
    t.add_raw('&nbsp;')
    t.add_raw('&bdquo;')
-   res =  "<html><body hus=\"JAN\"><div ahoj=\"ahoj\" bhoj=\"BHOJ\"/>\n<br/>bye bye bye</body></html>\\bye"
+   res =  "<div class=\"html\"><div id=\"JAN\"><div class=\"ahoj\" id=\"BHOJ\"></div>\n<br/>bye bye bye</div>\n</div>\n\\bye"
    res += "&gt;"
-   res += "\u00a0"
-   res += "„"
+   #res += "\u00a0"
+   #res += "„"
+   res += '&nbsp;'
+   res += '&bdquo;'
    #print "\n#{t.to_html}\n#{res}"
    t.to_html.should.equal res

metadata CHANGED Viewed

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: trac-wiki
 version: !ruby/object:Gem::Version
-  version: 0.2.20
+  version: 0.2.21
   prerelease:
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2014-01-06 00:00:00.000000000 Z
+date: 2014-01-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bacon