actionpack 1.12.5 → 1.13.0

data/lib/action_controller/flash.rb

@@ -17,7 +17,7 @@ module ActionController #:nodoc:
   #   end
   #
   #   display.rhtml
-  #     <% if @flash[:notice] %><div class="notice"><%= @flash[:notice] %></div><% end %>
+  #     <% if flash[:notice] %><div class="notice"><%= flash[:notice] %></div><% end %>
   #
   # This example just places a string in the flash, but you can put any object in there. And of course, you can put as many
   # as you like at a time too. Just remember: They'll be gone by the time the next action has been performed.
@@ -28,11 +28,9 @@ module ActionController #:nodoc:
       base.send :include, InstanceMethods
 
       base.class_eval do
-        alias_method :assign_shortcuts_without_flash, :assign_shortcuts
-        alias_method :assign_shortcuts, :assign_shortcuts_with_flash
-
-        alias_method :process_cleanup_without_flash, :process_cleanup
-        alias_method :process_cleanup, :process_cleanup_with_flash
+        alias_method_chain :assign_shortcuts, :flash
+        alias_method_chain :process_cleanup,  :flash
+        alias_method_chain :reset_session,    :flash
       end
     end
     
@@ -94,7 +92,7 @@ module ActionController #:nodoc:
       #
       #    flash.keep            # keeps the entire flash
       #    flash.keep(:notice)   # keeps only the "notice" entry, the rest of the flash is discarded
-      def keep(k=nil)
+      def keep(k = nil)
         use(k, false)
       end
     
@@ -102,7 +100,7 @@ module ActionController #:nodoc:
       #
       #     flash.keep                 # keep entire flash available for the next action
       #     flash.discard(:warning)    # discard the "warning" entry (it'll still be available for the current action)
-      def discard(k=nil)
+      def discard(k = nil)
         use(k)
       end
     
@@ -118,6 +116,7 @@ module ActionController #:nodoc:
             @used.delete(k)
           end
         end
+
         (@used.keys - keys).each{|k| @used.delete k } # clean up after keys that could have been left over by calling reject! or shift on the flash
       end
     
@@ -143,36 +142,41 @@ module ActionController #:nodoc:
       end
       
       def process_cleanup_with_flash
-        flash.sweep if @session
+        flash.sweep if @_session
         process_cleanup_without_flash
       end
+
+      def reset_session_with_flash
+        reset_session_without_flash
+        remove_instance_variable(:@_flash)
+        flash(:refresh)
+      end
       
       protected 
         # Access the contents of the flash. Use <tt>flash["notice"]</tt> to read a notice you put there or 
         # <tt>flash["notice"] = "hello"</tt> to put a new one.
         # Note that if sessions are disabled only flash.now will work.
         def flash(refresh = false) #:doc:
-          if @flash.nil? || refresh
-            @flash = 
-              if @session.is_a?(Hash)
-                # @session is a Hash, if sessions are disabled
-                # we don't put the flash in the session in this case
+          if !defined?(@_flash) || refresh
+            @_flash =
+              if session.is_a?(Hash)
+                # don't put flash in session if disabled
                 FlashHash.new
               else
-                # otherwise, @session is a CGI::Session or a TestSession
+                # otherwise, session is a CGI::Session or a TestSession
                 # so make sure it gets retrieved from/saved to session storage after request processing
-                @session["flash"] ||= FlashHash.new
+                session["flash"] ||= FlashHash.new
               end
           end
-          
-          @flash
+
+          @_flash
         end
 
         # deprecated. use <tt>flash.keep</tt> instead
         def keep_flash #:doc:
-          warn 'keep_flash is deprecated; use flash.keep instead.'
+          ActiveSupport::Deprecation.warn 'keep_flash is deprecated; use flash.keep instead.', caller
           flash.keep
         end
     end
   end
-end
+end

data/lib/action_controller/helpers.rb

@@ -1,8 +1,6 @@
 module ActionController #:nodoc:
   module Helpers #:nodoc:
-    def self.append_features(base)
-      super
-
+    def self.included(base)
       # Initialize the base module to aggregate its helpers.
       base.class_inheritable_accessor :master_helper_module
       base.master_helper_module = Module.new
@@ -13,8 +11,7 @@ module ActionController #:nodoc:
       base.class_eval do
         # Wrap inherited to create a new master helper module for subclasses.
         class << self
-          alias_method :inherited_without_helper, :inherited
-          alias_method :inherited, :inherited_with_helper
+          alias_method_chain :inherited, :helper
         end
       end
     end

data/lib/action_controller/integration.rb

@@ -1,6 +1,7 @@
 require 'dispatcher'
 require 'stringio'
 require 'uri'
+require 'action_controller/test_process'
 
 module ActionController
   module Integration #:nodoc:
