trac-wiki 0.1.0 → 0.1.1

data/lib/trac-wiki/parser.rb

@@ -16,6 +16,7 @@ require 'uri'
 # ||=Table=||=Heading=||
 # || Table || Cells   ||
 # [[Image(image.png)]]
+# [[Image(image.png, options)]]
 #
 # The simplest interface is TracWiki.render. The default handling of
 # links allow explicit local links using the [[link]] syntax. External
@@ -207,12 +208,35 @@ module TracWiki
     # method can be overridden to generate custom
     # markup, for example to add html additional attributes or
     # to put divs around the imgs.
-    def make_image(uri, alt='')
-      if alt
-        "<img src=\"" << escape_html(uri) << "\" alt=\"" << escape_html(alt) << "\"/>"
-      else
-        "<img src=\"" << escape_html(uri) << "\"/>"
-      end
+    def make_image(uri, attrs='')
+      "<img src=\"#{escape_html(uri)}\"#{make_image_attrs(attrs)}/>"
+    end
+
+    def make_image_attrs(attrs)
+       return '' if ! attrs
+       a = {}
+       style = []
+       attrs.strip.split(/\s*,\s*/).each do |opt|
+         case opt
+           when /^\d+[^\d]*$/
+             a['width'] = opt
+           when /^(right|left|center)/i
+             a['align'] = opt
+           when  /^(top|bottom|middle)$/i
+             a['valign'] = opt
+           when  /^link=(.*)$/i
+             # pass
+           when  /^nolink$/i
+             # pass
+           when /^(align|valign|border|width|height|alt|title|longdesc|class|id|usemap)=(.*)$/i
+            a[$1]= escape_html($2)
+           when /^(margin|margin-(left|right|top|bottom))=(\d+)$/
+            style.push($1 + ":" + escape_html($3))
+         end
+       end
+       a['style'] = style.join(';') if ! style.empty?
+       return '' if a.empty?
+       return ' ' + a.map{|k,v| "#{k}=\"#{v}\"" }.sort.join(' ')
     end
 
     def make_headline(level, text)
@@ -244,7 +268,7 @@ module TracWiki
             end
           end
         # [[Image(pic.jpg|tag)]]
-        when /\A\[\[Image\(([^|].*?)(\|(.*?))?\)\]\]/   # image 
+        when /\A\[\[Image\(([^,]*?)(,(.*?))?\)\]\]/   # image 
           str = $'
           @out << make_image($1, $3)
         # [[link]]

data/lib/trac-wiki/version.rb

@@ -1,3 +1,3 @@
 module TracWiki
-  VERSION = '0.1.0'
+  VERSION = '0.1.1'
 end

data/test/parser_test.rb

@@ -449,8 +449,8 @@ describe TracWiki::Parser do
     # Image tags should be escape
     tc("<p><img src=\"image.jpg\"/></p>\n", "[[Image(image.jpg)]]")
     tc("<p><img src=\"image.jpg\"/></p>\n", "[[Image(image.jpg)]]", :no_link=>true)
-    tc("<p><img src=\"image.jpg\" alt=\"&quot;tag&quot;\"/></p>\n", "[[Image(image.jpg|\"tag\")]]")
-    tc("<p><img src=\"image.jpg\" alt=\"&quot;tag&quot;\"/></p>\n", "[[Image(image.jpg|\"tag\")]]", :no_link=>true)
+    tc("<p><img src=\"image.jpg\" alt=\"a&quot;tag&quot;\"/></p>\n", "[[Image(image.jpg,alt=a\"tag\")]]")
+    tc("<p><img src=\"image.jpg\" alt=\"a&quot;tag&quot;\"/></p>\n", "[[Image(image.jpg,alt=a\"tag\")]]", :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]]")
@@ -708,7 +708,20 @@ describe TracWiki::Parser do
 
   it 'should parse image' do
     tc("<p><img src=\"image.jpg\"/></p>\n", "[[Image(image.jpg)]]")
-    tc("<p><img src=\"image.jpg\" alt=\"tag\"/></p>\n", "[[Image(image.jpg|tag)]]")
+    tc("<p><img src=\"image.jpg\" alt=\"tag\"/></p>\n", "[[Image(image.jpg,alt=tag)]]")
+    tc("<p><img src=\"image.jpg\" width=\"120px\"/></p>\n", "[[Image(image.jpg, 120px )]]")
+    tc("<p><img src=\"image.jpg\" width=\"120px\"/></p>\n", "[[Image(image.jpg, \t120px   )]]")
+    tc("<p><img src=\"image.jpg\" align=\"right\"/></p>\n", "[[Image(image.jpg, right)]]")
+    tc("<p><img src=\"image.jpg\" align=\"right\" valign=\"top\"/></p>\n", "[[Image(image.jpg, right,top)]]")
+    tc("<p><img src=\"image.jpg\" align=\"right\" valign=\"top\"/></p>\n", "[[Image(image.jpg, top,right)]]")
+    tc("<p><img src=\"image.jpg\" valign=\"top\"/></p>\n", "[[Image(image.jpg, top)]]")
+    tc("<p><img src=\"image.jpg\" valign=\"top\"/></p>\n", "[[Image(image.jpg, valign=top)]]")
+    tc("<p><img src=\"image.jpg\" align=\"center\"/></p>\n", "[[Image(image.jpg, center)]]")
+    tc("<p><img src=\"image.jpg\" valign=\"middle\"/></p>\n", "[[Image(image.jpg, middle)]]")
+    tc("<p><img src=\"image.jpg\" title=\"houhouhou\"/></p>\n", "[[Image(image.jpg, title=houhouhou)]]")
+    tc("<p><img src=\"image.jpg\" width=\"120px\"/></p>\n", "[[Image(image.jpg,width=120px)]]")
+    tc("<p><img src=\"image.jpg\" width=\"120%\"/></p>\n", "[[Image(image.jpg, width=120%)]]")
+    tc("<p><img src=\"image.jpg\" style=\"margin:5\"/></p>\n", "[[Image(image.jpg,margin=5)]]")
     tc("<p><img src=\"http://example.org/image.jpg\"/></p>\n", "[[Image(http://example.org/image.jpg)]]")
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: trac-wiki
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-19 00:00:00.000000000 Z
+date: 2013-05-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bacon