hanami-rspec 2.2.1 → 2.3.0.beta2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 545929e2a6c13aa7f5052858fe8fba43163558c730c512ba3a7ff9764f8ad6f8
-  data.tar.gz: 26be07463cb1646c6111d32dbcd208ce44e1cc7cb319787fdb92ad9f914d4380
+  metadata.gz: 0af8c0843959599de80bce86e2ab4f2352f331ba3e0c26cb809885d1578b13fb
+  data.tar.gz: 537e0134e03a4728452948791eb6c71e24db5354d5c28061ce31d2365e2ce479
 SHA512:
-  metadata.gz: 84de26024f511da7b7a741852f657f7f5c27f17faa3948d499a605abf6a18f57b7f0047aeeee2beeebba58796120f4dc6e972f12b355bef620bad9952966bf40
-  data.tar.gz: b9484baf4dbd6a3cf9bed838de729f3aa033d60a488661f738f7dcb1f662c995bbe490a9dd20e5b3245f0b73af77c78b8e9464c40aaab99508498da874afd835
+  metadata.gz: 3cad888bebd03004f2b1d3b6f792e346072f7c53584d7369c9dcaff91fbba5b7092459590285caa16f52838a3e300ed7ffc11daf6dc596d750b93f3a181437bb
+  data.tar.gz: d1987acefecac5d67439d5ebf91e1f80a955a683382129d40ded017eec29a498b9a817c49fb29c5bceba13c76c2fdf8a3e978327d34cac4664759fb92d9e8b92

data/.github/workflows/ci.yml

@@ -14,9 +14,9 @@ jobs:
       fail-fast: false
       matrix:
         ruby:
+          - "3.4"
           - "3.3"
           - "3.2"
-          - "3.1"
     steps:
       - uses: actions/checkout@v1
       - name: Install package dependencies

data/.rubocop.yml

@@ -16,6 +16,8 @@ Style/BlockDelimiters:
   Enabled: false
 Style/CommentedKeyword:
   Enabled: false
+Style/HashSyntax:
+  EnforcedShorthandSyntax: either_consistent
 Style/LambdaCall:
   Enabled: false
 Style/TrailingCommaInArguments:

data/CHANGELOG.md

@@ -2,6 +2,18 @@
 
 RSpec support for Hanami
 
+## v2.3.0.beta2 - 2025-10-17
+
+### Changed
+
+- Drop support for Ruby 3.1
+
+## v2.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
 
 ### Changed

data/Gemfile

@@ -8,10 +8,6 @@ unless ENV["CI"]
   gem "yard"
 end
 
-gem "dry-files", github: "dry-rb/dry-files", branch: "main"
-gem "dry-logger", github: "dry-rb/dry-logger", branch: "main"
-gem "dry-system", github: "dry-rb/dry-system", branch: "main"
-
 gem "hanami-utils", github: "hanami/utils", branch: "main"
 gem "hanami-cli", github: "hanami/cli", branch: "main"
 gem "hanami", github: "hanami/hanami", branch: "main"

data/hanami-rspec.gemspec

@@ -12,7 +12,7 @@ Gem::Specification.new do |spec|
   spec.description   = "Hanami RSpec generators and Rake tasks"
   spec.homepage      = "https://hanamirb.org"
   spec.license       = "MIT"
-  spec.required_ruby_version = ">= 3.1"
+  spec.required_ruby_version = ">= 3.2"
 
   spec.metadata["allowed_push_host"] = "https://rubygems.org"
 
