trac-wiki 0.3.23 → 0.3.24

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 942670f3f5c6d350ff28252441a67a232b7b75a3
-  data.tar.gz: 5382932ad9aed007e5b76686dd2e6a03819c1635
+  metadata.gz: 22a2efb3c9aa6e36324781de0fb805e3a50c6194
+  data.tar.gz: c03c21f99e66e561813158eddc82dd3f281e0f49
 SHA512:
-  metadata.gz: 27dd2ed6af666127bc3bafdd2be3d13b90ff82ef4c3baa544d392e16e366b573841dc15fc6c697bed3a0e42e2918213d2de827d36391dc744dd25b3a0b409a99
-  data.tar.gz: 44f3b3b7618e868232f138981d77bfa8f5e0b23a848932d5595aca0d71a47d3e34a6e48889942be6847888497015023630cf6e123eb6c34b1dfe478650a5d12c
+  metadata.gz: e2c7e3a974e849c1f29b2dc0ee62b42de0a7ba38e98ce3291de862abf5a837aece98847a8b4a41326d7e5c8474043e80234733c8ae0722dc3eaa64cae47888da
+  data.tar.gz: bc5a680d7dd8d2ff824eff79a4c39bd8c64ae879a04e6644f99542bcba49bb654aab43b03c44d1a48443c2f816983bc61a0335d55317ad4b802dccf52c4b7076

data/Gemfile.lock

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

data/lib/trac-wiki/env.rb

@@ -10,11 +10,6 @@ module TracWiki
       @argv_stack = []
     end
 
-    def nocache!
-      atput('nocache', true)
-      self
-    end
-
     # r: expanded-macro, rest-of-str, lines, offset-in-line
     def parse_macro_all(macro_name, str, macro_name_size = nil)
       str_size = str.size
@@ -101,6 +96,11 @@ module TracWiki
       end
       "UCMD(#{macro_name}|#{@env['arg']})"
     end
+
+    def arg_count
+      @env[:cmd_args].size
+    end
+
     def arg(idx)
       @env[:cmd_args][idx] || ''
     end
@@ -141,7 +141,7 @@ module TracWiki
         #print "at(#{key}) -> default\n" if cur.nil?
         if cur.nil?
           if ! @parser.at_callback.nil?
-            val = @parser.at_callback.call(key, @env) 
+            val = @parser.at_callback.call(key, self) 
             return val if ! val.nil?
           end
           return default

data/lib/trac-wiki/parser.rb

@@ -197,7 +197,29 @@ module TracWiki
 
     def init_macros
       @macro_commands = {
-        '!ifeq'  => proc { |env| env.expand_arg(0) == env.expand_arg(1) ? env.expand_arg(2) : env.expand_arg(3) },
+        '!ifeq'  => proc { |env| what = env.expand_arg(0)
+                                 count = env.arg_count
+                                 i = 1
+                                 ret = ''
+                                 while count > i
+                                     argi = env.expand_arg(i)
+                                     # this is else:
+                                     if count <= i + 1
+                                       ret = argi
+                                       break
+                                     end
+
+                                     # we found it
+                                     if what == argi
+                                       ret = env.expand_arg(i+1)
+                                       break
+                                     end
+
+                                     # next
+                                     i +=2
+                                 end
+                                 ret.sub /\n\s+\Z/, "\n"
+                         },
         '!ifdef' => proc { |env| env.at(env.expand_arg(0), nil, false).nil? ? env.expand_arg(2) : env.expand_arg(1) },
         '!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)); '' },

data/lib/trac-wiki/version.rb

@@ -1,3 +1,3 @@
 module TracWiki
-  VERSION = '0.3.23'
+  VERSION = '0.3.24'
 end

data/test/parser_test.rb

@@ -1013,6 +1013,37 @@ eos
     tc "<p>&nbsp;</p>\n", "&nbsp;"
     tc "<p>&bdquo;text&ldquo;</p>\n", "&bdquo;text&ldquo;"
   end
+  it 'should !ifeq' do
+    tc "<p>ELSE.</p>\n", "{{!ifeq  WHAT|C1|A1|C2|A2|C3|A3|ELSE}}."
+    tc "<p>A1.</p>\n", "{{!ifeq  C1|C1|A1|C2|A2|C3|A3|ELSE}}."
+    tc "<p>A2.</p>\n", "{{!ifeq  C2|C1|A1|C2|A2|C3|A3|ELSE}}."
+    tc "<p>A3.</p>\n", "{{!ifeq  C3|C1|A1|C2|A2|C3|A3|ELSE}}."
+    tc "<p>A1.</p>\n", "{{!ifeq  C1|C1|A1|C2|A2|C3|A3}}."
+    tc "<p>A2.</p>\n", "{{!ifeq  C2|C1|A1|C2|A2|C3|A3}}."
+    tc "<p>A3.</p>\n", "{{!ifeq  C3|C1|A1|C2|A2|C3|A3}}."
+    tc "<p>.</p>\n", "{{!ifeq  C4|C1|A1|C2|A2|C3|A3}}."
+    tc "<p>A1.</p>\n", "{{!ifeq  C1|C1|A1
+                                   |C2|A2
+                                   |C3|A3}}."
+    tc "<p>A2.</p>\n", "{{!ifeq  C2|C1|A1
+                                   |C2|A2
+                                   |C3|A3}}."
+    tc "<p>A3.</p>\n", "{{!ifeq  C3|C1|A1
+                                   |C2|A2
+                                   |C3|A3}}."
+    tc "<p>.</p>\n",   "{{!ifeq  C4|C1|A1
+                                   |C2|A2
+                                   |C3|A3}}."
+    tc "<p>ELSE.</p>\n", "{{!ifeq  C4|C1|A1
+                                    |C2|A2
+                                    |C3|A3
+                                       |ELSE}}."
+    tc "<p>A1.</p>\n", "{{!ifeq  C1|C1|A1}}."
+    tc "<p>.</p>\n", "{{!ifeq  C4|C1|A1}}."
+    tc "<p>.</p>\n", "{{!ifeq  C1|C1|}}."
+    tc "<p>C1.</p>\n", "{{!ifeq  C1|C1}}."
+    tc "<p>.</p>\n", "{{!ifeq  C1}}."
+  end
   it 'should plugin' do
     tc "<p>AHOJTE!</p>\n", "{{!print AHOJTE}}"
     tc "<p>test:AHOJTE! AHOJTE! </p>\n", "test:{{!print AHOJTE}}{{!print AHOJTE}}"

metadata

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