hanami 2.0.0.beta3 → 2.0.0.beta4

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 is bundled" do
-    it "exposes Hanami::Views's app configuration" do
-      is_expected.to be_an_instance_of(Hanami::Configuration::Views)
+    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
@@ -97,7 +96,7 @@ RSpec.describe Hanami::Configuration, "#views" do
     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

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::FrozenConfig)
+    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
+      end
+
+      module Nested
+        class MySubclass < TestApp::BaseClass
+        end
+      end
+    end
+
+    subject(:subclass) { Nested::MySubclass }
+
+    it "calls `configure_for_slice` with the nested slice" do
+      expect(subclass.traces).to eq [Nested::Slice]
+    end
+  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.beta3")
+    expect(Hanami::VERSION).to eq("2.0.0.beta4")
   end
 end

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.beta4
 platform: ruby
 authors:
 - Luca Guidi
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-09-21 00:00:00.000000000 Z
+date: 2022-10-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -36,28 +36,40 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.15'
+        version: '0.16'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.16.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.15'
+        version: '0.16'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.16.1
 - !ruby/object:Gem::Dependency
   name: dry-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '0.9'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.9.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '0.9'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.9.1
 - !ruby/object:Gem::Dependency
   name: dry-inflector
   requirement: !ruby/object:Gem::Requirement
@@ -84,40 +96,40 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.25'
+        version: '0.27'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.25.0
+        version: 0.27.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.25'
+        version: '0.27'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.25.0
+        version: 0.27.2
 - !ruby/object:Gem::Dependency
   name: dry-monitor
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: '0.7'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.6.3
+        version: '0.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: '0.7'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.6.3
+        version: '0.7'
 - !ruby/object:Gem::Dependency
   name: hanami-cli
   requirement: !ruby/object:Gem::Requirement
@@ -152,14 +164,14 @@ dependencies:
     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 +229,19 @@ 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/sessions.rb
+- lib/hanami/config/views.rb
 - lib/hanami/constants.rb
 - lib/hanami/errors.rb
 - lib/hanami/extensions.rb
@@ -244,7 +256,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
@@ -282,19 +293,21 @@ files:
 - spec/integration/container/shutdown_spec.rb
 - spec/integration/container/standard_bootable_components_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 +335,19 @@ 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/config_spec.rb
 - spec/unit/hanami/env_spec.rb
 - spec/unit/hanami/settings/env_store_spec.rb
 - spec/unit/hanami/settings_spec.rb
@@ -364,7 +377,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
-rubygems_version: 3.3.3
+rubygems_version: 3.3.7
 signing_key:
 specification_version: 4
 summary: The web, with simplicity
@@ -390,19 +403,21 @@ test_files:
 - spec/integration/container/shutdown_spec.rb
 - spec/integration/container/standard_bootable_components_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 +445,19 @@ 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/config_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/configuration/null_configuration.rb

@@ -1,14 +0,0 @@
-# frozen_string_literal: true
-
-require "dry/configurable"
-
-module Hanami
-  class Configuration
-    # NullConfiguration can serve as a fallback configuration object when out-of-gem
-    # configuration objects are not available (specifically, when the
-    # hanami-controller, hanami-router or hanami-view gems are not loaded)
-    class NullConfiguration
-      include Dry::Configurable
-    end
-  end
-end

data/lib/hanami/providers/settings.rb

@@ -1,98 +0,0 @@
-# frozen_string_literal: true
-
-require "dry/system/provider/source"
-require_relative "../constants"
-require_relative "../errors"
-
-module Hanami
-  module Providers
-    # The settings provider loads and registers the "settings" component in app and slice
-    # containers.
-    #
-    # To register this provider with a slice container, you should use
-    # {.register_with_slice}, which will register the provider only if settings are
-    # defined for the slice.
-    #
-    # @see Slice::ClassMethods.prepare_container_providers
-    #
-    # @api private
-    # @since 2.0.0
-    class Settings < Dry::System::Provider::Source
-      class << self
-        # Registers the provider with the slice's container, but only if settings are
-        # defined for the slice.
-        def register_with_slice(slice)
-          return unless settings_defined?(slice)
-
-          slice.register_provider(:settings, source: with_slice(slice))
-        end
-
-        # Creates a new subclass of the provider for the given slice.
-        #
-        # You must do this before registering the provider with a container. The provider
-        # uses the slice to locate the settings definition based on the slice's config.
-        def with_slice(slice)
-          Class.new(self) do |klass|
-            klass.instance_variable_set(:@slice, slice)
-          end
-        end
-
-        # Returns the slice for the provider
-        def slice
-          unless @slice
-            raise SliceLoadError, "a slice must be given to #{self} via `.with_slice(slice)`"
-          end
-
-          @slice
-        end
-
-        private
-
-        # Returns true if settings are defined for the slice.
-        #
-        # Settings are considered defined if a `Settings` class is already defined in the
-        # slice namespace, or a `config/settings.rb` exists under the slice root.
-        def settings_defined?(slice)
-          slice.namespace.const_defined?(SETTINGS_CLASS_NAME) ||
-            slice.root.join("#{SETTINGS_PATH}#{RB_EXT}").file?
-        end
-      end
-
-      def prepare
-        require_slice_settings unless slice_settings_class?
-      end
-
-      def start
-        settings = slice_settings_class.new(slice.config.settings_store)
-
-        register :settings, settings
-      end
-
-      private
-
-      def slice
-        self.class.slice
-      end
-
-      def slice_settings_class?
-        slice.namespace.const_defined?(SETTINGS_CLASS_NAME)
-      end
-
-      def slice_settings_class
-        slice.namespace.const_get(SETTINGS_CLASS_NAME)
-      end
-
-      def require_slice_settings
-        require "hanami/settings"
-
-        slice_settings_require_path = File.join(slice.root, SETTINGS_PATH)
-
-        begin
-          require slice_settings_require_path
-        rescue LoadError => e
-          raise e unless e.path == slice_settings_require_path
-        end
-      end
-    end
-  end
-end