Merge commit 'mainstream/master'

Conflicts:
	actionpack/lib/action_controller/base/mime_responds.rb

11 files changed, 379 insertions, 68 deletions

diff --git a/actionpack/lib/action_controller/new_base/base.rb b/actionpack/lib/action_controller/new_base/base.rb
index c25ffd5c84..ffe608ade4 100644
--- a/actionpack/lib/action_controller/new_base/base.rb
+++ b/actionpack/lib/action_controller/new_base/base.rb
@@ -2,41 +2,56 @@ module ActionController
   class Base < Http
     abstract!
     
+    include AbstractController::Benchmarker
     include AbstractController::Callbacks
-    include AbstractController::Helpers
     include AbstractController::Logger
-    
+
+    include ActionController::Helpers
     include ActionController::HideActions
     include ActionController::UrlFor
     include ActionController::Redirector
     include ActionController::Renderer
+    include ActionController::Renderers::All
     include ActionController::Layouts
     include ActionController::ConditionalGet
 
     # Legacy modules
     include SessionManagement
     include ActionDispatch::StatusCodes
+    include ActionController::Caching
+    include ActionController::MimeResponds
 
     # Rails 2.x compatibility
     include ActionController::Rails2Compatibility
 
+    include ActionController::Cookies
+    include ActionController::Session
+    include ActionController::Flash
+    include ActionController::Verification
+    include ActionController::RequestForgeryProtection
+    include ActionController::Streaming
+    include ActionController::HttpAuthentication::Basic::ControllerMethods
+    include ActionController::HttpAuthentication::Digest::ControllerMethods
+    include ActionController::FilterParameterLogging
+    include ActionController::Translation
+
     # TODO: Extract into its own module
     # This should be moved together with other normalizing behavior
     module ImplicitRender
       def process_action(method_name)
         ret = super
-        render if response_body.nil?
+        default_render if response_body.nil?
         ret
       end
 
-      def _implicit_render
+      def default_render
         render
       end
 
       def method_for_action(action_name)
         super || begin
           if view_paths.find_by_parts?(action_name.to_s, {:formats => formats, :locales => [I18n.locale]}, controller_path)
-            "_implicit_render"
+            "default_render"
           end
         end
       end
@@ -61,7 +76,7 @@ module ActionController
       end
     end
     
-    def render_to_body(action = nil, options = {})
+    def _normalize_options(action = nil, options = {}, &blk)
       if action.is_a?(Hash)
         options, action = action, nil 
       elsif action.is_a?(String) || action.is_a?(Symbol)
@@ -78,11 +93,25 @@ module ActionController
       if options.key?(:action) && options[:action].to_s.index("/")
         options[:template] = options.delete(:action)
       end
-      
-      # options = {:template => options.to_s} if options.is_a?(String) || options.is_a?(Symbol)
-      super(options) || " "
+
+      if options[:status]
+        options[:status] = interpret_status(options[:status]).to_i
+      end
+
+      options[:update] = blk if block_given?
+      options
     end
-    
+
+    def render(action = nil, options = {}, &blk)
+      options = _normalize_options(action, options, &blk)
+      super(options)
+    end
+
+    def render_to_string(action = nil, options = {}, &blk)
+      options = _normalize_options(action, options, &blk)
+      super(options)
+    end
+
     # Redirects the browser to the target specified in +options+. This parameter can take one of three forms:
     #
     # * <tt>Hash</tt> - The URL will be generated by calling url_for with the +options+.
@@ -140,4 +169,4 @@ module ActionController
       super(url, status)
     end
   end
-end
\ No newline at end of file
+end
diff --git a/actionpack/lib/action_controller/new_base/compatibility.rb b/actionpack/lib/action_controller/new_base/compatibility.rb
index 0a283887b6..b3190486e8 100644
--- a/actionpack/lib/action_controller/new_base/compatibility.rb
+++ b/actionpack/lib/action_controller/new_base/compatibility.rb
@@ -1,7 +1,10 @@
 module ActionController
   module Rails2Compatibility
     extend ActiveSupport::DependencyModule
-  
+
+    class ::ActionController::ActionControllerError < StandardError #:nodoc:
+    end
+
     # Temporary hax
     included do
       ::ActionController::UnknownAction = ::AbstractController::ActionNotFound
