trac-wiki 0.3.15 → 0.3.16

data/lib/trac-wiki/env.rb

@@ -202,7 +202,7 @@ module TracWiki
 
     def _do_macro_temp_low(macro_name)
       if ! @parser.template_handler.nil?
-        str = @parser.template_handler.call(macro_name, @env)
+        str = @parser.template_handler.call(macro_name, @env, @argv)
         is_defined = !str.nil?
         @parser.used_templates[macro_name] = is_defined
         if is_defined

data/lib/trac-wiki/parser.rb

@@ -55,10 +55,7 @@ module TracWiki
     #   ...
     # ]
     attr_accessor :headings
-
-    def env
-      @env
-    end
+    attr_accessor :env
 
     attr_reader :used_templates
     @used_templates = {}
@@ -134,7 +131,7 @@ module TracWiki
     MACRO_END_REX =  /\A(.*?) ( \}\} | \{\{ ( \$[\$\.\w]+ | [\#!\/]\w* | \w+)  )/mx
 
     # Create a new Parser instance.
-    def initialize(options = nil)
+    def initialize(options = {})
       init_macros
       @env = Env.new(self)
       @macros = true
@@ -680,8 +677,8 @@ module TracWiki
       while str =~ /\A\s*(\w+)\s*=\s*'([^>']*)'/ ||
             str =~ /\A\s*(\w+)\s*=\s*"([^>"]*)"/ ||
             str =~ /\A\s*(\w+)\s*=\s*(\S*)/
-       ret[$1] = @env.expand($2)
-       str = $'
+        ret[$1] = @env.expand($2)
+        str = $'
       end
       ret
     end
@@ -778,7 +775,8 @@ module TracWiki
         # empty line
         when str =~ /\A\s*$(\r?\n)?/
           end_paragraph
-        when str =~ /\A([:\w\s]+)::(\s+|\r?\n)/
+        #when str =~ /\A([:\w\s]+)::(\s+|\r?\n)/
+        when str =~ /\A(.+)::(\s+|\r?\n)/
           do_term($1)
         # li
         when str =~ /\A((\s*)([*-]|[aAIi\d]\.)\s+)(.*?)$(\r?\n)?/

data/lib/trac-wiki/version.rb

@@ -1,3 +1,3 @@
 module TracWiki
-  VERSION = '0.3.15'
+  VERSION = '0.3.16'
 end

data/test/parser_test.rb

@@ -378,6 +378,9 @@ describe TracWiki::Parser do
     tc "<dl><dt>Monty::Python</dt><dd> definition</dd></dl>\n", "Monty::Python:: definition\n"
     tc "<dl><dt>::Python</dt><dd> definition</dd></dl>\n", "::Python:: definition\n"
   end
+  it 'should parse definition list with dia' do
+    tc "<dl><dt>Monty Pýthón</dt><dd> definition</dd></dl>\n", "Monty Pýthón:: \n   definition\n"
+  end
   it 'should not parse definition list' do
     # FIXME: trailing space 
     tc "<p>Monty::Python::definition</p>\n", "Monty::Python::definition\n"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: trac-wiki
 version: !ruby/object:Gem::Version
-  version: 0.3.15
+  version: 0.3.16
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-18 00:00:00.000000000 Z
+date: 2014-08-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bacon