hanami 2.0.0.beta1.1 → 2.0.0.beta3

data/spec/integration/view/slice_configuration_spec.rb

@@ -0,0 +1,289 @@
+# frozen_string_literal: true
+
+RSpec.describe "App view / Slice configuration", :app_integration do
+  before do
+    with_directory(@dir = make_tmp_directory) do
+      write "config/app.rb", <<~'RUBY'
+        require "hanami"
+
+        module TestApp
+          class App < Hanami::App
+          end
+        end
+      RUBY
+
+      write "app/view.rb", <<~'RUBY'
+        require "hanami/view"
+
+        module TestApp
+          class View < Hanami::View
+          end
+        end
+      RUBY
+
+      require "hanami/setup"
+    end
+  end
+
+  def prepare_app
+    with_directory(@dir) { require "hanami/prepare" }
+  end
+
+  describe "inheriting from app-level base class" do
+    describe "app-level base class" do
+      it "applies default views config from the app", :aggregate_failures do
+        prepare_app
+
+        expect(TestApp::View.config.layouts_dir).to eq "layouts"
+        expect(TestApp::View.config.layout).to eq "app"
+      end
+
+      it "applies views config from the app" do
+        Hanami.app.config.views.layout = "app_layout"
+
+        prepare_app
+
+        expect(TestApp::View.config.layout).to eq "app_layout"
+      end
+
+      it "does not override config in the base class" do
+        Hanami.app.config.views.layout = "app_layout"
+
+        prepare_app
+
+        TestApp::View.config.layout = "custom_layout"
+
+        expect(TestApp::View.config.layout).to eq "custom_layout"
+      end
+    end
+
+    describe "subclass in app" do
+      before do
+        with_directory(@dir) do
+          write "app/views/articles/index.rb", <<~'RUBY'
+            module TestApp
+              module Views
+                module Articles
+                  class Index < TestApp::View
+                  end
+                end
+              end
+            end
+          RUBY
+        end
+      end
+
+      it "applies default views config from the app", :aggregate_failures do
+        prepare_app
+
+        expect(TestApp::Views::Articles::Index.config.layouts_dir).to eq "layouts"
+        expect(TestApp::Views::Articles::Index.config.layout).to eq "app"
+      end
+
+      it "applies views config from the app" do
+        Hanami.app.config.views.layout = "app_layout"
+
+        prepare_app
+
+        expect(TestApp::Views::Articles::Index.config.layout).to eq "app_layout"
+      end
+
+      it "applies config from the base class" do
+        prepare_app
+
+        TestApp::View.config.layout = "base_class_layout"
+
+        expect(TestApp::Views::Articles::Index.config.layout).to eq "base_class_layout"
+      end
+    end
+
+    describe "subclass in slice" do
+      before do
+        with_directory(@dir) do
+          write "slices/admin/views/articles/index.rb", <<~'RUBY'
+            module Admin
+              module Views
+                module Articles
+                  class Index < TestApp::View
+                  end
+                end
+              end
+            end
+          RUBY
+        end
+      end
+
+      it "applies default views config from the app", :aggregate_failures do
+        prepare_app
+
+        expect(Admin::Views::Articles::Index.config.layouts_dir).to eq "layouts"
+        expect(Admin::Views::Articles::Index.config.layout).to eq "app"
+      end
+
+      it "applies views config from the app" do
+        Hanami.app.config.views.layout = "app_layout"
+
+        prepare_app
+
+        expect(Admin::Views::Articles::Index.config.layout).to eq "app_layout"
+      end
+
+      it "applies config from the base class" do
+        prepare_app
+
+        TestApp::View.config.layout = "base_class_layout"
+
+        expect(Admin::Views::Articles::Index.config.layout).to eq "base_class_layout"
+      end
+    end
+  end
+
+  describe "inheriting from a slice-level base class, in turn inheriting from an app-level base class" do
+    before do
+      with_directory(@dir) do
+        write "slices/admin/view.rb", <<~'RUBY'
+          module Admin
+            class View < TestApp::View
+            end
+          end
+        RUBY
+      end
+    end
+
+    describe "slice-level base class" do
+      it "applies default views config from the app", :aggregate_failures do
+        prepare_app
+
+        expect(Admin::View.config.layouts_dir).to eq "layouts"
+        expect(Admin::View.config.layout).to eq "app"
+      end
+
+      it "applies views config from the app" do
+        Hanami.app.config.views.layout = "app_layout"
+
+        prepare_app
+
+        expect(Admin::View.config.layout).to eq "app_layout"
+      end
+
+      it "applies config from the app base class" do
+        prepare_app
+
+        TestApp::View.config.layout = "app_base_class_layout"
+
+        expect(Admin::View.config.layout).to eq "app_base_class_layout"
+      end
+
+      context "slice views config present" do
+        before do
+          with_directory(@dir) do
+            write "config/slices/admin.rb", <<~'RUBY'
+              module Admin
+                class Slice < Hanami::Slice
+                  config.views.layout = "slice_layout"
+                end
+              end
+            RUBY
+          end
+        end
+
+        it "applies views config from the slice" do
+          prepare_app
+
+          expect(Admin::View.config.layout).to eq "slice_layout"
+        end
+
+        it "prefers views config from the slice over config from the app-level base class" do
+          prepare_app
+
+          TestApp::View.config.layout = "app_base_class_layout"
+
+          expect(Admin::View.config.layout).to eq "slice_layout"
+        end
+
+        it "prefers config from the base class over views config from the slice" do
+          prepare_app
+
+          TestApp::View.config.layout = "app_base_class_layout"
+          Admin::View.config.layout = "slice_base_class_layout"
+
+          expect(Admin::View.config.layout).to eq "slice_base_class_layout"
+        end
+      end
+    end
+
+    describe "subclass in slice" do
+      before do
+        with_directory(@dir) do
+          write "slices/admin/views/articles/index.rb", <<~'RUBY'
+            module Admin
+              module Views
+                module Articles
+                  class Index < Admin::View
+                  end
+                end
+              end
+            end
+          RUBY
+        end
+      end
+
+      it "applies default views config from the app", :aggregate_failures do
+        prepare_app
+
+        expect(Admin::Views::Articles::Index.config.layouts_dir).to eq "layouts"
+        expect(Admin::Views::Articles::Index.config.layout).to eq "app"
+      end
+
+      it "applies views config from the app" do
+        Hanami.app.config.views.layout = "app_layout"
+
+        prepare_app
+
+        expect(Admin::Views::Articles::Index.config.layout).to eq "app_layout"
+      end
+
+      it "applies views config from the slice" do
+        with_directory(@dir) do
+          write "config/slices/admin.rb", <<~'RUBY'
+            module Admin
+              class Slice < Hanami::Slice
+                config.views.layout = "slice_layout"
+              end
+            end
+          RUBY
+        end
+
+        prepare_app
+
+        expect(Admin::Views::Articles::Index.config.layout).to eq "slice_layout"
+      end
+
+      it "applies config from the slice base class" do
+        prepare_app
+
+        Admin::View.config.layout = "slice_base_class_layout"
+
+        expect(Admin::Views::Articles::Index.config.layout).to eq "slice_base_class_layout"
+      end
+
+      it "prefers config from the slice base class over views config from the slice" do
+        with_directory(@dir) do
+          write "config/slices/admin.rb", <<~'RUBY'
+            module Admin
+              class Slice < Hanami::Slice
+                config.views.layout = "slice_layout"
+              end
+            end
+          RUBY
+        end
+
+        prepare_app
+
+        Admin::View.config.layout = "slice_base_class_layout"
+
+        expect(Admin::Views::Articles::Index.config.layout).to eq "slice_base_class_layout"
+      end
+    end
+  end
+end