@@ -53,10 +56,23 @@ module ActionController
 
       cattr_accessor :consider_all_requests_local
       self.consider_all_requests_local = true
+
+      # Prepends all the URL-generating helpers from AssetHelper. This makes it possible to easily move javascripts, stylesheets,
+      # and images to a dedicated asset server away from the main web server. Example:
+      #   ActionController::Base.asset_host = "http://assets.example.com"
+      cattr_accessor :asset_host
     end
     
+    # For old tests
+    def initialize_template_class(*) end
+    def assign_shortcuts(*) end
+
+    # TODO: Remove this after we flip
+    def template
+      _action_view
+    end
+
     module ClassMethods
-      def protect_from_forgery() end
       def consider_all_requests_local() end
       def rescue_action(env)
         raise env["action_dispatch.rescue.exception"]
@@ -80,7 +96,9 @@ module ActionController
       
       options[:text] = nil if options[:nothing] == true
 
-      super
+      body = super
+      body = [' '] if body.blank?
+      body
     end
 
     def _handle_method_missing
@@ -91,10 +109,12 @@ module ActionController
       super || (respond_to?(:method_missing) && "_handle_method_missing")
     end    
       
-    def _layout_for_name(name)
-      name &&= name.sub(%r{^/?layouts/}, '')
-      super
+    def _layout_prefix(name)
+      super unless name =~ /\blayouts/
+    end
+
+    def performed?
+      response_body
     end
-   
   end
-end
\ No newline at end of file
+end
diff --git a/actionpack/lib/action_controller/new_base/conditional_get.rb b/actionpack/lib/action_controller/new_base/conditional_get.rb
index e1407e671a..116ce34494 100644
--- a/actionpack/lib/action_controller/new_base/conditional_get.rb
+++ b/actionpack/lib/action_controller/new_base/conditional_get.rb
@@ -57,7 +57,7 @@ module ActionController
         raise ArgumentError, "too few arguments to head"
       end
       options = args.extract_options!
-      status = interpret_status(args.shift || options.delete(:status) || :ok)
+      status = args.shift || options.delete(:status) || :ok
 
       options.each do |key, value|
         headers[key.to_s.dasherize.split(/-/).map { |v| v.capitalize }.join("-")] = value.to_s
