From 4131a2d804c54960ac70984e7453069fe8688365 Mon Sep 17 00:00:00 2001
From: Piotr Sarnacki <drogus@gmail.com>
Date: Mon, 2 Aug 2010 17:38:44 +0200
Subject: [PATCH] Move ActionController::Railties::RoutesHelpers and
 ActionMailer::Railties::RoutesHelper to
 AbstractController::Railties::RoutesHelpers

---
 actionmailer/lib/action_mailer/railtie.rb       |  4 ++--
 .../railties/routes_helpers.rb                  |  2 +-
 actionpack/lib/action_controller/railtie.rb     |  4 ++--
 .../railties/routes_helpers.rb                  | 17 -----------------
 4 files changed, 5 insertions(+), 22 deletions(-)
 rename {actionmailer/lib/action_mailer => actionpack/lib/abstract_controller}/railties/routes_helpers.rb (94%)
 delete mode 100644 actionpack/lib/action_controller/railties/routes_helpers.rb

diff --git a/actionmailer/lib/action_mailer/railtie.rb b/actionmailer/lib/action_mailer/railtie.rb
index ec0aa5f2e6..9468fd03e2 100644
--- a/actionmailer/lib/action_mailer/railtie.rb
+++ b/actionmailer/lib/action_mailer/railtie.rb
@@ -1,6 +1,6 @@
 require "action_mailer"
 require "rails"
-require "action_mailer/railties/routes_helpers"
+require "abstract_controller/railties/routes_helpers"
 
 module ActionMailer
   class Railtie < Rails::Railtie
@@ -19,7 +19,7 @@ module ActionMailer
       options.stylesheets_dir ||= paths.public.stylesheets.to_a.first
 
       ActiveSupport.on_load(:action_mailer) do
-        extend ::ActionMailer::Railties::RoutesHelpers.with(app.routes)
+        extend ::AbstractController::Railties::RoutesHelpers.with(app.routes)
         include app.routes.mounted_helpers(:app)
         options.each { |k,v| send("#{k}=", v) }
       end
diff --git a/actionmailer/lib/action_mailer/railties/routes_helpers.rb b/actionpack/lib/abstract_controller/railties/routes_helpers.rb
similarity index 94%
rename from actionmailer/lib/action_mailer/railties/routes_helpers.rb
rename to actionpack/lib/abstract_controller/railties/routes_helpers.rb
index b16d581fc6..dec1e9d6d9 100644
--- a/actionmailer/lib/action_mailer/railties/routes_helpers.rb
+++ b/actionpack/lib/abstract_controller/railties/routes_helpers.rb
@@ -1,4 +1,4 @@
-module ActionMailer
+module AbstractController
   module Railties
     module RoutesHelpers
       def self.with(routes)
diff --git a/actionpack/lib/action_controller/railtie.rb b/actionpack/lib/action_controller/railtie.rb
index 23622b19e8..4b5a897b90 100644
--- a/actionpack/lib/action_controller/railtie.rb
+++ b/actionpack/lib/action_controller/railtie.rb
@@ -4,7 +4,7 @@ require "action_dispatch/railtie"
 require "action_view/railtie"
 require "active_support/deprecation/proxy_wrappers"
 require "active_support/deprecation"
-require "action_controller/railties/routes_helpers"
+require "abstract_controller/railties/routes_helpers"
 
 module ActionController
   class Railtie < Rails::Railtie
@@ -51,7 +51,7 @@ module ActionController
       options.helpers_path         ||= paths.app.helpers.to_a
 
       ActiveSupport.on_load(:action_controller) do
-        extend ::ActionController::Railties::RoutesHelpers.with(app.routes)
+        extend ::AbstractController::Railties::RoutesHelpers.with(app.routes)
         include app.routes.mounted_helpers(:app)
         options.each { |k,v| send("#{k}=", v) }
       end
diff --git a/actionpack/lib/action_controller/railties/routes_helpers.rb b/actionpack/lib/action_controller/railties/routes_helpers.rb
deleted file mode 100644
index a23f703f0b..0000000000
--- a/actionpack/lib/action_controller/railties/routes_helpers.rb
+++ /dev/null
@@ -1,17 +0,0 @@
-module ActionController
-  module Railties
-    module RoutesHelpers
-      def self.with(routes)
-        Module.new do
-          define_method(:inherited) do |klass|
-            super(klass)
-            if namespace = klass.parents.detect {|m| m.respond_to?(:_railtie) }
-              routes = namespace._railtie.routes
-            end
-            klass.send(:include, routes.url_helpers)
-          end
-        end
-      end
-    end
-  end
-end