data/spec/support/app_integration.rb

@@ -20,7 +20,7 @@ module RSpec
 end
 
 RSpec.shared_context "Application integration" do
-  let(:application_modules) { %i[TestApp Admin Main Search] }
+  let(:app_modules) { %i[TestApp Admin Main Search] }
 end
 
 RSpec.configure do |config|
@@ -52,9 +52,8 @@ RSpec.configure do |config|
     Zeitwerk::ExplicitNamespace.cpaths.clear
     Zeitwerk::ExplicitNamespace.tracer.disable
 
-    if Hanami.instance_variable_defined?(:@_app)
-      Hanami.remove_instance_variable(:@_app)
-    end
+    Hanami.instance_variable_set(:@_bundled, {})
+    Hanami.remove_instance_variable(:@_app) if Hanami.instance_variable_defined?(:@_app)
 
     $LOAD_PATH.replace(@load_paths)
 
@@ -68,7 +67,7 @@ RSpec.configure do |config|
     }
     $LOADED_FEATURES.replace(@loaded_features + new_features_to_keep)
 
-    application_modules.each do |app_module_name|
+    app_modules.each do |app_module_name|
       next unless Object.const_defined?(app_module_name)
 
       Object.const_get(app_module_name).tap do |mod|

data/spec/unit/hanami/configuration/actions_spec.rb

@@ -10,7 +10,7 @@ RSpec.describe Hanami::Configuration, "#actions" do
 
   subject(:actions) { configuration.actions }
 
-  context "Hanami::Action available" do
+  context "hanami-controller is bundled" do
     it "is a full actions configuration" do
       is_expected.to be_an_instance_of(Hanami::Configuration::Actions)
 
