hanami-rspec 2.3.1 → 3.11.0.beta3

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

@@ -1,59 +1,52 @@
 # frozen_string_literal: true
 
-require "hanami/cli/generators/app/ruby_class_file"
+require "erb"
+require "hanami/cli/generators/app/action_context"
 
 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(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))
+        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, :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
+        attr_reader :fs
 
-        def spec_content(class_name)
-          <<~RUBY
-            # frozen_string_literal: true
+        attr_reader :inflector
 
-            RSpec.describe #{class_name} do
-              let(:params) { Hash[] }
+        # @api private
+        # @param controller [Array<String>]
+        def controller_directory(controller)
+          fs.join(controller)
+        end
 
-              it "works" do
-                response = subject.call(params)
-                expect(response).to be_successful
-              end
-            end
-          RUBY
+        def template(path, context)
+          require "erb"
+
+          ERB.new(
+            File.read(__dir__ + "/action/#{path}")
+          ).result(context.ctx)
         end
+
+        alias_method :t, :template
       end
     end
   end

data/lib/hanami/rspec/generators/gemfile

@@ -1,6 +1,4 @@
 
 group :test do
-  # Web integration
-  gem "capybara"
   gem "rack-test"
 end

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

@@ -6,4 +6,5 @@ SPEC_ROOT = Pathname(__dir__).realpath.freeze
 ENV["HANAMI_ENV"] ||= "test"
 require "hanami/prepare"
 
-SPEC_ROOT.glob("support/**/*.rb").each { |f| require f }
+require_relative "support/rspec"
+require_relative "support/requests"

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

@@ -1,11 +1,11 @@
 # frozen_string_literal: true
 
 RSpec.describe "Root", type: :request do
-  it "is not found" do
+  it "is successful" do
     get "/"
 
-    # Generate new action via:
-    #   `bundle exec hanami generate action home.index --url=/`
-    expect(last_response.status).to be(404)
+    # Find me in `config/routes.rb`
+    expect(last_response).to be_successful
+    expect(last_response.body).to eq("Hello from Hanami")
   end
 end

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

@@ -1,38 +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 = 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))
-
-          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))
+          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
@@ -46,7 +36,7 @@ module Hanami
 
           ERB.new(
             File.read(__dir__ + "/slice/#{path}")
-          ).result(context.instance_eval { binding })
+          ).result(context.ctx)
         end
 
         alias_method :t, :template

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

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

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

@@ -1,61 +1,27 @@
 # frozen_string_literal: true
 
 RSpec.configure do |config|
-  # Use the recommended non-monkey patched syntax.
-  config.disable_monkey_patching!
-
-  # Use and configure rspec-expectations.
   config.expect_with :rspec do |expectations|
-    # This option will default to `true` in RSpec 4.
     expectations.include_chain_clauses_in_custom_matcher_descriptions = true
   end
 
-  # Use and configure rspec-mocks.
   config.mock_with :rspec do |mocks|
-    # Prevents you from mocking or stubbing a method that does not exist on a
-    # real object.
     mocks.verify_partial_doubles = true
   end
 
-  # This option will default to `:apply_to_host_groups` in RSpec 4.
   config.shared_context_metadata_behavior = :apply_to_host_groups
 
-  # Limit a spec run to individual examples or groups you care about by tagging
-  # them with `:focus` metadata. When nothing is tagged with `:focus`, all
-  # examples get run.
-  #
-  # RSpec also provides aliases for `it`, `describe`, and `context` that include
-  # `:focus` metadata: `fit`, `fdescribe` and `fcontext`, respectively.
   config.filter_run_when_matching :focus
 
-  # Allow RSpec to persist some state between runs in order to support the
-  # `--only-failures` and `--next-failure` CLI options. We recommend you
-  # configure your source control system to ignore this file.
-  config.example_status_persistence_file_path = "spec/examples.txt"
-
-  # Uncomment this to enable warnings. This is recommended, but in some cases
-  # may be too noisy due to issues in dependencies.
-  # config.warnings = true
+  config.disable_monkey_patching!
+  config.warnings = true
 
-  # Show more verbose output when running an individual spec file.
   if config.files_to_run.one?
     config.default_formatter = "doc"
   end
 
-  # Print the 10 slowest examples and example groups at the end of the spec run,
-  # to help surface which specs are running particularly slow.
   config.profile_examples = 10
 
-  # Run specs in random order to surface order dependencies. If you find an
-  # order dependency and want to debug it, you can fix the order by providing
-  # the seed, which is printed after each run:
-  #
-  # --seed 1234
   config.order = :random
-
-  # Seed global randomization in this process using the `--seed` CLI option.
-  # This allows you to use `--seed` to deterministically reproduce test failures
-  # related to randomization by passing the same `--seed` value as the one that
-  # triggered the failure.
   Kernel.srand config.seed
 end

data/lib/hanami/rspec/generators.rb

