This commit merges most of the work done by Piotr Sarnacki in his Ruby Summer of Code project.

His work brings several capabilities from app to engines, as routes, middleware stack, asset handling and much more. Please check Rails::Engine documentation for more refenrences.

Merge remote branch 'drogus/engines'

1 files changed, 6 insertions, 3 deletions

diff --git a/actionpack/lib/action_controller/railtie.rb b/actionpack/lib/action_controller/railtie.rb
index cd2dfafbe6..0cb4041855 100644
--- a/actionpack/lib/action_controller/railtie.rb
+++ b/actionpack/lib/action_controller/railtie.rb
@@ -4,6 +4,8 @@ require "action_dispatch/railtie"
 require "action_view/railtie"
 require "active_support/deprecation/proxy_wrappers"
 require "active_support/deprecation"
+require "abstract_controller/railties/routes_helpers"
+require "action_controller/railties/paths"
 
 module ActionController
   class Railtie < Rails::Railtie
@@ -47,10 +49,11 @@ module ActionController
       options.javascripts_dir      ||= paths.public.javascripts.to_a.first
       options.stylesheets_dir      ||= paths.public.stylesheets.to_a.first
       options.page_cache_directory ||= paths.public.to_a.first
-      options.helpers_path         ||= paths.app.helpers.to_a
 
       ActiveSupport.on_load(:action_controller) do
-        include app.routes.url_helpers
+        include app.routes.mounted_helpers(:app)
+        extend ::AbstractController::Railties::RoutesHelpers.with(app.routes)
+        extend ::ActionController::Railties::Paths.with(app)
         options.each { |k,v| send("#{k}=", v) }
       end
     end
@@ -63,4 +66,4 @@ module ActionController
       ActionController::Routing::Routes = proxy
     end
   end
-end
\ No newline at end of file
+end