trac-wiki 0.3.14 → 0.3.15

data/lib/trac-wiki/env.rb

@@ -5,7 +5,9 @@ module TracWiki
     attr_accessor :env
     def initialize(parser, env = {})
       @parser = parser
-      @env = env
+      @env = env || {}
+      @argv = {}
+      @argv_stack = []
     end
 
     # r: expanded-macro, rest-of-str, lines, offset-in-line
@@ -13,11 +15,19 @@ module TracWiki
       str_size = str.size
       args, rest, lines, offset = parse_balanced(str)
       atput('maclen', str_size - rest.size + macro_name_size) if ! macro_name_size.nil?
+
+
       if macro_name =~ /\A!/
          # {{!cmd}}
          mac_out = parse_macro_cmd(macro_name, args)
       else
          # {{$cmd}},  {{template}}, ...
+         if @argv_stack.size == 0
+           prefix_size  = lines == 0  ? macro_name.size + 2 + at('offset',0).to_i : 0
+           @env['maclines'] = lines
+           @env['eoffset'] = offset + prefix_size 
+           @env['elineno'] = at('lineno', 0).to_i + lines
+         end 
          mac_out = parse_macro_vartempl(macro_name, args)
       end
       return mac_out || '', rest, lines, offset
@@ -43,12 +53,13 @@ module TracWiki
 
     # r: [args], rest-of-str, num-of-lines, offset-last-line
     def parse_balanced(str)
-      str.sub!(/\A\s*\|?/, '')
-      offset = $&.size
-      return [], $', 0, 2 if str =~ /\A}}/
+      str.sub!(/\A(\s*[\r\n])*([ \t]*[\|:]?)/, '')
+      emptylines,  empty  = $1||'', $2||''
+      lines = emptylines.count("\n")
+      offset = empty.size
+      return [], $', 0, offset+2 if str =~ /\A}}/
       #print "_parse_macro_cmd: #{macro_name}, str#{str}\n"
       dep = 0
-      lines = 0
       args = ['']
       while str =~ /{{|}}|\n|\|/
         prefix, match, str  = $`, $&, $'
@@ -92,8 +103,7 @@ module TracWiki
     def prepare_y
       #print "prepare_y\n"
       return if @env.key? 'y'
-      #arg = @env['argv']['00']
-      arg = @env['argv']['00']
+      arg = @argv['00']
       return if arg.nil?
       begin
         @env['y'] = YAML.load(arg)
@@ -106,12 +116,11 @@ module TracWiki
     end
 
     def at(key, default = nil, to_str = true)
-      #print "at(#{key}), env:"
-      #pp @env
-      return @env[key] || default if key.is_a? Symbol
+
+      return @argv[key] if @argv.key? key
+
       prepare_y if key =~ /^y\./
-      key = "argv.#{key}" if key =~ /^\d+$/
-      #print "key: #{key}\n"
+
       cur = @env
       key.split(/\./).each do |subkey|
         subkey = at($1, '') if subkey =~ /\A\$(.*)/
@@ -133,6 +142,13 @@ module TracWiki
     def atput(key, val = nil)
       #print "atput: #{key}, #{val} env:"
       #pp @env
+
+      # local variable
+      if @argv.key? key
+         @argv[key] = val
+         return
+      end
+
       cur = @env
       if val.is_a? Symbol
         @env[key] = val
@@ -175,60 +191,56 @@ module TracWiki
       return args.join('|').strip  if macro_name == '#echo'
       return '' if macro_name == '#'
 
-      env = do_macro_arg_to_env(args)
+      @argv_stack.push @argv
 
-      #print "templ:#{macro_name}env:"
-      #pp(args)
+      @argv = do_macro_arg_to_env(args)
+      ret = _do_macro_temp_low(macro_name)
+
+      @argv = @argv_stack.pop
+      return ret
+    end
 
+    def _do_macro_temp_low(macro_name)
       if ! @parser.template_handler.nil?
-        str = @parser.template_handler.call(macro_name, env)
+        str = @parser.template_handler.call(macro_name, @env)
         is_defined = !str.nil?
         @parser.used_templates[macro_name] = is_defined
         if is_defined
-          #print "dep:#{env[:depth]}(#{macro_name}, #{str})\n"
-          if env[:depth] > 32
+          if @argv_stack.size > 32
              return "TOO_DEEP_RECURSION(`#{str}`)\n"
              #return "TOO_DEEP_RECURSION"
           end
           # FIXME: melo by nahlasit jestli to chce expandovat | wiki expadnovat |raw html
           #print "temp(#{macro_name}) --> : #{str}\n"
           #print "bf ex: [#{str}]\n"