@@ -29,7 +29,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{\Aexe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "hanami-cli", "~> 2.2"
+  spec.add_dependency "hanami-cli", "~> 2.3.0.beta2"
   spec.add_dependency "rspec", "~> 3.12"
   spec.add_dependency "rake", "~> 13.0"
   spec.add_dependency "zeitwerk", "~> 2.6"

data/lib/hanami/rspec/commands.rb

@@ -134,11 +134,13 @@ module Hanami
             return if options[:skip_tests]
 
             slice = inflector.underscore(Shellwords.shellescape(options[:slice])) if options[:slice]
-            name = inflector.underscore(Shellwords.shellescape(options[:name]))
-            *controller, action = name.split(ACTION_SEPARATOR)
+            key = inflector.underscore(Shellwords.shellescape(options[:name]))
+
+            namespace = slice ? inflector.camelize(slice) : app.namespace
+            base_path = slice ? "spec/slices/#{slice}" : "spec"
 
-            generator = Generators::Action.new(fs: fs, inflector: inflector)
-            generator.call(app.namespace, slice, controller, action)
+            generator = Generators::Action.new(fs:, inflector:)
+            generator.call(key:, namespace:, base_path:)
           end
         end
 

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

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require "erb"
+require "hanami/cli/generators/app/ruby_class_file"
 
 module Hanami
   module RSpec
@@ -17,41 +17,43 @@ module Hanami
 
         # @since 2.0.0
         # @api private
-        def call(app, slice, controller, action, context: Hanami::CLI::Generators::App::ActionContext.new(inflector, app, slice, controller, action)) # rubocop:disable Layout/LineLength
-          if slice
-            fs.write(
-              "spec/slices/#{slice}/actions/#{controller_directory(controller)}/#{action}_spec.rb",
-              t("action_slice_spec.erb", context)
-            )
-          else
-            fs.write(
-              "spec/actions/#{controller_directory(controller)}/#{action}_spec.rb",
-              t("action_spec.erb", context)
-            )
-          end
+        def call(key:, namespace:, base_path:)
+          ruby_class_file = action_ruby_class_file(key: key, namespace: namespace, base_path: base_path)
+          spec_file_path = ruby_class_file.path.gsub(/\.rb$/, "_spec.rb")
+          action_class_name = ruby_class_file.fully_qualified_name
+
+          fs.write(spec_file_path, spec_content(action_class_name))
         end
 
         private
 
-        attr_reader :fs
-
-        attr_reader :inflector
-
-        # @api private
-        # @param controller [Array<String>]
-        def controller_directory(controller)
-          fs.join(controller)
+        attr_reader :fs, :inflector
+
+        def action_ruby_class_file(key:, namespace:, base_path:)
+          Hanami::CLI::Generators::App::RubyClassFile.new(
+            fs: fs,
+            inflector: inflector,
+            namespace: namespace,
+            key: inflector.underscore(key),
+            base_path: base_path,
+            extra_namespace: "Actions",
+          )
         end
 
-        def template(path, context)
-          require "erb"
+        def spec_content(class_name)
+          <<~RUBY
+            # frozen_string_literal: true
 
-          ERB.new(
-            File.read(__dir__ + "/action/#{path}")
-          ).result(context.ctx)
-        end
+            RSpec.describe #{class_name} do
+              let(:params) { Hash[] }
 
-        alias_method :t, :template
+              it "works" do
+                response = subject.call(params)
+                expect(response).to be_successful
+              end
+            end
+          RUBY
+        end
       end
     end
   end

data/lib/hanami/rspec/generators/part/part_base_spec.erb

@@ -1,11 +1,7 @@
 # frozen_string_literal: true
 
 RSpec.describe <%= camelized_app_name %>::Views::Part do
-<%- if ruby_omit_hash_values? -%>
   subject { described_class.new(value:) }
-<%- else -%>
-  subject { described_class.new(value: value) }
-<%- end -%>
   let(:value) { double("value") }
 
   it "works" do

data/lib/hanami/rspec/generators/part/part_slice_base_spec.erb

@@ -1,11 +1,7 @@
 # frozen_string_literal: true
 
 RSpec.describe <%= camelized_slice_name %>::Views::Part do
-<%- if ruby_omit_hash_values? -%>
   subject { described_class.new(value:) }
-<%- else -%>
-  subject { described_class.new(value: value) }
-<%- end -%>
   let(:value) { double("value") }
 
   it "works" do

data/lib/hanami/rspec/generators/part/part_slice_spec.erb

@@ -1,11 +1,7 @@
 # frozen_string_literal: true
 
 RSpec.describe <%= camelized_slice_name %>::Views::Parts::<%= camelized_name %> do
-<%- if ruby_omit_hash_values? -%>
   subject { described_class.new(value:) }
-<%- else -%>
-  subject { described_class.new(value: value) }
-<%- end -%>
   let(:value) { double("<%= underscored_name %>") }
 
   it "works" do

data/lib/hanami/rspec/generators/part/part_spec.erb

@@ -1,11 +1,7 @@
 # frozen_string_literal: true
 
 RSpec.describe <%= camelized_app_name %>::Views::Parts::<%= camelized_name %> do
-<%- if ruby_omit_hash_values? -%>
   subject { described_class.new(value:) }
-<%- else -%>
-  subject { described_class.new(value: value) }
-<%- end -%>
   let(:value) { double("<%= underscored_name %>") }
 
   it "works" do

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

@@ -17,7 +17,19 @@ module Hanami
 
         # @since 2.1.0
         # @api private
-        def call(app, slice, name, context: Hanami::CLI::Generators::App::PartContext.new(inflector, app, slice, name))
+        def call(app, slice, name)
+          context = Struct.new(
+            :camelized_app_name,
+            :camelized_slice_name,
+            :camelized_name,
+            :underscored_name
+          ).new(
+            inflector.camelize(app),
+            slice ? inflector.camelize(slice) : nil,
+            inflector.camelize(name),
+            inflector.underscore(name)
+          )
+
           if slice
             generate_for_slice(slice, context)
           else
@@ -90,7 +102,7 @@ module Hanami
           ERB.new(
             File.read(__dir__ + "/part/#{path}"),
             trim_mode: "-"
-          ).result(context.ctx)
+          ).result(context.instance_eval { binding })
         end
 
         # @since 2.1.0

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

