Archimidis · July 29, 2013 14:05 · Sep 24, 2012 · Apr 1, 2012 · Feb 6, 2012 · Jan 16, 2012
diff --git a/application_controller.rb b/application_controller.rb
@@ -2,27 +2,15 @@ class ApplicationController < ActionController::Base
   # ...
 
   unless Rails.application.config.consider_all_requests_local
-    rescue_from Exception, with: :render_500
-    rescue_from ActionController::RoutingError, with: :render_404
-    rescue_from ActionController::UnknownController, with: :render_404
-    rescue_from ActionController::UnknownAction, with: :render_404
-    rescue_from ActiveRecord::RecordNotFound, with: :render_404
+    rescue_from Exception, with: lambda { |exception| render_error 500, exception }
+    rescue_from ActionController::RoutingError, ActionController::UnknownController, ::AbstractController::ActionNotFound, ActiveRecord::RecordNotFound, with: lambda { |exception| render_error 404, exception }
   end
 
   private
-  def render_404(exception)
-    @not_found_path = exception.message
+  def render_error(status, exception)
     respond_to do |format|
-      format.html { render template: 'errors/error_404', layout: 'layouts/application', status: 404 }
-      format.all { render nothing: true, status: 404 }
-    end
-  end
-
-  def render_500(exception)
-    @error = exception
-    respond_to do |format|
-      format.html { render template: 'errors/error_500', layout: 'layouts/application', status: 500 }
-      format.all { render nothing: true, status: 500}
+      format.html { render template: "errors/error_#{status}", layout: 'layouts/application', status: status }
+      format.all { render nothing: true, status: status }
     end
   end
 

diff --git a/generate.sh b/generate.sh
@@ -1 +1 @@
-rails generate controller errors error_404 error_505
+rails generate controller errors error_404 error_500
diff --git a/application_controller.rb b/application_controller.rb
@@ -13,15 +13,15 @@ class ApplicationController < ActionController::Base
   def render_404(exception)
     @not_found_path = exception.message
     respond_to do |format|
-      format.html { render template: 'errors/error_404', status: 404 }
+      format.html { render template: 'errors/error_404', layout: 'layouts/application', status: 404 }
       format.all { render nothing: true, status: 404 }
     end
   end
 
   def render_500(exception)
     @error = exception
     respond_to do |format|
-      format.html { render template: 'errors/error_500', status: 500 }
+      format.html { render template: 'errors/error_500', layout: 'layouts/application', status: 500 }
       format.all { render nothing: true, status: 500}
     end
   end

diff --git a/application_controller.rb b/application_controller.rb
@@ -10,15 +10,15 @@ class ApplicationController < ActionController::Base
   end
 
   private
-  def render_404(error)
+  def render_404(exception)
     @not_found_path = exception.message
     respond_to do |format|
       format.html { render template: 'errors/error_404', status: 404 }
       format.all { render nothing: true, status: 404 }
     end
   end
 
-  def render_500(error)
+  def render_500(exception)
     @error = exception
     respond_to do |format|
       format.html { render template: 'errors/error_500', status: 500 }

diff --git a/application_controller.rb b/application_controller.rb
@@ -0,0 +1,30 @@
+class ApplicationController < ActionController::Base
+  # ...
+
+  unless Rails.application.config.consider_all_requests_local
+    rescue_from Exception, with: :render_500
+    rescue_from ActionController::RoutingError, with: :render_404
+    rescue_from ActionController::UnknownController, with: :render_404
+    rescue_from ActionController::UnknownAction, with: :render_404
+    rescue_from ActiveRecord::RecordNotFound, with: :render_404
+  end
+
+  private
+  def render_404(error)
+    @not_found_path = exception.message
+    respond_to do |format|
+      format.html { render template: 'errors/error_404', status: 404 }
+      format.all { render nothing: true, status: 404 }
+    end
+  end
+
+  def render_500(error)
+    @error = exception
+    respond_to do |format|
+      format.html { render template: 'errors/error_500', status: 500 }
+      format.all { render nothing: true, status: 500}
+    end
+  end
+
+  # ...
+end
diff --git a/error_404.html.haml b/error_404.html.haml
@@ -0,0 +1,11 @@
+%h2 404
+%div
+  %h3 We're sorry
+  %p
+    The content that you requested could not be found.
+  %p
+    You tried to access '#{@not_found_path}', which is not a valid page.
+  %p
+    Want to
+    %a{href: root_path} go back to our home page
+    and try again?
diff --git a/errors_controller.rb b/errors_controller.rb
@@ -0,0 +1,8 @@
+class ErrorsController < ApplicationController
+  def error_404
+    @not_found_path = params[:not_found]
+  end
+
+  def error_500
+  end
+end
diff --git a/generate.sh b/generate.sh
@@ -0,0 +1 @@
+rails generate controller errors error_404 error_505
diff --git a/remove_routes.rb b/remove_routes.rb
@@ -0,0 +1,2 @@
+  get "errors/error_404"
+  get "errors/error_500"
diff --git a/routes.rb b/routes.rb
@@ -0,0 +1,3 @@
+  unless Rails.application.config.consider_all_requests_local
+    match '*not_found', to: 'errors#error_404'
+  end
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		rails generate controller errors error_404 error_505
		rails generate controller errors error_404 error_500
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		rails generate controller errors error_404 error_505