hanami 2.0.0.beta2 → 2.0.0.beta4

data/spec/{new_integration → integration}/view/context/routes_spec.rb

@@ -17,9 +17,7 @@ RSpec.describe "App view / Context / Routes", :app_integration do
       write "config/routes.rb", <<~RUBY
         module TestApp
           class Routes < Hanami::Routes
-            define do
-              root to: "home.index"
-            end
+            root to: "home.index"
           end
         end
       RUBY

data/spec/support/app_integration.rb

@@ -23,6 +23,23 @@ RSpec.shared_context "Application integration" do
   let(:app_modules) { %i[TestApp Admin Main Search] }
 end
 
+def autoloaders_teardown!
+  # Tear down Zeitwerk (from zeitwerk's own test/support/loader_test)
+  Zeitwerk::Registry.loaders.reject! do |loader|
+    test_loader = loader.dirs.any? { |dir|
+      dir.include?("/spec/") || dir.include?(Dir.tmpdir) ||
+        dir.include?("/slices/") || dir.include?("/app")
+    }
+
+    if test_loader
+      loader.unregister
+      true
+    else
+      false
+    end
+  end
+end
+
 RSpec.configure do |config|
   config.include RSpec::Support::Files, :app_integration
   config.include RSpec::Support::WithTmpDirectory, :app_integration
@@ -36,21 +53,7 @@ RSpec.configure do |config|
   end
 
   config.after :each, :app_integration do
-    # Tear down Zeitwerk (from zeitwerk's own test/support/loader_test)
-    Zeitwerk::Registry.loaders.each(&:unload)
-    Zeitwerk::Registry.loaders.clear
-
-    # This private interface changes between 2.5.4 and 2.6.0
-    if Zeitwerk::Registry.respond_to?(:loaders_managing_gems)
-      Zeitwerk::Registry.loaders_managing_gems.clear
-    else
-      Zeitwerk::Registry.gem_loaders_by_root_file.clear
-      Zeitwerk::Registry.autoloads.clear
-      Zeitwerk::Registry.inceptions.clear
-    end
-
-    Zeitwerk::ExplicitNamespace.cpaths.clear
-    Zeitwerk::ExplicitNamespace.tracer.disable
+    autoloaders_teardown!
 
     Hanami.instance_variable_set(:@_bundled, {})
     Hanami.remove_instance_variable(:@_app) if Hanami.instance_variable_defined?(:@_app)

data/spec/unit/hanami/{configuration → config}/actions/content_security_policy_spec.rb

@@ -1,10 +1,10 @@
 # frozen_string_literal: true
 
-require "hanami/configuration/actions"
+require "hanami/config/actions"
 
-RSpec.describe Hanami::Configuration::Actions, "#content_security_policy" do
-  let(:configuration) { described_class.new }
-  subject(:content_security_policy) { configuration.content_security_policy }
+RSpec.describe Hanami::Config::Actions, "#content_security_policy" do
+  let(:config) { described_class.new }
+  subject(:content_security_policy) { config.content_security_policy }
 
   context "no CSP config specified" do
     context "without assets_server_url" do
@@ -34,7 +34,7 @@ RSpec.describe Hanami::Configuration::Actions, "#content_security_policy" do
     end
 
     context "with assets_server_url" do
-      let(:configuration) { described_class.new(assets_server_url: assets_server_url) }
+      let(:config) { described_class.new(assets_server_url: assets_server_url) }
       let(:assets_server_url) { "http://localhost:8080" }
 
       it "includes server url" do
@@ -85,18 +85,18 @@ RSpec.describe Hanami::Configuration::Actions, "#content_security_policy" do
 
   context "with CSP enabled" do
     it "sets default header" do
-      configuration.finalize!
+      config.finalize!
 
-      expect(configuration.default_headers.fetch("Content-Security-Policy")).to eq(content_security_policy.to_str)
+      expect(config.default_headers.fetch("Content-Security-Policy")).to eq(content_security_policy.to_str)
     end
   end
 
   context "with CSP disabled" do
     it "doesn't set default header" do
