hanami-rspec 2.3.0 → 2.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c35e14348417f5144f25a0adcad009e2565b4e6ae1389cf99369648f51df3c70
-  data.tar.gz: 9981e1c6f375aa99b554166e96a4ab499d38b8550d1200369f6ad6119f29514e
+  metadata.gz: 1a2185e39d0b525de7f16d338057a0e2f87b1b2537663c63f0d0f2f9ddc09741
+  data.tar.gz: 691c5b210355c983af3a879dca1cf69cfbb6197b6c7151a76d37d78b002748c4
 SHA512:
-  metadata.gz: 72c72cc355cc6a1116123a9f5639cb6e1004ee0563220bfa4bdb2597f2eb3fd4c8b4c2f33bddfeceacd9e4d1a2aaf18efa2f3146a3e8a6d245a52aba812fc2a5
-  data.tar.gz: c964883c6fbea6c167addd58df39e2fc5e3f46a6d24261f6227ee4074be1b4ffaa6a2cbd82344755fc0de211e357ea45eba9cb2a593f2d419ce817d759c773c7
+  metadata.gz: 79f9422d2a433e90b9b4cf0bc2a8e963c12869004aeac391425c1f23413d5b3c78f04683ba5bd44f10ec74a74c31a9ae99c7fee7f5c96c2e377efbe665b822eb
+  data.tar.gz: 146c5ee5983d235ddd02a8263d74c67c13acf8e1f58e491c9c068ee0383f6e56e3e7972de2ba47ada5db3b5bca2f1e8cce00e8d11c4dfbb04b43dfa12a6974ac

data/.github/workflows/ci.yml

@@ -14,6 +14,7 @@ jobs:
       fail-fast: false
       matrix:
         ruby:
+          - "4.0"
           - "3.4"
           - "3.3"
           - "3.2"

data/CHANGELOG.md

@@ -1,34 +1,69 @@
-# Hanami::RSpec
+# Changelog
 
-RSpec support for Hanami
+All notable changes to this project will be documented in this file.
 
