hanami-rspec 2.3.1 → 3.0.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1a2185e39d0b525de7f16d338057a0e2f87b1b2537663c63f0d0f2f9ddc09741
-  data.tar.gz: 691c5b210355c983af3a879dca1cf69cfbb6197b6c7151a76d37d78b002748c4
+  metadata.gz: 52da36692e852f309936a6de50d48b1e39aae141cd0a90dc8c2a1a2905f7024e
+  data.tar.gz: 203f42d283c278333080bf223b5f51fb8d7510ba37b3b4421e8ac4f81434faec
 SHA512:
-  metadata.gz: 79f9422d2a433e90b9b4cf0bc2a8e963c12869004aeac391425c1f23413d5b3c78f04683ba5bd44f10ec74a74c31a9ae99c7fee7f5c96c2e377efbe665b822eb
-  data.tar.gz: 146c5ee5983d235ddd02a8263d74c67c13acf8e1f58e491c9c068ee0383f6e56e3e7972de2ba47ada5db3b5bca2f1e8cce00e8d11c4dfbb04b43dfa12a6974ac
+  metadata.gz: ace50373169fd424ffc76c832d13d04ad6f43388e1e552e09b776ba59e1b2f221b06fefbff60f455678290640f209dc06166975f16538ffc246a28a43a66e60a
+  data.tar.gz: 9ee94f6821a888afda9d331f6aa896766314d8192787fc16eb1288987af16815eea758682caafbae53af12c3db3bf969609e02c6243ddf241a58f84b70340408

data/CHANGELOG.md

@@ -2,8 +2,8 @@
 
 All notable changes to this project will be documented in this file.
 