-      configuration.content_security_policy = false
-      configuration.finalize!
+      config.content_security_policy = false
+      config.finalize!
 
-      expect(configuration.default_headers.key?("Content-Security-Policy")).to be(false)
+      expect(config.default_headers.key?("Content-Security-Policy")).to be(false)
     end
   end
 end

data/spec/unit/hanami/{configuration → config}/actions/cookies_spec.rb

@@ -1,10 +1,10 @@
 # frozen_string_literal: true
 
-require "hanami/configuration/actions"
+require "hanami/config/actions"
 
-RSpec.describe Hanami::Configuration::Actions, "#cookies" do
-  let(:configuration) { described_class.new }
-  subject(:cookies) { configuration.cookies }
+RSpec.describe Hanami::Config::Actions, "#cookies" do
+  let(:config) { described_class.new }
+  subject(:cookies) { config.cookies }
 
   context "default config" do
     it "is enabled" do
@@ -18,7 +18,7 @@ RSpec.describe Hanami::Configuration::Actions, "#cookies" do
 
   context "options given" do
     before do
-      configuration.cookies = {max_age: 300}
+      config.cookies = {max_age: 300}
     end
 
     it "is enabled" do
@@ -32,7 +32,7 @@ RSpec.describe Hanami::Configuration::Actions, "#cookies" do
 
   context "nil value given" do
     before do
-      configuration.cookies = nil
+      config.cookies = nil
     end
 
     it "is not enabled" do

data/spec/unit/hanami/{configuration → config}/actions/csrf_protection_spec.rb

@@ -1,32 +1,32 @@
 # frozen_string_literal: true
 
-require "hanami/configuration/actions"
+require "hanami/config/actions"
 
-RSpec.describe Hanami::Configuration::Actions, "#csrf_protection" do
-  let(:configuration) { described_class.new }
-  subject(:value) { configuration.csrf_protection }
+RSpec.describe Hanami::Config::Actions, "#csrf_protection" do
+  let(:config) { described_class.new }
+  subject(:value) { config.csrf_protection }
 
-  context "non-finalized configuration" do
+  context "non-finalized config" do
     it "returns a default of nil" do
       is_expected.to be_nil
     end
 
     it "can be explicitly enabled" do
-      configuration.csrf_protection = true
+      config.csrf_protection = true
       is_expected.to be true
     end
 
     it "can be explicitly disabled" do
-      configuration.csrf_protection = false
+      config.csrf_protection = false
       is_expected.to be false
     end
   end
 
-  context "finalized configuration" do
+  context "finalized config" do
     context "sessions enabled" do
       before do
-        configuration.sessions = :cookie, {secret: "abc"}
-        configuration.finalize!
+        config.sessions = :cookie, {secret: "abc"}
+        config.finalize!
       end
 
       it "is true" do
@@ -35,7 +35,7 @@ RSpec.describe Hanami::Configuration::Actions, "#csrf_protection" do
 
       context "explicitly disabled" do
         before do
-          configuration.csrf_protection = false
+          config.csrf_protection = false
         end
 
         it "is false" do
@@ -46,7 +46,7 @@ RSpec.describe Hanami::Configuration::Actions, "#csrf_protection" do
 
     context "sessions not enabled" do
       before do
-        configuration.finalize!
+        config.finalize!
       end
 
       it "is true" do

data/spec/unit/hanami/config/actions/default_values_spec.rb

