trac-wiki 0.3.29 → 0.3.30

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d9b5ec9f3bc16fa6f4d396574df290fcec619af0
-  data.tar.gz: e1d703758466837f1fad8770696982f7d6c8667a
+  metadata.gz: 107e539c3fae535e4b91d514bf1029e2a4ff4ab7
+  data.tar.gz: 58eecadc0308900fadb9da7aff1bd4a087265966
 SHA512:
-  metadata.gz: 2209fd84630c345578bc32e9d7ca8557b9f0abb89f5d26b603ad6f836c14defebba6eea592eeac742472050c4a284752539d55cc87efbfcd8fc3fd3034e68ebb
-  data.tar.gz: f0ac26537e613f37456886b88e6d2e5901a01bb8b0ff691df619134b63a56d606c36a7d35b62ea1e243539df79def9b901f414c9c17379e000a461db33e11327
+  metadata.gz: 25571b19eaf7b3aeb17c8ecb82a02921bd810605109ff6d47790db88ac391fdbfe4773ab27def6efd8b20f3809563a0584b7543c959917801ca0542f96a00739
+  data.tar.gz: fff67c49f1eecc16441bacd85cd4bac4bdff762ed71dd102ce7f3e6f402f547d1aa8e930f7158211a09c18d311f3497323cfbeb85ac29e5fe4d9847fafc332f6

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    trac-wiki (0.3.28)
+    trac-wiki (0.3.29)
 
 GEM
   remote: https://rubygems.org/

data/lib/trac-wiki/parser.rb

@@ -2,6 +2,8 @@
 require 'cgi'
 require 'uri'
 require 'yaml'
+require 'base64'
+require 'digest/sha2'
 require 'unicode_utils/compatibility_decomposition'
 
 # :main: TracWiki
@@ -131,10 +133,10 @@ module TracWiki
 
     # macro {{$var}} | {{#comment}} | {{!cmd}} |  {{template}} | {{/template}}
     # string begins with macro
