hanami 2.0.0.alpha4 → 2.0.0.alpha7

data/lib/hanami.rb

@@ -1,19 +1,25 @@
 # frozen_string_literal: true
 
+require_relative "hanami/application"
+require_relative "hanami/errors"
+require_relative "hanami/version"
+
+
 # A complete web framework for Ruby
 #
 # @since 0.1.0
 #
 # @see http://hanamirb.org
 module Hanami
-  require "hanami/version"
-  require "hanami/application"
-
   @_mutex = Mutex.new
 
   def self.application
     @_mutex.synchronize do
-      raise "Hanami.application not configured" unless defined?(@_application)
+      unless defined?(@_application)
+        raise ApplicationLoadError,
+          "Hanami.application is not yet configured. " \
+          "You may need to `require \"hanami/setup\"` to load your config/application.rb file."
+      end
 
       @_application
     end
@@ -25,26 +31,16 @@ module Hanami
 
   def self.application=(klass)
     @_mutex.synchronize do
-      raise "Hanami.application already configured" if defined?(@_application)
+      if defined?(@_application)
+        raise ApplicationLoadError, "Hanami.application is already configured."
+      end
 
       @_application = klass unless klass.name.nil?
     end
   end
 
-  def self.app
-    @_mutex.synchronize do
-      raise "Hanami.app not configured" unless defined?(@_app)
-
-      @_app
-    end
-  end
-
-  def self.app=(app)
-    @_mutex.synchronize do
-      raise "Hanami.app already configured" if defined?(@_app)
-
-      @_app = app
-    end
+  def self.rack_app
+    application.rack_app
   end
 
   def self.env
@@ -59,18 +55,12 @@ module Hanami
     application[:logger]
   end
 
-  def self.init
-    application.init
+  def self.prepare
+    application.prepare
   end
 
-  def self.boot(web: true)
-    if defined?(@_app)
-      @_app
-    else
-      application.boot
-
-      @_app = application.new if web
-    end
+  def self.boot
+    application.boot
   end
 
   def self.shutdown

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hanami
 version: !ruby/object:Gem::Version
-  version: 2.0.0.alpha4
+  version: 2.0.0.alpha7
 platform: ruby
 authors:
 - Luca Guidi
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-12-07 00:00:00.000000000 Z
+date: 2022-03-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -104,20 +104,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.19'
+        version: '0.23'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.21.0
+        version: 0.23.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.19'
+        version: '0.23'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.21.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,11 +230,14 @@ 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/application/slice_registrar.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
@@ -245,12 +247,16 @@ files:
 - lib/hanami/cli/commands/command.rb
 - lib/hanami/cli/commands/server.rb
 - lib/hanami/configuration.rb
+- lib/hanami/configuration/actions.rb
 - lib/hanami/configuration/logger.rb
 - lib/hanami/configuration/middleware.rb
 - lib/hanami/configuration/null_configuration.rb
 - lib/hanami/configuration/router.rb
 - lib/hanami/configuration/sessions.rb
-- lib/hanami/init.rb
+- lib/hanami/configuration/source_dirs.rb
+- lib/hanami/constants.rb
+- lib/hanami/errors.rb
+- lib/hanami/prepare.rb
 - lib/hanami/server.rb
 - lib/hanami/setup.rb
 - lib/hanami/slice.rb
@@ -260,6 +266,7 @@ homepage: http://hanamirb.org
 licenses:
 - MIT
 metadata:
+  rubygems_mfa_required: 'true'
   allowed_push_host: https://rubygems.org
 post_install_message:
 rdoc_options: []
@@ -269,14 +276,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.29
+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.filter_params
-    )
-
-    rack_logger.attach container[:rack_monitor]
-
-    register :rack_logger, rack_logger
-  end
-end