-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).
+The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
+and this project adheres to [Break Versioning](https://www.taoensso.com/break-versioning).
 
 ## [Unreleased]
 
@@ -19,13 +19,31 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Security
 
-[Unreleased]: https://github.com/hanami/rspec/compare/v2.3.0...HEAD
+[Unreleased]: https://github.com/hanami/rspec/compare/v3.0.0.rc1...HEAD
+
+## [v3.0.0.rc1] - 2026-06-16
+
+### Added
+
+- Activate Dry Monads' RSpec extension in `spec/support/operations.rb`. (@timriley)
+- Generate a starter spec when running `hanami generate operation`. (@timriley)
+- Generate a starter spec when running `hanami generate mailer`. (@timriley)
+
+### Changed
+
+- Use `prepend_before` for the generated DatabaseCleaner `:db` hook, so it runs before any other `before` hooks that might touch the database. This prevents factory calls in spec-level `before` blocks from running before the test transaction starts and leaking records across tests. (@timriley in #47)
+- Check for presence of hanami-action gem rather than hanami-controller (now retired). (@cllns in #44)
+- Require Ruby 3.3 or newer.
+
+[v3.0.0.rc1]: https://github.com/hanami/rspec/compare/v2.3.1...v3.0.0.rc1
 
 ## [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)
+- 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). (Tim Riley in #41)
+
+[2.3.1]: https://github.com/hanami/rspec/compare/v2.3.0...v2.3.1
 
 ## [2.3.0] - 2025-11-12
 
@@ -35,7 +53,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Changed
 
-- Drop support for Ruby 3.1
+- Drop support for Ruby 3.1.
 
 [2.3.0.beta2]: https://github.com/hanami/rspec/compare/v2.3.0.beta1...v2.3.0.beta2
 
@@ -43,7 +61,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Changed
 
-- [Aaron Allen] Change shared context name in generated `spec/support/requests.rb` to avoid a RuboCop RSpec offense (#40)
+- Change shared context name in generated `spec/support/requests.rb` to avoid a RuboCop RSpec offense. (Aaron Allen in #40)
 
 [2.3.0.beta1]: https://github.com/hanami/rspec/compare/v2.2.1...v2.3.0.beta1
 
@@ -51,7 +69,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### 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)
+- 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`. (Tim Riley in #30)
 
 [2.2.1]: https://github.com/hanami/rspec/compare/v2.2.0...v2.2.1
 
@@ -59,7 +77,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Changed
 
-- [Paweł Świątkowski, Seb Wilgosz] Only enhance `generate` CLI commands if the relevant gems are bundled (#29)
+- Only enhance `generate` CLI commands if the relevant gems are bundled. (Paweł Świątkowski, Seb Wilgosz in #29)
 
 [2.2.0]: https://github.com/hanami/rspec/compare/v2.2.0.rc1...v2.2.0
 
@@ -67,11 +85,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Added
 
-- [Tim Riley] As part of `hanami install`, add `database_cleaner-sequel` to the `Gemfile` and generate DatabaseCleaner configuration in `spec/support/db.rb` and `spec/support/db/cleaning.rb` (#28)
+- As part of `hanami install`, add `database_cleaner-sequel` to the `Gemfile` and generate DatabaseCleaner configuration in `spec/support/db.rb` and `spec/support/db/cleaning.rb`. (Tim Riley in #28)
 
 ### Changed
 
-- [Seb Wilgosz] Only enhance `generate` CLI commands if the relevant gems are bundled (#26)
+- Only enhance `generate` CLI commands if the relevant gems are bundled. (Seb Wilgosz in #26)
 
 [2.2.0.rc1]: https://github.com/hanami/rspec/compare/v2.2.0.beta1...v2.2.0.rc1
 
@@ -79,12 +97,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Added
 
-- [Sean Collins] Include `Dry::Monads[:result]` in tests via `support/operations.rb`
+- Include `Dry::Monads[:result]` in tests via `support/operations.rb`. (Sean Collins)
 
 ### 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)
+- In generated `spec_helper.rb`, require all files under `spec/support/` in a loop, rather than via manual requires. (Sean Collins in #24)
 
 [2.2.0.beta1]: https://github.com/hanami/rspec/compare/v2.1.0...v2.2.0.beta1
 
@@ -100,12 +118,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### 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
+- 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)
 
 ### Changed
 
-- [Tim Riley] Add explanatory code comments to `spec/support/rspec.rb` generated in `hanami install` hook
+- Add explanatory code comments to `spec/support/rspec.rb` generated in `hanami install` hook. (Tim Riley)
 
 [2.1.0.rc2]: https://github.com/hanami/rspec/compare/v2.1.0.rc1...v2.1.0.rc2
 
@@ -113,11 +131,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Added
 
-- [Luca Guidi] Generate spec for `hanami generate part` command
+- Generate spec for `hanami generate part` command. (Luca Guidi)
 
 ### Changed
 
-- [Luca Guidi] Default request spec to expect 404, now that `hanami new` doesn't generate a default root route anymore
+- Default request spec to expect 404, now that `hanami new` doesn't generate a default root route anymore. (Luca Guidi)
 
 [2.1.0.rc1]: https://github.com/hanami/rspec/compare/v2.1.0.beta1...v2.1.0.rc1
 
@@ -129,7 +147,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Added
 
-- [Luca Guidi] Official support for Ruby 3.2
+- Official support for Ruby 3.2. (Luca Guidi)
 
 [2.0.1]: https://github.com/hanami/rspec/compare/v2.0.0...v2.0.1
 
@@ -137,8 +155,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Added
 
-- [Tim Riley] Use Zeitwerk to autoload the gem
-- [Luca Guidi] Support RSpec 3.12
+- Use Zeitwerk to autoload the gem. (Tim Riley)
+- Support RSpec 3.12. (Luca Guidi)
 
 [2.0.0]: https://github.com/hanami/rspec/compare/v2.0.0.rc1...v2.0.0
 
@@ -146,7 +164,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Changed
 
-- [Luca Guidi] Follow `hanami` versioning
+- Follow `hanami` versioning. (Luca Guidi)
 
 [2.0.0.rc1]: https://github.com/hanami/rspec/compare/v3.11.0.beta4...v2.0.0.rc1
 
@@ -154,7 +172,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Changed
 
-- [Luca Guidi] Generate slice specs under `spec/slices/[slice_name]/` (#9)
+- Generate slice specs under `spec/slices/[slice_name]/`. (Luca Guidi in #9)
 
 [3.11.0.beta4]: https://github.com/hanami/rspec/compare/v3.11.0.beta3...v3.11.0.beta4
 
@@ -162,8 +180,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### 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
+- Hook into `hanami new` and `hanami generate` to respect name pluralization. (Luca Guidi)
+- Hook into `hanami generate action` to generate action specs. (Luca Guidi)
 
 [3.11.0.beta3]: https://github.com/hanami/rspec/compare/v3.11.0.beta2...v3.11.0.beta3
 
@@ -171,7 +189,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Added
 
-- [Luca Guidi] Hook into `hanami generate slice` to generate a slice directory in spec/ along with a placeholder base action spec (#5)
+- Hook into `hanami generate slice` to generate a slice directory in spec/ along with a placeholder base action spec. (Luca Guidi in #5)
 
 [3.11.0.beta2]: https://github.com/hanami/rspec/compare/v3.11.0.beta1...v3.11.0.beta2
 
@@ -179,6 +197,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Added
 
-- [Luca Guidi] Hook into `hanami install` to setup RSpec + Rack::Test
+- Hook into `hanami install` to setup RSpec + Rack::Test. (Luca Guidi)
 
 [3.11.0.beta1]: https://github.com/hanami/rspec/releases/tag/v3.11.0.beta1

data/LICENSE

@@ -0,0 +1,20 @@
+The MIT License (MIT)
+
+Copyright (c) 2015-2026 Hanakai team
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+the Software, and to permit persons to whom the Software is furnished to do so,
+subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README.md

@@ -1,18 +1,14 @@
-# Hanami::RSpec
+<!--- This file is synced from hanakai-rb/repo-sync -->
 
-RSpec and testing support for [Hanami applications](https://github.com/hanami/hanami).
+[actions]: https://github.com/hanami/hanami-rspec/actions
+[chat]: https://discord.gg/naQApPAsZB
+[forum]: https://discourse.hanamirb.org
+[rubygem]: https://rubygems.org/gems/hanami-rspec
 
-## Status
+# Hanami RSpec [![Gem Version](https://badge.fury.io/rb/hanami-rspec.svg)][rubygem] [![CI Status](https://github.com/hanami/hanami-rspec/workflows/CI/badge.svg)][actions]
 
-[![Gem Version](https://badge.fury.io/rb/hanami-rspec.svg)](https://badge.fury.io/rb/hanami-rspec)
-[![CI](https://github.com/hanami/rspec/actions/workflows/ci.yml/badge.svg?branch=main)](https://github.com/hanami/rspec/actions?query=workflow%3Aci+branch%3Amain)
-
-## Contact
-
-- Home page: http://hanamirb.org
-- Mailing List: http://hanamirb.org/mailing-list
-- Bugs/Issues: https://github.com/hanami/rspec/issues
-- Chat: http://chat.hanamirb.org
+[![Forum](https://img.shields.io/badge/Forum-dc360f?logo=discourse&logoColor=white)][forum]
+[![Chat](https://img.shields.io/badge/Chat-717cf8?logo=discord&logoColor=white)][chat]
 
 ## Installation
 
@@ -41,14 +37,13 @@ To install this gem onto your local machine, run `bundle exec rake install`. To
 
 Bug reports and pull requests are welcome on GitHub at https://github.com/hanami/rspec. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [code of conduct](https://github.com/hanami/rspec/blob/main/CODE_OF_CONDUCT.md).
 
-## License
+## Links
 
-The gem is available as open source under the terms of the [MIT License](https://opensource.org/licenses/MIT).
+- [User documentation](https://hanamirb.org)
+- [API documentation](http://rubydoc.info/gems/hanami-rspec)
 
-## Code of Conduct
 
-Everyone interacting in the `Hanami::RSpec` project's codebases, issue trackers, chat rooms and mailing lists is expected to follow the [code of conduct](https://github.com/hanami/rspec/blob/main/CODE_OF_CONDUCT.md).
+## License
 
-## Copyright
+See `LICENSE` file.
 
-Copyright © 2014–2024 Hanami Team – Released under MIT License

data/hanami-rspec.gemspec

@@ -1,39 +1,38 @@
 # frozen_string_literal: true
 
-require_relative "lib/hanami/rspec/version"
+# This file is synced from hanakai-rb/repo-sync. To update it, edit repo-sync.yml.
+
+lib = File.expand_path("lib", __dir__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require "hanami/rspec/version"
 
 Gem::Specification.new do |spec|
   spec.name          = "hanami-rspec"
-  spec.version       = Hanami::RSpec::VERSION
   spec.authors       = ["Hanakai team"]
   spec.email         = ["info@hanakai.org"]
-
-  spec.summary       = "Hanami RSpec"
-  spec.description   = "Hanami RSpec generators and Rake tasks"
-  spec.homepage      = "https://hanamirb.org"
   spec.license       = "MIT"
-  spec.required_ruby_version = ">= 3.2"
-
-  spec.metadata["allowed_push_host"] = "https://rubygems.org"
-
-  spec.metadata["homepage_uri"] = spec.homepage
-  spec.metadata["source_code_uri"] = "https://github.com/hanami/rspec"
-  spec.metadata["changelog_uri"] = "https://github.com/hanami/rspec/blob/master/CHANGELOG.md"
+  spec.version       = Hanami::RSpec::VERSION.dup
 
-  # Specify which files should be added to the gem when it is released.
-  # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
-  spec.files = Dir.chdir(File.expand_path(__dir__)) do
-    `git ls-files -z`.split("\x0").reject { |f| f.match(%r{\A(?:test|spec|features)/}) }
-  end
+  spec.summary       = "Hanami RSpec generators and CLI commands"
+  spec.description   = spec.summary
+  spec.homepage      = "https://hanamirb.org"
+  spec.files         = Dir["CHANGELOG.md", "LICENSE", "README.md", "hanami-rspec.gemspec", "lib/**/*"]
   spec.bindir        = "exe"
-  spec.executables   = spec.files.grep(%r{\Aexe/}) { |f| File.basename(f) }
+  spec.executables   = Dir["exe/*"].map { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "hanami-cli", "~> 2.3.0"
-  spec.add_dependency "rspec", "~> 3.12"
-  spec.add_dependency "rake", "~> 13.0"
-  spec.add_dependency "zeitwerk", "~> 2.6"
+  spec.extra_rdoc_files = ["README.md", "CHANGELOG.md", "LICENSE"]
+
+  spec.metadata["changelog_uri"]     = "https://github.com/hanami/hanami-rspec/blob/main/CHANGELOG.md"
+  spec.metadata["source_code_uri"]   = "https://github.com/hanami/hanami-rspec"
+  spec.metadata["bug_tracker_uri"]   = "https://github.com/hanami/hanami-rspec/issues"
+  spec.metadata["funding_uri"]       = "https://github.com/sponsors/hanami"
 
-  spec.add_development_dependency "rubocop", "~> 1.11"
-  spec.metadata["rubygems_mfa_required"] = "true"
+  spec.required_ruby_version = ">= 3.3"
+
+  spec.add_runtime_dependency "hanami-cli", "~> 3.0.0.rc"
+  spec.add_runtime_dependency "rspec", "~> 3.12"
+  spec.add_runtime_dependency "rake", "~> 13.0"
+  spec.add_runtime_dependency "zeitwerk", "~> 2.6"
 end
+

data/lib/hanami/rspec/commands.rb

@@ -4,14 +4,9 @@ require "shellwords"
 
 module Hanami
   module RSpec
-    # @since 2.0.0
     # @api private
     module Commands
-      # @since 2.0.0
-      # @api private
       class Install < Hanami::CLI::Command
-        # @since 2.0.0
-        # @api private
         def call(*, **)
           append_gemfile
           append_gitignore
@@ -47,7 +42,7 @@ module Hanami
         def copy_dotrspec
           fs.cp(
             fs.expand_path(fs.join("generators", "dotrspec"), __dir__),
-            fs.expand_path(fs.join(".rspec")),
+            fs.expand_path(fs.join(".rspec"))
           )
         end
 
@@ -108,25 +103,9 @@ module Hanami
         end
       end
 
-      # @since 2.0.0
-      # @api private
       module Generate
-        # @since 2.0.0
-        # @api private
         class Slice < Hanami::CLI::Command
-          # @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
-
+          def call(name: nil, **)
             slice = inflector.underscore(Shellwords.shellescape(name))
 
             generator = Generators::Slice.new(fs: fs, inflector: inflector)
@@ -134,24 +113,8 @@ module Hanami
           end
         end
 
-        # @since 2.0.0
-        # @api private
         class Action < Hanami::CLI::Commands::App::Command
-          # @since 2.0.0
-          # @api private
-          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
-
+          def call(name: nil, slice: nil, skip_tests: false, **)
             return if skip_tests
 
             slice = inflector.underscore(Shellwords.shellescape(slice)) if slice
@@ -165,24 +128,8 @@ module Hanami
           end
         end
 
-        # @since 2.1.0
-        # @api private
         class Part < Hanami::CLI::Commands::App::Command
-          # @since 2.1.0
-          # @api private
-          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
-
+          def call(name: nil, slice: nil, skip_tests: false, **)
             return if skip_tests
 
             slice = inflector.underscore(Shellwords.shellescape(slice)) if slice
@@ -192,6 +139,36 @@ module Hanami
             generator.call(app.namespace, slice, name)
           end
         end
+
+        class Operation < Hanami::CLI::Commands::App::Command
+          def call(name: nil, slice: nil, skip_tests: false, **)
+            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"
+
+            generator = Generators::Operation.new(fs:, inflector:)
+            generator.call(key:, namespace:, base_path:)
+          end
+        end
+
+        class Mailer < Hanami::CLI::Commands::App::Command
+          def call(name: nil, slice: nil, skip_tests: false, **)
+            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"
+
+            generator = Generators::Mailer.new(fs:, inflector:)
+            generator.call(key:, namespace:, base_path:)
+          end
+        end
       end
     end
   end

data/lib/hanami/rspec/generators/action.rb

@@ -36,7 +36,7 @@ module Hanami
             namespace: namespace,
             key: inflector.underscore(key),
             base_path: base_path,
-            extra_namespace: "Actions",
+            extra_namespace: "Actions"
           )
         end
 

data/lib/hanami/rspec/generators/mailer.rb

@@ -0,0 +1,60 @@
+# frozen_string_literal: true
+
+require "hanami/cli/generators/app/ruby_class_file"
+
+module Hanami
+  module RSpec
+    module Generators
+      # @api private
+      class Mailer
+        attr_reader :fs, :inflector
+
+        def initialize(fs:, inflector:)
+          @fs = fs
+          @inflector = inflector
+        end
+
+        def call(key:, namespace:, base_path:)
+          mailer_class_file = mailer_class_file(key:, namespace:, base_path:)
+          spec_file_path = mailer_class_file.path.gsub(/\.rb$/, "_spec.rb")
+          mailer_class_name = mailer_class_file.fully_qualified_name
+
+          fs.write(spec_file_path, spec_content(mailer_class_name))
+        end
+
+        private
+
+        def mailer_class_file(key:, namespace:, base_path:)
+          Hanami::CLI::Generators::App::RubyClassFile.new(
+            fs:, inflector:, namespace:,
+            key: inflector.underscore(key),
+            base_path: base_path,
+            extra_namespace: "Mailers"
+          )
+        end
+
+        def spec_content(class_name)
+          <<~RUBY
+            # frozen_string_literal: true
+
+            RSpec.describe #{class_name} do
+              subject(:mailer) { described_class.new }
+
+              # Inspect the delivered message to set expectations on its contents:
+              #
+              # expect(result.message.to).to eq(["recipient@example.com"])
+              # expect(result.message.subject).to eq("Welcome")
+              # expect(result.message.html_body).to include("...")
+
+              xit "delivers" do
+                result = mailer.deliver
+
+                expect(result).to be_success
+              end
+            end
+          RUBY
+        end
+      end
+    end
+  end
+end

data/lib/hanami/rspec/generators/operation.rb

@@ -0,0 +1,59 @@
+# frozen_string_literal: true
+
+require "hanami/cli/generators/app/ruby_class_file"
+
+module Hanami
+  module RSpec
+    module Generators
+      # @api private
+      class Operation
+        attr_reader :fs, :inflector
+
+        def initialize(fs:, inflector:)
+          @fs = fs
+          @inflector = inflector
+        end
+
+        def call(key:, namespace:, base_path:)
+          operation_class_file = operation_class_file(key:, namespace:, base_path:)
+          spec_file_path = operation_class_file.path.gsub(/\.rb$/, "_spec.rb")
+          operation_class_name = operation_class_file.fully_qualified_name
+
+          fs.write(spec_file_path, spec_content(operation_class_name))
+        end
+
+        private
+
+        def operation_class_file(key:, namespace:, base_path:)
+          Hanami::CLI::Generators::App::RubyClassFile.new(
+            fs:, inflector:, namespace:,
+            key: inflector.underscore(key),
+            base_path: base_path
+          )
+        end
+
+        def spec_content(class_name)
+          <<~RUBY
+            # frozen_string_literal: true
+
+            RSpec.describe #{class_name} do
+              subject(:operation) { described_class.new }
+
+              # Use `be_success` and `be_failure` (from spec/support/operations.rb) to set expectations on an
+              # operation's result:
+              #
+              # expect(result).to be_success(expected_value)
+              # expect(result).to be_failure(:some_error)
+
+              xit "succeeds" do
+                result = operation.call
+
+                expect(result).to be_success
+              end
+            end
+          RUBY
+        end
+      end
+    end
+  end
+end

data/lib/hanami/rspec/generators/support_db_cleaning.rb

@@ -25,7 +25,7 @@ RSpec.configure do |config|
     end
   end
 
-  config.before :each, :db do |example|
+  config.prepend_before :each, :db do |example|
     strategy = example.metadata[:js] ? :truncation : :transaction
 
     all_databases.call.each do |db|

data/lib/hanami/rspec/generators/support_operations.rb

@@ -2,7 +2,8 @@
 
 require "dry/monads"
 
-RSpec.configure do |config|
-  # Provide `Success` and `Failure` for testing operation results
-  config.include Dry::Monads[:result]
-end
+# Load Dry Monads' RSpec extension.
+#
+# This provides `be_success` and `be_failure` matchers for operation results, along with `Success`
+# and `Failure` constructors for use within your examples.
+Dry::Monads.load_extensions(:rspec)

data/lib/hanami/rspec/version.rb

@@ -4,8 +4,7 @@ module Hanami
   module RSpec
     # The current hanami-rspec version.
     #
-    # @since 2.0.0
     # @api public
-    VERSION = "2.3.1"
+    VERSION = "3.0.0.rc1"
   end
 end

data/lib/hanami/rspec.rb

@@ -35,13 +35,21 @@ module Hanami
       Hanami::CLI.before "install", Commands::Install
       Hanami::CLI.after "generate slice", Commands::Generate::Slice
 
-      if Hanami.bundled?("hanami-controller")
+      if Hanami.bundled?("dry-operation")
+        Hanami::CLI.after "generate operation", Commands::Generate::Operation
+      end
+
+      if Hanami.bundled?("hanami-action")
         Hanami::CLI.after "generate action", Commands::Generate::Action
       end
 
       if Hanami.bundled?("hanami-view")
         Hanami::CLI.after "generate part", Commands::Generate::Part
       end
+
+      if Hanami.bundled?("hanami-mailer")
+        Hanami::CLI.after "generate mailer", Commands::Generate::Mailer
+      end
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hanami-rspec
 version: !ruby/object:Gem::Version
-  version: 2.3.1
+  version: 3.0.0.rc1
 platform: ruby
 authors:
 - Hanakai team
@@ -15,14 +15,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.3.0
+        version: 3.0.0.rc
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.3.0
+        version: 3.0.0.rc
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -65,39 +65,19 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.6'
-- !ruby/object:Gem::Dependency
-  name: rubocop
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.11'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.11'
-description: Hanami RSpec generators and Rake tasks
+description: Hanami RSpec generators and CLI commands
 email:
 - info@hanakai.org
 executables: []
 extensions: []
-extra_rdoc_files: []
+extra_rdoc_files:
+- CHANGELOG.md
+- LICENSE
+- README.md
 files:
-- ".github/workflows/ci.yml"
-- ".gitignore"
-- ".rspec"
-- ".rubocop.yml"
 - CHANGELOG.md
-- CODE_OF_CONDUCT.md
-- Gemfile
-- LICENSE.md
+- LICENSE
 - README.md
-- Rakefile
-- bin/console
-- bin/setup
 - hanami-rspec.gemspec
 - lib/hanami-rspec.rb
 - lib/hanami/rspec.rb
@@ -108,6 +88,8 @@ files:
 - lib/hanami/rspec/generators/gemfile_db
 - lib/hanami/rspec/generators/gitignore
 - lib/hanami/rspec/generators/helper.rb
+- lib/hanami/rspec/generators/mailer.rb
+- lib/hanami/rspec/generators/operation.rb
 - lib/hanami/rspec/generators/part.rb
 - lib/hanami/rspec/generators/part/part_base_spec.erb
 - lib/hanami/rspec/generators/part/part_slice_base_spec.erb
@@ -131,11 +113,10 @@ homepage: https://hanamirb.org
 licenses:
 - MIT
 metadata:
-  allowed_push_host: https://rubygems.org
-  homepage_uri: https://hanamirb.org
-  source_code_uri: https://github.com/hanami/rspec
-  changelog_uri: https://github.com/hanami/rspec/blob/master/CHANGELOG.md
-  rubygems_mfa_required: 'true'
+  changelog_uri: https://github.com/hanami/hanami-rspec/blob/main/CHANGELOG.md
+  source_code_uri: https://github.com/hanami/hanami-rspec
+  bug_tracker_uri: https://github.com/hanami/hanami-rspec/issues
+  funding_uri: https://github.com/sponsors/hanami
 rdoc_options: []
 require_paths:
 - lib
@@ -143,7 +124,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '3.2'
+      version: '3.3'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -152,5 +133,5 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 rubygems_version: 3.6.9
 specification_version: 4
-summary: Hanami RSpec
+summary: Hanami RSpec generators and CLI commands
 test_files: []

data/.github/workflows/ci.yml

@@ -1,43 +0,0 @@
-name: ci
-
-on:
-  push:
-  pull_request:
-  create:
-  schedule:
-    - cron: "30 4 * * *"
-
-jobs:
-  tests:
-    runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
-      matrix:
-        ruby:
-          - "4.0"
-          - "3.4"
-          - "3.3"
-          - "3.2"
-    steps:
-      - uses: actions/checkout@v1
-      - name: Install package dependencies
-        run: "[ -e $APT_DEPS ] || sudo apt-get install -y --no-install-recommends $APT_DEPS"
-      - name: Set up Ruby
-        uses: ruby/setup-ruby@v1
-        with:
-          ruby-version: ${{matrix.ruby}}
-      - name: Install latest bundler
-        run: |
-          gem install bundler --no-document
-      - name: Bundle install
-        run: bundle install --jobs 4 --retry 3
-      - name: Run all tests
-        run: bundle exec rake
-
-  workflow-keepalive:
-    if: github.event_name == 'schedule'
-    runs-on: ubuntu-latest
-    permissions:
-      actions: write
-    steps:
-      - uses: liskin/gh-workflow-keepalive@v1

data/.gitignore

@@ -1,13 +0,0 @@
-/.bundle/
-/.yardoc
-/_yardoc/
-/coverage/
-/doc/
-/pkg/
-/spec/reports/
-/tmp/
-.rubocop-*
-Gemfile.lock
-
-# rspec failure tracking
-.rspec_status

data/.rspec

@@ -1 +0,0 @@
---require spec_helper

data/.rubocop.yml

@@ -1,28 +0,0 @@
-# Please keep AllCops, Bundler, Style, Metrics groups and then order cops
-# alphabetically
-inherit_from:
-  - https://raw.githubusercontent.com/hanami/devtools/main/.rubocop.yml
-Layout/LineLength:
-  Exclude:
-    - Gemfile
-Naming/MethodParameterName:
-  AllowedNames:
-    - fs
-Naming/HeredocDelimiterNaming:
-  Enabled: false
-Style/AccessorGrouping:
-  Enabled: false
-Style/BlockDelimiters:
-  Enabled: false
-Style/CommentedKeyword:
-  Enabled: false
-Style/HashSyntax:
-  EnforcedShorthandSyntax: either_consistent
-Style/LambdaCall:
-  Enabled: false
-Style/TrailingCommaInArguments:
-  Enabled: false
-Style/TrailingCommaInArrayLiteral:
-  Enabled: false
-Style/TrailingCommaInHashLiteral:
-  Enabled: false

data/CODE_OF_CONDUCT.md

@@ -1,84 +0,0 @@
-# Contributor Covenant Code of Conduct
-
-## Our Pledge
-
-We as members, contributors, and leaders pledge to make participation in our community a harassment-free experience for everyone, regardless of age, body size, visible or invisible disability, ethnicity, sex characteristics, gender identity and expression, level of experience, education, socio-economic status, nationality, personal appearance, race, religion, or sexual identity and orientation.
-
-We pledge to act and interact in ways that contribute to an open, welcoming, diverse, inclusive, and healthy community.
-
-## Our Standards
-
-Examples of behavior that contributes to a positive environment for our community include:
-
-* Demonstrating empathy and kindness toward other people
-* Being respectful of differing opinions, viewpoints, and experiences
-* Giving and gracefully accepting constructive feedback
-* Accepting responsibility and apologizing to those affected by our mistakes, and learning from the experience
-* Focusing on what is best not just for us as individuals, but for the overall community
-
-Examples of unacceptable behavior include:
-
-* The use of sexualized language or imagery, and sexual attention or
-  advances of any kind
-* Trolling, insulting or derogatory comments, and personal or political attacks
-* Public or private harassment
-* Publishing others' private information, such as a physical or email
-  address, without their explicit permission
-* Other conduct which could reasonably be considered inappropriate in a
-  professional setting
-
-## Enforcement Responsibilities
-
-Community leaders are responsible for clarifying and enforcing our standards of acceptable behavior and will take appropriate and fair corrective action in response to any behavior that they deem inappropriate, threatening, offensive, or harmful.
-
-Community leaders have the right and responsibility to remove, edit, or reject comments, commits, code, wiki edits, issues, and other contributions that are not aligned to this Code of Conduct, and will communicate reasons for moderation decisions when appropriate.
-
-## Scope
-
-This Code of Conduct applies within all community spaces, and also applies when an individual is officially representing the community in public spaces. Examples of representing our community include using an official e-mail address, posting via an official social media account, or acting as an appointed representative at an online or offline event.
-
-## Enforcement
-
-Instances of abusive, harassing, or otherwise unacceptable behavior may be reported to the community leaders responsible for enforcement at me@lucaguidi.com. All complaints will be reviewed and investigated promptly and fairly.
-
-All community leaders are obligated to respect the privacy and security of the reporter of any incident.
-
-## Enforcement Guidelines
-
-Community leaders will follow these Community Impact Guidelines in determining the consequences for any action they deem in violation of this Code of Conduct:
-
-### 1. Correction
-
-**Community Impact**: Use of inappropriate language or other behavior deemed unprofessional or unwelcome in the community.
-
-**Consequence**: A private, written warning from community leaders, providing clarity around the nature of the violation and an explanation of why the behavior was inappropriate. A public apology may be requested.
-
-### 2. Warning
-
-**Community Impact**: A violation through a single incident or series of actions.
-
-**Consequence**: A warning with consequences for continued behavior. No interaction with the people involved, including unsolicited interaction with those enforcing the Code of Conduct, for a specified period of time. This includes avoiding interactions in community spaces as well as external channels like social media. Violating these terms may lead to a temporary or permanent ban.
-
-### 3. Temporary Ban
-
-**Community Impact**: A serious violation of community standards, including sustained inappropriate behavior.
-
-**Consequence**: A temporary ban from any sort of interaction or public communication with the community for a specified period of time. No public or private interaction with the people involved, including unsolicited interaction with those enforcing the Code of Conduct, is allowed during this period. Violating these terms may lead to a permanent ban.
-
-### 4. Permanent Ban
-
-**Community Impact**: Demonstrating a pattern of violation of community standards, including sustained inappropriate behavior,  harassment of an individual, or aggression toward or disparagement of classes of individuals.
-
-**Consequence**: A permanent ban from any sort of public interaction within the community.
-
-## Attribution
-
-This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 2.0,
-available at https://www.contributor-covenant.org/version/2/0/code_of_conduct.html.
-
-Community Impact Guidelines were inspired by [Mozilla's code of conduct enforcement ladder](https://github.com/mozilla/diversity).
-
-[homepage]: https://www.contributor-covenant.org
-
-For answers to common questions about this code of conduct, see the FAQ at
-https://www.contributor-covenant.org/faq. Translations are available at https://www.contributor-covenant.org/translations.

data/Gemfile

@@ -1,13 +0,0 @@
-# frozen_string_literal: true
-
-source "https://rubygems.org"
-gemspec
-
-unless ENV["CI"]
-  gem "byebug", platforms: :mri
-  gem "yard"
-end
-
-gem "hanami-utils", github: "hanami/utils", branch: "main"
-gem "hanami-cli", github: "hanami/cli", branch: "main"
-gem "hanami", github: "hanami/hanami", branch: "main"

data/LICENSE.md

@@ -1,22 +0,0 @@
-Copyright © 2014 Hanami Team
-
-MIT License
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/Rakefile

@@ -1,12 +0,0 @@
-# frozen_string_literal: true
-
-require "bundler/gem_tasks"
-require "rspec/core/rake_task"
-
-RSpec::Core::RakeTask.new(:spec)
-
-require "rubocop/rake_task"
-
-RuboCop::RakeTask.new
-
-task default: %i[spec rubocop]

data/bin/console

@@ -1,15 +0,0 @@
-#!/usr/bin/env ruby
-# frozen_string_literal: true
-
-require "bundler/setup"
-require "hanami/rspec"
-
-# You can add fixtures and/or initialization code here to make experimenting
-# with your gem easier. You can also use a different console, if you like.
-
-# (If you use this, don't forget to add pry to your Gemfile!)
-# require "pry"
-# Pry.start
-
-require "irb"
-IRB.start(__FILE__)

data/bin/setup

@@ -1,8 +0,0 @@
-#!/usr/bin/env bash
-set -euo pipefail
-IFS=$'\n\t'
-set -vx
-
-bundle install
-
-# Do any other automated setup that you need to do here