-## v2.3.0 - 2025-11-12
+The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
+and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## v2.3.0.beta2 - 2025-10-17
+## [Unreleased]
+
+### Added
+
+### Changed
+
+### Deprecated
+
+### Removed
+
+### Fixed
+
+### Security
+
+[Unreleased]: https://github.com/hanami/rspec/compare/v2.3.0...HEAD
+
+## [2.3.1] - 2026-01-23
+
+### Fixed
+
+- Allow command callbacks to run with both Dry CLI 1.3 and 1.4 (1.4 corrects a longstanding bug regarding argument passing to command callbacks, which we had previously worked around here). (@timriley in #41)
+
+## [2.3.0] - 2025-11-12
+
+[2.3.0]: https://github.com/hanami/rspec/compare/v2.3.0.beta2...v2.3.0
+
+## [2.3.0.beta2] - 2025-10-17
 
 ### Changed
 
 - Drop support for Ruby 3.1
 
-## v2.3.0.beta1 - 2025-10-03
+[2.3.0.beta2]: https://github.com/hanami/rspec/compare/v2.3.0.beta1...v2.3.0.beta2
+
+## [2.3.0.beta1] - 2025-10-03
 
 ### Changed
 
 - [Aaron Allen] Change shared context name in generated `spec/support/requests.rb` to avoid a RuboCop RSpec offense (#40)
 
-## v2.2.1 - 2024-11-12
+[2.3.0.beta1]: https://github.com/hanami/rspec/compare/v2.2.1...v2.3.0.beta1
+
+## [2.2.1] - 2024-11-12
 
 ### Changed
 
 - [Tim Riley] Modify `Gemfile` via a `before "install"` hook on the `hanami` CLI. This ensures that testing-related gems are installed as part of running `hanami new` (#30)
 
-## v2.2.0 - 2024-11-05
+[2.2.1]: https://github.com/hanami/rspec/compare/v2.2.0...v2.2.1
+
+## [2.2.0] - 2024-11-05
 
 ### Changed
 
 - [Paweł Świątkowski, Seb Wilgosz] Only enhance `generate` CLI commands if the relevant gems are bundled (#29)
 
-## v2.2.0.rc1 - 2024-10-29
+[2.2.0]: https://github.com/hanami/rspec/compare/v2.2.0.rc1...v2.2.0
+
+## [2.2.0.rc1] - 2024-10-29
 
 ### Added
 
@@ -38,13 +73,9 @@ RSpec support for Hanami
 
 - [Seb Wilgosz] Only enhance `generate` CLI commands if the relevant gems are bundled (#26)
 
-## v2.2.0.beta1 - 2024-07-16
+[2.2.0.rc1]: https://github.com/hanami/rspec/compare/v2.2.0.beta1...v2.2.0.rc1
 
-### Changed
-
-- [Sean Collins] In generated `spec_helper.rb`, require all files under `spec/support/` in a loop, rather than via manual requires (#24)
-
-## v2.2.0.beta1 - 2024-07-16
+## [2.2.0.beta1] - 2024-07-16
 
 ### Added
 
@@ -53,23 +84,32 @@ RSpec support for Hanami
 ### Changed
 
 - Drop support for Ruby 3.0
+- [Sean Collins] In generated `spec_helper.rb`, require all files under `spec/support/` in a loop, rather than via manual requires (#24)
 
-## v2.1.0 - 2024-02-27
+[2.2.0.beta1]: https://github.com/hanami/rspec/compare/v2.1.0...v2.2.0.beta1
 
-## v2.1.0.rc3 - 2024-02-16
+## [2.1.0] - 2024-02-27
 
-## v2.1.0.rc2 - 2023-11-08
+[2.1.0]: https://github.com/hanami/rspec/compare/v2.1.0.rc3...v2.1.0
+
+## [2.1.0.rc3] - 2024-02-16
+
+[2.1.0.rc3]: https://github.com/hanami/rspec/compare/v2.1.0.rc2...v2.1.0.rc3
+
+## [2.1.0.rc2] - 2023-11-08
 
 ### Added
 
-- [Tim Riley] Skip generating tests for `hanami generate` when `--skip-tests` CLI option is given.
-- [Tim Riley] Install Capybara and generate `spec/support/capybara.rb` in `hanami install` hook.
+- [Tim Riley] Skip generating tests for `hanami generate` when `--skip-tests` CLI option is given
+- [Tim Riley] Install Capybara and generate `spec/support/capybara.rb` in `hanami install` hook
 
 ### Changed
 
-- [Tim Riley] Add explanatory code comments to `spec/support/rspec.rb` generated in `hanami install` hook.
+- [Tim Riley] Add explanatory code comments to `spec/support/rspec.rb` generated in `hanami install` hook
+
+[2.1.0.rc2]: https://github.com/hanami/rspec/compare/v2.1.0.rc1...v2.1.0.rc2
 
-## v2.1.0.rc1 - 2023-11-01
+## [2.1.0.rc1] - 2023-11-01
 
 ### Added
 
@@ -79,48 +119,66 @@ RSpec support for Hanami
 
 - [Luca Guidi] Default request spec to expect 404, now that `hanami new` doesn't generate a default root route anymore
 
-## v2.1.0.beta1 - 2023-06-29
+[2.1.0.rc1]: https://github.com/hanami/rspec/compare/v2.1.0.beta1...v2.1.0.rc1
 
-## v2.0.1 - 2022-12-25
+## [2.1.0.beta1] - 2023-06-29
+
+[2.1.0.beta1]: https://github.com/hanami/rspec/compare/v2.0.1...v2.1.0.beta1
+
+## [2.0.1] - 2022-12-25
 
 ### Added
 
 - [Luca Guidi] Official support for Ruby 3.2
 
-## v2.0.0 - 2022-11-22
+[2.0.1]: https://github.com/hanami/rspec/compare/v2.0.0...v2.0.1
+
+## [2.0.0] - 2022-11-22
 
 ### Added
 
 - [Tim Riley] Use Zeitwerk to autoload the gem
 - [Luca Guidi] Support RSpec 3.12
 
-## v2.0.0.rc1 - 2022-11-08
+[2.0.0]: https://github.com/hanami/rspec/compare/v2.0.0.rc1...v2.0.0
+
+## [2.0.0.rc1] - 2022-11-08
 
 ### Changed
 
 - [Luca Guidi] Follow `hanami` versioning
 
-## v3.11.0.beta4 - 2022-10-24
+[2.0.0.rc1]: https://github.com/hanami/rspec/compare/v3.11.0.beta4...v2.0.0.rc1
+
+## [3.11.0.beta4] - 2022-10-24
 
 ### Changed
 
 - [Luca Guidi] Generate slice specs under `spec/slices/[slice_name]/` (#9)
 
-## v3.11.0.beta3 - 2022-09-21
+[3.11.0.beta4]: https://github.com/hanami/rspec/compare/v3.11.0.beta3...v3.11.0.beta4
+
+## [3.11.0.beta3] - 2022-09-21
 
 ### Added
 
 - [Luca Guidi] Hook into `hanami new` and `hanami generate` to respect name pluralization
 - [Luca Guidi] Hook into `hanami generate action` to generate action specs
 
-## v3.11.0.beta2 - 2022-08-16
+[3.11.0.beta3]: https://github.com/hanami/rspec/compare/v3.11.0.beta2...v3.11.0.beta3
+
+## [3.11.0.beta2] - 2022-08-16
 
 ### Added
 
-- [Luca Guidi] Hook into `hanami generate slice` to generate a slice directory in spec/ along with a placeholder base action spec [#5]
+- [Luca Guidi] Hook into `hanami generate slice` to generate a slice directory in spec/ along with a placeholder base action spec (#5)
 
-## v3.11.0.beta1 - 2022-07-20
+[3.11.0.beta2]: https://github.com/hanami/rspec/compare/v3.11.0.beta1...v3.11.0.beta2
+
+## [3.11.0.beta1] - 2022-07-20
 
 ### Added
 
 - [Luca Guidi] Hook into `hanami install` to setup RSpec + Rack::Test
+
+[3.11.0.beta1]: https://github.com/hanami/rspec/releases/tag/v3.11.0.beta1

data/lib/hanami/rspec/commands.rb

@@ -114,9 +114,20 @@ module Hanami
         # @since 2.0.0
         # @api private
         class Slice < Hanami::CLI::Command
-          # FIXME: dry-cli kwargs aren't correctly forwarded in Ruby 3
-          def call(options, **)
-            slice = inflector.underscore(Shellwords.shellescape(options[:name]))
+          # @since 2.0.0
+          # @api private
+          def call(options = nil, name: nil, **)
+            # Support multiple calling conventions for dry-cli cross-version compatibility:
+            #
+            # - dry-cli 1.3 calls with positional hash: call({name: "foo"})
+            # - dry-cli 1.4+: calls with keyword arguments: call(name: "foo")
+            #
+            # TODO: Remove this with Hanami 2.4 (which will require dry-cli 1.4+).
+            if options.is_a?(Hash)
+              name = options[:name]
+            end
+
+            slice = inflector.underscore(Shellwords.shellescape(name))
 
             generator = Generators::Slice.new(fs: fs, inflector: inflector)
             generator.call(slice)
@@ -128,13 +139,23 @@ module Hanami
         class Action < Hanami::CLI::Commands::App::Command
           # @since 2.0.0
           # @api private
-          def call(options, **)
-            # FIXME: dry-cli kwargs aren't correctly forwarded in Ruby 3
-
-            return if options[:skip_tests]
-
-            slice = inflector.underscore(Shellwords.shellescape(options[:slice])) if options[:slice]
-            key = inflector.underscore(Shellwords.shellescape(options[:name]))
+          def call(options = nil, name: nil, slice: nil, skip_tests: false, **)
+            # Support multiple calling conventions for dry-cli cross-version compatibility:
+            #
+            # - dry-cli 1.3 calls with positional hash: call({name: "foo"})
+            # - dry-cli 1.4+: calls with keyword arguments: call(name: "foo")
+            #
+            # TODO: Remove this with Hanami 2.4 (which will require dry-cli 1.4+).
+            if options.is_a?(Hash)
+              name = options[:name]
+              slice = options[:slice]
+              skip_tests = options[:skip_tests] || false
+            end
+
+            return if skip_tests
+
+            slice = inflector.underscore(Shellwords.shellescape(slice)) if slice
+            key = inflector.underscore(Shellwords.shellescape(name))
 
             namespace = slice ? inflector.camelize(slice) : app.namespace
             base_path = slice ? "spec/slices/#{slice}" : "spec"
@@ -149,13 +170,23 @@ module Hanami
         class Part < Hanami::CLI::Commands::App::Command
           # @since 2.1.0
           # @api private
-          def call(options, **)
-            # FIXME: dry-cli kwargs aren't correctly forwarded in Ruby 3
-
-            return if options[:skip_tests]
-
-            slice = inflector.underscore(Shellwords.shellescape(options[:slice])) if options[:slice]
-            name = inflector.underscore(Shellwords.shellescape(options[:name]))
+          def call(options = nil, name: nil, slice: nil, skip_tests: false, **)
+            # Support multiple calling conventions for dry-cli cross-version compatibility:
+            #
+            # - dry-cli 1.3 calls with positional hash: call({name: "foo"})
+            # - dry-cli 1.4+: calls with keyword arguments: call(name: "foo")
+            #
+            # TODO: Remove this with Hanami 2.4 (which will require dry-cli 1.4+).
+            if options.is_a?(Hash)
+              name = options[:name]
+              slice = options[:slice]
+              skip_tests = options[:skip_tests] || false
+            end
+
+            return if skip_tests
+
+            slice = inflector.underscore(Shellwords.shellescape(slice)) if slice
+            name = inflector.underscore(Shellwords.shellescape(name))
 
             generator = Generators::Part.new(fs: fs, inflector: inflector)
             generator.call(app.namespace, slice, name)

data/lib/hanami/rspec/version.rb

@@ -6,6 +6,6 @@ module Hanami
     #
     # @since 2.0.0
     # @api public
-    VERSION = "2.3.0"
+    VERSION = "2.3.1"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hanami-rspec
 version: !ruby/object:Gem::Version
-  version: 2.3.0
+  version: 2.3.1
 platform: ruby
 authors:
 - Hanakai team