@@ -48,21 +48,10 @@ RSpec.describe Hanami::Configuration, "#actions" do
     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

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

@@ -0,0 +1,45 @@
+# frozen_string_literal: true
+
+require "hanami/configuration"
+require "hanami/configuration/router"
+
+RSpec.describe Hanami::Configuration, "#router" do
+  let(:configuration) { described_class.new(app_name: app_name, env: :development) }
+  let(:app_name) { "MyApp::app" }
+
+  subject(:router) { configuration.router }
+
+  context "hanami-router is bundled" do
+    it "is a full router configuration" do
+      is_expected.to be_an_instance_of(Hanami::Configuration::Router)
+
+      is_expected.to respond_to(:resolver)
+    end
+
+    it "loads the middleware stack" do
+      subject
+
+      expect(configuration.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::Configuration::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/slices_spec.rb

@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+
+require "dry/inflector"
+require "hanami/configuration"
+require "hanami/slice_name"
+
+RSpec.describe Hanami::Configuration, "#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) }
+
+  subject(:slices) { config.slices }
+
+  before do
+    @orig_env = ENV.to_h
+  end
+
+  after do
+    ENV.replace(@orig_env)
+  end
+
+  it "is nil by default" do
+    is_expected.to be nil
+  end
+
+  it "defaults to the HANAMI_LOAD_SLICES env var, separated by commas" do
+    ENV["HANAMI_SLICES"] = "main,admin"
+    is_expected.to eq %w[main admin]
+  end
+
+  it "strips spaces from HANAMI_LOAD_SLICES env var entries" do
+    ENV["HANAMI_SLICES"] = "main, admin"
+    is_expected.to eq %w[main admin]
+  end
+end

data/spec/unit/hanami/configuration/views_spec.rb

@@ -10,7 +10,7 @@ RSpec.describe Hanami::Configuration, "#views" do
 
   subject(:views) { configuration.views }
 
-  context "Hanami::View available" do
+  context "hanami-view is bundled" do
     it "exposes Hanami::Views's app configuration" do
       is_expected.to be_an_instance_of(Hanami::Configuration::Views)
 
@@ -90,21 +90,10 @@ 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

data/spec/unit/hanami/settings/env_store_spec.rb

@@ -0,0 +1,52 @@
+# frozen_string_literal: true
+
+require "hanami/settings/env_store"
+
+RSpec.describe Hanami::Settings::EnvStore do
+  it "defaults to using ENV as the store" do
+    orig_env = ENV.to_h
+
+    ENV["FOO"] = "bar"
+    expect(described_class.new.fetch("FOO")).to eq "bar"
+
+    ENV.replace(orig_env)
+  end
+
+  describe "#fetch" do
+    it "fetches from ENV" do
+      store = described_class.new(store: {"FOO" => "bar"})
+
+      expect(store.fetch("FOO")).to eq("bar")
+    end
+
+    it "capitalizes name" do
+      store = described_class.new(store: {"FOO" => "bar"})
+
+      expect(store.fetch("foo")).to eq("bar")
+    end
+
+    it "coerces name to string" do
+      store = described_class.new(store: {"FOO" => "bar"})
+
+      expect(store.fetch(:foo)).to eq("bar")
+    end
+
+    it "returns default when value is not found" do
+      store = described_class.new(store: {"FOO" => "bar"})
+
+      expect(store.fetch("BAZ", "qux")).to eq("qux")
+    end
+
+    it "returns the block execution when value is not found" do
+      store = described_class.new(store: {"FOO" => "bar"})
+
+      expect(store.fetch("BAZ") { "qux" }).to eq("qux") # rubocop:disable Style/RedundantFetchBlock
+    end
+
+    it "raises KeyError when value is not found and no default is given" do
+      store = described_class.new(store: {"FOO" => "bar"})
+
+      expect { store.fetch("BAZ") }.to raise_error(KeyError)
+    end
+  end
+end

data/spec/unit/hanami/slice_configurable_spec.rb

@@ -54,8 +54,8 @@ RSpec.describe Hanami::SliceConfigurable, :app_integration do
 
       subject(:subclass) { Main::MySubSubclass }
 
-      it "calls `configure_for_slice` again for the same slice" do
-        expect(subclass.traces).to eq [Main::Slice, Main::Slice]
+      it "does not call `configure_for_slice` again" do
+        expect(subclass.traces).to eq [Main::Slice]
       end
     end
 

data/spec/unit/hanami/version_spec.rb

@@ -2,6 +2,6 @@
 
 RSpec.describe "Hanami::VERSION" do
   it "returns current version" do
-    expect(Hanami::VERSION).to eq("2.0.0.beta1.1")
+    expect(Hanami::VERSION).to eq("2.0.0.beta3")
   end
 end