Fixed: Inline images don't work if file name has upper case letters or if image…

Fixed: Inline images don't work if file name has upper case letters or if image is in BMP format (#2102). git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@1958 e93f8b46-1217-0410-a6f0-8f06a7374b81

Fixed: Inline images don't work if file name has upper case letters or if image…
Fixed: Inline images don't work if file name has upper case letters or if image is in BMP format (#2102). git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@1958 e93f8b46-1217-0410-a6f0-8f06a7374b81
0f1787ea · Jean-Philippe Lang · 6cd4f0c0 · 0f1787ea · 0f1787ea
Commit 0f1787ea authored Oct 28, 2008 by Jean-Philippe Lang
Hide whitespace changes
Inline Side-by-side

Showing with 12 additions and 2 deletions

application_helper.rb app/helpers/application_helper.rb +1 -1

application_helper_test.rb test/unit/helpers/application_helper_test.rb +11 -1

No files found.
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -247,7 +247,7 @@ module ApplicationHelper
    
    if attachments
      attachments = attachments.sort_by(&:created_on).reverse
-      text = text.gsub(/!((\<|\=|\>)?(\([^\)]+\))?(\[[^\]]+\])?(\{[^\}]+\})?)(\S+\.(gif|jpg|jpeg|png))!/) do |m|
+      text = text.gsub(/!((\<|\=|\>)?(\([^\)]+\))?(\[[^\]]+\])?(\{[^\}]+\})?)(\S+\.(bmp|gif|jpg|jpeg|png))!/i) do |m|
        style = $1
        filename = $6
        rf = Regexp.new(Regexp.escape(filename),  Regexp::IGNORECASE)

--- a/test/unit/helpers/application_helper_test.rb
+++ b/test/unit/helpers/application_helper_test.rb
@@ -24,7 +24,8 @@ class ApplicationHelperTest < HelperTestCase
                      :repositories, :changesets, 
                      :trackers, :issue_statuses, :issues, :versions, :documents,
                      :wikis, :wiki_pages, :wiki_contents,
-                      :boards, :messages
+                      :boards, :messages,
+                      :attachments

  def setup
    super
@@ -70,6 +71,15 @@ class ApplicationHelperTest < HelperTestCase
    to_test.each { |text, result| assert_equal "<p>#{result}</p>", textilizable(text) }
  end
  
+  def test_attached_images
+    to_test = {
+      'Inline image: !logo.gif!' => 'Inline image: <img src="/attachments/download/3" title="This is a logo" alt="This is a logo" />',
+      'Inline image: !logo.GIF!' => 'Inline image: <img src="/attachments/download/3" title="This is a logo" alt="This is a logo" />'
+    }
+    attachments = Attachment.find(:all)
+    to_test.each { |text, result| assert_equal "<p>#{result}</p>", textilizable(text, :attachments => attachments) }
+  end
+  
  def test_textile_external_links
    to_test = {
      'This is a "link":http://foo.bar' => 'This is a <a href="http://foo.bar" class="external">link</a>',