trac-wiki 0.3.20 → 0.3.21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9082403f6f5ffdf60c8ea8e3c6785e5944292826
-  data.tar.gz: 13881be54dd10ad85d65928bd07258bd4905cf13
+  metadata.gz: 2cc0af0b5c51c390aa590950accded35c88c6b39
+  data.tar.gz: d0907cc3a0dc5a8a4e83555f4aa6366edad8ce3b
 SHA512:
-  metadata.gz: 56fb3457869356cb1ea30baa0044504411bac301d319db3ca638d6819e4f594d6abaa464370098a0abebb790bf20f21ce30db6c598c30fbc1dc3bb85c18ecbd7
-  data.tar.gz: 4b19c77f25ac1d16ebcfbdc48549806acee97ece6c38ea526fbd37b0b5522d1d6f2b5bd185582a68aad8865927180769e5f5e74957ba096d1fb496f831566906
+  metadata.gz: c0043c157364338f8c99d2c1e63c4c0a0754913dbe78580174fec37a66e728f341b21adbb4a65ca6ca7a8dcee9e9a3d8531ffad3e8942e087a00fb90a8d41e9f
+  data.tar.gz: 4408748ddc71a296aca9577c3e42af62beffab19e46d0f63975ea52f090bfa00be1a809a0dad13549b78cc86d6b6b2e62d561ed5a1e3ceb43d99d11bf598a13e

data/Gemfile.lock

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

data/README

@@ -118,6 +118,11 @@ Project page on github:
    * `$0` all parameters (without named)
    * `$00` all parameters (with named)
 
+* `{{unknown_macro par1}}` is expanded  to `{{unkmacro unknown_macro|par1}}`,
+   you have to specify `uknmacro` macro. If not, error strig
+   `UNKNOWN-MACRO(unkmacro)`
+   is generated.
+
 * `{{!command}}`
 
 == BUGS ==

data/lib/trac-wiki/env.rb

@@ -204,7 +204,7 @@ module TracWiki
       if ! @parser.template_handler.nil?
         str = @parser.template_handler.call(macro_name, @env, @argv)
         is_defined = !str.nil?
-        @parser.used_templates[macro_name] = is_defined
+        @parser.used_templates[macro_name] = is_defined if macro_name != 'unkmacro'
         if is_defined
           if @argv_stack.size > 32
              return "TOO_DEEP_RECURSION(`#{str}`)\n"
@@ -218,12 +218,16 @@ module TracWiki
           return str
         end
       end
-      "UNKNOWN-MACRO(#{macro_name})"
+      #return "UNKNOWN-MACRO(#{macro_name})"
+      return "UNKNOWN-MACRO(#{@argv['0']})" if macro_name == 'unkmacro'
+      return "{{unkmacro #{macro_name}}}" if @argv['##'] == '0'
+      return "{{unkmacro #{macro_name}|#{@argv['00']}}}"
     end
 
     def do_macro_arg_to_env(args)
       argv = {}
       argv['00'] = args.join('|')
+      argv['##'] = args.size.to_s
       arg0 = []
 
       idx = 1
@@ -237,6 +241,7 @@ module TracWiki
         end
       end
       argv['0'] = arg0.join('|')
+      argv['#'] = arg0.size.to_s
       return argv
     end
 

data/lib/trac-wiki/parser.rb

@@ -129,7 +129,7 @@ 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_INSIDE_REX =  /\A(.*?) (?<!\{|!|!\{) \{\{ ( \$[\$\.\w]+ | [\#!\/]\w* | \w+ ) /xm
     # find end of marcro or begin of inner macro
     MACRO_END_REX =  /\A(.*?) ( \}\} | \{\{ ( \$[\$\.\w]+ | [\#!\/]\w* | \w+)  )/mx
 
@@ -472,8 +472,12 @@ module TracWiki
           toggle_tag 'sup', $&            # ^{}
         when str =~ /\A,,/
           toggle_tag 'sub', $&            # _{}
-        when str =~ /\A!(\{\{|[^\s])/
+        when str =~ /\A!\./
+          @tree.add('')                   # !. \relax 
+        when str =~ /\A!(\{\{|[\S])/
           @tree.add($1)                   # !neco !{{
+#        when str =~ /\A!(\{\{)/
+#          @tree.add($1)                   # !neco !{
         when str =~ /\A./
           @tree.add($&)                   # ordinal char
         end

data/lib/trac-wiki/version.rb

@@ -1,3 +1,3 @@
 module TracWiki
-  VERSION = '0.3.20'
+  VERSION = '0.3.21'
 end

data/test/parser_test.rb

@@ -70,6 +70,9 @@ class Bacon::Context
       "off:{{$offset}}"
     when '/slash'
       "slash/slash"
+    when 'unkmacro'
+      #"UNKNOWN-MACRO:!{{!.{{$0}}}}."
+      "UNKNOWN-MACRO:!{{!.{{$1}}}}."
     else
       nil
       #"UNK_TEMPL(#{tname})"
@@ -965,11 +968,11 @@ eos
 
     tc "<h1>h1</h1>" , "{{# co{{HUU}}mment }}\n\n\n= h1 =\n{{# Comment2}}\n" 
 
-    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>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
 
@@ -980,7 +983,8 @@ 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>UNKNOWN-MACRO(unknown)3</p>\n", "{{unknown}}3"
+    tc "<p>UNKNOWN-MACRO:{{unknown}}.4</p>\n", "{{unknown u1|u2}}4"
+    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}}"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: trac-wiki
 version: !ruby/object:Gem::Version
-  version: 0.3.20
+  version: 0.3.21
 platform: ruby
 authors:
 - Vitas Stradal
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-13 00:00:00.000000000 Z
+date: 2014-10-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bacon