hanami-webconsole 2.1.0.beta1 → 2.1.0.beta2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 10d922780a71a3529439f8cce8c0bd48bac8d27c5db5633fb3b7749d2fac7bc4
-  data.tar.gz: f1ef77acb63c493d9b6ffa3305066a3abc9c3b5eea6e3403d73a68013f558027
+  metadata.gz: bfd72232a858cb02085d8bc8e1e51db6ad511fc9a98b33f2af6216f1a0872369
+  data.tar.gz: 13b031ac4e6380391ce93c03e106c3f6f067547bdff7c6e6aa1a2e0579ac7c4e
 SHA512:
-  metadata.gz: ff3519fc3582a38da7c2c6f267caf5388c6f0e02ad6b1681e6089e021fc9b668b485aab8cf74eea05a09ab14ff09103e52b7a97a59f7ec51ca6e86fc9a3da59e
-  data.tar.gz: 8a23351a12fad599ddee2b64e6875191a89f30dc571607a54dfeb5baadf172bf63f3a086da72cb0e7fc812c0a0ee2f9a1edb9e33bfe92a58db1ce24a4d580a54
+  metadata.gz: 85e9b3eea0220d6e8bb2b64bf9ecbb963a85d4a0ff678fe114e4aa622ddaca4395768b54b037c1f791f080aec02e1c6c06f6220e1b156a96c8e246e7100a5e84
+  data.tar.gz: cf80acd3bdf343e9acdedafd95292c76a439fb3b44bee86195932601f4ebebd4c54460859ccdf08673742bf869adf02d5042323a73c1ec822db32981ca80768a

data/CHANGELOG.md

@@ -1,6 +1,12 @@
 # Hanami::Webconsole
 Hanami development web console.
 
+## v2.1.0.beta2 - 2023-10-04
+
+### Fixed
+
+- [Tim Riley] Set correct error codes for Hanami app exceptions
+
 ## v2.1.0.beta1 - 2023-06-29
 
 ### Added

data/lib/hanami/webconsole/middleware.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require "rack"
+
 module Hanami
   module Webconsole
     # @api private
@@ -7,21 +9,68 @@ module Hanami
     class Middleware
       # @api private
       # @since 2.1.0
-      def initialize(app)
+      CAPTURE_EXCEPTION_PROC_KEY = "hanami.webconsole.capture_exception_proc"
+      private_constant :CAPTURE_EXCEPTION_PROC_KEY
+
+      # @see Middleware#call
+      #
+      # @api private
+      # @since 2.1.0
+      module BetterErrorsExtension
+        # The BetterErrors middleware always returns a 500 status when rescuing an exception
+        # (outside of Rails). This is not not always appropriate, such as for a
+        # `Hanami::Router::NotFoundError`, which should be a 404.
+        #
+        # To account for this, gently patch `BetterErrors::Middleware#show_error_page` (which is
+        # called only when an exception has been rescued) to pass that rescued exception to a proc
+        # we inject into the rack env here in our own middleware. This allows our middleware to know
+        # the about exception class and provide the correct status code after BetterErrors is done
+        # with its job.
+        #
+        # @see Webconsole::Middleware#call
+        def show_error_page(env, exception = nil)
+          if (capture_proc = env[CAPTURE_EXCEPTION_PROC_KEY])
+            capture_proc.call(exception)
+          end
+
+          super
+        end
+      end
+      BetterErrors::Middleware.prepend(BetterErrorsExtension)
+
+      # @api private
+      # @since 2.1.0
+      def initialize(app, config)
         @better_errors = BetterErrors::Middleware.new(app)
+        @config = config
+
         configure_better_errors
       end
 
       # @api private
       # @since 2.1.0
-      def call(...)
-        @better_errors.call(...)
+      def call(env)
+        rescued_exception = nil
+        env[CAPTURE_EXCEPTION_PROC_KEY] = -> ex { rescued_exception = ex }
+
+        status, headers, body = @better_errors.call(env)
+
+        # Replace the BetterErrors status with a properly configured one for the Hanami app
+        if rescued_exception
+          status = Rack::Utils.status_code(
+            @config.render_error_responses[rescued_exception.class.name]
+          )
+        end
+
+        [status, headers, body]
       end
 
       private
 
+      # @api private
+      # @since 2.1.0
       def configure_better_errors
-        BetterErrors.application_root = Hanami.app.root.to_s
+        BetterErrors.application_root = @config.root.to_s
       end
     end
   end

data/lib/hanami/webconsole/version.rb

@@ -3,6 +3,6 @@
 module Hanami
   module Webconsole
     # @since 0.1.0
-    VERSION = "2.1.0.beta1"
+    VERSION = "2.1.0.beta2"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hanami-webconsole
 version: !ruby/object:Gem::Version
-  version: 2.1.0.beta1
+  version: 2.1.0.beta2
 platform: ruby
 authors:
 - Luca Guidi
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-06-29 00:00:00.000000000 Z
+date: 2023-10-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: better_errors