hanami 2.0.0.beta3 → 2.0.0.rc1

data/spec/unit/hanami/settings_spec.rb

@@ -5,51 +5,106 @@ require "hanami/settings"
 RSpec.describe Hanami::Settings do
   describe "#initialize" do
     it "uses values from the store when present" do
-      config_class = Class.new(described_class) do
+      settings_class = Class.new(described_class) do
         setting :database_url, default: "postgres://localhost/test_app_development"
       end
-      store = { database_url: "mysql://localhost/test_app_development" }.freeze
 
-      instance = config_class.new(store)
+      store = {database_url: "mysql://localhost/test_app_development"}.freeze
+
+      instance = settings_class.new(store)
 
       expect(instance.config.database_url).to eq("mysql://localhost/test_app_development")
     end
 
     it "uses defaults when values are not present in the store" do
-      config_class = Class.new(described_class) do
+      settings_class = Class.new(described_class) do
         setting :database_url, default: "postgres://localhost/test_app_development"
       end
+
       store = {}.freeze
 
-      instance = config_class.new(store)
+      instance = settings_class.new(store)
 
       expect(instance.config.database_url).to eq("postgres://localhost/test_app_development")
     end
 
-    it "collects error for all failed settings" do
-      config_class = Class.new(described_class) do
+    it "collects error for all setting values failing their constructors" do
+      settings_class = Class.new(described_class) do
         setting :database_url, constructor: ->(_v) { raise "nope to database" }
         setting :redis_url, constructor: ->(_v) { raise "nope to redis" }
       end
+
       store = {
         database_url: "postgres://localhost/test_app_development",
         redis_url: "redis://localhost:6379"
       }.freeze
 
