trac-wiki 0.3.21 → 0.3.22

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2cc0af0b5c51c390aa590950accded35c88c6b39
-  data.tar.gz: d0907cc3a0dc5a8a4e83555f4aa6366edad8ce3b
+  metadata.gz: 78e7c6394c7e42eec56bad4af297ccc8e66a4fb8
+  data.tar.gz: a30866e55c43ce02a45080859f0b67661b4c18ea
 SHA512:
-  metadata.gz: c0043c157364338f8c99d2c1e63c4c0a0754913dbe78580174fec37a66e728f341b21adbb4a65ca6ca7a8dcee9e9a3d8531ffad3e8942e087a00fb90a8d41e9f
-  data.tar.gz: 4408748ddc71a296aca9577c3e42af62beffab19e46d0f63975ea52f090bfa00be1a809a0dad13549b78cc86d6b6b2e62d561ed5a1e3ceb43d99d11bf598a13e
+  metadata.gz: c4878f8e561b7f6c1a9559f59662e4c2c2399109873db4f9d4fa9862971adf4a471d594ae8dc1f82c010078b7068239f279fccad9c510652702e760654bd359b
+  data.tar.gz: c8f89d8b4457cd4d8601a9becb8506ddc86de4780ddfa89e68b9e329b4e1448960b73beb056ffcede8e2a28ba875c3ad6dbbdf245ea2a0d89c0471338b5a05ec

data/lib/trac-wiki/env.rb

@@ -131,10 +131,16 @@ module TracWiki
           cur = cur[subkey.to_i]
         else
           #print "at(#{key})->: default"
-          return default
+          cur = nil
         end
         #print "at(#{key}) -> default\n" if cur.nil?
-        return default if cur.nil?
+        if cur.nil?
+          if ! @parser.at_callback.nil?
+            val = @parser.at_callback.call(key, @env) 
+            return val if ! val.nil?
+          end
+          return default
+        end
       end
       #rint "at(#{key})->#{cur}\n"
       to_str ? cur.to_s : cur

data/lib/trac-wiki/parser.rb

@@ -125,6 +125,9 @@ module TracWiki
     # result fo `template_handler('myCoolMacro') inserted
     attr_accessor :template_handler
 
+    # Proc or nil
+    # at_callback.call(env, key) -> computed value
+    attr_accessor :at_callback
 
     # macro {{$var}} | {{#comment}} | {{!cmd}} |  {{template}} | {{/template}}
     # string begins with macro
@@ -136,6 +139,7 @@ module TracWiki
     # Create a new Parser instance.
     def initialize(options = {})
       init_macros
+      @at_callback = nil
       @env = Env.new(self)
       @macros = true
       @allowed_schemes = %w(http https ftp ftps)

data/lib/trac-wiki/version.rb

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

data/test/parser_test.rb

@@ -10,12 +10,14 @@ class Bacon::Context
     options[:template_handler] = self.method(:template_handler)
 
     parser = TracWiki.parser(options)
+    parser.at_callback = Proc.new { |k,env| k == 'MEOW' ? 'WUF' : nil }
     html.should.equal parser.to_html(wiki)
   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.at_callback = Proc.new { |k,env| k == 'MEOW' ? 'HAF' : nil }
     parser.to_html(wiki)
     parser.env.at(var).should.equal val
   end
@@ -1217,6 +1219,11 @@ eos
      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
+  it 'should parse at_callback ' do
+     tc "<p>WUF</p>\n", "{{$MEOW|meow}}\n"
+     tc "<p>meow</p>\n", "{{$UNKVAR|meow}}\n"
+     tc "<p>cat:</p>\n", "cat:{{$UNKVAR}}\n"
+  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

metadata

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