diff options
Diffstat (limited to 'actionpack/lib/action_controller/metal/helpers.rb')
-rw-r--r-- | actionpack/lib/action_controller/metal/helpers.rb | 17 |
1 files changed, 2 insertions, 15 deletions
diff --git a/actionpack/lib/action_controller/metal/helpers.rb b/actionpack/lib/action_controller/metal/helpers.rb index 03ba4b3f83..05843a061b 100644 --- a/actionpack/lib/action_controller/metal/helpers.rb +++ b/actionpack/lib/action_controller/metal/helpers.rb @@ -56,18 +56,15 @@ module ActionController module ClassMethods def helpers_dir + ActiveSupport::Deprecation.warn "helpers_dir is deprecated, use helpers_path instead" self.helpers_path end def helpers_dir=(value) + ActiveSupport::Deprecation.warn "helpers_dir= is deprecated, use helpers_path= instead" self.helpers_path = Array(value) end - def inherited(klass) - klass.class_eval { default_helper_module! unless name.blank? } - super - 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: @@ -101,16 +98,6 @@ module ActionController 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 - # Extract helper names from files in app/helpers/**/*_helper.rb def all_application_helpers helpers = [] |