Refactor ActionMailer to not use hide_actions

actionmailer/lib/action_mailer.rb

@@ -26,6 +26,7 @@
 
 require 'abstract_controller'
 require 'action_view'
+require 'action_dispatch'
 
 # Common Active Support usage in Action Mailer
 require 'active_support/core_ext/class'

actionmailer/lib/action_mailer/base.rb

@@ -5,7 +5,6 @@
 require 'active_support/core_ext/object/blank'
 require 'active_support/core_ext/proc'
 require 'action_mailer/log_subscriber'
-require 'action_mailer/hide_actions'
 
 module ActionMailer #:nodoc:
   # Action Mailer allows you to send email from your application using a mailer model and views.
@@ -341,13 +340,13 @@ class Base < AbstractController::Base
     include AbstractController::Helpers
     include AbstractController::Translation
     include AbstractController::AssetPaths
+    include AbstractController::UrlFor
 
     cattr_reader :protected_instance_variables
     @@protected_instance_variables = []
 
     helper  ActionMailer::MailHelper
     include ActionMailer::OldApi
-    include ActionMailer::HideActions
 
     delegate :register_observer, :to => Mail
     delegate :register_interceptor, :to => Mail
@@ -364,9 +363,8 @@ class Base < AbstractController::Base
 
     class << self
       def inherited(klass)
-        klass.with_hiding_actions do
-          super(klass)
-        end
+        super(klass)
+        klass.class_eval { @action_methods = nil }
       end
 
       def mailer_name
@@ -732,9 +730,6 @@ def insert_part(container, response, charset) #:nodoc:
       container.add_part(part)
     end
 
-    class_attribute :default_url_options
-    self.default_url_options = {}
-
     ActiveSupport.run_load_hooks(:action_mailer, self)
   end
 end

actionpack/lib/abstract_controller.rb

@@ -24,4 +24,5 @@ module AbstractController
   autoload :Translation
   autoload :AssetPaths
   autoload :ViewPaths
+  autoload :UrlFor
 end

actionpack/lib/abstract_controller/url_for.rb

@@ -0,0 +1,28 @@
+module AbstractController
+  module UrlFor
+    extend ActiveSupport::Concern
+
+    include ActionDispatch::Routing::UrlFor
+
+    def _routes
+      raise "In order to use #url_for, you must include routing helpers explicitly. " \
+            "For instance, `include Rails.application.routes.url_helpers"
+    end
+
+    module ClassMethods
+      def _routes
+        nil
+      end
+
+      def action_methods
+        @action_methods ||= begin
+          if _routes
+            super - _routes.named_routes.helper_names
+          else
+            super
+          end
+        end
+      end
+    end
+  end
+end

actionpack/lib/action_controller/metal/url_for.rb

@@ -2,7 +2,7 @@ module ActionController
   module UrlFor
     extend ActiveSupport::Concern
 
-    include ActionDispatch::Routing::UrlFor
+    include AbstractController::UrlFor
 
     def url_options
       options = {}
@@ -16,18 +16,5 @@ def url_options
         :_path_segments => request.symbolized_path_parameters
       )
     end
-
-    def _routes
-      raise "In order to use #url_for, you must include routing helpers explicitly. " \
-            "For instance, `include Rails.application.routes.url_helpers"
-    end
-
-    module ClassMethods
-      def action_methods
-        @action_methods ||= begin
-          super - _routes.named_routes.helper_names
-        end
-      end
-    end
   end
 end

actionpack/lib/action_dispatch/routing/route_set.rb

@@ -337,7 +337,12 @@ class << self
             # Yes plz - JP
             included do
               routes.install_helpers(self)
-              singleton_class.send(:define_method, :_routes) { @_routes || routes }
+              singleton_class.send(:define_method, :_routes) { routes }
+            end
+
+            def initialize(*)
+              @_routes = nil
+              super
             end
 
             define_method(:_routes) { @_routes || routes }