hanami 2.0.0.beta1.1 → 2.0.0.beta2

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hanami
 version: !ruby/object:Gem::Version
-  version: 2.0.0.beta1.1
+  version: 2.0.0.beta2
 platform: ruby
 authors:
 - Luca Guidi
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-07-22 00:00:00.000000000 Z
+date: 2022-08-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -58,20 +58,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.7'
-- !ruby/object:Gem::Dependency
-  name: dry-types
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.5'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.5'
 - !ruby/object:Gem::Dependency
   name: dry-inflector
   requirement: !ruby/object:Gem::Requirement
@@ -121,7 +107,7 @@ dependencies:
         version: '0.6'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.6.0
+        version: 0.6.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -131,7 +117,7 @@ dependencies:
         version: '0.6'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.6.0
+        version: 0.6.3
 - !ruby/object:Gem::Dependency
   name: hanami-cli
   requirement: !ruby/object:Gem::Requirement
@@ -231,7 +217,7 @@ files:
 - hanami.gemspec
 - lib/hanami.rb
 - lib/hanami/app.rb
-- lib/hanami/assets/application_configuration.rb
+- lib/hanami/assets/app_configuration.rb
 - lib/hanami/assets/configuration.rb
 - lib/hanami/boot.rb
 - lib/hanami/configuration.rb
@@ -263,7 +249,7 @@ files:
 - lib/hanami/routes.rb
 - lib/hanami/server.rb
 - lib/hanami/settings.rb
-- lib/hanami/settings/dotenv_store.rb
+- lib/hanami/settings/env_store.rb
 - lib/hanami/setup.rb
 - lib/hanami/slice.rb
 - lib/hanami/slice/router.rb
@@ -347,16 +333,17 @@ files:
 - spec/isolation/hanami/application/routes/configured_spec.rb
 - spec/isolation/hanami/application/routes/not_configured_spec.rb
 - spec/isolation/hanami/boot/success_spec.rb
-- spec/new_integration/action/configuration_spec.rb
 - spec/new_integration/action/cookies_spec.rb
 - spec/new_integration/action/csrf_protection_spec.rb
 - spec/new_integration/action/routes_spec.rb
 - spec/new_integration/action/sessions_spec.rb
+- spec/new_integration/action/slice_configuration_spec.rb
 - spec/new_integration/action/view_integration_spec.rb
 - spec/new_integration/action/view_rendering/automatic_rendering_spec.rb
 - spec/new_integration/action/view_rendering/paired_view_inference_spec.rb
 - spec/new_integration/action/view_rendering_spec.rb
 - spec/new_integration/code_loading/loading_from_app_spec.rb
+- spec/new_integration/code_loading/loading_from_lib_spec.rb
 - spec/new_integration/code_loading/loading_from_slice_spec.rb
 - spec/new_integration/container/application_routes_helper_spec.rb
 - spec/new_integration/container/auto_injection_spec.rb
@@ -366,16 +353,21 @@ files:
 - spec/new_integration/container/prepare_container_spec.rb
 - spec/new_integration/container/shutdown_spec.rb
 - spec/new_integration/container/standard_bootable_components_spec.rb
+- spec/new_integration/dotenv_loading_spec.rb
 - spec/new_integration/rack_app/middleware_spec.rb
 - spec/new_integration/rack_app/non_booted_rack_app_spec.rb
 - spec/new_integration/rack_app/rack_app_spec.rb
-- spec/new_integration/settings_spec.rb
+- spec/new_integration/settings/access_to_constants_spec.rb
+- spec/new_integration/settings/loading_from_env_spec.rb
+- spec/new_integration/settings/settings_component_loading_spec.rb
+- spec/new_integration/settings/using_types_spec.rb
+- spec/new_integration/setup_spec.rb
 - spec/new_integration/slices/external_slice_spec.rb
 - spec/new_integration/slices/slice_configuration_spec.rb
+- spec/new_integration/slices/slice_loading_spec.rb
 - spec/new_integration/slices/slice_routing_spec.rb
 - spec/new_integration/slices/slice_settings_spec.rb
 - spec/new_integration/slices_spec.rb
-- spec/new_integration/view/configuration_spec.rb
 - spec/new_integration/view/context/assets_spec.rb
 - spec/new_integration/view/context/inflector_spec.rb
 - spec/new_integration/view/context/request_spec.rb
@@ -384,6 +376,7 @@ files:
 - spec/new_integration/view/inflector_spec.rb
 - spec/new_integration/view/part_namespace_spec.rb
 - spec/new_integration/view/path_spec.rb
+- spec/new_integration/view/slice_configuration_spec.rb
 - spec/new_integration/view/template_spec.rb
 - spec/new_integration/view/views_spec.rb
 - spec/spec_helper.rb
