actionpack 1.12.5 → 1.13.0

data/lib/action_controller/scaffolding.rb

@@ -1,7 +1,6 @@
 module ActionController
   module Scaffolding # :nodoc:
-    def self.append_features(base)
-      super
+    def self.included(base)
       base.extend(ClassMethods)
     end
 
@@ -25,25 +24,25 @@ module ActionController
     #    end
     #
     #    def list
-    #      @entries = Entry.find_all
+    #      @entries = Entry.find(:all)
     #      render_scaffold "list"
     #    end
-    #  
+    #
     #    def show
     #      @entry = Entry.find(params[:id])
     #      render_scaffold
     #    end
-    #    
+    #
     #    def destroy
     #      Entry.find(params[:id]).destroy
     #      redirect_to :action => "list"
     #    end
-    #    
+    #
     #    def new
     #      @entry = Entry.new
     #      render_scaffold
     #    end
-    #    
+    #
     #    def create
     #      @entry = Entry.new(params[:entry])
     #      if @entry.save
@@ -53,16 +52,16 @@ module ActionController
     #        render_scaffold('new')
     #      end
     #    end
-    #    
+    #
     #    def edit
     #      @entry = Entry.find(params[:id])
     #      render_scaffold
     #    end
-    #    
+    #
     #    def update
     #      @entry = Entry.find(params[:id])
     #      @entry.attributes = params[:entry]
-    #  
+    #
     #      if @entry.save
     #        flash[:notice] = "Entry was successfully updated"
     #        redirect_to :action => "show", :id => @entry
@@ -72,17 +71,17 @@ module ActionController
     #    end
     #  end
     #
-    # The <tt>render_scaffold</tt> method will first check to see if you've made your own template (like "weblog/show.rhtml" for 
-    # the show action) and if not, then render the generic template for that action. This gives you the possibility of using the 
-    # scaffold while you're building your specific application. Start out with a totally generic setup, then replace one template 
+    # The <tt>render_scaffold</tt> method will first check to see if you've made your own template (like "weblog/show.rhtml" for
+    # the show action) and if not, then render the generic template for that action. This gives you the possibility of using the
+    # scaffold while you're building your specific application. Start out with a totally generic setup, then replace one template
     # and one action at a time while relying on the rest of the scaffolded templates and actions.
     module ClassMethods
       # Adds a swath of generic CRUD actions to the controller. The +model_id+ is automatically converted into a class name unless
       # one is specifically provide through <tt>options[:class_name]</tt>. So <tt>scaffold :post</tt> would use Post as the class
       # and @post/@posts for the instance variables.
-      # 
+      #
       # It's possible to use more than one scaffold in a single controller by specifying <tt>options[:suffix] = true</tt>. This will
-      # make <tt>scaffold :post, :suffix => true</tt> use method names like list_post, show_post, and create_post 
+      # make <tt>scaffold :post, :suffix => true</tt> use method names like list_post, show_post, and create_post
       # instead of just list, show, and post. If suffix is used, then no index method is added.
       def scaffold(model_id, options = {})
         options.assert_valid_keys(:class_name, :suffix)
@@ -99,13 +98,13 @@ module ActionController
             end
           end_eval
         end
-        
+
         module_eval <<-"end_eval", __FILE__, __LINE__
