Changeset 1552

Timestamp:

06/28/05 17:42:51 (3 years ago)

Author:

david

Message:

Added support for upload progress indicators in Apache and lighttpd 1.4.x (won't work in WEBrick or lighttpd 1.3.x) #1475 [Sean Treadway]

Files:

• trunk/actionpack/CHANGELOG (modified) (1 diff)
• trunk/actionpack/lib/action_controller.rb (modified) (2 diffs)
• trunk/actionpack/lib/action_controller/base.rb (modified) (1 diff)
• trunk/actionpack/lib/action_controller/cgi_ext/raw_post_data_fix.rb (modified) (4 diffs)
• trunk/actionpack/lib/action_view/helpers/javascript_helper.rb (modified) (3 diffs)
• trunk/actionpack/lib/action_view/helpers/javascripts/prototype.js (modified) (2 diffs)
• trunk/railties/lib/rails_generator/generators/components/scaffold/templates/style.css (modified) (1 diff)

trunk/actionpack/CHANGELOG

@@ -1 +1 @@
-*SVN*
+
+* Added support for upload progress indicators in Apache and lighttpd 1.4.x (won't work in WEBrick or lighttpd 1.3.x) #1475 [Sean Treadway]
+  See http://sean.treadway.info/files/howto-upload-progress-2.mov for example.
-
-* Added support for graceful error handling of Ajax calls #1217 [Jamis Buck/Thomas Fuchs]. Example:

trunk/actionpack/lib/action_controller.rb

@@ -49 +49 @@
-require 'action_controller/components'
-require 'action_controller/verification'
+require 'action_controller/upload_progress'
-require 'action_controller/streaming'
-require 'action_controller/auto_complete'
@@ -70 +71 @@
-  include ActionController::Components
-  include ActionController::Verification
+  include ActionController::UploadProgress
-  include ActionController::Streaming
-  include ActionController::AutoComplete

trunk/actionpack/lib/action_controller/base.rb

@@ -509 +509 @@
-      end
-      
-or redirect 
+
-      def erase_render_results #:nodoc:
-        @response.body = nil
-        @performed_render = false
+      end
+
+      # Clears the redirected results from the headers, resetting the status to 200 and returns 
+      # the URL that was used to redirect or nil if there was no redirected URL
+      # Note that +redirect_to+ will change the body of the response to indicate a redirection.
+      # The response body is not reset here, see +erase_render_results+
+      def erase_redirect_results #:nodoc:
+        @performed_redirect = false
+        response.redirected_to = nil
+        response.redirected_to_method_params = nil
+        response.headers['Status'] = DEFAULT_RENDER_STATUS_CODE
+        response.headers.delete('location')
-      end
-

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

@@ -7 +7 @@
-    # Reads query parameters in the @params field, and cookies into @cookies.
-    def initialize_query()
+      @cookies = CGI::Cookie::parse((env_table['HTTP_COOKIE'] || env_table['COOKIE']))
+
-      if boundary = multipart_form_boundary
-        @multipart = true
@@ -14 +16 @@
-        @params = CGI::parse(read_query_params || "")
-      end
-      
-      @cookies = CGI::Cookie::parse((env_table['HTTP_COOKIE'] || env_table['COOKIE']))
-    end
-
@@ -29 +29 @@
-      end
-
+      def read_params_from_query
+        if defined? MOD_RUBY
+          Apache::request.args || ''
+        else
+          # fixes CGI querystring parsing for POSTs
+          if env_table['QUERY_STRING'].blank? && !env_table['REQUEST_URI'].blank?
+            env_table['QUERY_STRING'] = env_table['REQUEST_URI'].split('?', 2)[1] || ''
+          end
+          env_table['QUERY_STRING']
+        end
+      end
+
+      def read_params_from_post
+        stdinput.binmode if stdinput.respond_to?(:binmode)
+        content = stdinput.read(Integer(env_table['CONTENT_LENGTH'])) || ''
+        env_table['RAW_POST_DATA'] = content.split("&_").first.to_s.freeze # &_ is a fix for Safari Ajax postings that always append \000
+      end
+
-      def read_query_params
-        case env_table['REQUEST_METHOD'].to_s.upcase
@@ -34 +52 @@
-            read_from_cmdline
-          when 'POST', 'PUT'
-
-
-
+
-          else # when 'GET', 'HEAD', 'DELETE', 'OPTIONS'
-(defined?(MOD_RUBY) ? Apache::request.args : env_table['QUERY_STRING']) || ''
+read_params_from_query
-        end
-      end

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

@@ -125 +125 @@
-         content_tag("script", code, options[:html_options] || {})
-      end
-
+
-      # Returns a form tag that will submit using XMLHttpRequest in the background instead of the regular 
-      # reloading POST arrangement. Even though it's using Javascript to serialize the form elements, the form submission 
@@ -374 +374 @@
-        js_options['method']       = method_option_to_s(options[:method]) if options[:method]
-        js_options['insertion']    = "Insertion.#{options[:position].to_s.camelize}" if options[:position]
+        js_options['script']       = options[:script] == true if options[:script]
-        
-        if options[:form]
@@ -383 +384 @@
-        options_for_javascript(js_options)
-      end
-
+
-      def method_option_to_s(method) 
-        (method.is_a?(String) and !method.index("'").nil?) ? method : "'#{method}'"

trunk/actionpack/lib/action_view/helpers/javascripts/prototype.js

@@ -255 +255 @@
-    }
-
+    this.script_re = /<script.*?>((?:\n|.)*?)<\/script>/im;
-    this.setOptions(options);
-  
@@ -272 +273 @@
-      (this.request.transport.status == 200) ?
-      this.containers.success : this.containers.failure;
+
+    var response = this.request.transport.responseText.replace(
+      this.script_re, '');
+
+    var scripts = this.request.transport.responseText.match(
+      this.script_re);
-    
-    if (receiver) {
-      if (this.options.insertion) {
-
-
+
-      } else {
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-document.getElementsByClassName = function(className) {

trunk/railties/lib/rails_generator/generators/components/scaffold/templates/style.css

@@ -52 +52 @@
-  list-style: square;
-}
+
+div.uploadStatus {
+  margin: 5px;
+}
+
+div.progressBar {
+  margin: 5px;
+}
+
+div.progressBar div.border {
+  background-color: #fff;
+  border: 1px solid grey;
+  width: 100%;
+}
+
+div.progressBar div.background {
+  background-color: #333;
+  height: 18px;
+  width: 0%;
+}
+