trac-wiki 0.3.10 → 0.3.12

data/Gemfile

@@ -1,2 +1,3 @@
 source 'https://rubygems.org/'
 gemspec
+gem  'unicode_utils'

data/Gemfile.lock

@@ -1,13 +1,14 @@
 PATH
   remote: .
   specs:
-    trac-wiki (0.2.24)
+    trac-wiki (0.3.10)
 
 GEM
   remote: https://rubygems.org/
   specs:
     bacon (1.2.0)
     rake (10.0.4)
+    unicode_utils (1.4.0)
 
 PLATFORMS
   ruby
@@ -16,3 +17,4 @@ DEPENDENCIES
   bacon
   rake
   trac-wiki!
+  unicode_utils

data/README

@@ -104,6 +104,22 @@ Project page on github:
   create html toc from previously parsed text
 
 * `parser.add_macro_command(name, &block)`
+
+* `parser.env.(env|at(key))`
+   access to env values after parse
+
+== Macros ==
+
+* `{{template}}`
+* `{{$variable}}`
+   * can be set by  {{!set variable|value}}
+   * `$1`, `$2` parameters send to template {{template ONE|TWO}}
+   * parameters send to template can be named {{template ahoj=test|hi=west}}
+   * `$0` all parameters (without named)
+   * `$00` all parameters (with named)
+
+* `{{!command}}`
+
 == BUGS ==
 
 If you found a bug, please report it at the TracWiki project's tracker

data/lib/trac-wiki/env.rb

@@ -2,6 +2,7 @@
 module TracWiki
 
   class Env
+    attr_accessor :env
     def initialize(parser, env = {})
       @parser = parser
       @env = env
@@ -33,34 +34,6 @@ module TracWiki
       return do_macro_templ(macro_name, args)
     end
 
-#    # parse to next }} (with balanced {{..}})
-#    # output will be parsed tree:  [ "string", [ "string", ... ], "string", [..],[..] ]
-#    def parse_macro_tree(macro_name, str)
-#      return do_macro_cmd(macro_name, []), $', 0 if str =~ /\A}}/
-#      #print "_parse_macro_cmd: #{macro_name}, str#{str}\n"
-#      lines = 0
-#      tree = []
-#      cur = tree
-#      stack = []
-#      while str =~ /{{|}}/
-#        prefix, match, str  = $`, $&, $'
-#        cur.push(prefix) if prefix.size > 0
-#        lines += prefix.count("\n")
-#        if match == '{{'
-#          stack.push(cur)
-#          cur.push([])
-#          cur = cur[-1]
-#        elsif match == '}}'
-#          return tree, str, lines if cur == tree
-#          cur = stack.pop
-#        else
-#          raise "never happen"
-#        end
-#      end
-#      raise "eol in parsing macro params"
-#    end
-
-
     # parse to next }} (with balanced {{..}})
     # like parse_macro_vartempl but not expand content
     # r: [expansion, rest_of_str, count_of_consumed_lines]
@@ -119,7 +92,8 @@ module TracWiki
     def prepare_y
       #print "prepare_y\n"
       return if @env.key? 'y'
-      arg = @env['arg']
+      #arg = @env['argv']['00']
+      arg = @env['argv']['00']
       return if arg.nil?
       begin
         @env['y'] = YAML.load(arg)
@@ -137,7 +111,7 @@ module TracWiki
       return @env[key] || default if key.is_a? Symbol
       prepare_y if key =~ /^y\./
       key = "argv.#{key}" if key =~ /^\d+$/
-      #print "key: #{key}\n"
+      print "key: #{key}\n"
       cur = @env
       key.split(/\./).each do |subkey|
         subkey = at($1, '') if subkey =~ /\A\$(.*)/
@@ -153,7 +127,7 @@ module TracWiki
         #print "at(#{key}) -> default\n" if cur.nil?
         return default if cur.nil?
       end
-      #print "at(#{key})->#{cur}\n"
+      print "at(#{key})->#{cur}\n"
       to_str ? cur.to_s : cur
     end
     def atput(key, val = nil)
@@ -232,18 +206,21 @@ module TracWiki
         env[k] = v if k != :depth && k != 'arg' && k!='argv'
       end
       env[:depth] = (@env[:depth]||0)+1
-      env['arg'] = args.join('|')
       env['argv'] = {}
+      env['argv']['00'] = args.join('|')
+      arg0 = []
 
       idx = 1
       args.each do |arg|
-        if arg =~ /\A\s*(\w+)\s*=\s*(.*)/m
+        if arg =~ /\A\s*(\w+)=\s*(.*)/m
           env[$1] = $2
         else
           env['argv'][idx.to_s] = arg
+          arg0.push arg
           idx+=1
         end
       end
+      env['argv']['0'] = arg0.join('|')
       return Env.new(@parser, env)
     end
 

data/lib/trac-wiki/parser.rb

@@ -56,6 +56,10 @@ module TracWiki
     # ]
     attr_accessor :headings
 
+    def env
+      env
+    end
+
     # url base for links
     attr_writer :base
 
