hanami-controller 2.3.0.beta2 → 2.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 194fc2615c1034ce507513f72e4f218a45fafe60ad53823e0b04e07cae0469f6
-  data.tar.gz: fff5370bd197844f24e83d88490a950fac8cb44c1683c489da94cbb8b5d92402
+  metadata.gz: 8fe7ba06a133967bb3119f5a4cacd11507d7e0b658dc446088bbb5fbe5f6e109
+  data.tar.gz: e86ac135385c01b1da0c9d5c87a461dbc743812ab2b1f0bc44ba347cc7685453
 SHA512:
-  metadata.gz: f61ceab1aba8a83b459e1c07698802f45fc27f5852454578a4cb135cf520bcf6c12a9a70ae90763dbdb0f1e0dde927da3eb67f071045344c44bb32bc86c8981a
-  data.tar.gz: f2d5905a9d93d09b4a328dbc27d564226293f89a54bb23155b5bd2ececfece6fe768a58d9e3473a228659e790c83018ee90b9f0b1ce1d783bba82679351abc1c
+  metadata.gz: 74acf00dfb30458595a50e87cb3544be5c181941ac4e94be1e89fc70b02132ec0b41947fb827ee9706a1a1d88f2206f8ce6d0c9eccf50c39ce0a22017f04940b
+  data.tar.gz: 283d12b473fac98a5538ef116ac9b7ccc3174d1abeff2c5054a45033a8219f7d0d9c857891221ec93a15b2b54bd4e781b498bcdefc0c7872f3ca2b717cbbe958

data/CHANGELOG.md

@@ -2,6 +2,65 @@
 
 Complete, fast and testable actions for Rack
 
