Changeset 2345

Timestamp:

09/26/05 17:59:46 (3 years ago)

Author:

bitsweat

Message:

r3573@asus: jeremy | 2005-09-26 11:38:44 -0700
Ticket 1507 - IE file uploads give the filename as a full Windows path, but Ruby on UNIX doesn't know how to File.basename('C:\\blah\blah.foo').
r3574@asus: jeremy | 2005-09-26 14:32:11 -0700
Get rid of constant redefine warning.
r3575@asus: jeremy | 2005-09-26 14:33:07 -0700
Override the file upload's original_filename singleton method in CGIMethods.get_typed_value.
r3576@asus: jeremy | 2005-09-26 14:33:49 -0700
Unit test overridden original_filename against normal filenames and full Windows paths.
r3577@asus: jeremy | 2005-09-26 14:33:57 -0700
Update change log.

Files:

• trunk/actionpack/CHANGELOG (modified) (1 diff)
• trunk/actionpack/lib/action_controller/cgi_ext/cgi_methods.rb (modified) (1 diff)
• trunk/actionpack/lib/action_view/helpers/text_helper.rb (modified) (1 diff)
• trunk/actionpack/test/controller/cgi_test.rb (modified) (4 diffs)

trunk/actionpack/CHANGELOG

@@ -1 +1 @@
-*SVN*
+
+* Shorten IE file upload path to filename only to match other browsers.  #1507 [court3nay@gmail.com]
-
-* Fix open/save dialog in IE not opening files send with send_file/send_data, #2279 [Thomas Fuchs]

trunk/actionpack/lib/action_controller/cgi_ext/cgi_methods.rb

@@ -89 +89 @@
-      if value.is_a?(String)
-        value
- && !value.content_type.empty?
+
-        # Uploaded file
+        unless value.respond_to?(:full_original_filename)
+          class << value
+            alias_method :full_original_filename, :original_filename
+
+            # Take the basename of the upload's original filename.
+            # This handles the full Windows paths given by Internet Explorer
+            # (and perhaps other broken user agents) without affecting
+            # those which give the lone filename.
+            # The Windows regexp is adapted from Perl's File::Basename.
+            def original_filename
+              if md = /^(?:.*[:\\\/])?(.*)/m.match(full_original_filename)
+                md.captures.first
+              else
+                File.basename full_original_filename
+              end
+            end
+          end
+        end
+
+        # Return the same value after overriding original_filename.
-        value
+
-      elsif value.respond_to?(:read)
-        # Value as part of a multipart request

trunk/actionpack/lib/action_view/helpers/text_helper.rb

@@ -302 +302 @@
-                        )
-                        ([[:punct:]]|\s|<|$)    # trailing text
-
+ unless const_defined?(:AUTO_LINK_RE)
-
-        # Turns all urls into clickable links.

trunk/actionpack/test/controller/cgi_test.rb

@@ -4 +4 @@
-require 'action_controller/cgi_ext/cgi_methods'
-require 'stringio'
-
-class MockUploadedFile < StringIO
-  def content_type
-    "img/jpeg"
-  end
-
-  def original_filename
-    "my_file.doc"
-  end
-end
-
-class CGITest < Test::Unit::TestCase
@@ -117 +107 @@
-  
-  def test_parse_params_from_multipart_upload
-
+
+
+
-  
-    input = {
@@ -123 +115 @@
-      "array_of_stringios" => [[ StringIO.new("One"), StringIO.new("Two") ]],
-      "mixed_types_array" => [[ StringIO.new("Three"), "NotStringIO" ]],
-
+
+
-      "products[string]" => [ StringIO.new("Apple Computer") ],
-
+
+
+
-    }
-    
@@ -133 +128 @@
-      "mixed_types_array" => [ "Three", "NotStringIO" ],
-      "mixed_types_as_checkboxes" => {
-
-=>[ mock_
+ 
+ => [ 
-         },
-      },
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-      }
-    }
-
-
+
+
+
+
+
+
+
+
+
+
-  end
-