render layouts properly

kuboon · kuboon · commit 07a3950e43e0 · 2025-02-01T04:21:19.000Z
diff --git a/app/views/layouts/restful_error.html.erb b/app/views/layouts/restful_error.html.erb
@@ -0,0 +1,5 @@
+<html>
+  <body>
+    <%= yield %>
+  </body>
+</html>
diff --git a/app/views/restful_error/show.json.erb b/app/views/restful_error/show.json.erb
diff --git a/app/views/restful_error/show.json.ruby b/app/views/restful_error/show.json.ruby
@@ -0,0 +1,5 @@
+raw JSON.generate(
+  status_code: @status_code,
+  reason_phrase: @reason_phrase,
+  response_message: @response_message
+)
diff --git a/lib/restful_error/exceptions_app.rb b/lib/restful_error/exceptions_app.rb
@@ -5,8 +5,11 @@ module RestfulError
   class ExceptionsController < ::ActionController::Metal
     include AbstractController::Rendering
     include ActionView::Layouts
+    include ActionController::Rendering
 
+    def self.controller_path = "restful_error"
     append_view_path File.join(File.dirname(__FILE__), "../../app/views")
+    layout nil
 
     def show
       @exception = request.env["action_dispatch.exception"]
@@ -16,8 +19,7 @@ def show
       @reason_phrase = status.reason_phrase
       @response_message = @exception.try(:response_message) || RestfulError.localized_phrase(@exception.class.name, status) || nil
 
-      self.status = status.code
-      render "restful_error/show", formats: request.format.symbol
+      render status: status.code, formats: request.format.symbol
     end
   end
 
diff --git a/spec/with_rails/exceptions_app_spec.rb b/spec/with_rails/exceptions_app_spec.rb
@@ -9,7 +9,7 @@
   def app = RestfulError::ExceptionsApp
 
   shared_context "html" do
-    let(:request) { get "/#{status_code}" }
+    let(:request) { get "/#{status_code}", {}, 'HTTP_ACCEPT' => 'text/html' }
     let(:body) { request; last_response.body }
   end
   shared_context "json" do
@@ -22,16 +22,19 @@ def app = RestfulError::ExceptionsApp
   end
   describe RestfulError[404] do
     let(:status_code) { 404 }
-    include_context "html" do
+    context 'html' do
+      include_context "html"
       context 'default message' do
         let(:exception) { described_class.new }
         it do
-          expect(body).to include "Page not found"
+          expect(body).to include "<p>Page not found</p>"
+          expect(body).to include "</html>" # layout is rendered
           expect(last_response.status).to eq status_code
         end
       end
     end
-    include_context "json" do
+    context 'json' do
+      include_context "json"
       context 'default message' do
         let(:exception) { described_class.new }
         it do

-Original file line number
+Diff line change
@@ @@ -0,0 +1,5 @@ @@
 +<html>
 +  <body>
 +    <%= yield %>
 +  </body>
 +</html>