@@ -412,11 +405,12 @@ files:
 - spec/unit/hanami/configuration/base_url_spec.rb
 - spec/unit/hanami/configuration/inflector_spec.rb
 - spec/unit/hanami/configuration/logger_spec.rb
+- spec/unit/hanami/configuration/slices_spec.rb
 - spec/unit/hanami/configuration/views_spec.rb
 - spec/unit/hanami/configuration_spec.rb
 - spec/unit/hanami/env_spec.rb
 - spec/unit/hanami/routes_spec.rb
-- spec/unit/hanami/settings/dotenv_store_spec.rb
+- spec/unit/hanami/settings/env_store_spec.rb
 - spec/unit/hanami/settings_spec.rb
 - spec/unit/hanami/slice_configurable_spec.rb
 - spec/unit/hanami/slice_name_spec.rb
@@ -520,16 +514,17 @@ test_files:
 - spec/isolation/hanami/application/routes/configured_spec.rb
 - spec/isolation/hanami/application/routes/not_configured_spec.rb
 - spec/isolation/hanami/boot/success_spec.rb
-- spec/new_integration/action/configuration_spec.rb
 - spec/new_integration/action/cookies_spec.rb
 - spec/new_integration/action/csrf_protection_spec.rb
 - spec/new_integration/action/routes_spec.rb
 - spec/new_integration/action/sessions_spec.rb
+- spec/new_integration/action/slice_configuration_spec.rb
 - spec/new_integration/action/view_integration_spec.rb
 - spec/new_integration/action/view_rendering/automatic_rendering_spec.rb
 - spec/new_integration/action/view_rendering/paired_view_inference_spec.rb
 - spec/new_integration/action/view_rendering_spec.rb
 - spec/new_integration/code_loading/loading_from_app_spec.rb
+- spec/new_integration/code_loading/loading_from_lib_spec.rb
 - spec/new_integration/code_loading/loading_from_slice_spec.rb
 - spec/new_integration/container/application_routes_helper_spec.rb
 - spec/new_integration/container/auto_injection_spec.rb
@@ -539,16 +534,21 @@ test_files:
 - spec/new_integration/container/prepare_container_spec.rb
 - spec/new_integration/container/shutdown_spec.rb
 - spec/new_integration/container/standard_bootable_components_spec.rb
+- spec/new_integration/dotenv_loading_spec.rb
 - spec/new_integration/rack_app/middleware_spec.rb
 - spec/new_integration/rack_app/non_booted_rack_app_spec.rb
 - spec/new_integration/rack_app/rack_app_spec.rb
-- spec/new_integration/settings_spec.rb
+- spec/new_integration/settings/access_to_constants_spec.rb
+- spec/new_integration/settings/loading_from_env_spec.rb
+- spec/new_integration/settings/settings_component_loading_spec.rb
+- spec/new_integration/settings/using_types_spec.rb
+- spec/new_integration/setup_spec.rb
 - spec/new_integration/slices/external_slice_spec.rb
 - spec/new_integration/slices/slice_configuration_spec.rb
+- spec/new_integration/slices/slice_loading_spec.rb
 - spec/new_integration/slices/slice_routing_spec.rb
 - spec/new_integration/slices/slice_settings_spec.rb
 - spec/new_integration/slices_spec.rb
-- spec/new_integration/view/configuration_spec.rb
 - spec/new_integration/view/context/assets_spec.rb
 - spec/new_integration/view/context/inflector_spec.rb
 - spec/new_integration/view/context/request_spec.rb
@@ -557,6 +557,7 @@ test_files:
 - spec/new_integration/view/inflector_spec.rb
 - spec/new_integration/view/part_namespace_spec.rb
 - spec/new_integration/view/path_spec.rb
+- spec/new_integration/view/slice_configuration_spec.rb
 - spec/new_integration/view/template_spec.rb
 - spec/new_integration/view/views_spec.rb
 - spec/spec_helper.rb
@@ -585,11 +586,12 @@ test_files:
 - spec/unit/hanami/configuration/base_url_spec.rb
 - spec/unit/hanami/configuration/inflector_spec.rb
 - spec/unit/hanami/configuration/logger_spec.rb
+- spec/unit/hanami/configuration/slices_spec.rb
 - spec/unit/hanami/configuration/views_spec.rb
 - spec/unit/hanami/configuration_spec.rb
 - spec/unit/hanami/env_spec.rb
 - spec/unit/hanami/routes_spec.rb
-- spec/unit/hanami/settings/dotenv_store_spec.rb
+- spec/unit/hanami/settings/env_store_spec.rb
 - spec/unit/hanami/settings_spec.rb
 - spec/unit/hanami/slice_configurable_spec.rb
 - spec/unit/hanami/slice_name_spec.rb

