Rails 2.1 RC1

Updated Instiki to Rails 2.1 RC1 (aka 2.0.991).

vendor/rails/actionpack/lib/action_controller/integration.rb

@@ -1,6 +1,7 @@
-require 'dispatcher'
 require 'stringio'
 require 'uri'
+
+require 'action_controller/dispatcher'
 require 'action_controller/test_process'
 
 module ActionController
@@ -54,6 +55,9 @@ module ActionController
       # A running counter of the number of requests processed.
       attr_accessor :request_count
 
+      class MultiPartNeededException < Exception
+      end
+
       # Create and initialize a new +Session+ instance.
       def initialize
         reset!
@@ -276,7 +280,7 @@ module ActionController
           ActionController::Base.clear_last_instantiation!
 
           cgi = StubCGI.new(env, data)
-          Dispatcher.dispatch(cgi, ActionController::CgiRequest::DEFAULT_SESSION_OPTIONS, cgi.stdoutput)
+          ActionController::Dispatcher.dispatch(cgi, ActionController::CgiRequest::DEFAULT_SESSION_OPTIONS, cgi.stdoutput)
           @result = cgi.stdoutput.string
           @request_count += 1
 
@@ -293,15 +297,19 @@ module ActionController
 
           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,
         # like cookies, status, headers, etc.
         def parse_result
-          headers, result_body = @result.split(/\r\n\r\n/, 2)
+          response_headers, result_body = @result.split(/\r\n\r\n/, 2)
 
           @headers = Hash.new { |h,k| h[k] = [] }
-          headers.each_line do |line|
+          response_headers.to_s.each_line do |line|
             key, value = line.strip.split(/:\s*/, 2)
             @headers[key.downcase] << value
           end
@@ -311,7 +319,7 @@ module ActionController
             @cookies[name] = value
           end
 
-          @status, @status_message = @headers["status"].first.split(/ /)
+          @status, @status_message = @headers["status"].first.to_s.split(/ /)
           @status = @status.to_i
         end
 
@@ -341,7 +349,9 @@ module ActionController
         # Convert the given parameters to a request string. The parameters may
         # be a string, +nil+, or a Hash.
         def requestify(parameters, prefix=nil)
-          if Hash === parameters
+          if TestUploadedFile === parameters
+            raise MultiPartNeededException
+          elsif Hash === parameters
             return nil if parameters.empty?
             parameters.map { |k,v| requestify(v, name_with_prefix(prefix, k)) }.join("&")
           elsif Array === parameters
@@ -352,6 +362,45 @@ module ActionController
             "#{CGI.escape(prefix)}=#{CGI.escape(parameters.to_s)}"
           end
         end
+
+        def multipart_requestify(params, first=true)
+          returning Hash.new do |p|
+            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