Changed the sanitization a little.

webmat · Jun 9, 2008 · 311732b · 311732b
1 parent e0c9d64
commit 311732b
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/lib/paperclip/attachment.rb b/lib/paperclip/attachment.rb
@@ -58,7 +58,7 @@ def assign uploaded_file
       return nil if uploaded_file.nil?
 
       @queued_for_write[:original]        = uploaded_file.to_tempfile
-      @instance[:"#{@name}_file_name"]    = uploaded_file.original_filename.strip.gsub /[^A-Za-z0-9\.]/, '_'
+      @instance[:"#{@name}_file_name"]    = uploaded_file.original_filename.strip.gsub /[^\w\d\.\-]+/, '_'
       @instance[:"#{@name}_content_type"] = uploaded_file.content_type.strip
       @instance[:"#{@name}_file_size"]    = uploaded_file.size.to_i
 

diff --git a/test/test_attachment.rb b/test/test_attachment.rb
@@ -137,7 +137,7 @@ class AttachmentTest < Test::Unit::TestCase
     end
 
     should "remove strange letters and replace with underscore (_)" do
-      assert_equal "sheep_say_b__.png", @dummy.avatar.original_filename
+      assert_equal "sheep_say_b_.png", @dummy.avatar.original_filename
     end
 
   end