-          
+
           verify :method => :post, :only => [ :destroy#{suffix}, :create#{suffix}, :update#{suffix} ],
                  :redirect_to => { :action => :list#{suffix} }
-          
-        
+
+
           def list#{suffix}
             @#{singular_name}_pages, @#{plural_name} = paginate :#{plural_name}, :per_page => 10
             render#{suffix}_scaffold "list#{suffix}"
@@ -115,17 +114,17 @@ module ActionController
             @#{singular_name} = #{class_name}.find(params[:id])
             render#{suffix}_scaffold
           end
-          
+
           def destroy#{suffix}
             #{class_name}.find(params[:id]).destroy
             redirect_to :action => "list#{suffix}"
           end
-          
+
           def new#{suffix}
             @#{singular_name} = #{class_name}.new
             render#{suffix}_scaffold
           end
-          
+
           def create#{suffix}
             @#{singular_name} = #{class_name}.new(params[:#{singular_name}])
             if @#{singular_name}.save
@@ -135,12 +134,12 @@ module ActionController
               render#{suffix}_scaffold('new')
             end
           end
-          
+
           def edit#{suffix}
             @#{singular_name} = #{class_name}.find(params[:id])
             render#{suffix}_scaffold
           end
-          
+
           def update#{suffix}
             @#{singular_name} = #{class_name}.find(params[:id])
             @#{singular_name}.attributes = params[:#{singular_name}]
@@ -152,14 +151,14 @@ module ActionController
               render#{suffix}_scaffold('edit')
             end
           end
-          
+
           private
             def render#{suffix}_scaffold(action=nil)
               action ||= caller_method_name(caller)
               # logger.info ("testing template:" + "\#{self.class.controller_path}/\#{action}") if logger
-              
+
               if template_exists?("\#{self.class.controller_path}/\#{action}")
-                render_action(action)
+                render :action => action
               else
                 @scaffold_class = #{class_name}
                 @scaffold_singular_name, @scaffold_plural_name = "#{singular_name}", "#{plural_name}"
@@ -169,9 +168,9 @@ module ActionController
                 @template.instance_variable_set("@content_for_layout", @template.render_file(scaffold_path(action.sub(/#{suffix}$/, "")), false))
 
                 if !active_layout.nil?
-                  render_file(active_layout, nil, true)
+                  render :file => active_layout, :use_full_path => true
                 else
-                  render_file(scaffold_path("layout"))
+                  render :file => scaffold_path('layout')
                 end
               end
             end
@@ -179,12 +178,12 @@ module ActionController
             def scaffold_path(template_name)
               File.dirname(__FILE__) + "/templates/scaffolds/" + template_name + ".rhtml"
             end
-            
+
             def caller_method_name(caller)
               caller.first.scan(/`(.*)'/).first.first # ' ruby-mode
             end
         end_eval
-      end      
+      end
     end
   end
 end

data/lib/action_controller/session/active_record_store.rb

@@ -5,6 +5,8 @@ require 'base64'
 
 class CGI
   class Session
+    attr_reader :data
+
     # Return this session's underlying Session instance. Useful for the DB-backed session stores.
     def model
       @dbman.model if @dbman

data/lib/action_controller/session/drb_store.rb

@@ -26,6 +26,10 @@ class CGI #:nodoc:all
       def delete
         @@session_data.delete(@session_id)
       end
+      
+      def data
+        @@session_data[@session_id]
+      end
     end
   end
 end

data/lib/action_controller/session/mem_cache_store.rb

@@ -93,6 +93,10 @@ begin
           end
           @session_data = {}
         end
+        
+        def data
+          @session_data
+        end
       end
     end
   end

data/lib/action_controller/session_management.rb

@@ -8,12 +8,9 @@ module ActionController #:nodoc:
   module SessionManagement #:nodoc:
     def self.included(base)
       base.extend(ClassMethods)
-
-      base.send :alias_method, :process_without_session_management_support, :process
-      base.send :alias_method, :process, :process_with_session_management_support
-
-      base.send :alias_method, :process_cleanup_without_session_management_support, :process_cleanup
-      base.send :alias_method, :process_cleanup, :process_cleanup_with_session_management_support
+      
+      base.send :alias_method_chain, :process, :session_management_support
+      base.send :alias_method_chain, :process_cleanup, :session_management_support
     end
 
     module ClassMethods
@@ -123,16 +120,16 @@ module ActionController #:nodoc:
       end
       
       def process_cleanup_with_session_management_support
-        process_cleanup_without_session_management_support
         clear_persistent_model_associations
+        process_cleanup_without_session_management_support
       end
 
       # Clear cached associations in session data so they don't overflow
       # the database field.  Only applies to ActiveRecordStore since there
       # is not a standard way to iterate over session data.
       def clear_persistent_model_associations #:doc:
-        if defined?(@session) && @session.instance_variables.include?('@data')
-          session_data = @session.instance_variable_get('@data')
+        if defined?(@_session) && @_session.respond_to?(:data)
+          session_data = @_session.data
 
           if session_data && session_data.respond_to?(:each_value)
             session_data.each_value do |obj|

data/lib/action_controller/status_codes.rb

@@ -0,0 +1,89 @@
+module ActionController
+  module StatusCodes
+
+    # Defines the standard HTTP status codes, by integer, with their
+    # corresponding default message texts.
+    # Source: http://www.iana.org/assignments/http-status-codes
+    STATUS_CODES = {
+      100 => "Continue",
+      101 => "Switching Protocols",
+      102 => "Processing",
+
+      200 => "OK",
+      201 => "Created",
+      202 => "Accepted",
+      203 => "Non-Authoritative Information",
+      204 => "No Content",
+      205 => "Reset Content",
+      206 => "Partial Content",
+      207 => "Multi-Status",
+      226 => "IM Used",
+
+      300 => "Multiple Choices",
+      301 => "Moved Permanently",
+      302 => "Found",
+      303 => "See Other",
+      304 => "Not Modified",
+      305 => "Use Proxy",
+      307 => "Temporary Redirect",
+
+      400 => "Bad Request",
+      401 => "Unauthorized",
+      402 => "Payment Required",
+      403 => "Forbidden",
+      404 => "Not Found",
+      405 => "Method Not Allowed",
+      406 => "Not Acceptable",
+      407 => "Proxy Authentication Required",
+      408 => "Request Timeout",
+      409 => "Conflict",
+      410 => "Gone",
+      411 => "Length Required",
+      412 => "Precondition Failed",
+      413 => "Request Entity Too Large",
+      414 => "Request-URI Too Long",
+      415 => "Unsupported Media Type",
+      416 => "Requested Range Not Satisfiable",
+      417 => "Expectation Failed",
+      422 => "Unprocessable Entity",
+      423 => "Locked",
+      424 => "Failed Dependency",
+      426 => "Upgrade Required",
+
+      500 => "Internal Server Error",
+      501 => "Not Implemented",
+      502 => "Bad Gateway",
+      503 => "Service Unavailable",
+      504 => "Gateway Timeout",
+      505 => "HTTP Version Not Supported",
+      507 => "Insufficient Storage",
+      510 => "Not Extended"
+    }
+
+    # Provides a symbol-to-fixnum lookup for converting a symbol (like
+    # :created or :not_implemented) into its corresponding HTTP status
+    # code (like 200 or 501).
+    SYMBOL_TO_STATUS_CODE = STATUS_CODES.inject({}) do |hash, (code, message)|
+      hash[message.gsub(/ /, "").underscore.to_sym] = code
+      hash
+    end
+
+    # Given a status parameter, determine whether it needs to be converted
+    # to a string. If it is a fixnum, use the STATUS_CODES hash to lookup
+    # the default message. If it is a symbol, use the SYMBOL_TO_STATUS_CODE
+    # hash to convert it.
+    def interpret_status(status)
+      case status
+      when Fixnum then
+        "#{status} #{STATUS_CODES[status]}".strip
+      when Symbol then
+        interpret_status(SYMBOL_TO_STATUS_CODE[status] ||
+          "500 Unknown Status #{status.inspect}")
+      else
+        status.to_s
+      end
+    end
+    private :interpret_status
+
+  end
+end

data/lib/action_controller/streaming.rb

@@ -69,17 +69,8 @@ module ActionController #:nodoc:
             logger.info "Streaming file #{path}" unless logger.nil?
             len = options[:buffer_size] || 4096
             File.open(path, 'rb') do |file|
-              if output.respond_to?(:syswrite)
-                begin
-                  while true
-                    output.syswrite(file.sysread(len))
-                  end
-                rescue EOFError
-                end
-              else
-                while buf = file.read(len)
-                  output.write(buf)
-                end
+              while buf = file.read(len)
+                output.write(buf)
               end
             end
           }
@@ -97,8 +88,8 @@ module ActionController #:nodoc:
       # * <tt>:type</tt> - specifies an HTTP content type.
       #   Defaults to 'application/octet-stream'.
       # * <tt>:disposition</tt> - specifies whether the file will be shown inline or downloaded.  
-      # * <tt>:status</tt> - specifies the status code to send with the response. Defaults to '200 OK'.
       #   Valid values are 'inline' and 'attachment' (default).
+      # * <tt>:status</tt> - specifies the status code to send with the response. Defaults to '200 OK'.
       #
       # Generic data download:
       #   send_data buffer
@@ -125,10 +116,10 @@ module ActionController #:nodoc:
         end
 
         disposition = options[:disposition].dup || 'attachment'
-        
+
         disposition <<= %(; filename="#{options[:filename]}") if options[:filename]
 
-        @headers.update(
+        headers.update(
           'Content-Length'            => options[:length],
           'Content-Type'              => options[:type].strip,  # fixes a problem with extra '\r' with some browsers
           'Content-Disposition'       => disposition,
@@ -141,7 +132,7 @@ module ActionController #:nodoc:
         # 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'
+        headers['Cache-Control'] = 'private' if headers['Cache-Control'] == 'no-cache'
       end
   end
 end

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

@@ -8,10 +8,10 @@
 <% if false %>
   <br /><br />
   <% begin %>
-    <%= form_tag(@request.request_uri, "method" => @request.method) %>
+    <%= form_tag(request.request_uri, "method" => request.method) %>
       <input type="hidden" name="BP-RETRY" value="1" />
   
-      <% for key, values in @params %>
+      <% for key, values in params %>
         <% next if key == "BP-RETRY" %>
         <% for value in Array(values) %>
           <input type="hidden" name="<%= key %>" value="<%= value %>" />
@@ -26,7 +26,7 @@
 <% end %>
 
 <%
-  request_parameters_without_action = @request.parameters.clone
+  request_parameters_without_action = request.parameters.clone
   request_parameters_without_action.delete("action")
   request_parameters_without_action.delete("controller")
   
@@ -37,8 +37,8 @@
 <p><b>Parameters</b>: <%=h request_dump == "{}" ? "None" : request_dump %></p>
 
 <p><a href="#" onclick="document.getElementById('session_dump').style.display='block'; return false;">Show session dump</a></p>
-<div id="session_dump" style="display:none"><%= debug(@request.session.instance_variable_get("@data")) %></div>
+<div id="session_dump" style="display:none"><%= debug(request.session.instance_variable_get("@data")) %></div>
 
 
 <h2 style="margin-top: 30px">Response</h2>
-<b>Headers</b>: <%=h @response.headers.inspect.gsub(/,/, ",\n") %><br/>
+<b>Headers</b>: <%=h response ? response.headers.inspect.gsub(/,/, ",\n") : "None" %><br/>

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

@@ -1,7 +1,7 @@
 <h1>
   <%=h @exception.class.to_s %>
-  <% if @request.parameters['controller'] %>
-    in <%=h @request.parameters['controller'].humanize %>Controller<% if @request.parameters['action'] %>#<%=h @request.parameters['action'] %><% end %>
+  <% if request.parameters['controller'] %>
+    in <%=h request.parameters['controller'].humanize %>Controller<% if request.parameters['action'] %>#<%=h request.parameters['action'] %><% end %>
   <% end %>
 </h1>
 <pre><%=h @exception.clean_message %></pre>

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

@@ -1,10 +1,10 @@
 <h1>Routing Error</h1>
 <p><pre><%=h @exception.message %></pre></p>
 <% unless @exception.failures.empty? %><p>
-	<h2>Failure reasons:</h2>
-	<ol>
-	<% @exception.failures.each do |route, reason| %>
-		<li><code><%=h route.inspect.gsub('\\', '') %></code> failed because <%=h reason.downcase %></li>
+  <h2>Failure reasons:</h2>
+  <ol>
+  <% @exception.failures.each do |route, reason| %>
+    <li><code><%=h route.inspect.gsub('\\', '') %></code> failed because <%=h reason.downcase %></li>
   <% end %>
   </ol>
 </p><% end %>

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

@@ -1,6 +1,6 @@
 <h1>
   <%=h @exception.original_exception.class.to_s %> in
-  <%=h @request.parameters["controller"].capitalize if @request.parameters["controller"]%>#<%=h @request.parameters["action"] %>
+  <%=h request.parameters["controller"].capitalize if request.parameters["controller"]%>#<%=h request.parameters["action"] %>
 </h1>
 
 <p>