@@ -13,6 +14,7 @@ module ActionController
     # rather than instantiating Integration::Session directly.
     class Session
       include Test::Unit::Assertions
+      include ActionController::Assertions
       include ActionController::TestProcess
 
       # The integer HTTP status code of the last request.
@@ -73,11 +75,11 @@ module ActionController
         unless @named_routes_configured
           # install the named routes in this session instance.
           klass = class<<self; self; end
-          Routing::NamedRoutes.install(klass)
+          Routing::Routes.named_routes.install(klass)
 
           # the helpers are made protected by default--we make them public for
           # easier access during testing and troubleshooting.
-          klass.send(:public, *Routing::NamedRoutes::Helpers)
+          klass.send(:public, *Routing::Routes.named_routes.helpers)
           @named_routes_configured = true
         end
       end
@@ -111,7 +113,7 @@ module ActionController
       # performed on the location header.
       def follow_redirect!
         raise "not a redirect! #{@status} #{@status_message}" unless redirect?
-        get(interpret_uri(headers["location"].first))
+        get(interpret_uri(headers['location'].first))
         status
       end
 
@@ -143,19 +145,33 @@ module ActionController
       # (application/x-www-form-urlencoded or multipart/form-data).  The headers
       # should be a hash.  The keys will automatically be upcased, with the 
       # prefix 'HTTP_' added if needed.
+      #
+      # You can also perform POST, PUT, DELETE, and HEAD requests with #post, 
+      # #put, #delete, and #head.
       def get(path, parameters=nil, headers=nil)
         process :get, path, parameters, headers
       end
 
-      # Performs a POST request with the given parameters. The parameters may
-      # be +nil+, a Hash, or a string that is appropriately encoded
-      # (application/x-www-form-urlencoded or multipart/form-data).  The headers
-      # should be a hash.  The keys will automatically be upcased, with the 
-      # prefix 'HTTP_' added if needed.
+      # Performs a POST request with the given parameters. See get() for more details.
       def post(path, parameters=nil, headers=nil)
         process :post, path, parameters, headers
       end
 
+      # Performs a PUT request with the given parameters. See get() for more details.
+      def put(path, parameters=nil, headers=nil)
+        process :put, path, parameters, headers
+      end
+      
+      # Performs a DELETE request with the given parameters. See get() for more details.
+      def delete(path, parameters=nil, headers=nil)
+        process :delete, path, parameters, headers
+      end
+      
+      # Performs a HEAD request with the given parameters. See get() for more details.
+      def head(path, parameters=nil, headers=nil)
+        process :head, path, parameters, headers
+      end
+
       # Performs an XMLHttpRequest request with the given parameters, mimicing
       # the request environment created by the Prototype library. The parameters
       # may be +nil+, a Hash, or a string that is appropriately encoded
@@ -163,7 +179,11 @@ module ActionController
       # should be a hash.  The keys will automatically be upcased, with the 
       # prefix 'HTTP_' added if needed.
       def xml_http_request(path, parameters=nil, headers=nil)
-        headers = (headers || {}).merge("X-Requested-With" => "XMLHttpRequest")
+        headers = (headers || {}).merge(
+          "X-Requested-With" => "XMLHttpRequest",
+          "Accept"           => "text/javascript, text/html, application/xml, text/xml, */*"
+        )
+
         post(path, parameters, headers)
       end
 
@@ -174,7 +194,6 @@ module ActionController
       end
 
       private
-
         class MockCGI < CGI #:nodoc:
           attr_accessor :stdinput, :stdoutput, :env_table
 
@@ -224,7 +243,7 @@ module ActionController
 
           (headers || {}).each do |key, value|
             key = key.to_s.upcase.gsub(/-/, "_")
-            key = "HTTP_#{key}" unless env.has_key?(key) || env =~ /^X|HTTP/
+            key = "HTTP_#{key}" unless env.has_key?(key) || key =~ /^HTTP_/
             env[key] = value
           end
 
@@ -247,6 +266,8 @@ module ActionController
           # tests.
           @response.extend(TestResponseBehavior)
 
+          @html_document = nil
+
           parse_result
           return status
         end
@@ -317,9 +338,8 @@ module ActionController
       def self.included(base)
         base.extend(ClassMethods)
         base.class_eval do
-          class <<self
-            alias_method :new_without_capture, :new
-            alias_method :new, :new_with_capture
+          class << self
+            alias_method_chain :new, :capture
           end
         end
       end
@@ -330,9 +350,11 @@ module ActionController
         def clear_last_instantiation!
           self.last_instantiation = nil
         end
-    
+
         def new_with_capture(*args)
-          self.last_instantiation ||= new_without_capture(*args)
+          controller = new_without_capture(*args)
+          self.last_instantiation ||= controller
+          controller
         end
       end
     end
