hanami 2.0.0.alpha5 → 2.0.0.alpha6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9c8875d3320057cffe3af1a7bb2ff781cd8ad2145c446fc9e9190d344a4a48e6
-  data.tar.gz: c003bc2117815e10f2c15f458fb3bc6d94b480dfe9f2ec98e6458804f8a0d06d
+  metadata.gz: 3fc76408b7d97db32194d24bf73739bde8405fbd13855b7e4ea744f634d0739e
+  data.tar.gz: 30d954f8332ea7579898a87187a89a0ae2a1b34b5d9f564a86b6f61c0844f2af
 SHA512:
-  metadata.gz: 7b133de3c728132ef6255480b10068482d58cf1e2708df395f00cc5981cdccac70cbecdb2c8325cd822298d7c92c0ee0253ab1f8f9d95ddf84b0d6de556e7f3f
-  data.tar.gz: 42b525e3163e7bb73938b5e2fa444ccc15cc38def3e74225086f0e90bb0d805979e0a88a47703fcc73956d68598260ab366a1c155eb94b7114515b8ffc56671e
+  metadata.gz: f64124d027449d451f5be703f4c00850c826e4d55ebef1e6c396be63dea59a9019cb74438f7844f1e68a187299ea45c7f89ba1e98267380e7d8e1b1f8666e4b9
+  data.tar.gz: 8ea32aae47f0fe9536726c977af03904fa23f7258ef747b2cdd1a3b324eb064466beccc9340b7dddfb46d3d6a49c8aba899b1b488c6016377581599efd594577

data/CHANGELOG.md

@@ -1,6 +1,83 @@
 # Hanami
 The web, with simplicity.
 
+## v2.0.0.alpha6 - 2022-02-10
+### Added
+- [Luca Guidi] Official support for Ruby: MRI 3.1
+- [Tim Riley] Introduce partial Slice imports and exports. It allows to selectively export a functionality from a slice and import into another.
+
+    Import from `search` slice, uses `search` as the imported key namespace:
+
+    ```ruby
+    # config/application.rb
+
+    module MyApp
+      class Application < Hanami::Application
+        config.slice(:admin) do
+          import(from: :search)
+        end
+      end
+    end
+    ```
+
+    Import from `search` slice with custom namespace:
+
+    ```ruby
+    # config/application.rb
+
+    module MyApp
+      class Application < Hanami::Application
+        config.slice(:admin) do
+          import(from: :search, as: :search_engine)
+        end
+      end
+    end
+    ```
+
+    Import specific keys from `search` slice
+
+    ```ruby
+    # config/application.rb
+
+    module MyApp
+      class Application < Hanami::Application
+        config.slice(:admin) do
+          import(keys: ["run_query"], from: :search)
+        end
+      end
+    end
+    ```
+
+    Export only specific keys from `search` slice, and import them in `admin`
+
+    ```ruby
+    # config/application.rb
+
+    module MyApp
+      class Application < Hanami::Application
+        config.slice(:admin) do
+          import(from: :search)
+        end
+
+        config.slice(:search) do
+          container.config.exports = %w[run_query index_item]
+        end
+      end
+    end
+    ```
+
+### Fixed
+- [Luca Guidi] Ensure request logger to respect logger formatter option.
+
+### Changed
+- [Luca Guidi] Drop support for Ruby: MRI 2.6 and 2.7.
+- [Tim Riley] `Hanami.init` => `Hanami.prepare` and `hanami/init` => `hanami/prepare`
+- [Tim Riley] `Hanami.register_bootable` => `Hanami.register_provider`
+- [Tim Riley] `Hanami.start_bootable` => `Hanami.start`
+- [Tim Riley] `Hanami::Slice#init` => `Hanami::Slice#prepare`
+- [Tim Riley] `Hanami::Slice#register_bootable` => `Hanami::Slice#register_provider`
+- [Tim Riley] `Hanami::Slice#start_bootable` => `Hanami::Slice#start`
+
 ## v2.0.0.alpha5 - 2022-01-12
 ### Changed
 - [Luca Guidi] Sensible default configuration for application logger, with per-environment defaults:

data/README.md

@@ -36,7 +36,7 @@ These components are designed to be used independently or together in a Hanami a
 
 ## Installation
 
