actionpack 1.9.1 → 1.10.1

data/lib/action_controller/streaming.rb

@@ -61,20 +61,20 @@ module ActionController #:nodoc:
         @performed_render = false
 
         if options[:stream]
-          render :text => Proc.new {
+          render :text => Proc.new { |response, output|
             logger.info "Streaming file #{path}" unless logger.nil?
             len = options[:buffer_size] || 4096
             File.open(path, 'rb') do |file|
-              if $stdout.respond_to?(:syswrite)
+              if output.respond_to?(:syswrite)
                 begin
                   while true
-                    $stdout.syswrite file.sysread(len)
+                    output.syswrite(file.sysread(len))
                   end
                 rescue EOFError
                 end
               else
                 while buf = file.read(len)
-                  $stdout.write buf
+                  output.write(buf)
                 end
               end
             end
@@ -120,6 +120,7 @@ module ActionController #:nodoc:
         end
 
         disposition = options[:disposition].dup || 'attachment'
+        
         disposition <<= %(; filename="#{options[:filename]}") if options[:filename]
 
         @headers.update(
@@ -127,7 +128,15 @@ module ActionController #:nodoc:
           'Content-Type'              => options[:type].strip,  # fixes a problem with extra '\r' with some browsers
           'Content-Disposition'       => disposition,
           'Content-Transfer-Encoding' => 'binary'
-        );
+        )
+
+        # Fix a problem with IE 6.0 on opening downloaded files:
+        # If Cache-Control: no-cache is set (which Rails does by default), 
+        # IE removes the file it just downloaded from its cache immediately 
+        # after it displays the "open/save" dialog, which means that if you 
+        # hit "open" the file isn't there anymore when the application that 
+        # is called for handling the download is run, so let's workaround that
+        @headers['Cache-Control'] = 'private' if @headers['Cache-Control'] == 'no-cache'
       end
   end
 end

data/lib/action_controller/templates/rescues/_request_and_response.rhtml

@@ -5,7 +5,7 @@
   <pre id="blame_trace" <%='style="display:none"' if hide %>><code><%=h @exception.describe_blame %></code></pre>
 <% end %>
 
-<% if defined?(Breakpoint) %>
+<% if false %>
   <br /><br />
   <% begin %>
     <%= form_tag(@request.request_uri, "method" => @request.method) %>

data/lib/action_controller/templates/rescues/_trace.rhtml

@@ -0,0 +1,24 @@
+<%
+  traces = [
+    ["Application Trace", @exception.application_backtrace],
+    ["Framework Trace", @exception.framework_backtrace],
+    ["Full Trace", @exception.clean_backtrace]
+  ]
+  names = traces.collect {|name, trace| name}
+%>
+
+<div id="traces">
+  <% names.each do |name| -%>
+    <%
+      show = "document.getElementById('#{name.gsub /\s/, '-'}').style.display='block';"
+      hide = (names - [name]).collect {|hide_name| "document.getElementById('#{hide_name.gsub /\s/, '-'}').style.display='none';"}
+    %>
+    <a href="#" onclick="<%= hide %><%= show %>; return false;"><%= name %></a> <%= '|' unless names.last == name %>
+  <% end -%>
+
+  <% traces.each do |name, trace| -%>
+    <div id="<%= name.gsub /\s/, '-' %>" style="display: <%= name == "Application Trace" ? 'block' : 'none' %>;">
+      <pre><code><%= trace.join "\n" %></code></pre>
+    </div>
+  <% end -%>
+</div>

data/lib/action_controller/templates/rescues/diagnostics.rhtml

@@ -1,20 +1,9 @@
-<%
-  clean_backtrace = @exception.backtrace.collect { |line| Object.const_defined?(:RAILS_ROOT) ? line.gsub(RAILS_ROOT, "") : line }
-  app_trace       = clean_backtrace.reject { |line| line =~ /(vendor|dispatch|ruby)/ }
-  framework_trace = clean_backtrace - app_trace
-%>
-
 <h1>
   <%=h @exception.class.to_s %> in
   <%=h (@request.parameters["controller"] || "<controller not set>").capitalize %>#<%=h @request.parameters["action"] || "<action not set>" %>
 </h1>
-<pre><%=h Object.const_defined?(:RAILS_ROOT) ? @exception.message.gsub(RAILS_ROOT, "") : @exception.message %></pre>
-
-<% unless app_trace.empty? %><pre><code><%=h app_trace.join("\n") %></code></pre><% end %>
+<pre><%=h @exception.clean_message %></pre>
 
-<% unless framework_trace.empty? %>
-  <a href="#" onclick="document.getElementById('framework_trace').style.display='block'; return false;">Show framework trace</a>
-  <pre id="framework_trace" style="display:none"><code><%=h framework_trace.join("\n") %></code></pre>
-<% end %>
+<%= render_file(@rescues_path + "/_trace.rhtml", false) %>
 
 <%= render_file(@rescues_path + "/_request_and_response.rhtml", false) %>

data/lib/action_controller/templates/rescues/template_error.rhtml

@@ -13,7 +13,9 @@
 
 <p><%=h @exception.sub_template_message %></p>
 
-<a href="#" onclick="document.getElementById('framework_trace').style.display='block'">Show template trace</a>
-<pre id="framework_trace" style="display:none"><code><%=h @exception.original_exception.backtrace.collect { |line| Object.const_defined?(:RAILS_ROOT) ? line.gsub(RAILS_ROOT, "") : line }.join("\n") %></code></pre>
+<% @real_exception = @exception
+   @exception = @exception.original_exception || @exception %>
+<%= render_file(@rescues_path + "/_trace.rhtml", false) %>
+<% @exception = @real_exception %>
 
 <%= render_file(@rescues_path + "/_request_and_response.rhtml", false) %>

data/lib/action_controller/templates/scaffolds/list.rhtml

@@ -14,7 +14,7 @@
   <% end %>
     <td><%= link_to "Show", :action => "show#{@scaffold_suffix}", :id => entry %></td>
     <td><%= link_to "Edit", :action => "edit#{@scaffold_suffix}", :id => entry %></td>
-    <td><%= link_to "Destroy", :action => "destroy#{@scaffold_suffix}", :id => entry, :confirm => "Are you sure?" %></td>
+    <td><%= link_to "Destroy", {:action => "destroy#{@scaffold_suffix}", :id => entry}, {:confirm => "Are you sure?"} %></td>
   </tr>
 <% end %>
 </table>

data/lib/action_controller/test_process.rb

@@ -11,10 +11,19 @@ module ActionController #:nodoc:
     def process_test(request) #:nodoc:
       process(request, TestResponse.new)
     end
+
+    def process_with_test(*args)
+      returning process_without_test(*args) do
+        add_variables_to_assigns
+      end
+    end
+
+    alias_method :process_without_test, :process
+    alias_method :process, :process_with_test
   end
 
   class TestRequest < AbstractRequest #:nodoc:
-    attr_accessor :cookies
+    attr_accessor :cookies, :session_options
     attr_accessor :query_parameters, :request_parameters, :path, :session, :env
     attr_accessor :host
 
@@ -35,6 +44,7 @@ module ActionController #:nodoc:
     
     def port=(number)
       @env["SERVER_PORT"] = number.to_i
+      @port_as_int = nil
     end
 
     def action=(action_name)
@@ -59,6 +69,10 @@ module ActionController #:nodoc:
       @env['REMOTE_ADDR'] = addr
     end
 
+    def remote_addr
+      @env['REMOTE_ADDR']
+    end
+
     def request_uri
       @request_uri || super()
     end
@@ -102,6 +116,7 @@ module ActionController #:nodoc:
         @request_uri             = "/"
         self.remote_addr         = "0.0.0.0"        
         @env["SERVER_PORT"]      = 80
+        @env['REQUEST_METHOD']   = "GET"
       end
   end
 
@@ -110,6 +125,15 @@ module ActionController #:nodoc:
     def response_code
       headers['Status'][0,3].to_i rescue 0
     end
+    
+    # returns a String to ensure compatibility with Net::HTTPResponse
+    def code
+      headers['Status'].to_s.split(' ')[0]
+    end
+
+    def message
+      headers['Status'].to_s.split(' ',2)[1]
+    end
 
     # was the response successful?
     def success?
@@ -255,13 +279,14 @@ module Test
       private  
         # execute the request and set/volley the response
         def process(action, parameters = nil, session = nil, flash = nil)
-          @request.recycle!
-
-          # Sanity check for required instance variables so we can give an understandable error message.
+          # Sanity check for required instance variables so we can give an
+          # understandable error message.
           %w(controller request response).each do |iv_name|
-            assert_not_nil instance_variable_get("@#{iv_name}"), "@#{iv_name} is nil: make sure you set it in your test's setup method."
+            raise "@#{iv_name} is nil: make sure you set it in your test's setup method." if instance_variable_get("@#{iv_name}").nil?
           end
 
+          @request.recycle!
+
           @html_document = nil
           @request.env['REQUEST_METHOD'] ||= "GET"
           @request.action = action.to_s
@@ -277,9 +302,9 @@ module Test
 
         # execute the request simulating a specific http method and set/volley the response
         %w( get post put delete head ).each do |method|
-          class_eval <<-EOV
+          class_eval <<-EOV, __FILE__, __LINE__
             def #{method}(action, parameters = nil, session = nil, flash = nil)
-              @request.env['REQUEST_METHOD'] = "#{method.upcase}"
+              @request.env['REQUEST_METHOD'] = "#{method.upcase}" if @request
               process(action, parameters, session, flash)
             end
           EOV
@@ -287,7 +312,9 @@ module Test
 
         def xml_http_request(request_method, action, parameters = nil, session = nil, flash = nil)
           @request.env['HTTP_X_REQUESTED_WITH'] = 'XMLHttpRequest'
-          self.send(request_method, action, parameters, session, flash)
+          returning self.send(request_method, action, parameters, session, flash) do
+            @request.env.delete 'HTTP_X_REQUESTED_WITH'
+          end
         end
         alias xhr :xml_http_request
 
@@ -334,7 +361,6 @@ module Test
         end
 
         def html_document
-          require_html_scanner
           @html_document ||= HTML::Document.new(@response.body)
         end
 
@@ -346,14 +372,6 @@ module Test
           html_document.find_all(conditions)
         end
 
-        def require_html_scanner
-          return true if defined?(HTML::Document)
-          require 'html/document'
-        rescue LoadError
-          $:.unshift File.dirname(__FILE__) + "/vendor/html-scanner"
-          require 'html/document'
-        end
-
         def method_missing(selector, *args)
           return @controller.send(selector, *args) if ActionController::Routing::NamedRoutes::Helpers.include?(selector)
           return super

data/lib/action_controller/upload_progress.rb

@@ -13,6 +13,9 @@ module ActionController #:nodoc:
   # fully on all the systems that is a part of your environment. Consider this an extended
   # preview.
   #
+  # To enable this module, add <tt>ActionController::Base.enable_upload_progress</tt> to your
+  # config/environment.rb file.
+  #
   # == Action Pack Upload Progress for multipart uploads
   #
   # The UploadProgress module aids in the process of viewing an Ajax driven
@@ -131,6 +134,55 @@ module ActionController #:nodoc:
   #   def custom_status
   #     render :inline => '<%= upload_progress_status %> <div>Updated at <%= Time.now %></div>', :layout => false
   #   end
+  #
+  # ==== Environment checklist
+  #
+  # This is an experimental feature that requires a specific webserver environment.  Use the following checklist 
+  # to confirm that you have an environment that supports upload progress.
+  #
+  # ===== Ruby:
+  # 
+  # * Running the command `ruby -v` should print "ruby 1.8.2 (2004-12-25)" or older
+  # 
+  # ===== Web server:
+  # 
+  # * Apache 1.3, Apache 2.0 or Lighttpd *1.4* (need to build lighttpd from CVS)
+  # 
+  # ===== FastCGI bindings:
+  # 
+  # * > 0.8.6 and must be the compiled C version of the bindings
+  # * The command `ruby -e "p require('fcgi.so')"` should print "true"
+  # 
+  # ===== Apache/Lighttpd FastCGI directives:
+  # 
+  # * You must allow more than one FCGI server process to allow concurrent requests.
+  # * If there is only a single FCGI process you will not get the upload status updates.
+  # * You can check this by taking a look for running FCGI servers in your process list during a progress upload.
+  # * Apache directive: FastCGIConfig -minProcesses 2
+  # * Lighttpd directives taken from config/lighttpd.conf (min-procs):
+  # 
+  #     fastcgi.server = (
+  #      ".fcgi" => (
+  #       "APP_NAME" => (
+  #        "socket" => "/tmp/APP_NAME1.socket",
+  #        "bin-path" => "RAILS_ROOT/public/dispatch.fcgi",
+  #        "min-procs" => 2
+  #       )
+  #      )
+  #     )
+  # 
+  # ===== config/environment.rb:
+  # 
+  # * Add the following line to your config/environment.rb and restart your web server.
+  # * <tt>ActionController::Base.enable_upload_progress</tt>
+  # 
+  # ===== Development log:
+  # 
+  # * When the upload progress is enabled by you will find something the following lines:
+  # * "Multipart upload with progress (id: 1, size: 85464)"
+  # * "Finished processing multipart upload in 0.363729s"
+  # * If you are properly running multiple FCGI processes, then you will see multiple entries for rendering the "upload_status" action before the "Finish processing..." log entry.  This is a *good thing* :)
+  #
   module UploadProgress
     def self.append_features(base) #:nodoc:
       super

data/lib/action_controller/url_rewriter.rb

@@ -20,8 +20,10 @@ module ActionController
     private
       def rewrite_url(path, options)
         rewritten_url = ""
-        rewritten_url << (options[:protocol] || @request.protocol) unless options[:only_path]
-        rewritten_url << (options[:host] || @request.host_with_port) unless options[:only_path]
+        unless options[:only_path]
+          rewritten_url << (options[:protocol] || @request.protocol)
+          rewritten_url << (options[:host] || @request.host_with_port)
+        end
 
         rewritten_url << @request.relative_url_root.to_s unless options[:skip_relative_url_root]
         rewritten_url << path
@@ -33,32 +35,35 @@ module ActionController
 
       def rewrite_path(options)
         options = options.symbolize_keys
-        options.update((options[:params] || {}).symbolize_keys)
-        RESERVED_OPTIONS.each {|k| options.delete k}
-        path, extras = Routing::Routes.generate(options, @request)
-
-        if extras[:overwrite_params]
-          params_copy = @request.parameters.reject { |k,v| %w(controller action).include? k }
-          params_copy.update extras[:overwrite_params]
-          extras.delete(:overwrite_params)
-          extras.update(params_copy)
+        options.update(options[:params].symbolize_keys) if options[:params]
+        if (overwrite = options.delete(:overwrite_params))
+          options.update(@parameters.symbolize_keys)
+          options.update(overwrite)
         end
+        RESERVED_OPTIONS.each {|k| options.delete k}
+        path, extra_keys = Routing::Routes.generate(options.dup, @request) # Warning: Routes will mutate and violate the options hash
 
-        path <<  build_query_string(extras) unless extras.empty?
+        path << build_query_string(options, extra_keys) unless extra_keys.empty?
         
         path
       end
 
       # Returns a query string with escaped keys and values from the passed hash. If the passed hash contains an "id" it'll
       # be added as a path element instead of a regular parameter pair.
-      def build_query_string(hash)
+      def build_query_string(hash, only_keys = nil)
         elements = []
         query_string = ""
+
+        only_keys ||= hash.keys
         
-        hash.each do |key, value|
+        only_keys.each do |key|
+          value = hash[key] 
           key = CGI.escape key.to_s
-          key <<  '[]' if value.class == Array
-          value = [ value ] unless value.class == Array
+          if value.class == Array
+            key <<  '[]'
+          else
+            value = [ value ]
+          end
           value.each { |val| elements << "#{key}=#{Routing.extract_parameter_value(val)}" }
         end
         

data/lib/action_controller/vendor/html-scanner/html/document.rb

@@ -11,7 +11,7 @@ module HTML #:nodoc:
     attr_reader :root
 
     # Create a new Document from the given text.
-    def initialize(text, strict=false)
+    def initialize(text, strict=false, xml=false)
       tokenizer = Tokenizer.new(text)
       @root = Node.new(nil)
       node_stack = [ @root ]
@@ -38,7 +38,7 @@ ignoring attempt to close #{node_stack.last.name} with #{node.name}
 EOF
               strict ? raise(msg) : warn(msg)
             end
-          elsif !node.childless? && node.closing != :close
+          elsif !node.childless?(xml) && node.closing != :close
             node_stack.push node
           end
         end

data/lib/action_controller/vendor/html-scanner/html/node.rb

@@ -122,6 +122,18 @@ module HTML #:nodoc:
     def validate_conditions(conditions)
       Conditions === conditions ? conditions : Conditions.new(conditions)
     end
+
+    def ==(node)
+      return false unless self.class == node.class && children.size == node.children.size
+
+      equivalent = true
+
+      children.size.times do |i|
+        equivalent &&= children[i] == node.children[i]
+      end
+
+      equivalent
+    end
     
     class <<self
       def parse(parent, line, pos, content, strict=true)
@@ -238,6 +250,11 @@ module HTML #:nodoc:
           nil
       end
     end
+
+    def ==(node)
+      return false unless super
+      content == node.content
+    end
   end
 
   # A Tag is any node that represents markup. It may be an opening tag, a
@@ -271,7 +288,8 @@ module HTML #:nodoc:
     end
 
     # Returns non-+nil+ if this tag can contain child nodes.
-    def childless?
+    def childless?(xml = false)
+      return false if xml && @closing.nil?
       !@closing.nil? ||
         @name =~ /^(img|br|hr|link|meta|area|base|basefont|
                     col|frame|input|isindex|param)$/ox
@@ -417,7 +435,11 @@ module HTML #:nodoc:
       
       # count children
       if opts = conditions[:children]
-        matches = children
+        matches = children.select do |c|
+          c.match(/./) or
+          (c.kind_of?(HTML::Tag) and (c.closing == :self or ! c.childless?))
+        end
+        
         matches = matches.select { |c| c.match(opts[:only]) } if opts[:only]
         opts.each do |key, value|
           next if key == :only
@@ -464,8 +486,13 @@ module HTML #:nodoc:
       true
     end
 
+    def ==(node)
+      return false unless super
+      return false unless closing == node.closing && self.name == node.name
+      attributes == node.attributes
+    end
+    
     private
-
       # Match the given value to the given condition.
       def match_condition(value, condition)
         case condition