diff --git a/actionpack/lib/action_controller/new_base/helpers.rb b/actionpack/lib/action_controller/new_base/helpers.rb
new file mode 100644
index 0000000000..e00c3c338b
--- /dev/null
+++ b/actionpack/lib/action_controller/new_base/helpers.rb
@@ -0,0 +1,130 @@
+require 'active_support/core_ext/load_error'
+require 'active_support/core_ext/name_error'
+require 'active_support/dependencies'
+
+module ActionController
+  module Helpers
+    extend ActiveSupport::DependencyModule
+
+    depends_on AbstractController::Helpers
+
+    included do
+      # Set the default directory for helpers
+      class_inheritable_accessor :helpers_dir
+      self.helpers_dir = (defined?(RAILS_ROOT) ? "#{RAILS_ROOT}/app/helpers" : "app/helpers")
+    end
+
+    module ClassMethods
+      def inherited(klass)
+        klass.__send__ :default_helper_module!
+        super
+      end
+
+      # The +helper+ class method can take a series of helper module names, a block, or both.
+      #
+      # * <tt>*args</tt>: One or more modules, strings or symbols, or the special symbol <tt>:all</tt>.
+      # * <tt>&block</tt>: A block defining helper methods.
+      # 
+      # ==== Examples
+      # When the argument is a string or symbol, the method will provide the "_helper" suffix, require the file 
+      # and include the module in the template class.  The second form illustrates how to include custom helpers 
+      # when working with namespaced controllers, or other cases where the file containing the helper definition is not
+      # in one of Rails' standard load paths:
+      #   helper :foo             # => requires 'foo_helper' and includes FooHelper
+      #   helper 'resources/foo'  # => requires 'resources/foo_helper' and includes Resources::FooHelper
+      #
+      # When the argument is a module it will be included directly in the template class.
+      #   helper FooHelper # => includes FooHelper
+      #
+      # When the argument is the symbol <tt>:all</tt>, the controller will include all helpers beneath
+      # <tt>ActionController::Base.helpers_dir</tt> (defaults to <tt>app/helpers/**/*.rb</tt> under RAILS_ROOT).
+      #   helper :all
+      #
+      # Additionally, the +helper+ class method can receive and evaluate a block, making the methods defined available 
+      # to the template.
+      #   # One line
+      #   helper { def hello() "Hello, world!" end }
+      #   # Multi-line
+      #   helper do
+      #     def foo(bar) 
+      #       "#{bar} is the very best" 
+      #     end
+      #   end
+      # 
+      # Finally, all the above styles can be mixed together, and the +helper+ method can be invoked with a mix of
+      # +symbols+, +strings+, +modules+ and blocks.
+      #   helper(:three, BlindHelper) { def mice() 'mice' end }
+      #
+      def helper(*args, &block)
+        args.flatten.each do |arg|
+          case arg
+          when :all
+            helper all_application_helpers
+          when String, Symbol
+            file_name  = arg.to_s.underscore + '_helper'
+            class_name = file_name.camelize
+
+            begin
+              require_dependency(file_name)
+            rescue LoadError => load_error
+              requiree = / -- (.*?)(\.rb)?$/.match(load_error.message).to_a[1]
+              if requiree == file_name
+                msg = "Missing helper file helpers/#{file_name}.rb"
+                raise LoadError.new(msg).copy_blame!(load_error)
+              else
+                raise
+              end
+            end
+
+            super class_name.constantize
+          else
+            super args
+          end
+        end
+
+        # Evaluate block in template class if given.
+        master_helper_module.module_eval(&block) if block_given?
+      end
+
+      # Declares helper accessors for controller attributes. For example, the
+      # following adds new +name+ and <tt>name=</tt> instance methods to a
+      # controller and makes them available to the view:
+      #   helper_attr :name
+      #   attr_accessor :name
+      def helper_attr(*attrs)
+        attrs.flatten.each { |attr| helper_method(attr, "#{attr}=") }
+      end
+
+      # Provides a proxy to access helpers methods from outside the view.
+      def helpers
+        unless @helper_proxy
+          @helper_proxy = ActionView::Base.new
+          @helper_proxy.extend master_helper_module
+        else
+          @helper_proxy
+        end
+      end
+
+      private
+
+      def default_helper_module!
+        unless name.blank?
+          module_name = name.sub(/Controller$|$/, 'Helper')
+          module_path = module_name.split('::').map { |m| m.underscore }.join('/')
+          require_dependency module_path
+          helper module_name.constantize
+        end
+      rescue MissingSourceFile => e
+        raise unless e.is_missing? module_path
+      rescue NameError => e
+        raise unless e.missing_name? module_name
+      end
+
+      # Extract helper names from files in app/helpers/**/*.rb
+      def all_application_helpers
+        extract = /^#{Regexp.quote(helpers_dir)}\/?(.*)_helper.rb$/
+        Dir["#{helpers_dir}/**/*_helper.rb"].map { |file| file.sub extract, '\1' }
+      end
+    end # ClassMethods
+  end
+end
diff --git a/actionpack/lib/action_controller/new_base/http.rb b/actionpack/lib/action_controller/new_base/http.rb
index 8891a2a8c3..2525e221a6 100644
--- a/actionpack/lib/action_controller/new_base/http.rb
+++ b/actionpack/lib/action_controller/new_base/http.rb
@@ -37,7 +37,7 @@ module ActionController
     end
     
     delegate :headers, :to => "@_response"
-    
+
     def params
       @_params ||= @_request.parameters
     end
@@ -60,7 +60,6 @@ module ActionController
     
     # :api: private
     def to_rack
-      @_response.body = response_body
       @_response.prepare!
       @_response.to_a
     end
diff --git a/actionpack/lib/action_controller/new_base/layouts.rb b/actionpack/lib/action_controller/new_base/layouts.rb
index bf5b14c4e1..35068db770 100644
--- a/actionpack/lib/action_controller/new_base/layouts.rb
+++ b/actionpack/lib/action_controller/new_base/layouts.rb
@@ -11,23 +11,20 @@ module ActionController
       end
     end
     
-    def render_to_body(options)
-      # render :text => ..., :layout => ...
-      # or
-      # render :anything_else
+  private
+
+    def _determine_template(options)
+      super
       if (!options.key?(:text) && !options.key?(:inline) && !options.key?(:partial)) || options.key?(:layout)