@@ -0,0 +1,54 @@
+# frozen_string_literal: true
+
+require "hanami/config/actions"
+
+RSpec.describe Hanami::Config::Actions, "default values" do
+  subject(:config) { described_class.new }
+
+  describe "sessions" do
+    specify { expect(config.sessions).not_to be_enabled }
+  end
+
+  describe "name_inference_base" do
+    specify { expect(config.name_inference_base).to eq "actions" }
+  end
+
+  describe "view_context_identifier" do
+    specify { expect(config.view_context_identifier).to eq "views.context" }
+  end
+
+  describe "view_name_inferrer" do
+    specify { expect(config.view_name_inferrer).to eq Hanami::Slice::ViewNameInferrer }
+  end
+
+  describe "view_name_inference_base" do
+    specify { expect(config.view_name_inference_base).to eq "views" }
+  end
+
+  describe "new default values applied to base action settings" do
+    describe "default_request_format" do
+      specify { expect(config.default_request_format).to eq :html }
+    end
+
+    describe "default_response_format" do
+      specify { expect(config.default_response_format).to eq :html }
+    end
+
+    describe "content_security_policy" do
+      specify { expect(config.content_security_policy).to be_kind_of(Hanami::Config::Actions::ContentSecurityPolicy) }
+    end
+
+    describe "default_headers" do
+      specify {
+        config.finalize!
+
+        expect(config.default_headers).to eq(
+          "X-Frame-Options" => "DENY",
+          "X-Content-Type-Options" => "nosniff",
+          "X-XSS-Protection" => "1; mode=block",
+          "Content-Security-Policy" => config.content_security_policy.to_str
+        )
+      }
+    end
+  end
+end

data/spec/unit/hanami/{configuration → config}/actions/sessions_spec.rb

@@ -1,10 +1,10 @@
 # frozen_string_literal: true
 
-require "hanami/configuration/actions"
+require "hanami/config/actions"
 
-RSpec.describe Hanami::Configuration::Actions, "#sessions" do
-  let(:configuration) { described_class.new }
-  subject(:sessions) { configuration.sessions }
+RSpec.describe Hanami::Config::Actions, "#sessions" do
+  let(:config) { described_class.new }
+  subject(:sessions) { config.sessions }
 
   context "no session config specified" do
     it "is not enabled" do
@@ -26,7 +26,7 @@ RSpec.describe Hanami::Configuration::Actions, "#sessions" do
 
   context "valid session config provided" do
     before do
-      configuration.sessions = :cookie, {secret: "abc"}
+      config.sessions = :cookie, {secret: "abc"}
     end
 
     it "is enabled" do

data/spec/unit/hanami/{configuration → config}/actions_spec.rb

@@ -1,18 +1,17 @@
 # frozen_string_literal: true
 
-require "hanami/configuration"
-require "hanami/configuration/actions"
-require "hanami/action/configuration"
+require "hanami/config"
+require "hanami/action"
 
-RSpec.describe Hanami::Configuration, "#actions" do
-  let(:configuration) { described_class.new(app_name: app_name, env: :development) }
+RSpec.describe Hanami::Config, "#actions" do
+  let(:config) { described_class.new(app_name: app_name, env: :development) }
   let(:app_name) { "MyApp::app" }
 
-  subject(:actions) { configuration.actions }
+  subject(:actions) { config.actions }
 
-  context "Hanami::Action available" do
-    it "is a full actions configuration" do
-      is_expected.to be_an_instance_of(Hanami::Configuration::Actions)
+  context "hanami-controller is bundled" do
+    it "is a full actions config" do
+      is_expected.to be_an_instance_of(Hanami::Config::Actions)
 
       is_expected.to respond_to(:default_response_format)
       is_expected.to respond_to(:default_response_format=)
@@ -43,30 +42,19 @@ RSpec.describe Hanami::Configuration, "#actions" do
       end
 
       it "includes all base action settings" do
-        expect(actions.settings).to include(Hanami::Action::Configuration.settings)
+        expect(actions.settings).to include(Hanami::Action.settings)
       end
     end
   end
 
-  context "Hanami::Action not available" do
+  context "hanami-controller is not bundled" do
     before do
-      load_error = LoadError.new.tap do |error|
-        error.instance_variable_set :@path, "hanami/action"
-      end
-
-      allow_any_instance_of(described_class)
-        .to receive(:require)
-        .with(anything)
-        .and_call_original
-
-      allow_any_instance_of(described_class)
-        .to receive(:require)
-        .with("hanami/action")
-        .and_raise load_error
+      allow(Hanami).to receive(:bundled?).and_call_original
+      expect(Hanami).to receive(:bundled?).with("hanami-controller").and_return(false)
     end
 
     it "does not expose any settings" do