+## [Unreleased]
+
+### Added
+
+### Changed
+
+### Deprecated
+
+### Removed
+
+### Fixed
+
+### Security
+
+[Unreleased]: https://github.com/hanami/hanami-controller/compare/v2.3.1...main
+
+## [2.3.1] - 2025-12-06
+
+### Fixed
+
+- Allow `handle_exception` to receive multiple class names as strings. (@sidane in #495)
+
+  ```ruby
+  class MyAction < Hanami::Action
+    config.handle_exception(
+      "MyException" => 500,
+      "MyOtherException" => 501
+    )
+  end
+  ```
+
+[2.3.1]: https://github.com/hanami/hanami-controller/compare/v2.3.0...v2.3.1
+
+## v2.3.0 - 2025-11-12
+
+### Added
+
+- Fetch CSRF tokens from `X-CSRF-Token` request header, in addition to body params. (@masterT in #422)
+
+### Changed
+
+- Allow `config.handle_exception` to receive an exception class name as a string. (@mathewdbutton in #488)
+
+  This allows you to handle exceptions in your actions without having to require the Ruby files that define the exception constants, which is often awkward if those exceptions come from far-removed layers of your app.
+
+  ```ruby
+  class MyAction < Hanami::Action
+    config.handle_exception "ROM::TupleCountMismatchError" => 404
+  end
+  ```
+- Allow both `:unprocessable_entity` and `:unprocessable_content` and  to be used to refer to the 422 HTTP status code (Rack v3 dropped the former and replaced it with the latter). (@alassek in #490)
+
+  ```ruby
+  def handle(request, response)
+    # Or :unprocessable_content, both work, on all Rack versions
+    response.status = :unprocessable_entity
+  end
+  ```
+
 ## v2.3.0.beta2 - 2025-10-17
 
 ### Added

data/README.md

@@ -5,9 +5,8 @@ Complete, fast, and testable actions for Rack and [Hanami](http://hanamirb.org)
 ## Status
 
 [![Gem Version](https://badge.fury.io/rb/hanami-controller.svg)](https://badge.fury.io/rb/hanami-controller)
-[![CI](https://github.com/hanami/controller/actions/workflows/ci.yml/badge.svg)](https://github.com/hanami/controller/actions?query=workflow%3Aci+branch%3Amain)
-[![Test Coverage](https://codecov.io/gh/hanami/controller/branch/main/graph/badge.svg)](https://codecov.io/gh/hanami/controller)
-[![Depfu](https://badges.depfu.com/badges/7cd17419fba78b726be1353118fb01de/overview.svg)](https://depfu.com/github/hanami/controller?project=Bundler)
+[![CI](https://github.com/hanami/hanami-controller/actions/workflows/ci.yml/badge.svg)](https://github.com/hanami/hanami-controller/actions?query=workflow%3Aci+branch%3Amain)
+[![Test Coverage](https://codecov.io/gh/hanami/hanami-controller/branch/main/graph/badge.svg)](https://codecov.io/gh/hanami/hanami-controller)
 
 ## Contact
 
@@ -21,8 +20,6 @@ Complete, fast, and testable actions for Rack and [Hanami](http://hanamirb.org)
 
 ## Installation
 
-__Hanami::Controller__ supports Ruby (MRI) 3.1+
-
 Add this line to your application's Gemfile:
 
 ```ruby

data/hanami-controller.gemspec

@@ -7,8 +7,8 @@ require "hanami/controller/version"
 Gem::Specification.new do |spec|
   spec.name          = "hanami-controller"
   spec.version       = Hanami::Controller::VERSION
-  spec.authors       = ["Luca Guidi"]
-  spec.email         = ["me@lucaguidi.com"]
+  spec.authors       = ["Hanakai team"]
+  spec.email         = ["info@hanakai.org"]
   spec.description   = "Complete, fast and testable actions for Rack"
   spec.summary       = "Complete, fast and testable actions for Rack and Hanami"
   spec.homepage      = "http://hanamirb.org"
@@ -21,12 +21,11 @@ Gem::Specification.new do |spec|
   spec.required_ruby_version = ">= 3.2"
 
   spec.add_dependency "rack", ">= 2.1"
-  spec.add_dependency "hanami-utils", "~> 2.3.0.beta1"
+  spec.add_dependency "hanami-utils", "~> 2.3.0"
   spec.add_dependency "dry-configurable", "~> 1.0", "< 2"
   spec.add_dependency "dry-core", "~> 1.0"
   spec.add_dependency "zeitwerk", "~> 2.6"
 
-  spec.add_development_dependency "bundler",   ">= 1.6", "< 3"
   spec.add_development_dependency "rack-test", "~> 2.0"
   spec.add_development_dependency "rake",      "~> 13"
   spec.add_development_dependency "rspec",     "~> 3.9"

data/lib/hanami/action/config.rb

@@ -54,7 +54,11 @@ module Hanami
       def handle_exception(exceptions)
         self.handled_exceptions = handled_exceptions
           .merge(exceptions)
-          .sort { |(ex1, _), (ex2, _)| ex1.ancestors.include?(ex2) ? -1 : 1 }
+          .sort do |(ex1, _), (ex2, _)|
+            next 0 if [ex1, ex2].any?(String)
+
+            ex1.ancestors.include?(ex2) ? -1 : 1
+          end
           .to_h
       end
 

data/lib/hanami/action/csrf_protection.rb

@@ -13,10 +13,11 @@ module Hanami
     # This security mechanism is enabled automatically if sessions are turned on.
     #
     # It stores a "challenge" token in session. For each "state changing request"
-    # (eg. <tt>POST</tt>, <tt>PATCH</tt> etc..), we should send a special param:
-    # <tt>_csrf_token</tt>.
+    # (eg. <tt>POST</tt>, <tt>PATCH</tt> etc..), we should send a special param
+    # <tt>_csrf_token</tt> or header <tt>X-CSRF-Token</tt> which contain the "challenge"
+    # token.
     #
-    # If the param matches with the challenge token, the flow can continue.
+    # If the request token matches with the challenge token, the flow can continue.
     # Otherwise the application detects an attack attempt, it reset the session
     # and <tt>Hanami::Action::InvalidCSRFTokenError</tt> is raised.
     #
@@ -107,6 +108,16 @@ module Hanami
         res.session[CSRF_TOKEN] ||= generate_csrf_token
       end
 
+      # Get CSRF Token in request.
+      #
+      # Retreives the CSRF token from the request param <tt>_csrf_token</tt> or the request header
+      # <tt>X-CSRF-Token</tt>.
+      #
+      # @api private
+      def request_csrf_token(req)
+        req.params.raw[CSRF_TOKEN.to_s] || req.get_header("HTTP_X_CSRF_TOKEN")
+      end
+
       # Verify if CSRF token from params, matches the one stored in session.
       # If not, it raises an error.
       #
@@ -131,14 +142,14 @@ module Hanami
         return false unless verify_csrf_token?(req, res)
 
         missing_csrf_token?(req, res) ||
-          !::Rack::Utils.secure_compare(req.session[CSRF_TOKEN], req.params.raw[CSRF_TOKEN.to_s])
+          !::Rack::Utils.secure_compare(req.session[CSRF_TOKEN], request_csrf_token(req))
       end
 
       # Verify the CSRF token was passed in params.
       #
       # @api private
       def missing_csrf_token?(req, *)
-        Hanami::Utils::Blank.blank?(req.params.raw[CSRF_TOKEN.to_s])
+        Hanami::Utils::Blank.blank?(request_csrf_token(req))
       end
 
       # Generates a random CSRF Token

data/lib/hanami/action.rb

@@ -373,13 +373,15 @@ module Hanami
     # Otherwise, it sets the response body with the default message associated
     # to the code (eg 404 will set `"Not Found"`).
     #
-    # @param status [Fixnum] a valid HTTP status code
+    # @param status [Integer, Symbol] A valid HTTP status code or a symbol representing the HTTP status code
     # @param body [String] the response body
     #
     # @raise [StandardError] if the code isn't valid
     #
     # @since 0.2.0
     #
+    # @see https://hanakai.org/learn/hanami/actions/status-codes List of status codes and symbols
+    #
     # @see Hanami::Action::Throwable#handle_exception
     # @see Hanami::Http::Status:ALL
     #
@@ -433,7 +435,12 @@ module Hanami
     # @api private
     def exception_handler(exception)
       config.handled_exceptions.each do |exception_class, handler|
-        return handler if exception.is_a?(exception_class)
+        case exception_class
+        when String
+          return handler if exception.class.name == exception_class # rubocop:disable Style/ClassEqualityComparison
+        else
+          return handler if exception.is_a?(exception_class)
+        end
       end
 
       nil

data/lib/hanami/controller/version.rb

@@ -8,6 +8,6 @@ module Hanami
     #
     # @since 0.1.0
     # @api public
-    VERSION = "2.3.0.beta2"
+    VERSION = "2.3.1"
   end
 end

data/lib/hanami/http/status.rb

@@ -21,7 +21,10 @@ module Hanami
       #
       # @since 2.0.2
       # @api private
-      SYMBOLS = ::Rack::Utils::SYMBOL_TO_STATUS_CODE
+      SYMBOLS = ::Rack::Utils::SYMBOL_TO_STATUS_CODE.merge(
+        unprocessable_content: 422,
+        unprocessable_entity: 422
+      )
 
       # Return a status for the given code
       #

metadata

@@ -1,10 +1,10 @@
 --- !ruby/object:Gem::Specification
 name: hanami-controller
 version: !ruby/object:Gem::Version
-  version: 2.3.0.beta2
+  version: 2.3.1
 platform: ruby
 authors:
-- Luca Guidi
+- Hanakai team
 bindir: bin
 cert_chain: []
 date: 1980-01-02 00:00:00.000000000 Z
@@ -29,14 +29,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.3.0.beta1
+        version: 2.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.3.0.beta1
+        version: 2.3.0
 - !ruby/object:Gem::Dependency
   name: dry-configurable
   requirement: !ruby/object:Gem::Requirement
@@ -85,26 +85,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.6'
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '1.6'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '3'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '1.6'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '3'
 - !ruby/object:Gem::Dependency
   name: rack-test
   requirement: !ruby/object:Gem::Requirement
@@ -163,7 +143,7 @@ dependencies:
         version: '1.0'
 description: Complete, fast and testable actions for Rack
 email:
-- me@lucaguidi.com
+- info@hanakai.org
 executables: []
 extensions: []
 extra_rdoc_files: []