From 684c2dc20801b7fcc941ec9478d33d3bf7c74551 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Sun, 18 Oct 2009 20:20:14 -0200
Subject: Remove ActionMailer helpers and rely on AbstractController one.

---
 actionpack/lib/action_controller/metal/helpers.rb | 69 ++---------------------
 1 file changed, 4 insertions(+), 65 deletions(-)

(limited to 'actionpack/lib/action_controller/metal')

diff --git a/actionpack/lib/action_controller/metal/helpers.rb b/actionpack/lib/action_controller/metal/helpers.rb
index 117ea3481f..b4325e24ad 100644
--- a/actionpack/lib/action_controller/metal/helpers.rb
+++ b/actionpack/lib/action_controller/metal/helpers.rb
@@ -1,5 +1,3 @@
-require 'active_support/dependencies'
-
 module ActionController
   # The Rails framework provides a large number of helpers for working with +assets+, +dates+, +forms+,
   # +numbers+ and model objects, to name a few. These helpers are available to all templates
@@ -64,46 +62,6 @@ module ActionController
         super
       end
 
-      # The +helper+ class method can take a series of helper module names, a block, or both.
-      #
-      # ==== Parameters
-      # *args<Array[Module, Symbol, String, :all]>
-      # block<Block>:: 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)
-        super(*_modules_for_helpers(args), &block)
-      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:
@@ -123,15 +81,8 @@ module ActionController
       end
 
     private
-      # Returns a list of modules, normalized from the acceptable kinds of
-      # helpers with the following behavior:
-      # String or Symbol:: :FooBar or "FooBar" becomes "foo_bar_helper",
-      #   and "foo_bar_helper.rb" is loaded using require_dependency.
-      # :all:: Loads all modules in the #helpers_dir
-      # Module:: No further processing
-      #
-      # After loading the appropriate files, the corresponding modules
-      # are returned.
+      # 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
@@ -140,20 +91,8 @@ module ActionController
       # Array[Module]:: A normalized list of modules for the list of
       #   helpers provided.
       def _modules_for_helpers(args)
-        args.flatten.map! do |arg|
-          case arg
-          when :all
-            _modules_for_helpers all_application_helpers
-          when String, Symbol
-            file_name = "#{arg.to_s.underscore}_helper"
-            require_dependency(file_name, "Missing helper file helpers/%s.rb")
-            file_name.camelize.constantize
-          when Module
-            arg
-          else
-            raise ArgumentError, "helper must be a String, Symbol, or Module"
-          end
-        end
+        args += all_application_helpers if args.delete(:all)
+        super(args)
       end
 
       def default_helper_module!
-- 
cgit v1.2.3