@@ -471,6 +493,8 @@ module ActionController
     %w(get post cookies assigns xml_http_request).each do |method|
       define_method(method) do |*args|
         reset! unless @integration_session
+        # reset the html_document variable, but only for new get/post calls
+        @html_document = nil unless %w(cookies assigns).include?(method)
         returning @integration_session.send(method, *args) do
           copy_session_variables!
         end

data/lib/action_controller/layout.rb

@@ -3,12 +3,13 @@ module ActionController #:nodoc:
     def self.included(base)
       base.extend(ClassMethods)
       base.class_eval do
+        # NOTE: Can't use alias_method_chain here because +render_without_layout+ is already
+        # defined as a publicly exposed method
         alias_method :render_with_no_layout, :render
         alias_method :render, :render_with_a_layout
 
         class << self
-          alias_method :inherited_without_layout, :inherited
-          alias_method :inherited, :inherited_with_layout
+          alias_method_chain :inherited, :layout
         end
       end
     end
@@ -26,9 +27,9 @@ module ActionController #:nodoc:
     # With layouts, you can flip it around and have the common structure know where to insert changing content. This means
     # that the header and footer are only mentioned in one place, like this:
     #
-    #   <!-- The header part of this layout -->
+    #   // The header part of this layout
     #   <%= yield %>
-    #   <!-- The footer part of this layout -->
+    #   // The footer part of this layout -->
     #
     # And then you have content pages that look like this:
     #
@@ -37,9 +38,9 @@ module ActionController #:nodoc:
     # Not a word about common structures. At rendering time, the content page is computed and then inserted in the layout, 
     # like this:
     #
-    #   <!-- The header part of this layout -->
+    #   // The header part of this layout
     #   hello world
-    #   <!-- The footer part of this layout -->
+    #   // The footer part of this layout -->
     #
     # == Accessing shared variables
     #
@@ -182,7 +183,6 @@ module ActionController #:nodoc:
       private
         def inherited_with_layout(child)
           inherited_without_layout(child)
