Ticket #11091: integ_upload_post_11163.diff

actionpack/test/controller/integration_upload_test.rb

@@ +1 @@
+require 'abstract_unit'
+require 'action_controller/integration'
+require 'action_controller/routing'
+
+unless defined? ApplicationController
+  class ApplicationController < ActionController::Base
+  end
+end
+
+class UploadTestController < ActionController::Base
+  session :off
+  
+  def update
+    SessionUploadTest.last_request_type = ActionController::Base.param_parsers[request.content_type]
+    render :text => "got here"
+  end 
+end
+
+class SessionUploadTest < ActionController::IntegrationTest
+  FILES_DIR = File.dirname(__FILE__) + '/../fixtures/multipart'
+
+  class << self
+    attr_accessor :last_request_type
+  end
+  
+
+  # def setup
+  #   @session = ActionController::Integration::Session.new
+  # end
+  # 
+  def test_post_with_upload
+    uses_mocha "test_post_with_upload" do
+      Dependencies.stubs(:load?).returns(false)      
+      with_routing do |set|
+        set.draw do |map|
+          map.update 'update', :controller => "upload_test", :action => "update", :method => :post
+        end
+        path = "/update"
+        params = {:uploaded_data => fixture_file_upload(FILES_DIR + "/mona_lisa.jpg", "image/jpg")}
+        headers = {:location => 'blah' }
+        post(path,params,headers)
+        assert_equal(:multipart_form, SessionUploadTest.last_request_type)
+      end
+    end
+    
+   end
+end

actionpack/lib/action_controller/integration.rb

@@ -53 +53 @@
-      attr_reader :response
-
-      # A running counter of the number of requests processed.
-
+
+
+
+
-
-      # Create and initialize a new +Session+ instance.
-      def initialize
@@ -294 +297 @@
-
-          parse_result
-          return status
+        rescue MultiPartNeededException
+          boundary = "----------XnJLe9ZIbbGUYtzPQJ16u1"
+          status = process(method, path, multipart_body(parameters, boundary), (headers || {}).merge({"CONTENT_TYPE" => "multipart/form-data; boundary=#{boundary}"}))
+          return status
-        end
-
-        # Parses the result of the response and extracts the various values,
@@ -342 +349 @@
-        # Convert the given parameters to a request string. The parameters may
-        # be a string, +nil+, or a Hash.
-        def requestify(parameters, prefix=nil)
-
+
+
+
-            return nil if parameters.empty?
-            parameters.map { |k,v| requestify(v, name_with_prefix(prefix, k)) }.join("&")
-          elsif Array === parameters
@@ -353 +362 @@
-            "#{CGI.escape(prefix)}=#{CGI.escape(parameters.to_s)}"
-          end
-        end
+
+        def multipart_requestify(params, first=true)
+          returning p = {} do
+            params.each do |key, value|
+              k = first ? CGI.escape(key.to_s) : "[#{CGI.escape(key.to_s)}]"
+              if Hash === value
+                multipart_requestify(value, false).each do |subkey, subvalue|
+                  p[k + subkey] = subvalue
+                end
+              else
+                p[k] = value
+              end
+            end
+          end
+        end
+
+        def multipart_body(params, boundary)
+          multipart_requestify(params).map do |key, value|
+            if value.respond_to?(:original_filename)
+              File.open(value.path) do |f|
+                <<-EOF
+--#{boundary}\r
+Content-Disposition: form-data; name="#{key}"; filename="#{CGI.escape(value.original_filename)}"\r
+Content-Type: #{value.content_type}\r
+Content-Length: #{File.stat(value.path).size}\r
+\r
+#{f.read}\r
+EOF
+              end
+            else
+<<-EOF
+--#{boundary}\r
+Content-Disposition: form-data; name="#{key}"\r
+\r
+#{value}\r
+EOF
+            end
+          end.join("")+"--#{boundary}--\r"
+        end
-    end
-
-    # A module used to extend ActionController::Base, so that integration tests