diff options
author | Andrew White <andrew.white@unboxed.co> | 2016-11-02 16:00:37 +0000 |
---|---|---|
committer | Andrew White <andrew.white@unboxed.co> | 2016-11-02 16:15:00 +0000 |
commit | 1f62443319c1b95c6e747a5de5e7e1041c64cbcb (patch) | |
tree | 9a0157258850bf3a98163a84dfd7322c3a0f92e8 /actionpack/lib/abstract_controller | |
parent | 6341c1c698e69fdaba4fd212d16ab3e8979e9c6e (diff) | |
download | rails-1f62443319c1b95c6e747a5de5e7e1041c64cbcb.tar.gz rails-1f62443319c1b95c6e747a5de5e7e1041c64cbcb.tar.bz2 rails-1f62443319c1b95c6e747a5de5e7e1041c64cbcb.zip |
Fix inconsistencies in path with missing helpers
Ruby 2.0 and later demonstrate some inconsistencies when a helper file
is not found with the path method on LoadError. By creating a subclass
of LoadError we can cater for the inconsistencies.
Diffstat (limited to 'actionpack/lib/abstract_controller')
-rw-r--r-- | actionpack/lib/abstract_controller/helpers.rb | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/actionpack/lib/abstract_controller/helpers.rb b/actionpack/lib/abstract_controller/helpers.rb index 77cc4c07d9..7a9055a679 100644 --- a/actionpack/lib/abstract_controller/helpers.rb +++ b/actionpack/lib/abstract_controller/helpers.rb @@ -12,6 +12,15 @@ module AbstractController self._helper_methods = Array.new end + class MissingHelperError < LoadError + def initialize(error, path) + @error = error + @path = "helpers/#{path}.rb" + set_backtrace error.backtrace + super("Missing helper file helpers/%s.rb" % path) + end + end + module ClassMethods # When a class is inherited, wrap its helper module in a new module. # This ensures that the parent class's module can be changed @@ -132,7 +141,11 @@ module AbstractController case arg when String, Symbol file_name = "#{arg.to_s.underscore}_helper" - require_dependency(file_name, "Missing helper file helpers/%s.rb") + begin + require_dependency(file_name) + rescue LoadError => e + raise MissingHelperError.new(e, file_name) + end file_name.camelize.constantize when Module arg |