-      expect { config_class.new(store) }.to raise_error(
+      expect { settings_class.new(store) }.to raise_error(
         described_class::InvalidSettingsError,
         /(database_url: nope to database).*(redis_url: nope to redis)/m,
       )
     end
+
+    it "collects errors for missing settings failing their constructors" do
+      settings_class = Class.new(described_class) do
+        setting :database_url, constructor: ->(_v) { raise "nope to database" }
+      end
+
+      store = {}
+
+      expect { settings_class.new(store) }.to raise_error(
+        described_class::InvalidSettingsError,
+        /database_url: nope to database/m,
+      )
+    end
+
+    it "finalizes the config" do
+      settings_class = Class.new(described_class) do
+        setting :database_url
+      end
+
+      store = {database_url: "postgres://localhost/test_app_development"}
+
+      settings = settings_class.new(store)
+
+      expect(settings.config).to be_frozen
+      expect { settings.database_url = "new" }.to raise_error(Dry::Configurable::FrozenConfigError)
+    end
+  end
+
+  describe "#inspect" do
+    it "shows keys" do
+      settings_class = Class.new(described_class) do
+        setting :password, default: "dont_tell_anybody"
+        setting :passphrase, default: "shhhh"
+      end
+
+      expect(settings_class.new.inspect).to eq(
+        "#<#{settings_class.to_s} [password, passphrase]>"
+      )
+    end
+  end
+
+  describe "#inspect_values" do
+    it "shows keys & values" do
+      settings_class = Class.new(described_class) do
+        setting :password, default: "dont_tell_anybody"
+        setting :passphrase, default: "shhh"
+      end
+
+      expect(settings_class.new.inspect_values).to eq(
+        "#<#{settings_class.to_s} password=\"dont_tell_anybody\" passphrase=\"shhh\">"
+      )
+    end
   end
 
   it "delegates unknown methods to config" do
-    config_class = Class.new(described_class) do
+    settings_class = Class.new(described_class) do
       setting :foo, default: "bar"
     end
     store = {}.freeze
 
-    instance = config_class.new(store)
+    instance = settings_class.new(store)
 
     expect(instance.foo).to eq("bar")
   end

data/spec/unit/hanami/slice_configurable_spec.rb

@@ -28,8 +28,6 @@ RSpec.describe Hanami::SliceConfigurable, :app_integration do
         end
       end
     end
-
-    Hanami.app.prepare
   end
 
   context "subclass inside slice namespace" do
@@ -101,4 +99,25 @@ RSpec.describe Hanami::SliceConfigurable, :app_integration do
       end
     end
   end
+
+  context "subclass inside nested slice namespace" do
+    before do
+      module Main
+        class Slice
+          register_slice :nested
+        end
+
+        module Nested
+          class MySubclass < TestApp::BaseClass
+          end
+        end
+      end
+    end
+
+    subject(:subclass) { Main::Nested::MySubclass }
+
+    it "calls `configure_for_slice` with the nested slice" do
+      expect(subclass.traces).to eq [Main::Nested::Slice]
+    end
+  end
 end

data/spec/unit/hanami/slice_spec.rb

@@ -8,6 +8,38 @@ RSpec.describe Hanami::Slice, :app_integration do
     end
   end
 
+  describe ".environemnt" do
+    subject(:slice) { Hanami.app.register_slice(:main) }
+
+    before do
+      allow(slice.config).to receive(:env) { :development }
+    end
+
+    it "evaluates the block with the env matches the Hanami.env" do
+      expect {
+        slice.environment(:development) do
+          config.logger.level = :info
+        end
+      }
+        .to change { slice.config.logger.level }
+        .to :info
+    end
+
+    it "yields the slice to the block" do
+      captured_slice = nil
+      slice.environment(:development) { |slice| captured_slice = slice }
+      expect(captured_slice).to be slice
+    end
+
+    it "does not evaluate the block with the env does not match the Hanami.env" do
+      expect {
+        slice.environment(:test) do
+          config.logger.level = :info
+        end
+      }.not_to(change { slice.config.logger.level })
+    end
+  end
+
   describe ".prepare" do
     it "raises an error if the slice class is anonymous" do
       expect { Class.new(described_class).prepare }

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.beta3")
+    expect(Hanami::VERSION).to eq("2.0.0.rc1")
   end
 end

data/spec/unit/hanami/web/rack_logger_spec.rb

@@ -1,13 +1,24 @@
 # frozen_string_literal: true
 
 require "hanami/web/rack_logger"
-require "hanami/logger"
+require "dry/logger"
 require "stringio"
 require "rack/mock"
 
 RSpec.describe Hanami::Web::RackLogger do
   subject { described_class.new(logger) }
-  let(:logger) { Hanami::Logger.new(app_name, stream: stream, level: Hanami::Logger::DEBUG, filter: filters) }
+
+  let(:logger) do
+    Dry.Logger(
+      app_name,
+      stream: stream,
+      level: :debug,
+      filters: filters,
+      formatter: :rack,
+      template: "[%<progname>s] [%<severity>s] [%<time>s] %<message>s"
+    )
+  end
+
   let(:stream) { StringIO.new }
   let(:filters) { ["user.password"] }
   let(:app_name) { "my_app" }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hanami
 version: !ruby/object:Gem::Version
-  version: 2.0.0.beta3
+  version: 2.0.0.rc1
 platform: ruby
 authors:
 - Luca Guidi
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-09-21 00:00:00.000000000 Z
+date: 2022-11-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -36,130 +36,150 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.15'
+        version: '1.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.15'
+        version: '1.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2'
 - !ruby/object:Gem::Dependency
   name: dry-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '1.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '1.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2'
 - !ruby/object:Gem::Dependency
   name: dry-inflector
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
-    - - ">="
+        version: '1.0'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 0.2.1
+        version: '2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
-    - - ">="
+        version: '1.0'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 0.2.1
+        version: '2'
 - !ruby/object:Gem::Dependency
-  name: dry-system
+  name: dry-monitor
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.25'
-    - - ">="
+        version: '1.0'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 0.25.0
+        version: '2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.25'
-    - - ">="
+        version: '1.0'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 0.25.0
+        version: '2'
 - !ruby/object:Gem::Dependency
-  name: dry-monitor
+  name: dry-system
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.6'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.6.3
+        version: 1.0.rc
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.6'
-    - - ">="
+        version: 1.0.rc
+- !ruby/object:Gem::Dependency
+  name: dry-logger
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.0.rc
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.3
+        version: 1.0.rc
 - !ruby/object:Gem::Dependency
   name: hanami-cli
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.beta
+        version: 2.0.rc
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.beta
+        version: 2.0.rc
 - !ruby/object:Gem::Dependency
   name: hanami-utils
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.beta
+        version: 2.0.rc
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.beta
+        version: 2.0.rc
 - !ruby/object:Gem::Dependency
   name: zeitwerk
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.4'
+        version: '2.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.4'
+        version: '2.6'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -217,19 +237,18 @@ files:
 - hanami.gemspec
 - lib/hanami.rb
 - lib/hanami/app.rb
-- lib/hanami/assets/app_configuration.rb
-- lib/hanami/assets/configuration.rb
+- lib/hanami/assets/app_config.rb
+- lib/hanami/assets/config.rb
 - lib/hanami/boot.rb
-- lib/hanami/configuration.rb
-- lib/hanami/configuration/actions.rb
-- lib/hanami/configuration/actions/content_security_policy.rb
-- lib/hanami/configuration/actions/cookies.rb
-- lib/hanami/configuration/actions/sessions.rb
-- lib/hanami/configuration/logger.rb
-- lib/hanami/configuration/null_configuration.rb
-- lib/hanami/configuration/router.rb
-- lib/hanami/configuration/sessions.rb
-- lib/hanami/configuration/views.rb
+- lib/hanami/config.rb
+- lib/hanami/config/actions.rb
+- lib/hanami/config/actions/content_security_policy.rb
+- lib/hanami/config/actions/cookies.rb
+- lib/hanami/config/actions/sessions.rb
+- lib/hanami/config/logger.rb
+- lib/hanami/config/null_config.rb
+- lib/hanami/config/router.rb
+- lib/hanami/config/views.rb
 - lib/hanami/constants.rb
 - lib/hanami/errors.rb
 - lib/hanami/extensions.rb
@@ -244,7 +263,6 @@ files:
 - lib/hanami/providers/logger.rb
 - lib/hanami/providers/rack.rb
 - lib/hanami/providers/routes.rb
-- lib/hanami/providers/settings.rb
 - lib/hanami/rake_tasks.rb
 - lib/hanami/routes.rb
 - lib/hanami/settings.rb
@@ -279,22 +297,26 @@ files:
 - spec/integration/container/autoloader_spec.rb
 - spec/integration/container/imports_spec.rb
 - spec/integration/container/prepare_container_spec.rb
+- spec/integration/container/provider_lifecycle_spec.rb
 - spec/integration/container/shutdown_spec.rb
-- spec/integration/container/standard_bootable_components_spec.rb
+- spec/integration/container/standard_providers/rack_provider_spec.rb
+- spec/integration/container/standard_providers_spec.rb
 - spec/integration/dotenv_loading_spec.rb
+- spec/integration/rack_app/body_parser_spec.rb
 - spec/integration/rack_app/middleware_spec.rb
 - spec/integration/rack_app/non_booted_rack_app_spec.rb
 - spec/integration/rack_app/rack_app_spec.rb
+- spec/integration/settings/access_in_slice_class_body_spec.rb
 - spec/integration/settings/access_to_constants_spec.rb
 - spec/integration/settings/loading_from_env_spec.rb
 - spec/integration/settings/settings_component_loading_spec.rb
+- spec/integration/settings/slice_registration_spec.rb
 - spec/integration/settings/using_types_spec.rb
 - spec/integration/setup_spec.rb
 - spec/integration/slices/external_slice_spec.rb
 - spec/integration/slices/slice_configuration_spec.rb
 - spec/integration/slices/slice_loading_spec.rb
 - spec/integration/slices/slice_routing_spec.rb
-- spec/integration/slices/slice_settings_spec.rb
 - spec/integration/slices_spec.rb
 - spec/integration/view/context/assets_spec.rb
 - spec/integration/view/context/inflector_spec.rb
@@ -322,19 +344,18 @@ files:
 - spec/support/shared_examples/cli/generate/migration.rb
 - spec/support/shared_examples/cli/generate/model.rb
 - spec/support/shared_examples/cli/new.rb
-- spec/unit/hanami/configuration/actions/content_security_policy_spec.rb
-- spec/unit/hanami/configuration/actions/cookies_spec.rb
-- spec/unit/hanami/configuration/actions/csrf_protection_spec.rb
-- spec/unit/hanami/configuration/actions/default_values_spec.rb
-- spec/unit/hanami/configuration/actions/sessions_spec.rb
-- spec/unit/hanami/configuration/actions_spec.rb
-- 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/router_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/config/actions/content_security_policy_spec.rb
+- spec/unit/hanami/config/actions/cookies_spec.rb
+- spec/unit/hanami/config/actions/csrf_protection_spec.rb
+- spec/unit/hanami/config/actions/default_values_spec.rb
+- spec/unit/hanami/config/actions/sessions_spec.rb
+- spec/unit/hanami/config/actions_spec.rb
+- spec/unit/hanami/config/base_url_spec.rb
+- spec/unit/hanami/config/inflector_spec.rb
+- spec/unit/hanami/config/logger_spec.rb
+- spec/unit/hanami/config/router_spec.rb
+- spec/unit/hanami/config/slices_spec.rb
+- spec/unit/hanami/config/views_spec.rb
 - spec/unit/hanami/env_spec.rb
 - spec/unit/hanami/settings/env_store_spec.rb
 - spec/unit/hanami/settings_spec.rb
@@ -387,22 +408,26 @@ test_files:
 - spec/integration/container/autoloader_spec.rb
 - spec/integration/container/imports_spec.rb
 - spec/integration/container/prepare_container_spec.rb
+- spec/integration/container/provider_lifecycle_spec.rb
 - spec/integration/container/shutdown_spec.rb
-- spec/integration/container/standard_bootable_components_spec.rb
+- spec/integration/container/standard_providers/rack_provider_spec.rb
+- spec/integration/container/standard_providers_spec.rb
 - spec/integration/dotenv_loading_spec.rb
+- spec/integration/rack_app/body_parser_spec.rb
 - spec/integration/rack_app/middleware_spec.rb
 - spec/integration/rack_app/non_booted_rack_app_spec.rb
 - spec/integration/rack_app/rack_app_spec.rb
+- spec/integration/settings/access_in_slice_class_body_spec.rb
 - spec/integration/settings/access_to_constants_spec.rb
 - spec/integration/settings/loading_from_env_spec.rb
 - spec/integration/settings/settings_component_loading_spec.rb
+- spec/integration/settings/slice_registration_spec.rb
 - spec/integration/settings/using_types_spec.rb
 - spec/integration/setup_spec.rb
 - spec/integration/slices/external_slice_spec.rb
 - spec/integration/slices/slice_configuration_spec.rb
 - spec/integration/slices/slice_loading_spec.rb
 - spec/integration/slices/slice_routing_spec.rb
-- spec/integration/slices/slice_settings_spec.rb
 - spec/integration/slices_spec.rb
 - spec/integration/view/context/assets_spec.rb
 - spec/integration/view/context/inflector_spec.rb
@@ -430,19 +455,18 @@ test_files:
 - spec/support/shared_examples/cli/generate/migration.rb
 - spec/support/shared_examples/cli/generate/model.rb
 - spec/support/shared_examples/cli/new.rb
-- spec/unit/hanami/configuration/actions/content_security_policy_spec.rb
-- spec/unit/hanami/configuration/actions/cookies_spec.rb
-- spec/unit/hanami/configuration/actions/csrf_protection_spec.rb
-- spec/unit/hanami/configuration/actions/default_values_spec.rb
-- spec/unit/hanami/configuration/actions/sessions_spec.rb
-- spec/unit/hanami/configuration/actions_spec.rb
-- 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/router_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/config/actions/content_security_policy_spec.rb
+- spec/unit/hanami/config/actions/cookies_spec.rb
+- spec/unit/hanami/config/actions/csrf_protection_spec.rb
+- spec/unit/hanami/config/actions/default_values_spec.rb
+- spec/unit/hanami/config/actions/sessions_spec.rb
+- spec/unit/hanami/config/actions_spec.rb
+- spec/unit/hanami/config/base_url_spec.rb
+- spec/unit/hanami/config/inflector_spec.rb
+- spec/unit/hanami/config/logger_spec.rb
+- spec/unit/hanami/config/router_spec.rb
+- spec/unit/hanami/config/slices_spec.rb
+- spec/unit/hanami/config/views_spec.rb
 - spec/unit/hanami/env_spec.rb
 - spec/unit/hanami/settings/env_store_spec.rb
 - spec/unit/hanami/settings_spec.rb

data/lib/hanami/assets/app_configuration.rb

@@ -1,69 +0,0 @@
-# frozen_string_literal: true
-
-require "hanami/assets/configuration"
-require "dry/configurable"
-
-module Hanami
-  module Assets
-    # @since 2.0.0
-    # @api public
-    class AppConfiguration
-      include Dry::Configurable
-
-      # @since 2.0.0
-      # @api private
-      attr_reader :base_configuration
-      protected :base_configuration
-
-      setting :server_url, default: "http://localhost:8080"
-
-      # @since 2.0.0
-      # @api private
-      def initialize(*)
-        super
-
-        @base_configuration = Assets::Configuration.new
-      end
-
-      def initialize_copy(source)
-        super
-        @base_configuration = source.base_configuration.dup
-      end
-
-      # @since 2.0.0
-      # @api private
-      def finalize!
-      end
-
-      # Returns the list of available settings
-      #
-      # @return [Set]
-      #
-      # @since 2.0.0
-      # @api private
-      def settings
-        base_configuration.settings + self.class.settings
-      end
-
-      private
-
-      # @since 2.0.0
-      # @api private
-      def method_missing(name, *args, &block)
-        if config.respond_to?(name)
-          config.public_send(name, *args, &block)
-        elsif base_configuration.respond_to?(name)
-          base_configuration.public_send(name, *args, &block)
-        else
-          super
-        end
-      end
-
-      # @since 2.0.0
-      # @api private
-      def respond_to_missing?(name, _incude_all = false)
-        config.respond_to?(name) || base_configuration.respond_to?(name) || super
-      end
-    end
-  end
-end