-          child.send :include, Reloadable
           layout_match = child.name.underscore.sub(/_controller$/, '').sub(/^controllers\//, '')
           child.layout(layout_match) unless layout_list.grep(%r{layouts/#{layout_match}\.[a-z][0-9a-z]*$}).empty?
         end
@@ -235,6 +235,8 @@ module ActionController #:nodoc:
       template_with_options = options.is_a?(Hash)
 
       if apply_layout?(template_with_options, options) && (layout = pick_layout(template_with_options, options, deprecated_layout))
+        assert_existence_of_template_file(layout)
+
         options = options.merge :layout => false if template_with_options
         logger.info("Rendering #{options} within #{layout}") if logger
 
@@ -248,6 +250,7 @@ module ActionController #:nodoc:
         erase_render_results
         add_variables_to_assigns
         @template.instance_variable_set("@content_for_layout", content_for_layout)
+        response.layout = layout
         render_text(@template.render_file(layout, true), deprecated_status)
       else
         render_with_no_layout(options, deprecated_status, &block)
@@ -263,7 +266,7 @@ module ActionController #:nodoc:
 
       def candidate_for_layout?(options)
         (options.has_key?(:layout) && options[:layout] != false) || 
-        options.values_at(:text, :xml, :file, :inline, :partial, :nothing).compact.empty? &&
+        options.values_at(:text, :xml, :json, :file, :inline, :partial, :nothing).compact.empty? &&
         !template_exempt_from_layout?(default_template_name(options[:action] || options[:template]))
       end
 

data/lib/action_controller/macros/auto_complete.rb

@@ -4,11 +4,12 @@ module ActionController
   # backing.
   module Macros
     module AutoComplete #:nodoc:
-      def self.append_features(base) #:nodoc:
-        super
+      def self.included(base) #:nodoc:
         base.extend(ClassMethods)
       end
 
+      # DEPRECATION WARNING: This method will become a separate plugin when Rails 2.0 ships.
+      #
       # Example:
       #
       #   # Controller

data/lib/action_controller/macros/in_place_editing.rb

@@ -1,11 +1,12 @@
 module ActionController
   module Macros
     module InPlaceEditing #:nodoc:
-      def self.append_features(base) #:nodoc:
-        super
+      def self.included(base) #:nodoc:
         base.extend(ClassMethods)
       end
 
+      # DEPRECATION WARNING: This method will become a separate plugin when Rails 2.0 ships.
+      #
       # Example:
       #
       #   # Controller

data/lib/action_controller/mime_responds.rb

@@ -8,18 +8,18 @@ module ActionController #:nodoc:
       # Without web-service support, an action which collects the data for displaying a list of people
       # might look something like this:
       #
-      #   def list
+      #   def index
       #     @people = Person.find(:all)
       #   end
       # 
       # Here's the same action, with web-service support baked in:
       # 
-      #   def list
+      #   def index
       #     @people = Person.find(:all)
       # 
-      #     respond_to do |wants|
-      #       wants.html
-      #       wants.xml { render :xml => @people.to_xml }
+      #     respond_to do |format|
+      #       format.html
+      #       format.xml { render :xml => @people.to_xml }
       #     end
       #   end
       # 
@@ -30,7 +30,7 @@ module ActionController #:nodoc:
       # Supposing you have an action that adds a new person, optionally creating their company 
       # (by name) if it does not already exist, without web-services, it might look like this:
       # 
-      #   def add
+      #   def create
       #     @company = Company.find_or_create_by_name(params[:company][:name])
       #     @person  = @company.people.create(params[:person])
       # 
@@ -39,15 +39,15 @@ module ActionController #:nodoc:
       # 
       # Here's the same action, with web-service support baked in:
       # 
-      #   def add
+      #   def create
       #     company  = params[:person].delete(:company)
       #     @company = Company.find_or_create_by_name(company[:name])
       #     @person  = @company.people.create(params[:person])
       # 
-      #     respond_to do |wants|
-      #       wants.html { redirect_to(person_list_url) }
-      #       wants.js
-      #       wants.xml  { render :xml => @person.to_xml(:include => @company) }
+      #     respond_to do |format|
+      #       format.html { redirect_to(person_list_url) }
+      #       format.js
+      #       format.xml  { render :xml => @person.to_xml(:include => @company) }
       #     end
       #   end
       # 
@@ -97,9 +97,8 @@ module ActionController #:nodoc:
       # environment.rb as follows.
       # 
       #   Mime::Type.register "image/jpg", :jpg
-      # 
       def respond_to(*types, &block)
-        raise ArgumentError, "respond_to takes either types or a block, never bot" unless types.any? ^ block
+        raise ArgumentError, "respond_to takes either types or a block, never both" unless types.any? ^ block
         block ||= lambda { |responder| types.each { |type| responder.send(type) } }
         responder = Responder.new(block.binding)
         block.call(responder)
@@ -108,15 +107,19 @@ module ActionController #:nodoc:
     end
     
     class Responder #:nodoc:
-      DEFAULT_BLOCKS = {
-        :html    => 'Proc.new { render }',
-        :js      => 'Proc.new { render :action => "#{action_name}.rjs" }',
-        :xml     => 'Proc.new { render :action => "#{action_name}.rxml" }'
-      }
+      DEFAULT_BLOCKS = [:html, :js, :xml].inject({}) do |blocks, ext|
+        template_extension = (ext == :html ? '' : ".r#{ext}")
+        blocks.update ext => %(Proc.new { render :action => "\#{action_name}#{template_extension}", :content_type => Mime::#{ext.to_s.upcase} })
+      end
       
       def initialize(block_binding)
         @block_binding = block_binding
-        @mime_type_priority = eval("request.accepts", block_binding)
+        @mime_type_priority = eval(
+          "(params[:format] && Mime::EXTENSION_LOOKUP[params[:format]]) ? " +
+          "[ Mime::EXTENSION_LOOKUP[params[:format]] ] : request.accepts", 
+          block_binding
+        )
+
         @order     = []
         @responses = {}
       end
@@ -127,24 +130,33 @@ module ActionController #:nodoc:
         @order << mime_type
         
         if block_given?
-          @responses[mime_type] = block
+          @responses[mime_type] = Proc.new do
+            eval "response.content_type = '#{mime_type.to_s}'", @block_binding
+            block.call
+          end
         else
-          @responses[mime_type] = eval(DEFAULT_BLOCKS[mime_type.to_sym], @block_binding)
-        end
-      end
-      
-      for mime_type in %w( all html js xml rss atom yaml )
-        eval <<-EOT
-          def #{mime_type}(&block)
-            custom(Mime::#{mime_type.upcase}, &block)
+          if source = DEFAULT_BLOCKS[mime_type.to_sym]
+            @responses[mime_type] = eval(source, @block_binding)
+          else
+            raise ActionController::RenderError, "Expected a block but none was given for custom mime handler #{mime_type}"
           end
-        EOT
+        end
       end
 
       def any(*args, &block)
         args.each { |type| send(type, &block) }
       end
       
+      def method_missing(symbol, &block)
+        mime_constant = symbol.to_s.upcase
+        
+        if Mime::SET.include?(Mime.const_get(mime_constant))
+          custom(Mime.const_get(mime_constant), &block)
+        else
+          super
+        end
+      end
+      
       def respond
         for priority in @mime_type_priority
           if priority == Mime::ALL