hanami-rspec 3.11.0.beta1 → 3.11.0.beta3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bb274d263b143f47cda8bf26d3e064125d57dea50a5be98b0b5182e6a952d186
-  data.tar.gz: e98375c2ef0d2974a1982989694e5873377bb1b5cafccf159477e5e90e963657
+  metadata.gz: a3c622f62aeded6a152396460f0bb462d1abc6e1c46e8f009ff7c5defb80f6d0
+  data.tar.gz: b473be9664791e51a31c58604f4040df018c82dec2bb4eb1abc9a0da0284629f
 SHA512:
-  metadata.gz: 89e4a5322a0f7bafd4c8abbfd94f8edaf0e7f9ff617ac65f543ce8d2232dbdc40c33618ca3061f93b092359a0c83ea29c42039b9c64976bb6e810dceac7813fe
-  data.tar.gz: 8049790bcf4437f5363c94af6d41a58be5b90a5c02cea61c4f6b274180f6559a00b1271a7d566b8ef6a52c36c6304c2c24f9c9c7e25d9abdc95b360a48a56d40
+  metadata.gz: ac3a26f68ab3ecff9b292ff9a94159547792b5f2c035c9dfd1d92ed30504f39c49f980da62754e6a21d43d9dead44c56b652ad746bb19497d06a42551c6e4cca
+  data.tar.gz: f947e767c88960d73e51761b4367f4028d74036d62176c933f160f73274a588ef64cd3b14f44a3ec24f9fe32f214e2acd953924b9ca5a5a976d7e75b7494a295

data/.github/workflows/ci.yml

@@ -12,7 +12,9 @@ name: ci
       - '.rubocop.yml'
   pull_request:
     branches:
-      - master
+      - main
+  schedule:
+    - cron: '30 4 * * *'
   create:
 
 jobs:
@@ -22,8 +24,16 @@ jobs:
       fail-fast: false
       matrix:
         ruby:
+          - '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,3 +1,16 @@
+## 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/hanami-rspec.gemspec

@@ -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.0.0.alpha"
+  spec.add_dependency "hanami-cli", "~> 2.0.0.beta"
   spec.add_dependency "rspec", "~> 3.11"
   spec.add_dependency "rake", "~> 13.0"
 

data/lib/hanami/rspec/commands.rb

@@ -2,6 +2,7 @@
 
 require "hanami/cli"
 require "shellwords"
+require "hanami/cli/commands/app/command"
 require "hanami/cli/generators/context"
 require_relative "./generators"
 
@@ -72,11 +73,22 @@ module Hanami
           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
+
+        class Action < Hanami::CLI::Commands::App::Command
+          # FIXME: dry-cli kwargs aren't correctly forwarded in Ruby 3
+          def call(options, **)
+            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
@@ -84,5 +96,6 @@ 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
+  Hanami::CLI.after "generate slice", Hanami::RSpec::Commands::Generate::Slice
+  Hanami::CLI.after "generate action", Hanami::RSpec::Commands::Generate::Action
 end

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

@@ -0,0 +1,10 @@
+# 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

@@ -0,0 +1,10 @@
+# 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

@@ -0,0 +1,53 @@
+# frozen_string_literal: true
+
+require "erb"
+require "hanami/cli/generators/app/action_context"
+
+module Hanami
+  module RSpec
+    module Generators
+      class Action
+        def initialize(fs:, inflector:)
+          @fs = fs
+          @inflector = inflector
+        end
+
+        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/#{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

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

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

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

@@ -2,5 +2,5 @@
 
 require "slices/<%= underscored_slice_name %>/repository"
 
-RSpec.describe <%= classified_slice_name %>::Repository do
+RSpec.describe <%= camelized_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 <%= classified_slice_name %>::View do
+RSpec.describe <%= camelized_slice_name %>::View do
 end

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

@@ -12,17 +12,17 @@ module Hanami
           @inflector = inflector
         end
 
-        def call(slice, context: Hanami::CLI::Generators::App::SliceContext.new(inflector, nil, slice, nil)) # rubocop:disable Metrics/AbcSize
+        def call(slice, context: Hanami::CLI::Generators::App::SliceContext.new(inflector, nil, slice, nil))
           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}/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))
+          # 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

@@ -4,6 +4,7 @@ module Hanami
   module RSpec
     module Generators
       require_relative "./generators/slice"
+      require_relative "./generators/action"
     end
   end
 end

data/lib/hanami/rspec/version.rb

@@ -2,6 +2,6 @@
 
 module Hanami
   module RSpec
-    VERSION = "3.11.0.beta1"
+    VERSION = "3.11.0.beta3"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hanami-rspec
 version: !ruby/object:Gem::Version
-  version: 3.11.0.beta1
+  version: 3.11.0.beta3
 platform: ruby
 authors:
 - Luca Guidi
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-07-20 00:00:00.000000000 Z
+date: 2022-09-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hanami-cli
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.0.alpha
+        version: 2.0.0.beta
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.0.alpha
+        version: 2.0.0.beta
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -91,6 +91,9 @@ files:
 - lib/hanami/rspec/commands.rb
 - lib/hanami/rspec/error.rb
 - lib/hanami/rspec/generators.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/helper.rb