diff options
author | Santiago Pastorino <santiago@wyeworks.com> | 2015-04-21 16:45:43 -0400 |
---|---|---|
committer | Santiago Pastorino <santiago@wyeworks.com> | 2015-06-11 16:54:13 -0300 |
commit | e7b89f10813e16936f305b0cc5456c7e37e8ee9a (patch) | |
tree | 031b4f5f9fe954fcd71cebd541d30e280b53e3fe /actionpack/lib | |
parent | 38818c93a9959118a87bbdeda16e0766adc67598 (diff) | |
download | rails-e7b89f10813e16936f305b0cc5456c7e37e8ee9a.tar.gz rails-e7b89f10813e16936f305b0cc5456c7e37e8ee9a.tar.bz2 rails-e7b89f10813e16936f305b0cc5456c7e37e8ee9a.zip |
Remove Unneeded ApiPublicExceptions middleware, PublicExceptions already does the work
Diffstat (limited to 'actionpack/lib')
-rw-r--r-- | actionpack/lib/action_dispatch.rb | 1 | ||||
-rw-r--r-- | actionpack/lib/action_dispatch/middleware/api_public_exceptions.rb | 46 |
2 files changed, 0 insertions, 47 deletions
diff --git a/actionpack/lib/action_dispatch.rb b/actionpack/lib/action_dispatch.rb index 74ddf2954a..dcd3ee0644 100644 --- a/actionpack/lib/action_dispatch.rb +++ b/actionpack/lib/action_dispatch.rb @@ -53,7 +53,6 @@ module ActionDispatch autoload :ExceptionWrapper autoload :Flash autoload :ParamsParser - autoload :ApiPublicExceptions autoload :PublicExceptions autoload :Reloader autoload :RemoteIp diff --git a/actionpack/lib/action_dispatch/middleware/api_public_exceptions.rb b/actionpack/lib/action_dispatch/middleware/api_public_exceptions.rb deleted file mode 100644 index 00c7a9622a..0000000000 --- a/actionpack/lib/action_dispatch/middleware/api_public_exceptions.rb +++ /dev/null @@ -1,46 +0,0 @@ -module ActionDispatch - class ApiPublicExceptions - attr_accessor :public_path - - def initialize(public_path) - @public_path = public_path - end - - def call(env) - exception = env["action_dispatch.exception"] - status = env["PATH_INFO"][1..-1] - request = ActionDispatch::Request.new(env) - content_type = request.formats.first - body = { :status => status, :error => exception.message } - - render(status, content_type, body) - end - - private - def render(status, content_type, body) - format = content_type && "to_#{content_type.to_sym}" - if format && body.respond_to?(format) - render_format(status, content_type, body.public_send(format)) - else - render_html(status) - end - end - - def render_format(status, content_type, body) - [status, {'Content-Type' => "#{content_type}; charset=#{ActionDispatch::Response.default_charset}", - 'Content-Length' => body.bytesize.to_s}, [body]] - end - - def render_html(status) - found = false - path = "#{public_path}/#{status}.#{I18n.locale}.html" if I18n.locale - path = "#{public_path}/#{status}.html" unless path && (found = File.exist?(path)) - - if found || File.exist?(path) - render_format(status, 'text/html', File.read(path)) - else - [404, { "X-Cascade" => "pass" }, []] - end - end - end -end |