-        options[:_layout] = options.key?(:layout) ? _layout_for_option(options[:layout]) : _default_layout
+        options[:_layout] = _layout_for_option(options.key?(:layout) ? options[:layout] : :none, options[:_template].details)
       end
-      
-      super
     end
-    
-  private
   
-    def _layout_for_option(name)
+    def _layout_for_option(name, details)
       case name
-      when String     then _layout_for_name(name)
-      when true       then _default_layout(true)
+      when String     then _layout_for_name(name, details)
+      when true       then _default_layout(true, details)
+      when :none      then _default_layout(false, details)
       when false, nil then nil
       else
         raise ArgumentError, 
diff --git a/actionpack/lib/action_controller/new_base/render_options.rb b/actionpack/lib/action_controller/new_base/render_options.rb
new file mode 100644
index 0000000000..581a92cb7b
--- /dev/null
+++ b/actionpack/lib/action_controller/new_base/render_options.rb
@@ -0,0 +1,107 @@
+module ActionController
+  module RenderOptions
+    extend ActiveSupport::DependencyModule
+    
+    included do
+      extlib_inheritable_accessor :_renderers
+      self._renderers = []
+    end
+    
+    module ClassMethods
+      def _write_render_options
+        renderers = _renderers.map do |r|
+          <<-RUBY_EVAL
+            if options.key?(:#{r})
+              _process_options(options)
+              return _render_#{r}(options[:#{r}], options)
+            end
+          RUBY_EVAL
+        end
+        
+        class_eval <<-RUBY_EVAL, __FILE__, __LINE__ + 1
+          def _handle_render_options(options)
+            #{renderers.join}
+          end
+        RUBY_EVAL
+      end
+      
+      def _add_render_option(name)
+        _renderers << name
+        _write_render_options
+      end
+    end
+    
+    def render_to_body(options)
+      _handle_render_options(options) || super
+    end
+  end
+  
+  module RenderOption
+    extend ActiveSupport::DependencyModule
+
+    included do
+      extend ActiveSupport::DependencyModule
+      depends_on ::ActionController::RenderOptions
+
+      def self.register_renderer(name)
+        included { _add_render_option(name) }
+      end
+    end
+  end
+
+  module Renderers
+    module Json
+      include RenderOption
+      register_renderer :json
+      
+      def _render_json(json, options)
+        json = ActiveSupport::JSON.encode(json) unless json.respond_to?(:to_str)
+        json = "#{options[:callback]}(#{json})" unless options[:callback].blank?
+        response.content_type ||= Mime::JSON
+        self.response_body = json
+      end      
+    end
+
+    module Js
+      include RenderOption
+      register_renderer :js
+
+      def _render_js(js, options)
+        response.content_type ||= Mime::JS
+        self.response_body = js
+      end
+    end
+
+    module Xml
+      include RenderOption
+      register_renderer :xml
+
+      def _render_xml(xml, options)
+        response.content_type ||= Mime::XML
+        self.response_body  = xml.respond_to?(:to_xml) ? xml.to_xml : xml
+      end
+    end
+
+    module Rjs
+      include RenderOption
+      register_renderer :update
+
+      def _render_update(proc, options)
+        generator = ActionView::Helpers::PrototypeHelper::JavaScriptGenerator.new(_action_view, &proc)
+        response.content_type = Mime::JS
+        self.response_body = generator.to_s
+      end
+    end
+
+    module All
+      extend ActiveSupport::DependencyModule
+
+      included do
+        include ::ActionController::Renderers::Json
+        include ::ActionController::Renderers::Js
+        include ::ActionController::Renderers::Xml
+        include ::ActionController::Renderers::Rjs
+      end
+    end
+  end
+end
diff --git a/actionpack/lib/action_controller/new_base/renderer.rb b/actionpack/lib/action_controller/new_base/renderer.rb
index 8a9f230603..987751a601 100644
--- a/actionpack/lib/action_controller/new_base/renderer.rb
+++ b/actionpack/lib/action_controller/new_base/renderer.rb
@@ -4,17 +4,45 @@ module ActionController
 
     depends_on AbstractController::Renderer
     
-    def initialize(*)
-      self.formats = [:html]
+    def process_action(*)
+      self.formats = request.formats.map {|x| x.to_sym}
       super
     end
     
+    def response_body=(body)
+      response.body = body if response
+      super
+    end
+
+    def render(options)
+      super
+      options[:_template] ||= _action_view._partial
+      response.content_type ||= begin
+        mime = options[:_template].mime_type
+        formats.include?(mime && mime.to_sym) || formats.include?(:all) ? mime : Mime::Type.lookup_by_extension(formats.first)
+      end
+      response_body
+    end
+
     def render_to_body(options)
       _process_options(options)
       
+      if options.key?(:partial)
+        _render_partial(options[:partial], options)
+      end
+
+      super
+    end
+
+  private
+
+    def _prefix
+      controller_path
+    end
+
+    def _determine_template(options)
       if options.key?(:text)
-        options[:_template] = ActionView::TextTemplate.new(_text(options))
-        template = nil
+        options[:_template] = ActionView::TextTemplate.new(options[:text], formats.first)
       elsif options.key?(:inline)
         handler = ActionView::Template.handler_class_for_extension(options[:type] || "erb")
         template = ActionView::Template.new(options[:inline], "inline #{options[:inline].inspect}", handler, {})
@@ -23,35 +51,14 @@ module ActionController
         options[:_template_name] = options[:template]
       elsif options.key?(:file)
         options[:_template_name] = options[:file]
-      elsif options.key?(:partial)
-        _render_partial(options[:partial], options)
-      else
+      elsif !options.key?(:partial)
         options[:_template_name] = (options[:action] || action_name).to_s
         options[:_prefix] = _prefix 
       end
       
-      ret = super(options)
-      
-      options[:_template] ||= _action_view._partial
-      response.content_type ||= options[:_template].mime_type
-      ret
+      super
     end
-    
-  private
-  
-    def _prefix
-      controller_path
-    end  
-  
-    def _text(options)
-      text = options[:text]
 
-      case text
-      when nil then " "
-      else text.to_s
-      end
-    end
-    
     def _render_partial(partial, options)
       case partial
       when true
@@ -68,9 +75,10 @@ module ActionController
     end
   
     def _process_options(options)
-      status, content_type = options.values_at(:status, :content_type)
-      response.status = status.to_i if status
+      status, content_type, location = options.values_at(:status, :content_type, :location)
+      response.status = status if status
       response.content_type = content_type if content_type
+      response.headers["Location"] = url_for(location) if location
     end
   end
 end
diff --git a/actionpack/lib/action_controller/new_base/session.rb b/actionpack/lib/action_controller/new_base/session.rb
new file mode 100644
index 0000000000..a8715555fb
--- /dev/null
+++ b/actionpack/lib/action_controller/new_base/session.rb
@@ -0,0 +1,11 @@
+module ActionController
+  module Session
+    def session
+      @_request.session
+    end
+
+    def reset_session
+      @_request.reset_session
+    end
+  end
+end
diff --git a/actionpack/lib/action_controller/new_base/testing.rb b/actionpack/lib/action_controller/new_base/testing.rb
index b39d8d539d..d8c3421587 100644
--- a/actionpack/lib/action_controller/new_base/testing.rb
+++ b/actionpack/lib/action_controller/new_base/testing.rb
@@ -1,13 +1,13 @@
 module ActionController
   module Testing
-    
+
     # OMG MEGA HAX
-    def process_with_test(request, response)
+    def process_with_new_base_test(request, response)
       @_request = request
       @_response = response
       @_response.request = request
       ret = process(request.parameters[:action])
-      @_response.body = self.response_body || " "
+      @_response.body ||= self.response_body
       @_response.prepare!
       set_test_assigns
       ret
@@ -20,6 +20,11 @@ module ActionController
         @assigns[name] = value
       end
     end
-    
+
+    # TODO : Rewrite tests using controller.headers= to use Rack env
+    def headers=(new_headers)
+      @_response ||= ActionDispatch::Response.new
+      @_response.headers.replace(new_headers)
+    end
   end
-end
\ No newline at end of file
+end
diff --git a/actionpack/lib/action_controller/new_base/url_for.rb b/actionpack/lib/action_controller/new_base/url_for.rb
index af5b21012b..94de9fab50 100644
--- a/actionpack/lib/action_controller/new_base/url_for.rb
+++ b/actionpack/lib/action_controller/new_base/url_for.rb
@@ -1,5 +1,10 @@
 module ActionController
   module UrlFor
+    def process_action(*)
+      initialize_current_url
+      super
+    end
+
     def initialize_current_url
       @url = UrlRewriter.new(request, params.clone)
     end