-    MACRO_BEG_REX =  /\A\{\{ ( \$[\$\.\w]+ | [\#!\/]\w* |\w+ ) /x
-    MACRO_BEG_INSIDE_REX =  /\A(.*?) (?<!\{|!|!\{) \{\{ ( \$[\$\.\w]+ | [\#!\/]\w* | \w+ ) /xm
+    MACRO_BEG_REX =  /\A\{\{ ( \$[#\$\.\w]+ | [\#!\/]\w* |\w+ ) /x
+    MACRO_BEG_INSIDE_REX =  /\A(.*?) (?<!\{|!|!\{) \{\{ ( \$[#\$\.\w]+ | [\#!\/]\w* | \w+ ) /xm
     # find end of marcro or begin of inner macro
-    MACRO_END_REX =  /\A(.*?) ( \}\} | \{\{ ( \$[\$\.\w]+ | [\#!\/]\w* | \w+)  )/mx
+    MACRO_END_REX =  /\A(.*?) ( \}\} | \{\{ ( \$[#\$\.\w]+ | [\#!\/]\w* | \w+)  )/mx
 
     # Create a new Parser instance.
     def initialize(options = {})
@@ -227,29 +229,83 @@ 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')}"  },
+        '!macpos'=> proc { |env| "#{env.at('lineno')}.#{env.at('offset')}-#{env.at('elineno')}.#{env.at('eoffset')}"  },
+        # in macro {{arg {{$i}}} -> i=4 => ctyry
+        '!arg'   => proc { |env|
+             #print "arg: #{env.arg(0)}, #{env} }"
+             "#{env.at(env.expand(env.arg(0)))}"
+             },
+
+        # {{!forargs i|3|i:{$$i}}}} -> 0,1,2
+        # {{!forargs i||i:{$$i}}}} -> 0,1,2
+        '!sprintf'   => proc { |env|
+                               fmt = env.arg(0)
+                               args = (1 .. env.arg_count ).map{ |i| env.expand_arg(i)}
+                               begin
+                                 sprintf fmt, *args
+                               rescue Exception => e
+                                 "(sprintf error:`#{e}`)" 
+                               end
+                        },
+        '!digest'    => proc { |env| Base64.urlsafe_encode64(Digest::SHA256.digest(env.expand_arg(0))) },
+        '!base64'    => proc { |env| Base64.urlsafe_encode64(env.expand_arg(0)) },
+        '!tt'        => proc { |env| "`#{env.expand_arg(0)}`" },
+        '!forargs'   => proc { |env| i_name = env.arg(0)
+                               i_name = env.arg(0)
+                               start = env.arg(1).to_i # side efect '' => 0
+                               start = 1 if start < 1
+                               template = env.arg(2)
+                               argcount =
+                               (start .. env.arg_count ).map do |i|
+                                 env.atput(i_name, i.to_s)
+                                 env.expand(template)
+                               end.join('')
+                         },
+        # {{!for i|1,3|i:{$$i}}}} -> 0,1,2
+        # {{!for i|1,3,data|i:{$$i}}}} -> data[1,2,3]
+        # {{!for i|data|i:{$$i}}}} -> vsechny data
+        # {{!for i|1|i:{$$i}}}} -> vsechny data
         '!for'   => proc { |env| i_name = env.arg(0)
-                               top = env.arg(1)
-                               tmpl = env.arg(2)
-                               #print "top#{top}\n"
-                               if top =~ /^\d+/
-                                 set = (0..(top.to_i-1))
+
+                               raise "!for takes exactly 3 argumentsif not #{env.arg_count}" if env.arg_count != 3
+
+                               i_name = env.arg(0)
+                               range =  env.expand_arg(1)
+                               templ =  env.arg(2)
+
+                               arange = range.split(/,/)
+                               arange = [ nil, nil, arange[0]] if arange.size == 1
+
+                               bot = arange[0]
+                               top = arange[1]
+                               var = arange[2]
+
+                               if var.nil?
+                                 set = (bot.to_i||1 .. top.to_i)
                                else
-                                 set = env.at(top, nil, false)
-                                 if set.is_a?(Hash)
-                                   set = set.keys.sort
-                                 elsif set.is_a?(Array)
-                                   set = (0 .. set.size-1)
-                                 elsif set.nil?
+                                 obj = env.at(var, nil, false)
+
+                                 if obj.is_a?(Hash)
+                                   set = obj.keys.sort
+                                 elsif obj.is_a?(Array)
+                                   #print "ble:#{bot} #{bot}, #{obj.size}\n"
+                                   set = (bot||0 .. obj.size-1)
+                                 elsif obj.nil?
                                    set = []
                                  else
-                                   print "error top(#{top}), set#{set} #{set.class}\n"
-                                   raise "Error in {{!for #{i_name}|#{top}|#{tmpl}}} $#{top}.class=#{set.class}(#{set.to_s})"
+                                   raise "Error: wrong arg #{obj} class='#{obj.class}'"
                                  end
                                end
+                               #set.select! { |x| x >= bot } if bot
+                               #set.select! { |x| x <= top } if top
+
+                               #print "for set#{set} tmpl#{templ||"nic"}\n"
+
                                set.map do |i|
+                                 #print "for#{i} #{templ}\n"
                                  env[i_name] = i.to_s
-                                 env.expand(tmpl)
+                                 env.atput(i_name, i.to_s)
+                                 env.expand(templ)
                                end.join('')
                        },
       }

data/lib/trac-wiki/version.rb

@@ -1,3 +1,3 @@
 module TracWiki
-  VERSION = '0.3.29'
+  VERSION = '0.3.30'
 end

data/test/parser_test.rb

@@ -72,9 +72,19 @@ class Bacon::Context
       "off:{{$offset}}"
     when '/slash'
       "slash/slash"
+    when 'argcount'
+      "{{$#}},{{$##}}"
+    when 'argi'
+      "{{$i}}:{{!arg {{$i}}}}."
+    when 'forargs'
+      "{{!forargs i||{{$i}}:{{!arg {{$i}}}},}}"
+    when 'forargs2'
+      "{{!forargs i|2|{{$i}}:{{!arg {{$i}}}},}}"
     when 'unkmacro'
       #"UNKNOWN-MACRO:!{{!.{{$0}}}}."
       "UNKNOWN-MACRO:!{{!.{{$1}}}}."
+    when 'digesttest'
+       "({{$00}}:{{!digest blabla{{$00}}}})"
     else
       nil
       #"UNK_TEMPL(#{tname})"
@@ -1063,20 +1073,27 @@ eos
     tc "<p>,2</p>\n", "{{!yset ahoj|data: [1,2]\ndesc: malo}},{{$ahoj.data.1}}"
     tc "<p>AHOJ,dve</p>\n", "{{ytest2 \nahoj: AHOJ\nbhoj: [ jedna, dve ]\n}}"
     tc "<p>,,BHOJ</p>\n", "{{!set ahoj|AHOJ}},{{!set AHOJ|BHOJ}},{{$$ahoj}}"
-    tc "<p>(0),(1),(2),</p>\n", "{{!for i|3|({{$i}}),}}", allow_html: true
-    tc "<p>(0),(1),(2),(3),</p>\n", "{{!for i|4|({{$i}}),}}", allow_html: true
-    tc "<p>,(ALFA),(BETA),</p>\n", "{{!yset data|[ALFA,BETA]}},{{!for i|data|({{$data.$i}}),}}"
-    tc "<p>,(1),(2),</p>\n", "{{!yset data|[1,2]}},{{!for i|data|({{$data.$i}}),}}"
-    tc "<p>,(alfa:ALFA),(beta:BETA),</p>\n", "{{!yset data|beta: BETA\nalfa: ALFA\n}},{{!for i|data|({{$i}}:{{$data.$i}}),}}"
-    tc "<p>,(0:1),(1:2),</p>\n", "{{!yset data|[ 1,2 ]\n}},{{!for i|data|({{$i}}:{{$data.$i}}),}}"
-    tc "<p>,</p>\n", "{{!yset data|[  ]\n}},{{!for i|data|({{$i}}:{{$data.$i}}),}}"
 
     tc "<p>,FALSE</p>\n", "{{!yset data|[1,2]}},{{!ifdef data.55|TRUE|FALSE}}"
     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}}"
   end
-
+  it 'should parse !for' do
+    tc "<p>(1),(2),(3),</p>\n", "{{!for i|1,3|({{$i}}),}}", allow_html: true
+    tc "<p>(2),(3),</p>\n", "{{!for i|2,3|({{$i}}),}}", allow_html: true
+    tc "<p>(3),</p>\n", "{{!for i|3,3|({{$i}}),}}", allow_html: true
+    tc "<p>(0),(1),(2),(3),(4),</p>\n", "{{!for i|,4|({{$i}}),}}", allow_html: true
+    tc "<p>,(ALFA),(BETA),</p>\n", "{{!yset data|[ALFA,BETA]}},{{!for i|data|({{$data.$i}}),}}"
+    tc "<p>,(1),(2),</p>\n", "{{!yset data|[1,2]}},{{!for i|data|({{$data.$i}}),}}"
+    tc "<p>,(alfa:ALFA),(beta:BETA),</p>\n", "{{!yset data|beta: BETA\nalfa: ALFA\n}},{{!for i|data|({{$i}}:{{$data.$i}}),}}"
+    tc "<p>,(0:1),(1:2),</p>\n", "{{!yset data|[ 1,2 ]\n}},{{!for i|data|({{$i}}:{{$data.$i}}),}}"
+    tc "<p>,</p>\n", "{{!yset data|[  ]\n}},{{!for i|data|({{$i}}:{{$data.$i}}),}}"
+  end
+  it 'should parse argi' do
+    tc "<p>1:one.</p>\n", "{{argi one|two|i=1}}"
+    tc "<p>2:two.</p>\n", "{{argi one|two|i=2}}"
+  end
   it 'should parse html' do
     tc "<p>alert(666)</p>\n", "<script>alert(666)</script>", allow_html: true
     tc "<p><b>T</b>E</p>\n", "<p><b>T</b>E</p>", allow_html: true
@@ -1114,8 +1131,8 @@ eos
     tc "<p>d<strong>e</strong></p>\n", "{{!ifeq a|b|c|d*\\\n*e**}}"
     tc "<p>d<strong>e</strong></p>\n", "{{!ifeq a|b|c|d*\\\r\n*e**}}"
     tc "<p>e</p>\n", "{{!ifeq a|b|c|\\\r\ne}}"
-    tc "<p>a0a1a2</p>\n", "{{!for i|3|a\\\n{{$i}}}}"
-    tc "<p>a0a1a2</p>\n", "{{!for i|3|a\\\n   {{$i}}}}"
+    tc "<p>a1a2a3</p>\n", "{{!for i|1,3|a\\\n{{$i}}}}"
+    tc "<p>a0a1a2a3</p>\n", "{{!for i|0,3|a\\\n   {{$i}}}}"
   end
   it 'should parse offset' do
     tc "<p>0</p>\n", "{{$offset}}"
@@ -1260,6 +1277,13 @@ eos
      tc "<p>meow</p>\n", "{{$UNKVAR|meow}}\n"
      tc "<p>cat:</p>\n", "cat:{{$UNKVAR}}\n"
   end
+  it 'should argcount ' do
+    tc "<p>0,0</p>\n", "{{argcount}}"
+    tc "<p>1,1</p>\n", "{{argcount one}}"
+    tc "<p>2,2</p>\n", "{{argcount one|two}}"
+    tc "<p>2,3</p>\n", "{{argcount one|two|blaf=haf}}"
+    tc "<p>0,3</p>\n", "{{argcount one=1|two=2|blaf=haf}}"
+  end
   it 'should parse data-* ' do
      tc "<div data-coffie=\"tea\">TEST</div>\n", "<div data-coffie=\"tea\">TEST</div>\n", allow_html: true
      tc "<div data-coffie-break=\"tea\">TEST</div>\n", "<div data-coffie-break=\"tea\">TEST</div>\n", allow_html: true
@@ -1267,5 +1291,31 @@ eos
 
      tc "<p>&lt;div data-coffie-break=&quot;tea&quot;&gt;TEST&lt;/div&gt;</p>\n", "<div data-coffie-break=\"tea\">TEST</div>\n", allow_html: false
   end
+  it 'should forargs' do
+    tc "<p>1:jedna,2:dva,3:tri,</p>\n", "{{forargs jedna|dva|tri}}", allow_html: true
+    tc "<p>2:dva,3:tri,</p>\n", "{{forargs2 jedna|dva|tri}}", allow_html: true
+  end
+  it 'should parse digest' do
+    tc "<p>wFNeS-K3n_2TKRMFQ2v4iTFOSj-uwF7P_Lt98xrZ5Ro=</p>\n", "{{!digest Hello world!}}"
+    tc "<p>wFNeS-K3n_2TKRMFQ2v4iTFOSj-uwF7P_Lt98xrZ5Ro=</p>\n", "{{!digest  Hello world!}}"
+    tc "<p>wFNeS-K3n_2TKRMFQ2v4iTFOSj-uwF7P_Lt98xrZ5Ro=</p>\n", "{{!set ahoj|Hello world!}}{{!digest {{$ahoj}}}}"
+    tc "<p>qj7BbmrMgJ2LKBhmInYlar_S8bRBy1FXSTPz1L0RXRE=</p>\n", "{{!set ahoj|Hello world.}}{{!digest {{$ahoj}}}}"
+  end
+  it 'should parse sprintf' do
+    tc "<p>001</p>\n", "{{!sprintf %03i|1}}"
+    tc "<p>0001-3.14</p>\n", "{{!sprintf %04i-%.2f|1|3.1415}}"
+    tc "<p><tt>   ahoj</tt></p>\n", "{{!sprintf `%7s`|ahoj}}"
+    tc "<p><tt>ahoj   </tt></p>\n", "{{!sprintf `%-7s`|ahoj}}"
+    tc "<p>(sprintf error:<tt>malformed format string - %*[0-9]</tt>)</p>\n", "{{!sprintf %03|1}}"
+  end
+  it 'should parse sprintf' do
+    tc "<p><tt>ahoj</tt></p>\n", "{{!tt ahoj}}"
+    tc "<p>YWhvanRl</p>\n", "{{!base64 ahojte}}"
+    tc "<p>(ahojte:FuVx_SBpN3croY9zm4j14xVw19yIHsyZIzErSffwPpY=)</p>\n", "{{digesttest ahojte}}"
+    tc "<p>(bhojte:iwqSnWkQXpGogNtIXpDr8TYIcwJFQTKOLQgG7b9VFVg=)</p>\n", "{{digesttest bhojte}}"
+    tc "<p>(bhojte|ahoj=qhoj:6o2F88ZwLtQadp-8O6ArYIPcePy8_h_rg_2Fsa0EUv0=)</p>\n", "{{digesttest bhojte|ahoj=qhoj}}"
+    tc "<p>(bhojte|ahoj=dhoj:m8afmveEhG78gsv5Pt-gJ56idfKCR10JNPr-G72Fttc=)</p>\n", "{{digesttest bhojte|ahoj=dhoj}}"
+    tc "<p><tt>ah!@\#$%^&amp;*()[]oj</tt></p>\n", "{{!tt ah!@\#$%^&*()[]oj}}"
+  end
 end
 # vim: tw=0

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: trac-wiki
 version: !ruby/object:Gem::Version
-  version: 0.3.29
+  version: 0.3.30
 platform: ruby
 authors:
 - Vitas Stradal
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-18 00:00:00.000000000 Z
+date: 2015-01-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bacon