diff options
Diffstat (limited to 'actionpack/lib/action_view')
| -rw-r--r-- | actionpack/lib/action_view/asset_paths.rb | 8 | ||||
| -rw-r--r-- | actionpack/lib/action_view/template/error.rb | 3 |
2 files changed, 8 insertions, 3 deletions
diff --git a/actionpack/lib/action_view/asset_paths.rb b/actionpack/lib/action_view/asset_paths.rb index 3ddd8bd552..a9216c4333 100644 --- a/actionpack/lib/action_view/asset_paths.rb +++ b/actionpack/lib/action_view/asset_paths.rb @@ -1,6 +1,6 @@ require 'zlib' require 'active_support/core_ext/file' -require 'active_support/core_ext/module/delegation' +require 'action_controller/metal/exceptions' module ActionView class AssetPaths #:nodoc: @@ -8,8 +8,6 @@ module ActionView attr_reader :config, :controller - delegate :invalid_asset_host!, :to => :controller, :prefix => false - def initialize(config, controller = nil) @config = config @controller = controller @@ -99,6 +97,10 @@ module ActionView @config.default_asset_host_protocol || (has_request? ? :request : :relative) end + def invalid_asset_host!(help_message) + raise ActionView::MissingRequestError, "This asset host cannot be computed without a request in scope. #{help_message}" + end + # Pick an asset host for this source. Returns +nil+ if no host is set, # the host if no wildcard is set, the host interpolated with the # numbers 0-3 if it contains <tt>%d</tt> (the number is the source hash mod 4), diff --git a/actionpack/lib/action_view/template/error.rb b/actionpack/lib/action_view/template/error.rb index f2bef4bded..e00056781d 100644 --- a/actionpack/lib/action_view/template/error.rb +++ b/actionpack/lib/action_view/template/error.rb @@ -8,6 +8,9 @@ module ActionView class EncodingError < StandardError #:nodoc: end + class MissingRequestError < StandardError #:nodoc: + end + class WrongEncodingError < EncodingError #:nodoc: def initialize(string, encoding) @string, @encoding = string, encoding |