trac-wiki 0.3.31 → 0.3.32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5e0a2c31f6a8138bebdf78c8f3951b5b362c183d
-  data.tar.gz: 5495008115fb52b374a50418e53a419dac0497d8
+  metadata.gz: 486c2d7cf3dd8fbcb005759e6ef0cd9aa95dfc38
+  data.tar.gz: 25938551d6ec9e52aedfc163f738143476d9b406
 SHA512:
-  metadata.gz: 4888042f069752ae6192cc3b0b7f6ca84f93c6ede3e559e6f735d4e52e655eac33cf1ed2e96b7b8d322c417769cc4c46848d771e979371c57796de67c79e8f07
-  data.tar.gz: ad42ebe564e253088819abd52150d7fa5d884804db3ebc9df97f4324dbff408cae20098330a7a3bc713c989766f523ca3563fae45c253681220ca47e7145fc64
+  metadata.gz: f36f872853aa702f736f8d402acf2528ccdd9ff2b203ccbdd7635ae4fa78bf3b6e36e30dbf9e04216be1ae752bcba147ac05e84f4e7d3ede62479a16f7d91aed
+  data.tar.gz: c81847b6bbff57636edd5722165374aa01be69c0a62eee3a3bcdaf2ee2d244fa60f3445ee928dea9bd6c892a86fc7776aff34cdccf846307ec1e58b3c3652896

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    trac-wiki (0.3.31)
+    trac-wiki (0.3.32)
 
 GEM
   remote: https://rubygems.org/
@@ -18,3 +18,6 @@ DEPENDENCIES
   rake
   trac-wiki!
   unicode_utils
+
+BUNDLED WITH
+   1.13.2

data/lib/trac-wiki/env.rb

@@ -101,8 +101,8 @@ module TracWiki
       @env[:cmd_args].size
     end
 
-    def arg(idx)
-      @env[:cmd_args][idx] || ''
+    def arg(idx, default = nil)
+      @env[:cmd_args][idx] || default || ''
     end
 
     def prepare_y
@@ -265,8 +265,8 @@ module TracWiki
     end
 
     # template expand
-    def expand_arg(idx)
-      expand(arg(idx))
+    def expand_arg(idx, default = nil)
+      expand(arg(idx, default))
     end
 
     def pp_env

data/lib/trac-wiki/parser.rb

@@ -224,6 +224,11 @@ module TracWiki
                          },
         '!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); '' },
+        '!append'=> proc { |env| key = env.expand_arg(0)
+                                 sep = env.expand_arg(2,'')
+                                 env[key] = (env[key].nil? ? '' : env[key] + sep ) + env.expand_arg(1);
+                                 ''
+                         },
         '!yset'  => proc { |env| env[env.expand_arg(0)] = YAML.load(env.arg(1)); '' },
         '!sub'   => proc { |env| pat = env.expand_arg(1)
                                  pat = Regexp.new(pat[1..-2]) if pat =~ /\A\/.*\/\Z/
@@ -423,7 +428,12 @@ module TracWiki
     # markup, for example to add html additional attributes or
     # to put divs around the imgs.
     def make_image(uri, attrs='')
-      @tree.tag(:img, make_image_attrs(uri, attrs))
+      attrs =  make_image_attrs(uri, attrs)
+      link = attrs.delete('link')
+
+      @tree.tag_beg(:a, {href: make_explicit_link(link)}) if link
+      @tree.tag(:img, attrs)
+      @tree.tag_end(:a) if link
     end
 
     def make_image_attrs(uri, attrs)
@@ -439,7 +449,7 @@ module TracWiki
            when  /^(top|bottom|middle)$/i
              a['valign'] = escape_url(opt)
            when  /^link=(.*)$/i
-             # pass
+             a['link'] = escape_url($1)
            when  /^nolink$/i
              # pass
            when /^(align|valign|border|width|height|alt|title|longdesc|class|id|usemap)=(.*)$/i

data/lib/trac-wiki/version.rb

@@ -1,3 +1,3 @@
 module TracWiki
-  VERSION = '0.3.31'
+  VERSION = '0.3.32'
 end

data/test/parser_test.rb

@@ -609,6 +609,8 @@ describe TracWiki::Parser do
     tc("<p><img src=\"image.jpg\"/></p>\n", "[[Image(image.jpg)]]", :no_link=>true)
     tc("<p><img alt=\"a%22tag%22\" src=\"image.jpg\"/></p>\n", "[[Image(image.jpg,alt=a\"tag\")]]")
     tc("<p><img alt=\"a%22tag%22\" src=\"image.jpg\"/></p>\n", "[[Image(image.jpg,alt=a\"tag\")]]", :no_link=>true)
+    tc("<p><a href=\"ahoj\"><img alt=\"a%22tag%22\" src=\"image.jpg\"/></a></p>\n", "[[Image(image.jpg,alt=a\"tag\",link=ahoj)]]", :no_link=>true)
+    tc("<p><a href=\"javascript%253Aalert%2528666%2529\"><img alt=\"a%22tag%22\" src=\"image.jpg\"/></a></p>\n", "[[Image(image.jpg,alt=a\"tag\",link=javascript:alert(666))]]", :no_link=>true)
 
     # Malicious links should not be converted.
     tc("<p><a href=\"javascript%3Aalert%28%22Boo%21%22%29\">Click</a></p>\n", "[[javascript:alert(\"Boo!\")|Click]]")
@@ -1308,6 +1310,12 @@ eos
     tc "<p><tt>ahoj   </tt></p>\n", "{{!sprintf `%-7s`|ahoj}}"
     tc "<p>(sprintf error:<tt>malformed format string - %*[0-9]</tt>)</p>\n", "{{!sprintf %03|1}}"
   end
+  it 'should parse !append' do
+    tc "<p>value</p>\n", "{{!set var|value}}{{$var}}"
+    tc "<p>value</p>\n", "{{!append var|value}}{{$var}}"
+    tc "<p>valuebalue</p>\n", "{{!append var|value}}{{!append var|balue}}{{$var}}"
+    tc "<p>value:balue</p>\n", "{{!append var|value}}{{!append var|balue|:}}{{$var}}"
+  end
   it 'should parse sprintf' do
     tc "<p><tt>ahoj</tt></p>\n", "{{!tt ahoj}}"
     tc "<p>YWhvanRl</p>\n", "{{!base64 ahojte}}"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: trac-wiki
 version: !ruby/object:Gem::Version
-  version: 0.3.31
+  version: 0.3.32
 platform: ruby
 authors:
 - Vitas Stradal
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-20 00:00:00.000000000 Z
+date: 2016-11-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bacon