hanami-rspec 2.0.1 → 3.11.0.beta1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d165f3b5190d2f5c4ca7b33f28570ce3fdd696bd14da89cabedb710d433a42b9
-  data.tar.gz: 4ed2cde06e1a09a9d05679e184db40c8e5d578b3e259e3cecd151b433371c34c
+  metadata.gz: bb274d263b143f47cda8bf26d3e064125d57dea50a5be98b0b5182e6a952d186
+  data.tar.gz: e98375c2ef0d2974a1982989694e5873377bb1b5cafccf159477e5e90e963657
 SHA512:
-  metadata.gz: edd319a20e32f589479134941d0275a41e80305e3964f1247532075ba5f48809d0fa0a1d186759e0879548b580764807813fb4b7c8e02e7052201d2af5bce101
-  data.tar.gz: 2f938a13f5a1fa2a13d76fc82c919e6d19fab5ea2140048e53a3083af4ff5766fac1f3020002b19144901f1a6f683da9829da1af614324eefc7e9c4bef6a1a71
+  metadata.gz: 89e4a5322a0f7bafd4c8abbfd94f8edaf0e7f9ff617ac65f543ce8d2232dbdc40c33618ca3061f93b092359a0c83ea29c42039b9c64976bb6e810dceac7813fe
+  data.tar.gz: 8049790bcf4437f5363c94af6d41a58be5b90a5c02cea61c4f6b274180f6559a00b1271a7d566b8ef6a52c36c6304c2c24f9c9c7e25d9abdc95b360a48a56d40

data/.github/workflows/ci.yml

@@ -12,9 +12,7 @@ name: ci
       - '.rubocop.yml'
   pull_request:
     branches:
-      - main
-  schedule:
-    - cron: '30 4 * * *'
+      - master
   create:
 
 jobs:
@@ -24,17 +22,8 @@ jobs:
       fail-fast: false
       matrix:
         ruby:
-          - '3.2'
-          - '3.1'
           - '3.0'
     steps:
-      - uses: ravsamhq/notify-slack-action@v1
-        if: always()
-        with:
-          status: ${{ job.status }}
-          notify_when: 'failure'
-        env:
-          SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}
       - uses: actions/checkout@v1
       - name: Install package dependencies
         run: '[ -e $APT_DEPS ] || sudo apt-get install -y --no-install-recommends $APT_DEPS'

data/CHANGELOG.md