data/lib/hanami/settings/dotenv_store.rb

@@ -1,58 +0,0 @@
-# frozen_string_literal: true
-
-require "dry/core/constants"
-
-module Hanami
-  class Settings
-    # Default app settings store.
-    #
-    # Uses [dotenv](https://github.com/bkeepers/dotenv) (if available) to load
-    # .env files and then loads settings from ENV. For a given `HANAMI_ENV`
-    # environment, the following `.env` files are looked up in the following order:
-    #
-    # - .env.{environment}.local
-    # - .env.local (except if the environment is `test`)
-    # - .env.{environment}
-    # - .env
-    #
-    # @since 2.0.0
-    # @api private
-    class DotenvStore
-      Undefined = Dry::Core::Constants::Undefined
-
-      attr_reader :store,
-                  :hanami_env
-
-      def initialize(store: ENV, hanami_env: Hanami.env)
-        @store = store
-        @hanami_env = hanami_env
-      end
-
-      def fetch(name, default_value = Undefined, &block)
-        name = name.to_s.upcase
-        args = (default_value == Undefined) ? [name] : [name, default_value]
-
-        store.fetch(*args, &block)
-      end
-
-      def with_dotenv_loaded
-        require "dotenv"
-        Dotenv.load(*dotenv_files) if defined?(Dotenv)
-        self
-      rescue LoadError
-        self
-      end
-
-      private
-
-      def dotenv_files
-        [
-          ".env.#{hanami_env}.local",
-          (".env.local" unless hanami_env == :test),
-          ".env.#{hanami_env}",
-          ".env"
-        ].compact
-      end
-    end
-  end
-end

data/spec/new_integration/action/configuration_spec.rb

@@ -1,26 +0,0 @@
-# frozen_string_literal: true
-
-RSpec.describe "App action / Configuration", :app_integration do
-  before do
-    module TestApp
-      class App < Hanami::App
-        config.actions.default_response_format = :json
-        register_slice :main
-      end
-    end
-
-    Hanami.app.prepare
-
-    module TestApp
-      class Action < Hanami::Action
-      end
-    end
-  end
-
-  let(:action_class) { TestApp::Action }
-  subject(:configuration) { action_class.config }
-
-  it "applies 'config.actions' configuration from the app" do
-    expect(configuration.default_response_format).to eq :json
-  end
-end

data/spec/new_integration/settings_spec.rb

@@ -1,115 +0,0 @@
-# frozen_string_literal: true
-
-require "hanami/settings"
-
-RSpec.describe "App settings", :app_integration do
-  before do
-    @env = ENV.to_h
-  end
-
-  after do
-    ENV.replace(@env)
-  end
-
-  specify "Settings defined in config/settings.rb are loaded from .env" do
-    with_tmp_directory(Dir.mktmpdir) do
-      write "config/app.rb", <<~RUBY
-        require "hanami"
-
-        module TestApp
-          class App < Hanami::App
-          end
-        end
-      RUBY
-
-      write "config/settings.rb", <<~RUBY
-        require "hanami/settings"
-        require "test_app/types"
-
-        module TestApp
-          class Settings < Hanami::Settings
-            setting :database_url
-            setting :redis_url
-            setting :feature_flag, constructor: TestApp::Types::Params::Bool
-            setting :feature_flag_with_default, default: false, constructor: TestApp::Types::Params::Bool
-          end
-        end
-      RUBY
-
-      write ".env", <<~RUBY
-        DATABASE_URL=postgres://localhost/test_app_development
-        REDIS_URL=redis://localhost:6379
-        FEATURE_FLAG=true
-      RUBY
-
-      write "lib/test_app/types.rb", <<~RUBY
-        require "dry/types"
-
-        module TestApp
-          module Types
-            include Dry.Types()
-          end
-        end
-      RUBY
-
-      require "hanami/prepare"
-
-      expect(Hanami.app.settings.database_url).to eq "postgres://localhost/test_app_development"
-      expect(Hanami.app.settings.redis_url).to eq "redis://localhost:6379"
-      expect(Hanami.app.settings.feature_flag).to be true
-      expect(Hanami.app.settings.feature_flag_with_default).to be false
-
-      expect(Hanami.app[:settings]).to eql Hanami.app.settings
-    end
-  end
-
-  specify "Errors raised from setting constructors are collected" do
-    with_tmp_directory(Dir.mktmpdir) do
-      write "config/app.rb", <<~RUBY
-        require "hanami"
-
-        module TestApp
-          class App < Hanami::App
-          end
-        end
-      RUBY
-
-      write "config/settings.rb", <<~RUBY
-        require "hanami/settings"
-        require "test_app/types"
-
-        module TestApp
-          class Settings < Hanami::Settings
-            setting :numeric_setting, constructor: TestApp::Types::Params::Integer
-            setting :feature_flag, constructor: TestApp::Types::Params::Bool
-          end
-        end
-      RUBY
-
-      write ".env", <<~RUBY
-        NUMERIC_SETTING=hello
-        FEATURE_FLAG=maybe
-      RUBY
-
-      write "lib/test_app/types.rb", <<~RUBY
-        require "dry/types"
-
-        module TestApp
-          module Types
-            include Dry.Types()
-          end
-        end
-      RUBY
-
-      numeric_setting_error = "numeric_setting: invalid value for Integer"
-      feature_flag_error = "feature_flag: maybe cannot be coerced"
-
-      expect {
-        require "hanami/prepare"
-      }.to raise_error(
-        Hanami::Settings::InvalidSettingsError,
-        /#{numeric_setting_error}.+#{feature_flag_error}|#{feature_flag_error}.+#{numeric_setting_error}/m
-      )
-    end
-  end
-end