-      is_expected.not_to be_an_instance_of(Hanami::Configuration::Actions)
+      is_expected.not_to be_an_instance_of(Hanami::Config::Actions)
       is_expected.not_to respond_to(:default_response_format)
       is_expected.not_to respond_to(:default_response_format=)
     end

data/spec/unit/hanami/{configuration → config}/base_url_spec.rb

@@ -1,9 +1,9 @@
 # frozen_string_literal: true
 
-require "hanami/configuration"
+require "hanami/config"
 require "uri"
 
-RSpec.describe Hanami::Configuration, "base_url" do
+RSpec.describe Hanami::Config, "base_url" do
   subject(:config) { described_class.new(app_name: app_name, env: :development) }
   let(:app_name) { "MyApp::app" }
 

data/spec/unit/hanami/{configuration → config}/inflector_spec.rb

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
-require "hanami/configuration"
+require "hanami/config"
 
-RSpec.describe Hanami::Configuration do
+RSpec.describe Hanami::Config do
   subject(:config) { described_class.new(app_name: app_name, env: :development) }
   let(:app_name) { "MyApp::app" }
 

data/spec/unit/hanami/{configuration → config}/logger_spec.rb

@@ -1,11 +1,11 @@
 # frozen_string_literal: true
 
-require "hanami/configuration/logger"
+require "hanami/config/logger"
 require "hanami/slice_name"
 require "dry/inflector"
 require "logger"
 
-RSpec.describe Hanami::Configuration::Logger do
+RSpec.describe Hanami::Config::Logger do
   subject { described_class.new(app_name: app_name, env: env) }
   let(:app_name) { Hanami::SliceName.new(double(name: "MyApp::app"), inflector: -> { Dry::Inflector.new }) }
   let(:env) { :development }
@@ -165,7 +165,7 @@ RSpec.describe Hanami::Configuration::Logger do
   end
 end
 
-RSpec.describe Hanami::Configuration do
+RSpec.describe Hanami::Config do
   subject(:config) { described_class.new(app_name: app_name, env: env) }
   let(:app_name) { Hanami::SliceName.new(double(name: "SOS::app"), inflector: -> { Dry::Inflector.new }) }
   let(:env) { :development }
@@ -180,7 +180,7 @@ RSpec.describe Hanami::Configuration do
     end
 
     describe "#app_name" do
-      it "defaults to Hanami::Configuration#app_name" do
+      it "defaults to Hanami::Config#app_name" do
         expect(config.logger.app_name).to eq(config.app_name)
       end
     end

data/spec/unit/hanami/config/router_spec.rb

@@ -0,0 +1,44 @@
+# frozen_string_literal: true
+
+require "hanami/config"
+
+RSpec.describe Hanami::Config, "#router" do
+  let(:config) { described_class.new(app_name: app_name, env: :development) }
+  let(:app_name) { "MyApp::app" }
+
+  subject(:router) { config.router }
+
+  context "hanami-router is bundled" do
+    it "is a full router configuration" do
+      is_expected.to be_an_instance_of(Hanami::Config::Router)
+
+      is_expected.to respond_to(:resolver)
+    end
+
+    it "loads the middleware stack" do
+      subject
+
+      expect(config.middleware_stack).not_to be_nil
+    end
+
+    it "can be finalized" do
+      is_expected.to respond_to(:finalize!)
+    end
+  end
+
+  context "hanami-router is not bundled" do
+    before do
+      allow(Hanami).to receive(:bundled?).and_call_original
+      expect(Hanami).to receive(:bundled?).with("hanami-router").and_return(false)
+    end
+
+    it "does not expose any settings" do
+      is_expected.not_to be_an_instance_of(Hanami::Config::Router)
+      is_expected.not_to respond_to(:resolver)
+    end
+
+    it "can be finalized" do
+      is_expected.to respond_to(:finalize!)
+    end
+  end
+end

data/spec/unit/hanami/{configuration → config}/slices_spec.rb

@@ -1,10 +1,10 @@
 # frozen_string_literal: true
 
 require "dry/inflector"
-require "hanami/configuration"
+require "hanami/config"
 require "hanami/slice_name"
 