@@ -17,7 +17,12 @@ module Hanami
 
         # @since 2.0.0
         # @api private
-        def call(slice, context: Hanami::CLI::Generators::App::SliceContext.new(inflector, nil, slice, nil))
+        def call(slice)
+          context = Struct.new(:slice, :camelized_slice_name).new(
+            slice,
+            inflector.camelize(slice)
+          )
+
           fs.write("spec/slices/#{slice}/action_spec.rb", t("action_spec.erb", context))
           # fs.write("spec/slices/#{slice}/view_spec.rb", t("view_spec.erb", context))
           # fs.write("spec/slices/#{slice}/repository_spec.rb", t("repository_spec.erb", context))
@@ -41,7 +46,7 @@ module Hanami
 
           ERB.new(
             File.read(__dir__ + "/slice/#{path}")
-          ).result(context.ctx)
+          ).result(context.instance_eval { binding })
         end
 
         alias_method :t, :template

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

@@ -2,12 +2,12 @@
 
 require "rack/test"
 
-RSpec.shared_context "Rack::Test" do
+RSpec.shared_context "with Rack::Test" do
   # Define the app for Rack::Test requests
   let(:app) { Hanami.app }
 end
 
 RSpec.configure do |config|
   config.include Rack::Test::Methods, type: :request
-  config.include_context "Rack::Test", type: :request
+  config.include_context "with Rack::Test", type: :request
 end

data/lib/hanami/rspec/version.rb

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

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: hanami-rspec
 version: !ruby/object:Gem::Version
-  version: 2.2.1
+  version: 2.3.0.beta2
 platform: ruby
 authors:
 - Luca Guidi
-autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-11-13 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hanami-cli
@@ -16,14 +15,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.2'
+        version: 2.3.0.beta2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.2'
+        version: 2.3.0.beta2
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -104,8 +103,6 @@ files:
 - lib/hanami/rspec.rb
 - lib/hanami/rspec/commands.rb
 - lib/hanami/rspec/generators/action.rb
-- lib/hanami/rspec/generators/action/action_slice_spec.erb
-- lib/hanami/rspec/generators/action/action_spec.erb
 - lib/hanami/rspec/generators/dotrspec
 - lib/hanami/rspec/generators/gemfile
 - lib/hanami/rspec/generators/gemfile_db
@@ -139,7 +136,6 @@ metadata:
   source_code_uri: https://github.com/hanami/rspec
   changelog_uri: https://github.com/hanami/rspec/blob/master/CHANGELOG.md
   rubygems_mfa_required: 'true'
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -147,15 +143,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '3.1'
+      version: '3.2'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.22
-signing_key:
+rubygems_version: 3.6.9
 specification_version: 4
 summary: Hanami RSpec
 test_files: []

data/lib/hanami/rspec/generators/action/action_slice_spec.erb

@@ -1,10 +0,0 @@
-# frozen_string_literal: true
-
-RSpec.describe <%= camelized_slice_name %>::Actions::<%= camelized_controller_name %>::<%= camelized_action_name %> do
-  let(:params) { Hash[] }
-
-  it "works" do
-    response = subject.call(params)
-    expect(response).to be_successful
-  end
-end

data/lib/hanami/rspec/generators/action/action_spec.erb

@@ -1,10 +0,0 @@
-# frozen_string_literal: true
-
-RSpec.describe <%= camelized_app_name %>::Actions::<%= camelized_controller_name %>::<%= camelized_action_name %> do
-  let(:params) { Hash[] }
-
-  it "works" do
-    response = subject.call(params)
-    expect(response).to be_successful
-  end
-end