@@ -117,11 +121,13 @@ module TracWiki
     # result fo `template_handler('myCoolMacro') inserted
     attr_accessor :template_handler
 
+
+    # 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 = nil)

data/lib/trac-wiki/version.rb

@@ -1,3 +1,3 @@
 module TracWiki
-  VERSION = '0.3.10'
+  VERSION = '0.3.12'
 end

data/test/parser_test.rb

@@ -12,6 +12,13 @@ class Bacon::Context
     parser = TracWiki.parser(options)
     parser.to_html(wiki).should.equal html
   end
+  def env(wiki, var, val,options = {})
+    options[:macro_commands] = { '!print' => proc { |env| env.arg(0) + '! ' }, }
+    options[:template_handler] = self.method(:template_handler)
+    parser = TracWiki.parser(options)
+    parser.to_html(wiki)
+    parser.env.at(var).should.equal val
+  end
 
   def template_handler(tname, env)
     case tname
@@ -23,8 +30,12 @@ class Bacon::Context
       "{{$y.ahoj}},{{$y.bhoj.1}}"
     when 'ytest2'
       "{{!set i|ahoj}}{{$y.$i}},{{$y.bhoj.1}}"
+    when 'varnula'
+      "nula:{{$0}},a:{{$a}}"
+    when 'varnulanula'
+      "nulanula:{{$00}},a:{{$a}}"
     when 'vartest'
-      "jedna:{{$1}},dve:{{$2}},p:{{$p}},arg:{{$arg}}"
+      "jedna:{{$1}},dve:{{$2}},p:{{$p}},arg:{{$00}}"
     when 'test'
       "{{west}}"
     when 'west'
@@ -39,6 +50,10 @@ class Bacon::Context
        "maclen:{{$maclen}}"
     when 'wide'
       "0123456789{{wide}}" * 10
+    when 'testoff'
+      "off:{{$offset}}"
+    when '/slash'
+      "slash/slash"
     else
       nil
       #"UNK_TEMPL(#{tname})"
@@ -1057,7 +1072,11 @@ eos
     tc "<p><blockquote>2<blockquote>6</blockquote></blockquote></p>\n", "> {{$offset}}\n> >   {{$offset}}"
     tc "<p>test:5,17</p>\n", "test:{{$offset}},{{$offset}}"
     tc "<p>test:5,17,<strong>31</strong></p>\n", "test:{{$offset}},{{$offset}},**{{$offset}}**"
+    tc "<p>off:0</p>\n", "{{testoff}}"
+    tc "<p>A:off:2</p>\n", "A:{{testoff}}"
+    tc "<p>A:off:2</p>\n", "A:{{#echo {{testoff}}}}"
   end
+
   it 'should parse offset and template' do
     tc "<p>ahoj ahoj,19</p>\n" , "ahoj {{$mac|ahoj}},{{$offset}}"
     tc "<p>ahoj line one line two ,12</p>\n" , "ahoj {{nl}},{{$offset}}"
@@ -1081,6 +1100,9 @@ eos
     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
   it 'should parse lineno' do
     tc "<p>1</p>\n" , "{{$lineno}}"
     tc "<p>3</p>\n" , "\n\n{{$lineno}}"
@@ -1098,5 +1120,21 @@ eos
     tc "<ul><li>[[ahoj|bhoj]]</li>\n</ul>\n<p>3</p>\n", "* [[ahoj|bhoj]]\n\n{{$lineno}}", :no_link => true
     tc "<ul><li>[[ahoj|bhoj]] 2</li>\n</ul>\n", "* [[ahoj|bhoj]]\n{{$lineno}}", :no_link => true
   end
+  it 'should parse nula' do
+    tc "<p>nula:TEXT,a:</p>\n" , "{{varnula TEXT}}"
+    tc "<p>nula:TEXT,a:AHOJ</p>\n" , "{{varnula a=AHOJ|TEXT}}"
+    tc "<p>nula:TEXT,a:AHOJ</p>\n" , "{{varnula TEXT|a=AHOJ}}"
+    tc "<p>nula:TEXT,a:</p>\n" , "{{varnula TEXT|b=AHOJ}}"
+    tc "<p>nula:TE|XT,a:AHOJ</p>\n" , "{{varnula TE|XT|a=AHOJ}}"
+    tc "<p>nula:TE|XT,a:AHOJ</p>\n" , "{{varnula TE|a=AHOJ|XT}}"
+    tc "<p>nula:TE|XT,a:AHOJ</p>\n" , "{{varnula  TE|a=AHOJ|XT}}"
+    tc "<p>nulanula:TE|a=AHOJ|XT,a:AHOJ</p>\n" , "{{varnulanula TE|a=AHOJ|XT}}"
+  end
+  it 'should parse env' do
+    env '{{!set b|ahoj}}', 'b', 'ahoj'
+#    env '{{!set *|ahoj}}', '*', 'ahoj'
+#    env '{{!set *|{}|}}', '*', '{}'
+#    tc "<p>a</p>\n" , "{{!set qq|a}}{{$qq}}"
+  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.10
+  version: 0.3.12
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-10 00:00:00.000000000 Z
+date: 2014-06-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bacon