-          str = env.expand(str)
+          str = expand(str)
           #print "af ex: [#{str}]\n"
           return str
         end
       end
-      #print "UMACRO(#{macro_name}|#{args})\n"
-      "UMACRO(#{macro_name}|#{args.join('|')})"
+      "UNKNOWN-MACRO(#{macro_name})"
     end
 
     def do_macro_arg_to_env(args)
-      env  = {}
-      @env.each do  |k,v|
-        env[k] = v if k != :depth && k != 'arg' && k!='argv'
-      end
-      env[:depth] = (@env[:depth]||0)+1
-      env['argv'] = {}
-      env['argv']['00'] = args.join('|')
+      argv = {}
+      argv['00'] = args.join('|')
       arg0 = []
 
       idx = 1
       args.each do |arg|
         if arg =~ /\A\s*(\w+)=\s*(.*)/m
-          env[$1] = $2
+          argv[$1] = $2
         else
-          env['argv'][idx.to_s] = arg
+          argv[idx.to_s] = arg
           arg0.push arg
           idx+=1
         end
       end
-      env['argv']['0'] = arg0.join('|')
-      return Env.new(@parser, env)
+      argv['0'] = arg0.join('|')
+      return argv
     end
 
     def do_macro_var(var_name, args)
-      #print "var(#{var_name})env:"
-      #pp(@env)
       ret = at(var_name, nil)
       return ret if !ret.nil?
       return args.join('|')  if args.size > 0
@@ -238,7 +250,7 @@ module TracWiki
 
     # template expand
     def expand_arg(idx)
-      expand(@env[:cmd_args][idx])
+      expand(arg(idx))
     end
 
     def pp_env
@@ -252,6 +264,7 @@ module TracWiki
           ret << prefix
           # FIXME if macro_name2 =~ /^!/
           mac_out, str, lines, offset = parse_macro_all(macro_name2, str, nil)
+
           ret << mac_out
           #print "Too long macro expadion" if ret.size > 1_000_000
           raise TooLongException if ret.size > 1_000_000
@@ -262,5 +275,4 @@ module TracWiki
       return ret.gsub(/\\\r?\n\s*/, '')
     end
   end
-
 end

data/lib/trac-wiki/parser.rb

@@ -136,6 +136,7 @@ module TracWiki
     # Create a new Parser instance.
     def initialize(options = nil)
       init_macros
+      @env = Env.new(self)
       @macros = true
       @allowed_schemes = %w(http https ftp ftps)
       macro_commands = options.delete :macro_commands
@@ -198,6 +199,7 @@ module TracWiki
                                  pat = Regexp.new(pat[1..-2]) if pat =~ /\A\/.*\/\Z/
                                  env.expand_arg(0).gsub(pat, env.expand_arg(2))
                          },
+        '!macpos' => proc { |env| "#{env.at('lineno')}.#{env.at('offset')}-#{env.at('elineno')}.#{env.at('eoffset')}"  },
         '!for'   => proc { |env| i_name = env.arg(0)
                                top = env.arg(1)
                                tmpl = env.arg(2)
@@ -482,7 +484,6 @@ module TracWiki
     def parse_macro(macro_name, str, offset, macro_name_size)
       raise "offset is nil" if offset.nil?
       raise "offset is nil" if macro_name_size.nil?
-      @env = Env.new(self) if @env.nil?
       @env.atput('offset',  offset)
       @env.atput('lineno',  @line_no)
       begin
@@ -675,10 +676,11 @@ module TracWiki
 
     def _parse_attrs_to_hash(str)
       ret = {}
+      @env.atput('lineno', @line_no);
       while str =~ /\A\s*(\w+)\s*=\s*'([^>']*)'/ ||
             str =~ /\A\s*(\w+)\s*=\s*"([^>"]*)"/ ||
             str =~ /\A\s*(\w+)\s*=\s*(\S*)/
