Merge remote branch 'mainstream/master'

Conflicts:
	railties/lib/rails/railtie.rb

6 files changed, 60 insertions, 80 deletions

diff --git a/actionpack/lib/action_controller/base.rb b/actionpack/lib/action_controller/base.rb
index f46231d72b..215b70734c 100644
--- a/actionpack/lib/action_controller/base.rb
+++ b/actionpack/lib/action_controller/base.rb
@@ -7,7 +7,6 @@ module ActionController
     include AbstractController::Translation
 
     include ActionController::Helpers
-    helper :all # By default, all helpers should be included
     
     include ActionController::HideActions
     include ActionController::UrlFor
@@ -67,6 +66,7 @@ module ActionController
     def self.inherited(klass)
       ::ActionController::Base.subclasses << klass.to_s
       super
+      klass.helper :all
     end
 
     def self.subclasses
diff --git a/actionpack/lib/action_controller/deprecated.rb b/actionpack/lib/action_controller/deprecated.rb
index 589061e77c..edc0e5b3fe 100644
--- a/actionpack/lib/action_controller/deprecated.rb
+++ b/actionpack/lib/action_controller/deprecated.rb
@@ -2,3 +2,4 @@ ActionController::AbstractRequest = ActionController::Request = ActionDispatch::
 ActionController::AbstractResponse = ActionController::Response = ActionDispatch::Response
 ActionController::Routing = ActionDispatch::Routing
 ActionController::Routing::Routes = ActionDispatch::Routing::RouteSet.new
+ActionController::UrlWriter = AbstractController::UrlFor
diff --git a/actionpack/lib/action_controller/metal/helpers.rb b/actionpack/lib/action_controller/metal/helpers.rb
index cdd14560e1..03ba4b3f83 100644
--- a/actionpack/lib/action_controller/metal/helpers.rb
+++ b/actionpack/lib/action_controller/metal/helpers.rb
@@ -50,13 +50,19 @@ module ActionController
     include AbstractController::Helpers
 
     included do
-      # Set the default directory for helpers
-      extlib_inheritable_accessor(:helpers_dir) do
-        defined?(Rails.root) ? "#{Rails.root}/app/helpers" : "app/helpers"
-      end
+      extlib_inheritable_accessor(:helpers_path)
+      self.helpers_path = []
     end
 
     module ClassMethods
+      def helpers_dir
+        self.helpers_path
+      end
+
+      def helpers_dir=(value)
+        self.helpers_path = Array(value)
+      end
+
       def inherited(klass)
         klass.class_eval { default_helper_module! unless name.blank? }
         super
@@ -80,36 +86,42 @@ module ActionController
         @helper_proxy ||= ActionView::Base.new.extend(_helpers)
       end
 
-    private
-      # Overwrite _modules_for_helpers to accept :all as argument, which loads
-      # all helpers in helpers_dir.
-      #
-      # ==== Parameters
-      # args<Array[String, Symbol, Module, all]>:: A list of helpers
-      #
-      # ==== Returns
-      # Array[Module]:: A normalized list of modules for the list of
-      #   helpers provided.
-      def _modules_for_helpers(args)
-        args += all_application_helpers if args.delete(:all)
-        super(args)
-      end
+      private
+        # Overwrite _modules_for_helpers to accept :all as argument, which loads
+        # all helpers in helpers_dir.
+        #
+        # ==== Parameters
+        # args<Array[String, Symbol, Module, all]>:: A list of helpers
+        #
+        # ==== Returns
+        # Array[Module]:: A normalized list of modules for the list of
+        #   helpers provided.
+        def _modules_for_helpers(args)
+          args += all_application_helpers if args.delete(:all)
+          super(args)
+        end
 
-      def default_helper_module!
-        module_name = name.sub(/Controller$/, '')
-        module_path = module_name.underscore
-        helper module_path
-      rescue MissingSourceFile => e
-        raise e unless e.is_missing? "helpers/#{module_path}_helper"
-      rescue NameError => e
-        raise e unless e.missing_name? "#{module_name}Helper"
-      end
+        def default_helper_module!
+          module_name = name.sub(/Controller$/, '')
+          module_path = module_name.underscore
+          helper module_path
+        rescue MissingSourceFile => e
+          raise e unless e.is_missing? "helpers/#{module_path}_helper"
+        rescue NameError => e
+          raise e unless e.missing_name? "#{module_name}Helper"
+        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
+        # Extract helper names from files in app/helpers/**/*_helper.rb
+        def all_application_helpers
+          helpers = []
+          helpers_path.each do |path|
+            extract  = /^#{Regexp.quote(path)}\/?(.*)_helper.rb$/
+            helpers += Dir["#{path}/**/*_helper.rb"].map { |file| file.sub(extract, '\1') }
+          end
+          helpers.sort!
+          helpers.uniq!
+          helpers
+        end
     end
   end
 end
