trac-wiki 0.3.12 → 0.3.13

data/lib/trac-wiki/env.rb

@@ -111,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\$(.*)/
@@ -127,7 +127,7 @@ module TracWiki
         #print "at(#{key}) -> default\n" if cur.nil?
         return default if cur.nil?
       end
-      print "at(#{key})->#{cur}\n"
+      #rint "at(#{key})->#{cur}\n"
       to_str ? cur.to_s : cur
     end
     def atput(key, val = nil)
@@ -182,7 +182,9 @@ module TracWiki
 
       if ! @parser.template_handler.nil?
         str = @parser.template_handler.call(macro_name, env)
-        if !str.nil?
+        is_defined = !str.nil?
+        @parser.used_templates[macro_name] = is_defined
+        if is_defined
           #print "dep:#{env[:depth]}(#{macro_name}, #{str})\n"
           if env[:depth] > 32
              return "TOO_DEEP_RECURSION(`#{str}`)\n"

data/lib/trac-wiki/parser.rb

@@ -57,9 +57,13 @@ module TracWiki
     attr_accessor :headings
 
     def env
-      env
+      @env
     end
 
+    attr_reader :used_templates
+    @used_templates = {}
+
+
     # url base for links
     attr_writer :base
 
@@ -151,6 +155,7 @@ module TracWiki
 
     def to_html(text = nil)
       text(text) if ! text.nil?
+      @used_templates = {}
       @was_math = false
       @anames = {}
       @count_lines_level = 0

data/lib/trac-wiki/version.rb

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

data/test/parser_test.rb

@@ -19,6 +19,16 @@ class Bacon::Context
     parser.to_html(wiki)
     parser.env.at(var).should.equal val
   end
+  def used_templates(wiki, used_templates, 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.used_templates.sort.map do |key,value|
+      "#{key}:#{value}"
+    end.join(',').should.equal used_templates
+
+  end
 
   def template_handler(tname, env)
     case tname
@@ -36,6 +46,8 @@ class Bacon::Context
       "nulanula:{{$00}},a:{{$a}}"
     when 'vartest'
       "jedna:{{$1}},dve:{{$2}},p:{{$p}},arg:{{$00}}"
+    when 'testundef'
+      "{{westundef}}"
     when 'test'
       "{{west}}"
     when 'west'
@@ -1132,9 +1144,14 @@ eos
   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}}"
+    env '{{!set *|ahoj}}', '*', 'ahoj'
+    env '{{!set *|{}|}}', '*', '{}'
+    tc "<p>a</p>\n" , "{{!set qq|a}}{{$qq}}"
+  end
+  it 'should know used templates' do
+    used_templates "{{varnula}}", "varnula:true"
+    used_templates "{{test}}", "test:true,west:true"
+    used_templates "{{testundef}}", "testundef:true,westundef:false"
   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.12
+  version: 0.3.13
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-07 00:00:00.000000000 Z
+date: 2014-06-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bacon