@@ -1,45 +1,3 @@
-# Hanami::RSpec
-
-RSpec support for Hanami
-
-## v2.0.1 - 2022-12-25
-
-### Added
-
-- [Luca Guidi] Official support for Ruby 3.2
-
-## v2.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
-
-### Changed
-
-- [Luca Guidi] Follow `hanami` versioning
-
-## v3.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
-
-### 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
-
-### Added
-
-- [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
 
 ### Added

data/Gemfile

@@ -9,7 +9,5 @@ unless ENV["CI"]
 end
 
 gem "dry-files", require: false, git: "https://github.com/dry-rb/dry-files.git", branch: "main"
-gem "dry-logger", require: false, git: "https://github.com/dry-rb/dry-logger.git", branch: "main"
-gem "hanami-utils", require: false, git: "https://github.com/hanami/utils.git", branch: "main"
 gem "hanami-cli", require: false, git: "https://github.com/hanami/cli.git", branch: "main"
 gem "hanami", require: false, git: "https://github.com/hanami/hanami.git", branch: "main"

data/README.md

@@ -1,6 +1,6 @@
 # Hanami::RSpec
 
-RSpec and testing support for [Hanami applications](https://github.com/hanami/hanami).
+RSpec and testing support for [full-stack Hanami applications](`https://github.com/hanami/hanami`).
 
 ## Status
 
@@ -8,6 +8,10 @@ RSpec and testing support for [Hanami applications](https://github.com/hanami/ha
 [![CI](https://github.com/hanami/rspec/workflows/ci/badge.svg?branch=main)](https://github.com/hanami/rspec/actions?query=workflow%3Aci+branch%3Amain)
 [![Depfu](https://badges.depfu.com/badges/a8545fb67cf32a2c75b6227bc0821027/overview.svg)](https://depfu.com/github/hanami/rspec?project=Bundler)
 
+## Version
+
+Versioning of this gem follows RSpec.
+
 ## Contact
 
 - Home page: http://hanamirb.org
@@ -32,10 +36,10 @@ end
 
 And then execute:
 
-```
-$ bundle install
-$ bundle exec hanami setup
-```
+    $ bundle install
+    $ bundle exec hanami setup
+
+## Usage
 
 ## Development
 

data/hanami-rspec.gemspec

@@ -29,10 +29,9 @@ 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.0"
-  spec.add_dependency "rspec", "~> 3.12"
+  spec.add_dependency "hanami-cli", "~> 2.0.0.alpha"
+  spec.add_dependency "rspec", "~> 3.11"
   spec.add_dependency "rake", "~> 13.0"
-  spec.add_dependency "zeitwerk", "~> 2.6"
 
   spec.add_development_dependency "rubocop", "~> 1.11"
   spec.metadata["rubygems_mfa_required"] = "true"

data/lib/hanami/rspec/commands.rb

@@ -1,17 +1,14 @@
 # frozen_string_literal: true
 
+require "hanami/cli"
 require "shellwords"
+require "hanami/cli/generators/context"
+require_relative "./generators"
 
 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
           copy_dotrspec
@@ -69,37 +66,23 @@ module Hanami
         end
       end
 
-      # @since 2.0.0
-      # @api private
       module Generate
-        # @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]))
 
+            out.puts "generating #{slice} (rspec)"
             generator = Generators::Slice.new(fs: fs, inflector: inflector)
             generator.call(slice)
           end
         end
-
-        # @since 2.0.0
-        # @api private
-        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
-            slice = inflector.underscore(Shellwords.shellescape(options[:slice])) if options[:slice]
-            name = inflector.underscore(Shellwords.shellescape(options[:name]))
-            *controller, action = name.split(ACTION_SEPARATOR)
-
-            generator = Generators::Action.new(fs: fs, inflector: inflector)
-            generator.call(app.namespace, slice, controller, action)
-          end
-        end
       end
     end
   end
 end
+
+if Hanami::CLI.within_hanami_app?
+  Hanami::CLI.after "install", Hanami::RSpec::Commands::Install
+  # Hanami::CLI.after "generate slice", Hanami::RSpec::Commands::Generate::Slice
+end

data/lib/hanami/rspec/error.rb

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+module Hanami
+  module RSpec
+    class Error < StandardError
+    end
+  end
+end

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

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
-RSpec.describe <%= camelized_slice_name %>::Action do
-  xit "works"
+require "slices/<%= underscored_slice_name %>/action"
+
+RSpec.describe <%= classified_slice_name %>::Action do
 end

data/lib/hanami/rspec/generators/slice/repository_spec.erb

@@ -2,5 +2,5 @@
 
 require "slices/<%= underscored_slice_name %>/repository"
 
-RSpec.describe <%= camelized_slice_name %>::Repository do
+RSpec.describe <%= classified_slice_name %>::Repository do
 end

data/lib/hanami/rspec/generators/slice/view_spec.erb

@@ -2,5 +2,5 @@
 
 require "slices/<%= underscored_slice_name %>/view"
 
-RSpec.describe <%= camelized_slice_name %>::View do
+RSpec.describe <%= classified_slice_name %>::View do
 end

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

@@ -1,33 +1,28 @@
 # frozen_string_literal: true
 
 require "erb"
+require "hanami/cli/generators/app/slice_context"
 
 module Hanami
   module RSpec
     module Generators
-      # @since 2.0.0
-      # @api private
       class Slice
-        # @since 2.0.0
-        # @api private
         def initialize(fs:, inflector:)
           @fs = fs
           @inflector = inflector
         end
 
-        # @since 2.0.0
-        # @api private
-        def call(slice, context: Hanami::CLI::Generators::App::SliceContext.new(inflector, nil, slice, nil))
-          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))
-
-          fs.write("spec/slices/#{slice}/actions/.keep", t("keep.erb", context))
-          # fs.write("spec/slices/#{slice}/views/.keep", t("keep.erb", context))
-          # fs.write("spec/slices/#{slice}/templates/.keep", t("keep.erb", context))
-          # fs.write("spec/slices/#{slice}/templates/layouts/.keep", t("keep.erb", context))
-          # fs.write("spec/slices/#{slice}/entities/.keep", t("keep.erb", context))
-          # fs.write("spec/slices/#{slice}/repositories/.keep", t("keep.erb", context))
+        def call(slice, context: Hanami::CLI::Generators::App::SliceContext.new(inflector, nil, slice, nil)) # rubocop:disable Metrics/AbcSize
+          fs.write("spec/#{slice}/action_spec.rb", t("action_spec.erb", context))
+          fs.write("spec/#{slice}/view_spec.rb", t("view_spec.erb", context))
+          fs.write("spec/#{slice}/repository_spec.rb", t("repository_spec.erb", context))
+
+          fs.write("spec/#{slice}/actions/.keep", t("keep.erb", context))
+          fs.write("spec/#{slice}/views/.keep", t("keep.erb", context))
+          fs.write("spec/#{slice}/templates/.keep", t("keep.erb", context))
+          fs.write("spec/#{slice}/templates/layouts/.keep", t("keep.erb", context))
+          fs.write("spec/#{slice}/entities/.keep", t("keep.erb", context))
+          fs.write("spec/#{slice}/repositories/.keep", t("keep.erb", context))
         end
 
         private

data/lib/hanami/rspec/generators.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+module Hanami
+  module RSpec
+    module Generators
+      require_relative "./generators/slice"
+    end
+  end
+end

data/lib/hanami/rspec/rake_tasks.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require "hanami/cli/rake_tasks"
+
 Hanami::CLI::RakeTasks.register_tasks do
   require "rspec/core/rake_task"
   ::RSpec::Core::RakeTask.new(:spec)

data/lib/hanami/rspec/version.rb

@@ -2,10 +2,6 @@
 
 module Hanami
   module RSpec
-    # The current hanami-rspec version.
-    #
-    # @since 2.0.0
-    # @api public
-    VERSION = "2.0.1"
+    VERSION = "3.11.0.beta1"
   end
 end

data/lib/hanami/rspec.rb

@@ -1,40 +1,10 @@
 # frozen_string_literal: true
 
-require "hanami/cli"
-require "zeitwerk"
-
-# @see Hanami::RSpec
-# @since 2.0.0
 module Hanami
-  # RSpec and testing support for Hanami applications.
-  #
-  # @since 2.0.0
-  # @api private
   module RSpec
-    # @since 2.0.0
-    # @api private
-    def self.gem_loader
-      @gem_loader ||= Zeitwerk::Loader.new.tap do |loader|
-        root = File.expand_path("..", __dir__)
-        loader.tag = "hanami-rspec"
-        loader.inflector = Zeitwerk::GemInflector.new("#{root}/hanami-rspec.rb")
-        loader.push_dir(root)
-        loader.ignore(
-          "#{root}/hanami-rspec.rb",
-          "#{root}/hanami/rspec/{rake_tasks,version}.rb"
-        )
-        loader.inflector.inflect("rspec" => "RSpec")
-      end
-    end
-
-    gem_loader.setup
     require_relative "rspec/version"
+    require_relative "rspec/error"
+    require_relative "rspec/commands"
     require_relative "rspec/rake_tasks"
-
-    if Hanami::CLI.within_hanami_app?
-      Hanami::CLI.after "install", Commands::Install
-      Hanami::CLI.after "generate slice", Commands::Generate::Slice
-      Hanami::CLI.after "generate action", Commands::Generate::Action
-    end
   end
 end

data/lib/hanami-rspec.rb

@@ -1,3 +1,3 @@
 # frozen_string_literal: true
 
-require_relative "hanami/rspec"
+require_relative "./hanami/rspec"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hanami-rspec
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 3.11.0.beta1
 platform: ruby
 authors:
 - Luca Guidi
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-12-25 00:00:00.000000000 Z
+date: 2022-07-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hanami-cli
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: 2.0.0.alpha
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: 2.0.0.alpha
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.12'
+        version: '3.11'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.12'
+        version: '3.11'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -52,20 +52,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '13.0'
-- !ruby/object:Gem::Dependency
-  name: zeitwerk
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.6'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.6'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
@@ -103,9 +89,8 @@ files:
 - lib/hanami-rspec.rb
 - 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/error.rb
+- lib/hanami/rspec/generators.rb
 - lib/hanami/rspec/generators/dotrspec
 - lib/hanami/rspec/generators/gemfile
 - lib/hanami/rspec/generators/helper.rb
@@ -139,11 +124,11 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 3.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
-rubygems_version: 3.4.1
+rubygems_version: 3.3.3
 signing_key:
 specification_version: 4
 summary: Hanami RSpec

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

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

@@ -1,58 +0,0 @@
-# frozen_string_literal: true
-
-require "erb"
-
-module Hanami
-  module RSpec
-    module Generators
-      # @since 2.0.0
-      # @api private
-      class Action
-        # @since 2.0.0
-        # @api private
-        def initialize(fs:, inflector:)
-          @fs = fs
-          @inflector = inflector
-        end
-
-        # @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
-        end
-
-        private
-
-        attr_reader :fs
-
-        attr_reader :inflector
-
-        # @api private
-        # @param controller [Array<String>]
-        def controller_directory(controller)
-          fs.join(controller)
-        end
-
-        def template(path, context)
-          require "erb"
-
-          ERB.new(
-            File.read(__dir__ + "/action/#{path}")
-          ).result(context.ctx)
-        end
-
-        alias_method :t, :template
-      end
-    end
-  end
-end