-       ret[$1] = $2
+       ret[$1] = @env.expand($2)
        str = $'
       end
       ret

data/lib/trac-wiki/tree.rb

@@ -140,7 +140,7 @@ module TracWiki
 
 
      TAGS_APPEND_NL = [:div, :p, :li, :ol, :ul, :dl, :table, :tr, :td , :th]
-     TAGS_FORCE_PAIR = [:a, :td, :h1, :h2, :h3, :h4, :h5, :h6, :div, :script]
+     TAGS_FORCE_PAIR = [:a, :td, :h1, :h2, :h3, :h4, :h5, :h6, :div, :script, :i]
      TAGS_ALLOVED = [:a,
                      :h1, :h2, :h3, :h4, :h5, :h6,
                      :div, :span, :p, :pre,
@@ -151,7 +151,7 @@ module TracWiki
                      :form, :textarea, :input, :select, :option,
      ]
      TAGS_SKIP_EMPTY = [ :p , :ol, :li, :strong, :em  ]
-     ATTRIBUTES_ALLOWED = { :form  =>  [:action, :meth],
+     ATTRIBUTES_ALLOWED = { :form  =>  [:action, :method],
                             :input =>  [:size, :type, :value, :name],
                             :select => [:multiple, :name],
                             :option => [:disabled, :selected, :label, :value, :name],

data/lib/trac-wiki/version.rb

@@ -1,3 +1,3 @@
 module TracWiki
-  VERSION = '0.3.14'
+  VERSION = '0.3.15'
 end

data/test/parser_test.rb

@@ -10,7 +10,7 @@ class Bacon::Context
     options[:template_handler] = self.method(:template_handler)
 
     parser = TracWiki.parser(options)
-    parser.to_html(wiki).should.equal html
+    html.should.equal parser.to_html(wiki)
   end
   def env(wiki, var, val,options = {})
     options[:macro_commands] = { '!print' => proc { |env| env.arg(0) + '! ' }, }
@@ -32,6 +32,10 @@ class Bacon::Context
 
   def template_handler(tname, env)
     case tname
+    when 'testmacpos2'
+      "{{testmacpos}}"
+    when 'testmacpos'
+      "{{!macpos}}"
     when 'ifeqtest'
       "{{!ifeq {{$1}}|{{$2}}|TRUE|FALSE}}"
     when 'vartest2'
@@ -949,11 +953,11 @@ eos
 
     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(macr|UMACRO(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(macr|UMACRO(mac|<strong>o</strong>))</p>\n" , "ahoj {{macr{{mac **o**}}}}"
+    tc "<p>UNKNOWN-MACRO(macr)</p>\n" , "{{macr\nahoj\n}}"
+    tc "<p>ahoj UNKNOWN-MACRO(macr)</p>\n" , "ahoj {{macr{{o}}}}"
+    tc "<p>ahoj UNKNOWN-MACRO(macro)</p>\n" , "ahoj {{macro}}"
+    tc "<p>ahoj {{%macrUNKNOWN-MACRO(o)}}</p>\n" , "ahoj {{%macr{{o}}}}"
+    tc "<p>ahoj UNKNOWN-MACRO(macr)</p>\n" , "ahoj {{macr{{mac **o**}}}}"
     tc "<p>ahoj ahoj</p>\n" , "ahoj {{$mac|ahoj}}"
   end
 
@@ -964,10 +968,15 @@ eos
     # 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"
+    tc "<p>UNKNOWN-MACRO(unknown)3</p>\n", "{{unknown}}3"
   end
   it 'should do temlate with args' do
+    tc "<p>jedna::VARTESTPARAM,dve:,p:DVE,arg::VARTESTPARAM|p=DVE</p>\n", "{{vartest::VARTESTPARAM|p=DVE}}"
+    tc "<p>jedna::VARTESTPARAM,dve:,p:DVE,arg::VARTESTPARAM|p=DVE</p>\n", "{{vartest|:VARTESTPARAM|p=DVE}}"
     tc "<p>jedna:VARTESTPARAM,dve:,p:DVE,arg:VARTESTPARAM|p=DVE</p>\n", "{{vartest VARTESTPARAM|p=DVE}}"
+    tc "<p>jedna:VARTESTPARAM,dve:,p:DVE,arg:VARTESTPARAM|p=DVE</p>\n", "{{vartest:VARTESTPARAM|p=DVE}}"
+    tc "<p>jedna:VARTESTPARAM,dve:,p:DVE,arg:VARTESTPARAM|p=DVE</p>\n", "{{vartest  :VARTESTPARAM|p=DVE}}"
+    tc "<p>jedna:VARTESTPARAM,dve:,p:DVE,arg:VARTESTPARAM|p=DVE</p>\n", "{{vartest  |VARTESTPARAM|p=DVE}}"
     tc "<p>jedna:VARTESTPARAM,dve:TRI,p:DVE,arg:VARTESTPARAM|p=DVE|TRI</p>\n", "{{vartest VARTESTPARAM|p=DVE|TRI}}"
     tc "<p>jedna:VARTESTPARAM,dve:TRI,p:DVE,arg:VARTESTPARAM|TRI|p=DVE|tridef</p>\n", "{{vartest2 VARTESTPARAM|p=DVE|dva=TRI}}"
     tc "<p>ahoj |</p>\n", "ahoj {{!}}"
@@ -1092,27 +1101,13 @@ eos
 
   it 'should parse offset and template' do
     tc "<p>ahoj ahoj,19</p>\n" , "ahoj {{$mac|ahoj}},{{$offset}}"
+    tc "<p>ahoj ahoj,19</p>\n" , "ahoj {{$mac:ahoj}},{{$offset}}"
     tc "<p>ahoj line one line two ,12</p>\n" , "ahoj {{nl}},{{$offset}}"
     tc "<ul><li>line one</li>\n<li>line two,8</li>\n</ul>\n" , "{{nl2}},{{$offset}}"
     tc "<ul><li>line one</li>\n<li>line two 8</li>\n</ul>\n" , "{{nl2}} {{$offset}}"
     # in the future:
     #tc "<p>ble * line one</p>\n<ul><li>line two 8</li>\n</ul>\n" , "ble {{nl2}} {{$offset}}"
   end
-  it 'should parse macro len' do
-    tc "<p>11</p>\n" , "{{$maclen}}"
-    tc "<p>17</p>\n" , "{{$maclen|12345}}"
-    tc "<p>18</p>\n" , "{{$maclen| 12345}}"
-    tc "<p>19</p>\n" , "{{$maclen | 12345}}"
-    tc "<p>18</p>\n" , "{{$maclen |12345}}"
-    tc "<p>18</p>\n" , "{{$maclen |12345}}"
-    tc "<p>15</p>\n" , "{{$maclen|kuk}}"
-    tc "<p>15</p>\n" , "{{$maclen|123}}"
-    tc "<p>18</p>\n" , "{{$maclen|žížala}}"
-    tc "<p>37</p>\n" , "{{$maclen|{{$maclen}}{{!echo ahoj}}}}"
-    tc "<p><strong>37</strong></p>\n" , "**{{$maclen|{{$maclen}}{{!echo ahoj}}}}**"
-    tc "<p>28</p>\n" , "{{$maclen|a=e|b=c|d={{$e}}}}"
-    tc "<p>maclen:14</p>\n" , "{{maclentest}}"
-  end
   it 'should parse macro slash' do
     tc "<p>slash/slash</p>\n" , "{{/slash}}"
   end
@@ -1154,5 +1149,57 @@ eos
     used_templates "{{test}}", "test:true,west:true"
     used_templates "{{testundef}}", "testundef:true,westundef:false"
   end
+  it 'should parse macro len' do
+    tc "<p>11</p>\n" , "{{$maclen}}"
+    tc "<p>17</p>\n" , "{{$maclen|12345}}"
+    tc "<p>18</p>\n" , "{{$maclen| 12345}}"
+    tc "<p>19</p>\n" , "{{$maclen | 12345}}"
+    tc "<p>18</p>\n" , "{{$maclen |12345}}"
+    tc "<p>18</p>\n" , "{{$maclen |12345}}"
+    tc "<p>15</p>\n" , "{{$maclen|kuk}}"
+    tc "<p>15</p>\n" , "{{$maclen|123}}"
+    tc "<p>18</p>\n" , "{{$maclen|žížala}}"
+    tc "<p>37</p>\n" , "{{$maclen|{{$maclen}}{{!echo ahoj}}}}"
+    tc "<p><strong>37</strong></p>\n" , "**{{$maclen|{{$maclen}}{{!echo ahoj}}}}**"
+    tc "<p>28</p>\n" , "{{$maclen|a=e|b=c|d={{$e}}}}"
+    tc "<p>maclen:14</p>\n" , "{{maclentest}}"
+  end
+  it 'should parse macro eoffset' do
+    tc "<p>16</p>\n" , "{{$eoffset 123}}"
+    tc "<p>12</p>\n" , "{{$eoffset}}"
+    tc "<p>ABC15</p>\n" , "ABC{{$eoffset}}"
+    tc "<p>A B C13</p>\n" , "A\nB\nC{{$eoffset}}"
+    tc "<p>A B C18</p>\n" , "A\nB\nC{{$eoffset ahoj}}"
+    tc "<p>A B C18</p>\n" , "A\nB\nC{{$eoffset ahoj}}\n"
+    tc "<p>A B 17</p>\n" , "A\nB\n{{$eoffset ahoj}}\n"
+    tc "<p>A B 6</p>\n" , "A\nB\n{{$eoffset|\nahoj}}\n"
+    tc "<p>A B 6</p>\n" , "A\nB\n{{$eoffset \nahoj}}\n"
+    tc "<p>A B 6</p>\n" , "A\nB\n{{$eoffset \n  tak to teda\nahoj}}\n"
+    tc "<p>A B 6BBB</p>\n" , "A\nB\n{{$eoffset \n  tak to teda\nahoj}}BBB\n"
+    tc "<p>A B 7</p>\n" , "A\nB\n{{$eoffset \t\t\n\t\n\r\f  \n\tahoj}}\n"
+    tc "<p>A B 6</p>\n" , "A\nB\n{{$elineno \t\t\n\t\n\r\f  \n\tahoj}}\n"
+    tc "<p>A B 6</p>\n" , "A\nB\n{{$elineno \t\t\n\t\n\r\r\r\f  \n\tahoj}}\n"
+    tc "<p>A B 7</p>\n" , "A\nB\n{{$elineno \t\t\n\t\n\r\r\r\f\n  \n\tahoj}}\n"
+    tc "<p>A B 3</p>\n" , "A\nB\n{{$elineno}}\n"
+    tc "<p>A B 4</p>\n" , "A\nB\n{{$elineno\nbla}}\n"
+  end
+  it 'should parse {{!macpos}}' do
+     tc "<p>1.0-1.14</p>\n", "{{testmacpos}}"
+     tc "<p>2.0-2.14</p>\n", "\n{{testmacpos}}\n"
+     tc "<p>1.0-1.30</p>\n", "{{testmacpos alsdkfjlsadjfk }}"
+     tc "<p>1.0-2.10</p>\n", "{{testmacpos\n12345678}}"
+     tc "<p>Ahoj 2.0-3.10</p>\n", "Ahoj\n{{testmacpos\n12345678}}"
+     tc "<p>1.0-1.15</p>\n", "{{testmacpos2}}"
+     tc "<p>2.0-2.15</p>\n", "\n{{testmacpos2}}\n"
+     tc "<p>1.0-1.31</p>\n", "{{testmacpos2 alsdkfjlsadjfk }}"
+     tc "<p>1.0-2.10</p>\n", "{{testmacpos2\n12345678}}"
+     tc "<p>Ahoj 2.0-3.10</p>\n", "Ahoj\n{{testmacpos2\n12345678}}"
+  end
+  it 'should expand html  attrs' do
+     tc "<div class=\"1\">TEST</div>\n", "<div class=\"{{$lineno}}\">TEST</div></p>\n", allow_html: true
+     tc "<div class=\"A1B1\">TEST</div>\n", "<div class=\"A{{$lineno}}B{{$lineno}}\">TEST</div></p>\n", allow_html: true
+     tc "<div class=\"AHOJ\">TEST</div>\n", "{{!set ahoj|AHOJ}}<div class=\"{{$ahoj}}\">TEST</div></p>\n", allow_html: true
+     tc "<div class=\"**AHOJ**\">TEST</div>\n", "{{!set ahoj|AHOJ}}<div class=\"**{{$ahoj}}**\">TEST</div></p>\n", allow_html: true
+  end
 end
 # vim: tw=0

metadata

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