diff --git a/actionpack/lib/action_controller/metal/mime_responds.rb b/actionpack/lib/action_controller/metal/mime_responds.rb
index 4c02677729..08599d660e 100644
--- a/actionpack/lib/action_controller/metal/mime_responds.rb
+++ b/actionpack/lib/action_controller/metal/mime_responds.rb
@@ -1,3 +1,5 @@
+require 'abstract_controller/collector'
+
 module ActionController #:nodoc:
   module MimeResponds #:nodoc:
     extend ActiveSupport::Concern
@@ -265,6 +267,7 @@ module ActionController #:nodoc:
     end
 
     class Collector #:nodoc:
+      include AbstractController::Collector
       attr_accessor :order
 
       def initialize(&block)
@@ -289,32 +292,6 @@ module ActionController #:nodoc:
       def response_for(mime)
         @responses[mime] || @responses[Mime::ALL] || @default_response
       end
-
-      def self.generate_method_for_mime(mime)
-        sym = mime.is_a?(Symbol) ? mime : mime.to_sym
-        const = sym.to_s.upcase
-        class_eval <<-RUBY, __FILE__, __LINE__ + 1
-          def #{sym}(&block)                # def html(&block)
-            custom(Mime::#{const}, &block)  #   custom(Mime::HTML, &block)
-          end                               # end
-        RUBY
-      end
-
-      Mime::SET.each do |mime|
-        generate_method_for_mime(mime)
-      end
-
-      def method_missing(symbol, &block)
-        mime_constant = Mime.const_get(symbol.to_s.upcase)
-
-        if Mime::SET.include?(mime_constant)
-          self.class.generate_method_for_mime(mime_constant)
-          send(symbol, &block)
-        else
-          super
-        end
-      end
-
     end
   end
 end
diff --git a/actionpack/lib/action_controller/metal/rendering.rb b/actionpack/lib/action_controller/metal/rendering.rb
index 72e2bbd00e..8f03035b2b 100644
--- a/actionpack/lib/action_controller/metal/rendering.rb
+++ b/actionpack/lib/action_controller/metal/rendering.rb
@@ -13,6 +13,10 @@ module ActionController
     end
 
     def render(*args)
+      if response_body
+        raise ::AbstractController::DoubleRenderError
+      end
+
       args << {} unless args.last.is_a?(Hash)
       super(*args)
       self.content_type ||= args.last[:_template].mime_type.to_s
diff --git a/actionpack/lib/action_controller/railtie.rb b/actionpack/lib/action_controller/railtie.rb
index 7ea64c1923..9151de4462 100644
--- a/actionpack/lib/action_controller/railtie.rb
+++ b/actionpack/lib/action_controller/railtie.rb
@@ -3,41 +3,27 @@ require "rails"
 
 module ActionController
   class Railtie < Rails::Railtie
-    plugin_name :action_controller
+    railtie_name :action_controller
 
     require "action_controller/railties/subscriber"
     subscriber ActionController::Railties::Subscriber.new
 
-    initializer "action_controller.set_configs" do |app|
-      app.config.action_controller.each do |k,v|
-        ActionController::Base.send "#{k}=", v
-      end
-    end
-
-    # TODO: ActionController::Base.logger should delegate to its own config.logger
     initializer "action_controller.logger" do
       ActionController::Base.logger ||= Rails.logger
     end
 
-    # Routing must be initialized after plugins to allow the former to extend the routes
-    initializer "action_controller.initialize_routing" do |app|
-      app.route_configuration_files << app.config.routes_configuration_file
-      app.route_configuration_files << app.config.builtin_routes_configuration_file
+    initializer "action_controller.set_configs" do |app|
+      app.config.action_controller.each do |k,v|
+        ActionController::Base.send "#{k}=", v
+      end
     end
 
     initializer "action_controller.initialize_framework_caches" do
       ActionController::Base.cache_store ||= RAILS_CACHE
     end
 
-    # Sets +ActionController::Base#view_paths+ and +ActionMailer::Base#template_root+
-    # (but only for those frameworks that are to be loaded). If the framework's
-    # paths have already been set, it is not changed, otherwise it is
-    # set to use Configuration#view_path.
-    initializer "action_controller.initialize_framework_views" do |app|
-      # TODO: this should be combined with the logic for default config.action_controller.view_paths
-      view_path = ActionView::PathSet.type_cast(app.config.view_path, app.config.cache_classes)
-      ActionController::Base.view_paths = view_path if ActionController::Base.view_paths.blank?
+    initializer "action_controller.set_helpers_path" do |app|
+      ActionController::Base.helpers_path = app.config.paths.app.helpers.to_a
     end
-
   end
 end