-RSpec.describe Hanami::Configuration, "#slices" do
+RSpec.describe Hanami::Config, "#slices" do
   subject(:config) { described_class.new(app_name: app_name, env: :development) }
   let(:app_name) { Hanami::SliceName.new(double(name: "MyApp::App"), inflector: Dry::Inflector.new) }
 

data/spec/unit/hanami/{configuration → config}/views_spec.rb

@@ -1,25 +1,24 @@
 # frozen_string_literal: true
 
-require "hanami/configuration"
-require "hanami/configuration/views"
+require "hanami/config"
 require "saharspec/matchers/dont"
 
-RSpec.describe Hanami::Configuration, "#views" do
-  let(:configuration) { described_class.new(app_name: app_name, env: :development) }
+RSpec.describe Hanami::Config, "#views" do
+  let(:config) { described_class.new(app_name: app_name, env: :development) }
   let(:app_name) { "MyApp::app" }
 
-  subject(:views) { configuration.views }
+  subject(:views) { config.views }
 
-  context "Hanami::View available" do
-    it "exposes Hanami::Views's app configuration" do
-      is_expected.to be_an_instance_of(Hanami::Configuration::Views)
+  context "hanami-view is bundled" do
+    it "exposes Hanami::Views's app config" do
+      is_expected.to be_an_instance_of(Hanami::Config::Views)
 
       is_expected.to respond_to(:finalize!)
       is_expected.to respond_to(:layouts_dir)
       is_expected.to respond_to(:layouts_dir=)
     end
 
-    it "includes base view configuration" do
+    it "includes base view config" do
       expect(views).to respond_to(:paths)
       expect(views).to respond_to(:paths=)
     end
@@ -39,11 +38,11 @@ RSpec.describe Hanami::Configuration, "#views" do
       end
     end
 
-    it "preserves default values from the base view configuration" do
+    it "preserves default values from the base view config" do
       expect(views.layouts_dir).to eq Hanami::View.config.layouts_dir
     end
 
-    it "allows settings to be configured independently of the base view configuration" do
+    it "allows settings to be configured independently of the base view config" do
       expect { views.layouts_dir = "custom_layouts" }
         .to change { views.layouts_dir }.to("custom_layouts")
         .and(dont.change { Hanami::View.config.layouts_dir })
@@ -71,7 +70,7 @@ RSpec.describe Hanami::Configuration, "#views" do
       end
     end
 
-    describe "finalized configuration" do
+    describe "finalized config" do
       before do
         views.finalize!
       end
@@ -90,25 +89,14 @@ RSpec.describe Hanami::Configuration, "#views" do
     end
   end
 
-  context "Hanami::View not available" do
+  context "hanami-view is not bundled" do
     before do
-      load_error = LoadError.new.tap do |error|
-        error.instance_variable_set :@path, "hanami/view"
-      end
-
-      allow_any_instance_of(described_class)
-        .to receive(:require)
-        .with(anything)
-        .and_call_original
-
-      allow_any_instance_of(described_class)
-        .to receive(:require)
-        .with("hanami/view")
-        .and_raise load_error
+      allow(Hanami).to receive(:bundled?).and_call_original
+      expect(Hanami).to receive(:bundled?).with("hanami-view").and_return(false)
     end
 
     it "does not expose any settings" do
-      is_expected.not_to be_an_instance_of(Hanami::Configuration::Views)
+      is_expected.not_to be_an_instance_of(Hanami::Config::Views)
       is_expected.not_to respond_to(:layouts_dir)
       is_expected.not_to respond_to(:layouts_dir=)
     end

data/spec/unit/hanami/{configuration_spec.rb → config_spec.rb}

@@ -1,11 +1,11 @@
-require "hanami/configuration"
+require "hanami/config"
 
-RSpec.describe Hanami::Configuration do
+RSpec.describe Hanami::Config do
   let(:config) { described_class.new(app_name: app_name, env: env) }
   let(:app_name) { "MyApp::app" }
   let(:env) { :development }
 
-  describe "environment-specific configuration" do
+  describe "environment-specific config" do
     before do
       config.logger.level = :debug__set_without_env
     end