@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+module Hanami
+  module RSpec
+    module Generators
+      require_relative "./generators/slice"
+      require_relative "./generators/action"
+    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.3.1"
+    VERSION = "3.11.0.beta3"
   end
 end

data/lib/hanami/rspec.rb

@@ -1,47 +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.before "install", Commands::Install
-      Hanami::CLI.after "generate slice", Commands::Generate::Slice
-
-      if Hanami.bundled?("hanami-controller")
-        Hanami::CLI.after "generate action", Commands::Generate::Action
-      end
-
-      if Hanami.bundled?("hanami-view")
-        Hanami::CLI.after "generate part", Commands::Generate::Part
-      end
-    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,13 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hanami-rspec
 version: !ruby/object:Gem::Version
-  version: 2.3.1
+  version: 3.11.0.beta3
 platform: ruby
 authors:
-- Hanakai team
+- Luca Guidi
+autorequire:
 bindir: exe
 cert_chain: []
-date: 1980-01-02 00:00:00.000000000 Z
+date: 2022-09-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hanami-cli
@@ -15,28 +16,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.3.0
+        version: 2.0.0.beta
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.3.0
+        version: 2.0.0.beta
 - !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
@@ -51,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
@@ -81,7 +68,7 @@ dependencies:
         version: '1.11'
 description: Hanami RSpec generators and Rake tasks
 email:
-- info@hanakai.org
+- me@lucaguidi.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -93,7 +80,7 @@ files:
 - CHANGELOG.md
 - CODE_OF_CONDUCT.md
 - Gemfile
-- LICENSE.md
+- LICENSE.txt
 - README.md
 - Rakefile
 - bin/console
@@ -102,27 +89,20 @@ files:
 - lib/hanami-rspec.rb
 - lib/hanami/rspec.rb
 - 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/gemfile_db
-- lib/hanami/rspec/generators/gitignore
 - lib/hanami/rspec/generators/helper.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
-- lib/hanami/rspec/generators/part/part_slice_spec.erb
-- lib/hanami/rspec/generators/part/part_spec.erb
 - lib/hanami/rspec/generators/request.rb
 - lib/hanami/rspec/generators/slice.rb
 - lib/hanami/rspec/generators/slice/action_spec.erb
 - lib/hanami/rspec/generators/slice/keep.erb
 - lib/hanami/rspec/generators/slice/repository_spec.erb
 - lib/hanami/rspec/generators/slice/view_spec.erb
-- lib/hanami/rspec/generators/support_db.rb
-- lib/hanami/rspec/generators/support_db_cleaning.rb
-- lib/hanami/rspec/generators/support_features.rb
-- lib/hanami/rspec/generators/support_operations.rb
 - lib/hanami/rspec/generators/support_requests.rb
 - lib/hanami/rspec/generators/support_rspec.rb
 - lib/hanami/rspec/rake_tasks.rb
@@ -136,6 +116,7 @@ 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
@@ -143,14 +124,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '3.2'
+      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.6.9
+rubygems_version: 3.3.3
+signing_key:
 specification_version: 4
 summary: Hanami RSpec
 test_files: []

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/lib/hanami/rspec/generators/gemfile_db

@@ -1,9 +0,0 @@
-
-group :test do
-  # Database
-  gem "database_cleaner-sequel"
-
-  # Web integration
-  gem "capybara"
-  gem "rack-test"
-end

data/lib/hanami/rspec/generators/gitignore

@@ -1 +0,0 @@
-spec/examples.txt

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

@@ -1,10 +0,0 @@
-# frozen_string_literal: true
-
-RSpec.describe <%= camelized_app_name %>::Views::Part do
-  subject { described_class.new(value:) }
-  let(:value) { double("value") }
-
-  it "works" do
-    expect(subject).to be_kind_of(described_class)
-  end
-end

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

@@ -1,10 +0,0 @@
-# frozen_string_literal: true
-
-RSpec.describe <%= camelized_slice_name %>::Views::Part do
-  subject { described_class.new(value:) }
-  let(:value) { double("value") }
-
-  it "works" do
-    expect(subject).to be_kind_of(described_class)
-  end
-end

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

@@ -1,10 +0,0 @@
-# frozen_string_literal: true
-
-RSpec.describe <%= camelized_slice_name %>::Views::Parts::<%= camelized_name %> do
-  subject { described_class.new(value:) }
-  let(:value) { double("<%= underscored_name %>") }
-
-  it "works" do
-    expect(subject).to be_kind_of(described_class)
-  end
-end

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

@@ -1,10 +0,0 @@
-# frozen_string_literal: true
-
-RSpec.describe <%= camelized_app_name %>::Views::Parts::<%= camelized_name %> do
-  subject { described_class.new(value:) }
-  let(:value) { double("<%= underscored_name %>") }
-
-  it "works" do
-    expect(subject).to be_kind_of(described_class)
-  end
-end