@@ -1,3 +1,8 @@ +2008-10-09 Dima Sabanin <sdmitry@gmail.com> + * Fixed display of images with special symbols in the name, + like '2777-nipple-+-apple-napple.jpg'. + is reserved by HTTP. + Now escaping filenames before giving them back in #public_path() + 2008-09-10 Norman Clarke <norman@randomba.org> * Fixed images not being converted to target format. CHANGELOG @@ -87,7 +87,13 @@ module HasImage # # /photos/0000/0001/3er0zs.jpg def public_path_for(object, thumbnail = nil) - filesystem_path_for(object, thumbnail).gsub(/\A.*public/, '') + webpath = filesystem_path_for(object, thumbnail).gsub(/\A.*public/, '') + escape_file_name_for_http(webpath) + end + + def escape_file_name_for_http(webpath) + dir, file = File.split(webpath) + File.join(dir, CGI.escape(file)) end # Deletes the images and directory that contains them. lib/has_image/storage.rb @@ -40,6 +40,24 @@ class StorageTest < Test::Unit::TestCase assert_equal "/tests/0000/0001/mypic_square.jpg", @storage.public_path_for(pic, :square) end + def test_public_path_for_image_with_html_special_symbols_in_name + @storage = HasImage::Storage.new(default_options.merge(:base_path => '/public')) + pic = stub(:has_image_file => "my+pic", :has_image_id => 1) + assert_equal "/tests/0000/0001/my%2Bpic_square.jpg", @storage.public_path_for(pic, :square) + end + + def test_escape_file_name_for_http + @storage = HasImage::Storage.new(default_options.merge(:base_path => '/public')) + real = @storage.escape_file_name_for_http("/tests/0000/0001/mypic+square?something.jpg") + assert_equal "/tests/0000/0001/mypic%2Bsquare%3Fsomething.jpg", real + end + + def test_escape_file_name_for_http_escapes_only_filename + @storage = HasImage::Storage.new(default_options.merge(:base_path => '/public')) + real = @storage.escape_file_name_for_http("/tests/00+00/0001/mypic+square?something.jpg") + assert_equal "/tests/00+00/0001/mypic%2Bsquare%3Fsomething.jpg", real + end + def test_filename_for @storage = HasImage::Storage.new(default_options) assert_equal "test.jpg", @storage.send(:file_name_for, "test") test/storage_test.rb 192e1f1b0df26dd1d00d6f3d71cd4bec6c5e30e8 Dima Sabanin sdmitry@gmail.com http://github.com/norman/has_image/commit/53888da5cd236bbbfdf9124f96ca2bbfececf4e7 53888da5cd236bbbfdf9124f96ca2bbfececf4e7 2008-10-09T06:56:30-07:00 2008-10-09T06:35:38-07:00 Fixed display of images with special symbols in the name, like '2777-nipple-+-apple-napple.jpg'. + is reserved by HTTP. Now escaping filenames before giving them back in #public_path() e7acea62a1205ecf7e1a91628ebe21f1a62efdab Dima Sabanin sdmitry@gmail.com