data/spec/new_integration/view/configuration_spec.rb

@@ -1,49 +0,0 @@
-# frozen_string_literal: true
-
-require "hanami"
-
-RSpec.describe "App view / Configuration", :app_integration do
-  before do
-    module TestApp
-      class App < Hanami::App
-        config.root = "/test_app"
-      end
-    end
-
-    Hanami.app.instance_eval(&app_hook) if respond_to?(:app_hook)
-    Hanami.app.register_slice :main
-    Hanami.app.prepare
-
-    module TestApp
-      class View < Hanami::View
-      end
-    end
-  end
-
-  let(:view_class) { TestApp::View }
-
-  subject(:config) { view_class.config }
-
-  it "applies default view configuration from the app" do
-    aggregate_failures do
-      expect(config.layouts_dir).to eq "layouts"
-      expect(config.layout).to eq "app"
-    end
-  end
-
-  context "custom views configuration on app" do
-    let(:app_hook) {
-      proc do
-        config.views.layouts_dir = "custom_layouts"
-        config.views.layout = "my_layout"
-      end
-    }
-
-    it "applies the custom configuration" do
-      aggregate_failures do
-        expect(config.layouts_dir).to eq "custom_layouts"
-        expect(config.layout).to eq "my_layout"
-      end
-    end
-  end
-end

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

@@ -1,119 +0,0 @@
-# frozen_string_literal: true
-
-require "hanami/settings/dotenv_store"
-require "dotenv"
-
-RSpec.describe Hanami::Settings::DotenvStore do
-  def mock_dotenv(store)
-    dotenv = spy(:dotenv)
-    allow(store).to receive(:require).and_call_original
-    stub_const "Dotenv", dotenv
-  end
-
-  describe "#with_dotenv_loaded" do
-    context "dotenv available and environment other than test" do
-      it "requires and loads a range of dotenv files, specific to the current environment" do
-        store = described_class.new(store: {}, hanami_env: :development)
-        dotenv = mock_dotenv(store)
-
-        store.with_dotenv_loaded
-
-        expect(store).to have_received(:require).with("dotenv").ordered
-        expect(dotenv).to have_received(:load).ordered.with(
-          ".env.development.local",
-          ".env.local",
-          ".env.development",
-          ".env"
-        )
-      end
-
-      it "returns self" do
-        store = described_class.new(store: {}, hanami_env: :development)
-
-        expect(store.with_dotenv_loaded).to be(store)
-      end
-    end
-
-    context "dotenv available and test environment" do
-      it "does not load .env.local (which is intended for non-test settings only)" do
-        store = described_class.new(store: {}, hanami_env: :test)
-        dotenv = mock_dotenv(store)
-
-        store.with_dotenv_loaded
-
-        expect(store).to have_received(:require).with("dotenv").ordered
-        expect(dotenv).to have_received(:load).ordered.with(
-          ".env.test.local",
-          ".env.test",
-          ".env"
-        )
-      end
-
-      it "returns self" do
-        store = described_class.new(store: {}, hanami_env: :test)
-
-        expect(store.with_dotenv_loaded).to be(store)
-      end
-    end
-
-    context "dotenv unavailable" do
-      let(:store) { described_class.new(store: {}) }
-
-      before do
-        allow(store).to receive(:require).with("dotenv").and_raise LoadError
-      end
-
-      it "attempts to require dotenv" do
-        store.with_dotenv_loaded
-
-        expect(store).to have_received(:require).with("dotenv")
-      end
-
-      it "gracefully ignores load errors" do
-        expect { store.with_dotenv_loaded }.not_to raise_error
-      end
-
-      it "returns self" do
-        expect(store.with_dotenv_loaded).to be(store)
-      end
-    end
-  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")
-    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