Merge branch 'master' of https://github.com/iainbeeston/paperclip

Overbryd · Oct 5, 2011 · 85936c7 · 85936c7
2 parents eadf7e8 + cc89e4a
commit 85936c7
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/lib/paperclip/interpolations.rb b/lib/paperclip/interpolations.rb
@@ -86,7 +86,7 @@ def class attachment = nil, style_name = nil
 
     # Returns the basename of the file. e.g. "file" for "file.jpg"
     def basename attachment, style_name
-      attachment.original_filename.gsub(/#{File.extname(attachment.original_filename)}$/, "")
+      attachment.original_filename.gsub(/#{Regexp.escape(File.extname(attachment.original_filename))}$/, "")
     end
 
     # Returns the extension of the file. e.g. "jpg" for "file.jpg"

diff --git a/test/interpolations_test.rb b/test/interpolations_test.rb
@@ -154,6 +154,13 @@ def url(*args)
     attachment.stubs(:original_filename).returns("one")
     assert_equal "one", Paperclip::Interpolations.filename(attachment, :style)
   end
+
+  should "return the basename when the extension contains regexp special characters" do
+    attachment = mock
+    attachment.stubs(:styles).returns({})
+    attachment.stubs(:original_filename).returns("one.ab)")
+    assert_equal "one", Paperclip::Interpolations.basename(attachment, :style)
+  end
 
   should "return the timestamp" do
     now = Time.now