-__Hanami__ supports Ruby (MRI) 2.6+
+__Hanami__ supports Ruby (MRI) 3.0+
 
 ```shell
 gem install hanami
@@ -136,8 +136,4 @@ __Hanami__ uses [Semantic Versioning 2.0.0](http://semver.org)
 
 ## Copyright
 
-Released under MIT License.
-
-This project was formerly known as Lotus (`lotusrb`).
-
-Copyright © 2014-2021 Luca Guidi.
+Copyright © 2014-2022 Hanami Team – Released under MIT License.

data/hanami.gemspec

@@ -4,7 +4,7 @@ lib = File.expand_path("../lib", __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require "hanami/version"
 
-Gem::Specification.new do |spec| # rubocop:disable Metrics/BlockLength
+Gem::Specification.new do |spec|
   spec.name          = "hanami"
   spec.version       = Hanami::VERSION
   spec.authors       = ["Luca Guidi"]
@@ -14,10 +14,11 @@ Gem::Specification.new do |spec| # rubocop:disable Metrics/BlockLength
   spec.homepage      = "http://hanamirb.org"
   spec.license       = "MIT"
 
-  spec.files         = `git ls-files -c -o --exclude-standard -z -- lib/* bin/* LICENSE.md README.md CODE_OF_CONDUCT.md CHANGELOG.md FEATURES.md hanami.gemspec`.split("\x0")
+  spec.files         = `git ls-files -c -o --exclude-standard -z -- lib/* bin/* LICENSE.md README.md CODE_OF_CONDUCT.md CHANGELOG.md FEATURES.md hanami.gemspec`.split("\x0") # rubocop:disable Layout/LineLength
   spec.test_files    = spec.files.grep(%r{^(test)/})
   spec.require_paths = ["lib"]
-  spec.required_ruby_version = ">= 2.6.0"
+  spec.metadata["rubygems_mfa_required"] = "true"
+  spec.required_ruby_version = ">= 3.0"
 
   spec.metadata["allowed_push_host"] = "https://rubygems.org"
 
@@ -26,7 +27,7 @@ Gem::Specification.new do |spec| # rubocop:disable Metrics/BlockLength
   spec.add_dependency "dry-core",          "~> 0.4"
   spec.add_dependency "dry-inflector",     "~> 0.2", ">= 0.2.1"
   spec.add_dependency "dry-monitor"
-  spec.add_dependency "dry-system",        "~> 0.22", ">= 0.22.0"
+  spec.add_dependency "dry-system",        "~> 0.23", ">= 0.23.0"
   spec.add_dependency "hanami-cli",        "~> 2.0.alpha"
   spec.add_dependency "hanami-utils",      "~> 2.0.alpha"
   spec.add_dependency "zeitwerk",          "~> 2.4"

data/lib/hanami/application/container/{boot → providers}/inflector.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-Hanami.application.register_bootable :inflector do
+Hanami.application.register_provider :inflector do
   start do
     register :inflector, Hanami.application.inflector
   end

data/lib/hanami/application/container/{boot → providers}/logger.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-Hanami.application.register_bootable :logger do
+Hanami.application.register_provider :logger do
   start do
     register :logger, Hanami.application.configuration.logger_instance
   end

data/lib/hanami/application/container/providers/rack_logger.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+Hanami.application.register_provider :rack_logger do
+  start do
+    require "hanami/web/rack_logger"
+
+    target.start :logger
+    target.start :rack_monitor
+
+    rack_logger = Hanami::Web::RackLogger.new(target[:logger])
+    rack_logger.attach target[:rack_monitor]
+
+    register :rack_logger, rack_logger
+  end
+end

data/lib/hanami/application/container/{boot → providers}/rack_monitor.rb

@@ -1,11 +1,11 @@
 # frozen_string_literal: true
 
-Hanami.application.register_bootable :rack_monitor do |container|
+Hanami.application.register_provider :rack_monitor do
   start do
     require "dry/monitor"
     require "dry/monitor/rack/middleware"
 
-    middleware = Dry::Monitor::Rack::Middleware.new(container[:notifications])
+    middleware = Dry::Monitor::Rack::Middleware.new(target[:notifications])
 
     register :rack_monitor, middleware
   end

data/lib/hanami/application/container/{boot → providers}/routes_helper.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-Hanami.application.register_bootable :routes_helper do
+Hanami.application.register_provider :routes_helper do
   start do
     require "hanami/application/routes_helper"
 

data/lib/hanami/application/container/{boot → providers}/settings.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-Hanami.application.register_bootable :settings do
+Hanami.application.register_provider :settings do
   start do
     register :settings, Hanami.application.settings
   end

data/lib/hanami/application.rb

@@ -7,7 +7,6 @@ require "pathname"
 require "rack"
 require "zeitwerk"
 require_relative "slice"
-require_relative "application/autoloader/inflector_adapter"
 
 module Hanami
   # Hanami application class
@@ -18,6 +17,7 @@ module Hanami
 
     class << self
       def inherited(klass)
+        super
         @_mutex.synchronize do
           klass.class_eval do
             @_mutex         = Mutex.new
@@ -39,7 +39,7 @@ module Hanami
     module ClassMethods
       def self.extended(klass)
         klass.class_eval do
-          @inited = @booted = false
+          @prepared = @booted = false
         end
       end
 
@@ -47,35 +47,38 @@ module Hanami
         @_configuration
       end
 
-      alias config configuration
+      alias_method :config, :configuration
 
-      def init # rubocop:disable Metrics/MethodLength
-        return self if inited?
+      def prepare(provider_name = nil)
+        if provider_name
+          container.prepare(provider_name)
+          return self
+        end
 
-        configuration.finalize!
+        return self if prepared?
 
-        @autoloader = Zeitwerk::Loader.new
-        autoloader.inflector = Autoloader::InflectorAdapter.new(inflector)
+        configuration.finalize!
 
         load_settings
 
+        @autoloader = Zeitwerk::Loader.new
         @container = prepare_container
         @deps_module = prepare_deps_module
 
         load_slices
-        slices.values.each(&:init)
+        slices.each_value(&:prepare)
         slices.freeze
 
-        autoloader.setup
+        @autoloader.setup
 
-        @inited = true
+        @prepared = true
         self
       end
 
       def boot(&block)
         return self if booted?
 
-        init
+        prepare
 
         container.finalize!(&block)
 
@@ -89,8 +92,8 @@ module Hanami
         container.shutdown!
       end
 
-      def inited?
-        @inited
+      def prepared?
+        @prepared
       end
 
       def booted?
@@ -98,25 +101,25 @@ module Hanami
       end
 
       def autoloader
-        raise "Application not init'ed" unless defined?(@autoloader)
+        raise "Application not yet prepared" unless defined?(@autoloader)
 
         @autoloader
       end
 
       def container
-        raise "Application not init'ed" unless defined?(@container)
+        raise "Application not yet prepared" unless defined?(@container)
 
         @container
       end
 
       def deps
-        raise "Application not init'ed" unless defined?(@deps_module)
+        raise "Application not yet prepared" unless defined?(@deps_module)
 
         @deps_module
       end
 
       def router
-        raise "Application not init'ed" unless inited?
+        raise "Application not yet prepared" unless prepared?
 
         @_mutex.synchronize do
           @_router ||= load_router
@@ -139,36 +142,32 @@ module Hanami
         slices[name.to_sym] = slice
       end
 
-      def register(*args, **opts, &block)
-        container.register(*args, **opts, &block)
-      end
-
-      def register_bootable(*args, **opts, &block)
-        container.boot(*args, **opts, &block)
+      def register(...)
+        container.register(...)
       end
 
-      def init_bootable(*args)
-        container.init(*args)
+      def register_provider(...)
+        container.register_provider(...)
       end
 
-      def start_bootable(*args)
-        container.start(*args)
+      def start(...)
+        container.start(...)
       end
 
-      def key?(*args)
-        container.key?(*args)
+      def key?(...)
+        container.key?(...)
       end
 
       def keys
         container.keys
       end
 
-      def [](*args)
-        container[*args]
+      def [](...)
+        container.[](...)
       end
 
-      def resolve(*args)
-        container.resolve(*args)
+      def resolve(...)
+        container.resolve(...)
       end
 
       def settings
@@ -201,7 +200,7 @@ module Hanami
 
       # @api private
       def component_provider(component)
-        raise "Hanami.application must be inited before detecting providers" unless inited?
+        raise "Hanami.application must be prepared before detecting providers" unless prepared?
 
         # [Admin, Main, MyApp] or [MyApp::Admin, MyApp::Main, MyApp]
         providers = slices.values + [self]
@@ -221,53 +220,46 @@ module Hanami
         $LOAD_PATH.unshift base_path unless $LOAD_PATH.include?(base_path)
       end
 
+      # rubocop:disable Metrics/AbcSize
       def prepare_container
-        define_container.tap do |container|
-          configure_container container
-        end
-      end
-
-      def prepare_deps_module
-        define_deps_module
-      end
-
-      def define_container
-        require "#{application_name}/container"
-        namespace.const_get :Container
-      rescue LoadError, NameError
-        namespace.const_set :Container, Class.new(Dry::System::Container)
-      end
+        container =
+          begin
+            require "#{application_name}/container"
+            namespace.const_get :Container
+          rescue LoadError, NameError
+            namespace.const_set :Container, Class.new(Dry::System::Container)
+          end
 
-      # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/MethodLength
-      def configure_container(container)
         container.use :env, inferrer: -> { Hanami.env }
+        container.use :zeitwerk, loader: autoloader, run_setup: false, eager_load: false
         container.use :notifications
 
-        container.configure do |config|
-          config.inflector = configuration.inflector
-
-          config.root = configuration.root
-          config.bootable_dirs = [
-            "config/boot",
-            Pathname(__dir__).join("application/container/boot").realpath,
-          ]
+        container.config.root = configuration.root
+        container.config.inflector = configuration.inflector
 
-          config.component_dirs.loader = Dry::System::Loader::Autoloading
-          config.component_dirs.add_to_load_path = false
-        end
+        container.config.provider_dirs = [
+          "config/providers",
+          Pathname(__dir__).join("application/container/providers").realpath,
+        ]
 
         # Autoload classes defined in lib/[app_namespace]/
         if root.join("lib", namespace_path).directory?
-          autoloader.push_dir(root.join("lib", namespace_path), namespace: namespace)
+          container.autoloader.push_dir(root.join("lib", namespace_path), namespace: namespace)
         end
 
-        # Add lib/ to to the $LOAD_PATH so other files there (outside the app namespace)
-        # are require-able
+        # Add lib/ to to the $LOAD_PATH so any files there (outside the app namespace) can
+        # be required
         container.add_to_load_path!("lib") if root.join("lib").directory?
 
+        container.configured!
+
         container
       end
-      # rubocop:enable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/MethodLength
+      # rubocop:enable Metrics/AbcSize
+
+      def prepare_deps_module
+        define_deps_module
+      end
 
       def define_deps_module
         require "#{application_name}/deps"
@@ -286,7 +278,6 @@ module Hanami
         File.join(root, config.slices_dir)
       end
 
-      # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
       def load_slice(slice_path)
         slice_path = Pathname(slice_path)
 
@@ -308,7 +299,6 @@ module Hanami
           root: slice_path.realpath
         )
       end
-      # rubocop:enable Metrics/AbcSize, Metrics/MethodLength
 
       def load_settings
         require_relative "application/settings"

data/lib/hanami/cli/application/cli.rb

@@ -26,7 +26,7 @@ module Hanami
             # of the boot process respect the provided env
             ENV["HANAMI_ENV"] = arguments[:env] if arguments[:env]
 
-            require "hanami/init"
+            require "hanami/prepare"
             application = Hanami.application
 
             [command.with_application(application), arguments]

data/lib/hanami/configuration.rb

@@ -126,7 +126,7 @@ module Hanami
 
     setting :root, constructor: -> path { Pathname(path) }
 
-    setting :inflector, default: Dry::Inflector.new, cloneable: true
+    setting :inflector, default: Dry::Inflector.new
 
     def inflections(&block)
       self.inflector = Dry::Inflector.new(&block)

data/lib/hanami/{init.rb → prepare.rb}

@@ -2,4 +2,4 @@
 
 require_relative "setup"
 
-Hanami.init
+Hanami.prepare

data/lib/hanami/slice.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require "dry/system/container"
-require "dry/system/loader/autoloading"
 require "pathname"
 
 module Hanami
@@ -16,7 +15,7 @@ module Hanami
       @name = name.to_sym
       @namespace = namespace
       @root = root ? Pathname(root) : root
-      @container = container || define_container
+      @container = container
     end
 
     def inflector
@@ -27,17 +26,28 @@ module Hanami
       @namespace_path ||= inflector.underscore(namespace.to_s)
     end
 
-    def init
-      container.import application: application.container
+    def prepare(provider_name = nil)
+      if provider_name
+        container.prepare(provider_name)
+        return self
+      end
+
+      @container ||= define_container
+
+      container.import from: application.container, as: :application
 
       slice_block = application.configuration.slices[name]
       instance_eval(&slice_block) if slice_block
+
+      # This is here and not inside define_container to allow for the slice block to
+      # interact with container config
+      container.configured!
+
+      self
     end
 
     def boot
-      container.finalize! do
-        container.config.env = application.container.config.env
-      end
+      container.finalize!
 
       @booted = true
       self
@@ -53,44 +63,47 @@ module Hanami
       @container ||= define_container
     end
 
-    def import(*slice_names)
+    def import(from:, **kwargs)
+      # TODO: This should be handled via dry-system (see dry-rb/dry-system#228)
       raise "Cannot import after booting" if booted?
 
-      slice_names.each do |slice_name|
-        container.import slice_name.to_sym => application.slices.fetch(slice_name.to_sym).container
+      if from.is_a?(Symbol) || from.is_a?(String)
+        slice_name = from
+        # TODO: better error than the KeyError from fetch if the slice doesn't exist
+        from = application.slices.fetch(from.to_sym).container
       end
+
+      as = kwargs[:as] || slice_name
+
+      container.import(from: from, as: as, **kwargs)
     end
 
     def register(*args, &block)
       container.register(*args, &block)
     end
 
-    def register_bootable(*args, &block)
-      container.boot(*args, &block)
-    end
-
-    def init_bootable(*args)
-      container.init(*args)
+    def register_provider(...)
+      container.register_provider(...)
     end
 
-    def start_bootable(*args)
-      container.start(*args)
+    def start(...)
+      container.start(...)
     end
 
-    def key?(*args)
-      container.key?(*args)
+    def key?(...)
+      container.key?(...)
     end
 
     def keys
       container.keys
     end
 
-    def [](*args)
-      container[*args]
+    def [](...)
+      container.[](...)
     end
 
-    def resolve(*args)
-      container.resolve(*args)
+    def resolve(...)
+      container.resolve(...)
     end
 
     private
@@ -98,82 +111,72 @@ module Hanami
     # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
     def define_container
       container = Class.new(Dry::System::Container)
-      container.use :env
 
-      container.configure do |config|
-        config.name = name
-        config.inflector = application.configuration.inflector
-
-        config.component_dirs.loader = Dry::System::Loader::Autoloading
-        config.component_dirs.add_to_load_path = false
-
-        if root&.directory?
-          config.root = root
-          config.bootable_dirs = ["config/boot"]
-
-          # Add component dirs for each configured component path
-          application.configuration.source_dirs.component_dirs.each do |component_dir|
-            next unless root.join(component_dir.path).directory?
-
-            component_dir = component_dir.dup
-
-            # TODO: this `== "lib"` check should be codified into a method somewhere
-            if component_dir.path == "lib"
-              # Expect component files in the root of the lib/ component dir to define
-              # classes inside the slice's namespace.
-              #
-              # e.g. "lib/foo.rb" should define SliceNamespace::Foo, to be registered as
-              # "foo"
-              component_dir.namespaces.delete_root
-              component_dir.namespaces.add_root(key: nil, const: namespace_path)
-
-              config.component_dirs.add(component_dir)
-
-              application.autoloader.push_dir(root.join("lib"), namespace: namespace)
-            else
-              # Expect component files in the root of non-lib/ component dirs to define
-              # classes inside a namespace matching that dir.
-              #
-              # e.g. "actions/foo.rb" should define SliceNamespace::Actions::Foo, to be
-              # registered as "actions.foo"
-
-              dir_namespace_path = File.join(namespace_path, component_dir.path)
-
-              autoloader_namespace = begin
-                inflector.constantize(inflector.camelize(dir_namespace_path))
-              rescue NameError
-                namespace.const_set(inflector.camelize(component_dir.path), Module.new)
-              end
-
-              component_dir.namespaces.delete_root
-              component_dir.namespaces.add_root(const: dir_namespace_path, key: component_dir.path) # TODO: do we need to swap path delimiters for key delimiters here?
-
-              config.component_dirs.add(component_dir)
-
-              application.autoloader.push_dir(
-                container.root.join(component_dir.path),
-                namespace: autoloader_namespace
-              )
-            end
+      container.use :env
+      container.use :zeitwerk,
+        loader: application.autoloader,
+        run_setup: false,
+        eager_load: false
+
+      container.config.name = name
+      container.config.env = application.configuration.env
+      container.config.inflector = application.configuration.inflector
+
+      if root&.directory?
+        container.config.root = root
+        container.config.provider_dirs = ["config/providers"]
+
+        # Add component dirs for each configured component path
+        application.configuration.source_dirs.component_dirs.each do |component_dir|
+          next unless root.join(component_dir.path).directory?
+
+          component_dir = component_dir.dup
+
+          # TODO: this `== "lib"` check should be codified into a method somewhere
+          if component_dir.path == "lib"
+            # Expect component files in the root of the lib/ component dir to define
+            # classes inside the slice's namespace.
+            #
+            # e.g. "lib/foo.rb" should define SliceNamespace::Foo, to be registered as
+            # "foo"
+            component_dir.namespaces.delete_root
+            component_dir.namespaces.add_root(key: nil, const: namespace_path)
+
+            container.config.component_dirs.add(component_dir)
+          else
+            # Expect component files in the root of non-lib/ component dirs to define
+            # classes inside a namespace matching that dir.
+            #
+            # e.g. "actions/foo.rb" should define SliceNamespace::Actions::Foo, to be
+            # registered as "actions.foo"
+
+            dir_namespace_path = File.join(namespace_path, component_dir.path)
+
+            component_dir.namespaces.delete_root
+            component_dir.namespaces.add_root(const: dir_namespace_path, key: component_dir.path)
+
+            container.config.component_dirs.add(component_dir)
           end
+        end
+      end
 
-          # Pass configured autoload dirs to the autoloader
-          application.configuration.source_dirs.autoload_paths.each do |autoload_path|
-            next unless root.join(autoload_path).directory?
-
-            dir_namespace_path = File.join(namespace_path, autoload_path)
+      if root&.directory?
+        # Pass configured autoload dirs to the autoloader
+        application.configuration.source_dirs.autoload_paths.each do |autoload_path|
+          next unless root.join(autoload_path).directory?
 
-            autoloader_namespace = begin
-              inflector.constantize(inflector.camelize(dir_namespace_path))
-            rescue NameError
-              namespace.const_set(inflector.camelize(autoload_path), Module.new)
-            end
+          dir_namespace_path = File.join(namespace_path, autoload_path)
 
-            application.autoloader.push_dir(
-              container.root.join(autoload_path),
-              namespace: autoloader_namespace
-            )
+          autoloader_namespace = begin
+            inflector.constantize(inflector.camelize(dir_namespace_path))
+          rescue NameError
+            namespace.const_set(inflector.camelize(autoload_path), Module.new)
           end
+
+          container.config.autoloader.push_dir(
+            container.root.join(autoload_path),
+            namespace: autoloader_namespace
+          )
         end
       end
 

data/lib/hanami/version.rb

@@ -8,7 +8,7 @@ module Hanami
   module Version
     # @since 0.9.0
     # @api private
-    VERSION = "2.0.0.alpha5"
+    VERSION = "2.0.0.alpha6"
 
     # @since 0.9.0
     # @api private

data/lib/hanami/web/rack_logger.rb

@@ -1,19 +1,32 @@
 # frozen_string_literal: true
 
-require "json"
-require "rack/request"
-require "hanami/utils/hash"
-
 module Hanami
   module Web
     # Rack logger for Hanami applications
     class RackLogger
-      attr_reader :logger
-      attr_reader :filter_params
+      REQUEST_METHOD = "REQUEST_METHOD"
+      private_constant :REQUEST_METHOD
+
+      HTTP_X_FORWARDED_FOR = "HTTP_X_FORWARDED_FOR"
+      private_constant :HTTP_X_FORWARDED_FOR
+
+      REMOTE_ADDR = "REMOTE_ADDR"
+      private_constant :REMOTE_ADDR
+
+      SCRIPT_NAME = "SCRIPT_NAME"
+      private_constant :SCRIPT_NAME
+
+      PATH_INFO = "PATH_INFO"
+      private_constant :PATH_INFO
+
+      ROUTER_PARAMS = "router.params"
+      private_constant :ROUTER_PARAMS
+
+      CONTENT_LENGTH = "Content-Length"
+      private_constant :CONTENT_LENGTH
 
-      def initialize(logger, filter_params: [])
+      def initialize(logger)
         @logger = logger
-        @filter_params = filter_params
       end
 
       def attach(rack_monitor)
@@ -26,22 +39,20 @@ module Hanami
         end
       end
 
-      # rubocop:disable Metrics/MethodLength
-      def log_request(env, status, time)
+      def log_request(env, status, elapsed)
         data = {
-          http: env[HTTP_VERSION],
           verb: env[REQUEST_METHOD],
           status: status,
+          elapsed: "#{elapsed}ms",
           ip: env[HTTP_X_FORWARDED_FOR] || env[REMOTE_ADDR],
           path: env[SCRIPT_NAME] + env[PATH_INFO].to_s,
           length: extract_content_length(env),
-          params: extract_params(env),
-          elapsed: time,
+          params: env[ROUTER_PARAMS],
+          time: Time.now,
         }
 
-        logger.info JSON.generate(data)
+        logger.info(data)
       end
-      # rubocop:enable Metrics/MethodLength
 
       def log_exception(exception)
         logger.error exception.message
@@ -50,47 +61,12 @@ module Hanami
 
       private
 
-      HTTP_VERSION = "HTTP_VERSION"
-      REQUEST_METHOD = "REQUEST_METHOD"
-      HTTP_X_FORWARDED_FOR = "HTTP_X_FORWARDED_FOR"
-      REMOTE_ADDR = "REMOTE_ADDR"
-      SCRIPT_NAME = "SCRIPT_NAME"
-      PATH_INFO = "PATH_INFO"
-      RACK_ERRORS = "rack.errors"
-      QUERY_HASH = "rack.request.query_hash"
-      FORM_HASH = "rack.request.form_hash"
-      ROUTER_PARAMS = "router.params"
-      CONTENT_LENGTH = "Content-Length"
+      attr_reader :logger
 
       def extract_content_length(env)
         value = env[CONTENT_LENGTH]
         !value || value.to_s == "0" ? "-" : value
       end
-
-      def extract_params(env)
-        result = env.fetch(QUERY_HASH, {})
-        result.merge!(env.fetch(FORM_HASH, {}))
-        result.merge!(Hanami::Utils::Hash.deep_stringify(env.fetch(ROUTER_PARAMS, {})))
-        result
-      end
-
-      FILTERED = "[FILTERED]"
-
-      # rubocop:disable Metrics/MethodLength
-      def filter(params)
-        params.each_with_object({}) do |(k, v), h|
-          if filter_params.include?(k)
-            h.update(k => FILTERED)
-          elsif v.is_a?(Hash)
-            h.update(k => filter(v))
-          elsif v.is_a?(Array)
-            h.update(k => v.map { |m| m.is_a?(Hash) ? filter(m) : m })
-          else
-            h[k] = v
-          end
-        end
-      end
-      # rubocop:enable Metrics/MethodLength
     end
   end
 end

data/lib/hanami.rb

@@ -47,8 +47,8 @@ module Hanami
     application[:logger]
   end
 
-  def self.init
-    application.init
+  def self.prepare
+    application.prepare
   end
 
   def self.boot

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hanami
 version: !ruby/object:Gem::Version
-  version: 2.0.0.alpha5
+  version: 2.0.0.alpha6
 platform: ruby
 authors:
 - Luca Guidi
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-01-12 00:00:00.000000000 Z
+date: 2022-02-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -104,20 +104,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.22'
+        version: '0.23'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.22.0
+        version: 0.23.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.22'
+        version: '0.23'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.22.0
+        version: 0.23.0
 - !ruby/object:Gem::Dependency
   name: hanami-cli
   requirement: !ruby/object:Gem::Requirement
@@ -217,13 +217,12 @@ files:
 - hanami.gemspec
 - lib/hanami.rb
 - lib/hanami/application.rb
-- lib/hanami/application/autoloader/inflector_adapter.rb
-- lib/hanami/application/container/boot/inflector.rb
-- lib/hanami/application/container/boot/logger.rb
-- lib/hanami/application/container/boot/rack_logger.rb
-- lib/hanami/application/container/boot/rack_monitor.rb
-- lib/hanami/application/container/boot/routes_helper.rb
-- lib/hanami/application/container/boot/settings.rb
+- lib/hanami/application/container/providers/inflector.rb
+- lib/hanami/application/container/providers/logger.rb
+- lib/hanami/application/container/providers/rack_logger.rb
+- lib/hanami/application/container/providers/rack_monitor.rb
+- lib/hanami/application/container/providers/routes_helper.rb
+- lib/hanami/application/container/providers/settings.rb
 - lib/hanami/application/router.rb
 - lib/hanami/application/routes.rb
 - lib/hanami/application/routes_helper.rb
@@ -231,13 +230,11 @@ files:
 - lib/hanami/application/routing/resolver.rb
 - lib/hanami/application/routing/resolver/node.rb
 - lib/hanami/application/routing/resolver/trie.rb
-- lib/hanami/application/routing/router.rb
 - lib/hanami/application/settings.rb
 - lib/hanami/application/settings/dotenv_store.rb
 - lib/hanami/assets/application_configuration.rb
 - lib/hanami/assets/configuration.rb
 - lib/hanami/boot.rb
-- lib/hanami/boot/source_dirs.rb
 - lib/hanami/cli/application/cli.rb
 - lib/hanami/cli/application/command.rb
 - lib/hanami/cli/application/commands.rb
@@ -253,7 +250,7 @@ files:
 - lib/hanami/configuration/router.rb
 - lib/hanami/configuration/sessions.rb
 - lib/hanami/configuration/source_dirs.rb
-- lib/hanami/init.rb
+- lib/hanami/prepare.rb
 - lib/hanami/server.rb
 - lib/hanami/setup.rb
 - lib/hanami/slice.rb
@@ -263,6 +260,7 @@ homepage: http://hanamirb.org
 licenses:
 - MIT
 metadata:
+  rubygems_mfa_required: 'true'
   allowed_push_host: https://rubygems.org
 post_install_message:
 rdoc_options: []
@@ -272,14 +270,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.6.0
+      version: '3.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">"
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
-rubygems_version: 3.2.3
+rubygems_version: 3.3.3
 signing_key:
 specification_version: 4
 summary: The web, with simplicity

data/lib/hanami/application/autoloader/inflector_adapter.rb

@@ -1,22 +0,0 @@
-module Hanami
-  class Application
-    module Autoloader
-      # Allows the Hanami standard inflector (from dry-inflector) to be used with Zeitwerk
-      class InflectorAdapter
-        def initialize(inflector)
-          @inflector = inflector
-        end
-
-        def camelize(basename, _abspath)
-          # Discard unused `_abspath` argument before calling our own inflector's
-          # `#camelize` (which takes only one argument)
-          inflector.camelize(basename)
-        end
-
-        private
-
-        attr_reader :inflector
-      end
-    end
-  end
-end

data/lib/hanami/application/container/boot/rack_logger.rb

@@ -1,19 +0,0 @@
-# frozen_string_literal: true
-
-Hanami.application.register_bootable :rack_logger do |container|
-  start do
-    require "hanami/web/rack_logger"
-
-    use :logger
-    use :rack_monitor
-
-    rack_logger = Hanami::Web::RackLogger.new(
-      container[:logger],
-      filter_params: Hanami.application.configuration.logger.filters
-    )
-
-    rack_logger.attach container[:rack_monitor]
-
-    register :rack_logger, rack_logger
-  end
-end

data/lib/hanami/application/routing/router.rb

@@ -1,36 +0,0 @@
-# # frozen_string_literal: true
-
-# require "hanami/application/router"
-
-# Hanami.application.register_bootable :router do
-#   start do
-#     configuration = Hanami.application.configuration
-
-#     routes = begin
-#       require File.join(configuration.root, configuration.router.routes_path)
-#       routes_class = Hanami.application.send(:autodiscover_application_constant, configuration.router.routes_class_name) # WIP private
-#       routes_class.routes
-#     rescue LoadError
-#       proc {}
-#     end
-
-#     resolver = configuration.router.resolver.new(
-#       slices: Hanami.application.slices,
-#       inflector: Hanami.application.inflector # TODO: use container[:inflector]?
-#     )
-
-#     router = Hanami::Application::Router.new(
-#       routes: routes,
-#       resolver: resolver,
-#       **configuration.router.options,
-#     ) do
-#       use Hanami.application[:rack_monitor]
-
-#       Hanami.application.config.for_each_middleware do |m, *args, &block|
-#         use(m, *args, &block)
-#       end
-#     end
-
-#     register :router, router
-#   end
-# end

data/lib/hanami/boot/source_dirs.rb

@@ -1,44 +0,0 @@
-module Hanami
-  module Boot
-    module SourceDirs
-      def self.setup_component_dir!(component_dir, slice, container)
-        # TODO: this `== "lib"` check should be codified into a method somewhere
-        if component_dir.path == "lib"
-          # Expect component files in the root of the lib
-          # component dir to define classes inside the slice's namespace.
-          #
-          # e.g. "lib/foo.rb" should define SliceNamespace::Foo, and will be
-          # registered as "foo"
-          component_dir.namespaces.root(key: nil, const: slice.namespace_path)
-
-          slice.application.autoloader.push_dir(slice.root.join("lib"), namespace: slice.namespace)
-
-          container.config.component_dirs.add(component_dir)
-        else
-          # Expect component files in the root of these component dirs to define
-          # classes inside a namespace matching the dir.
-          #
-          # e.g. "actions/foo.rb" should define SliceNamespace::Actions::Foo, and
-          # will be registered as "actions.foo"
-
-          dir_namespace_path = File.join(slice.namespace_path, component_dir.path)
-
-          autoloader_namespace = begin
-            slice.inflector.constantize(slice.inflector.camelize(dir_namespace_path))
-          rescue NameError
-            slice.namespace.const_set(slice.inflector.camelize(component_dir.path), Module.new)
-          end
-
-          # TODO: do we need to do something special to clear out any previously configured root namespace here?
-          component_dir.namespaces.root(const: dir_namespace_path, key: component_dir.path) # TODO: do we need to swap path delimiters for key delimiters here?
-          container.config.component_dirs.add(component_dir)
-
-          slice.application.autoloader.push_dir(
-            slice.root.join(component_dir.path),
-            namespace: autoloader_namespace
-          )
-        end
-      end
-    end
-  end
-end