hanami 1.3.5 → 2.0.0.alpha1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 92d8362c387abfc24cda9234c81c671d544f03a2ae2680c9f71d492c7172410a
-  data.tar.gz: 57643cd0ca74fd851e800edbe62c18464dc5ca0dcd09c66189ed53b256beb5f0
+  metadata.gz: 1c197523a333228ef0596099b121a0f3a3e02c4a5a0da3f3f4fe837e794b7cf8
+  data.tar.gz: 5a7526ef47fc6f64ebffdae725d26a17944e390274dbc478ff52d593c7ba63b9
 SHA512:
-  metadata.gz: 6570e1184cc95fe719bbb366f59f082ccafdc55dddae70496c98579cd53f4d46a31bd740030b500e5d2b7ed03e2df8f42148344170c1a90453209b2575960441
-  data.tar.gz: f2409cb5bc4d8bf3c7fe4bfa026eb03a9315fb6ccb80e95aa2b44e9b94600427cab0814a00d32035128a3ace49b42ed35644e1d0652ffc584be2ac5ea6564db5
+  metadata.gz: dd55bf77935140473affae77676eae8afe042f385dee3288dd9d80729fb887899f89950f26b83e2b793161545347cdc3dab8a5f6e0915013aa333c2caf2e080d
+  data.tar.gz: d254599b55640e0e3a27b718c1ae7141a40662c7291e60463d9620383cc419d49f06f5c8d1712b484f50ba758b71bf3f0ae79729452243532a0769e00478af8b

data/CHANGELOG.md

@@ -1,44 +1,54 @@
 # Hanami
 The web, with simplicity.
 
-## v1.3.5 - 2021-10-18
-### Fixed
-- [Ivan Kabluchkov] Ensure to properly store exceptions in Rack environment
-- [Sean Collins] Explicitly limit in gemspec the supported rubies (>= 2.3 and < 3) for Hanami 1
-
-### Changed
-- [Luca Guidi] Use JSON as default HTTP session serializer for cookie session storage
-
-## v1.3.4 - 2021-05-02
-### Fixed
-- [Slava Kardakov] Fix generated `config.ru` `require_relative` statement
-- [Armin] Fix `Hanami::CommonLogger` elapsed time compatibility with `rack` 2.1.0+
-- [Adam Daniels] Fix generated tests compatibility with `minitest` 6.0+
-
-## v1.3.3 - 2019-09-20
-### Added
-- [Gray Manley] Standardize file loading for `.env` files (see: https://github.com/bkeepers/dotenv#what-other-env-files-can-i-use)
-
-### Fixed
-- [Alfonso Uceda & Luca Guidi] Ensure to use `:host` option when mounting an application in main router (e.g. `mount Beta::Application.new, at: "/", host: "beta.hanami.test"`)
-
-## v1.3.2 - 2019-07-26
-### Added
-- [Luca Guidi] Support both `hanami-validations` 1 and 2
-
-### Fixed
-- [Wisnu Adi Nurcahyo] Ensure `hanami generate` syntax for Welcome page is compatible with ZSH
-- [Luca Guidi] Don't let `hanami` to crash when called without `bundle exec`
-
-## v1.3.1 - 2019-01-18
+## v2.0.0.alpha1 - 2019-01-30
 ### Added
-- [Luca Guidi] Official support for Ruby: MRI 2.6
-- [Luca Guidi] Support `bundler` 2.0+
+- [Luca Guidi] Implemented from scratch `hanami version`
+- [Luca Guidi] Implemented from scratch `hanami server`
+- [Luca Guidi] Main configuration is opinionated: when a setting is not specified in generated code, it uses a framework default.
+- [Luca Guidi] Main configuration setting `environment`: to yield env based settings (e.g. `config.environment(:production) { |c| c.logger = {...} }`)
+- [Luca Guidi] Main configuration setting `base_url`: to set the base URL of the app (e.g. `config.base_url = "https://example.com"`)
+- [Luca Guidi] Main configuration setting `logger`: to set the logger options (e.g. `config.logger = { level: :info, format: :json }`)
+- [Luca Guidi] Main configuration setting `routes`: to set the path to routes file (e.g. `config.routes = "path/to/routes"`)
+- [Luca Guidi] Main configuration setting `cookies`: to set cookies options (e.g. `config.cookies = { max_age: 300 }`)
+- [Luca Guidi] Main configuration setting `sessions`: to set session options (e.g. `config.sessions = :cookie, { secret: "abc" }`)
+- [Luca Guidi] Main configuration setting `default_request_format`: to set the fallback for request format (aka MIME Type) (e.g. `config.default_request_format = :json`)
+- [Luca Guidi] Main configuration setting `default_response_format`: to set the default response format (aka MIME Type) (e.g. `config.default_response_format = :json`)
+- [Luca Guidi] Main configuration setting `middleware` to mount Rack middleware (e.g. `config.middleware.use MyMiddleware, "argument"`)
+- [Luca Guidi] Main configuration setting `security` to set security settings (see below)
+- [Luca Guidi] Main configuration setting `inflections` to configure inflections (e.g. `config.inflections { |i| i.plural "virus", "viruses" }`)
+- [Luca Guidi] Main configuration security setting `x_frame_options`: defaults to `"deny"` (e.g. `config.security.x_frame_options = "sameorigin"`)
+- [Luca Guidi] Main configuration security setting `x_content_type_options`: defaults to `"nosniff"` (e.g. `config.security.x_content_type_options = nil`)
+- [Luca Guidi] Main configuration security setting `x_xss_protection`: defaults to `"1; mode=block"` (e.g. `config.security.x_xss_protection = "1"`)
+- [Luca Guidi] Main configuration security setting `content_security_policy`: defaults to `"form-action 'self'; frame-ancestors 'self'; base-uri 'self'; default-src 'none'; script-src 'self'; connect-src 'self'; img-src 'self' https: data:; style-src 'self' 'unsafe-inline' https:; font-src 'self'; object-src 'none'; plugin-types application/pdf; child-src 'self'; frame-src 'self'; media-src 'self'"`
+  (e.g. `config.security.content_security_policy[:style_src] += " https://my.cdn.example"` to add another source)
+  (e.g. `config.security.content_security_policy[:plugin_types] = nil` to override the settings)
 
-### Fixed
-- [Aidan Coyle] Remove from app generator support for deprecated `force_ssl` setting
-- [Alessandro Caporrini] Remove from app generator support for deprecated `body_parsers` setting
-- [Daphne Rouw & Sean Collins] Make app generator to work when code in `config/environment.rb` uses double quotes
+### Changed
+- [Luca Guidi] Drop support for Ruby: MRI 2.3, and 2.4.
+- [Luca Guidi] `Hanami::Application` must be used as superclass for main application under `config/application.rb` (e.g. `Bookshelf::Application`)
+- [Luca Guidi] Main configuration is available at `config/application.rb` instead of `config/enviroment.rb`
+- [Luca Guidi] Removed `Hanami.configure` in favor of main application configuration (e.g. `Bookshelf::Application.config`)
+- [Luca Guidi] Removed DSL syntax for main configuration (from `cookies max_age: 600` to `config.cookies = { max_age: 600 }`)
+- [Luca Guidi] Per enviroment settings must be wrapped in a block (e.g. `config.enviroment(:production) { |c| c.logger = {} }`)
+- [Luca Guidi] Concrete applications are no longer supported (e.g. `Web::Application` in `apps/web/application.rb`)
+- [Luca Guidi] Main routes must be configured at `config/routes.rb`:
+```ruby
+# frozen_string_literal: true
+
+Hanami.application.routes do
+  mount :web, at: "/" do
+    root to: "home#index"
+  end
+
+  mount :admin, at: "/admin" do
+    root to: "home#index"
+  end
+end
+```
+- [Luca Guidi] Per application routes are no longer supported (e.g. `apps/web/config/routes.rb`)
+- [Luca Guidi] Removed `shotgun` and code reloading from the core. Code reloading is implemented by `hanami-reloader` gem.
+- [Luca Guidi] Removed support for `.hanamirc`
 
 ## v1.3.0 - 2018-10-24
 ### Added
@@ -55,7 +65,7 @@ The web, with simplicity.
 
 ### Fixed
 - [Anton Davydov] Make possible to pass extra settings for custom logger instances (eg. `logger SemanticLogger.new, :foo, :bar`)
-- [graywolf] Ensure `hanami generate app` to work without `require_relative` entries in `config/environment.rb`
+- [graywolf] Ensure `hanami generate app` to work without `require_relative` entries in `config/enviroment.rb`
 - [Makoto Tajitsu & Luca Guidi] Fixed regression for `hanami new .` that used to generate a broken project
 
 ### Fixed
@@ -172,7 +182,7 @@ The web, with simplicity.
 - [Luca Guidi] Make compatible with Rack 2.0 only
 - [Luca Guidi] Removed `logger` settings from Hanami applications
 - [Luca Guidi] Removed logger for Hanami applications (eg `Web.logger`)
-- [Luca Guidi] Changed mailer syntax in `config/environment.rb`
+- [Luca Guidi] Changed mailer syntax in `config/enviroment.rb`
 
 ## v0.9.2 - 2016-12-19
 ## Added
@@ -261,11 +271,11 @@ The web, with simplicity.
 
 ## v0.7.2 - 2016-02-09
 ### Fixed
-- [Alfonso Uceda Pompa] Fixed routing issue when static assets server tried to hijack paths that are matching directories in public directory
+- [Alfonso Uceda Pompa] Fixed routing issue when static assets server tried to hijiack paths that are matching directories in public directory
 
 ## v0.7.1 - 2016-02-05
 ### Fixed
-- [Anton Davydov] Fixed routing issue when static assets server tried to hijack requests belonging to dynamic endpoints
+- [Anton Davydov] Fixed routing issue when static assets server tried to hijiack requests belonging to dynamic endpoints
 - [Anatolii Didukh] Ensure to fallback to default engine for `hanami console`
 
 ## v0.7.0 - 2016-01-22
@@ -400,7 +410,7 @@ The web, with simplicity.
 ## v0.3.0 - 2015-03-23
 ### Added
 - [Luca Guidi] Introduced action generator. Eg. `bundle exec lotus generate action web dashboard#index`
-- [Alfonso Uceda Pompa] Allow to specify default cookies options in application configuration. Eg. `cookies true, { domain: 'lotusrb.org' }`
+- [Alfonso Uceda Pompa] Allow to specify default coookies options in application configuration. Eg. `cookies true, { domain: 'lotusrb.org' }`
 - [Tom Kadwill] Include `Lotus::Helpers` in views.
 - [Linus Pettersson] Allow to specify `--database` CLI option when generate a new project. Eg. `lotus new bookshelf --database=postgresql`
 - [Linus Pettersson] Initialize a Git repository when generating a new project

data/FEATURES.md

@@ -3,17 +3,7 @@
 
 ## Features
 
-## v1.3.5 - 2021-10-18
-
-## v1.3.4 - 2021-05-02
-
-## v1.3.3 - 2019-09-20
-
-- Standardize file loading for `.env` files (see: https://github.com/bkeepers/dotenv#what-other-env-files-can-i-use)
-
-## v1.3.2 - 2019-07-26
-
-## v1.3.1 - 2019-01-18
+## v2.0.0.alpha1 - 2019-01-30
 
 ## v1.3.0 - 2018-10-24
 
@@ -30,7 +20,7 @@
 - Unobtrusive JavaScript (UJS) (via `hanami-ujs` gem)
 - Interactive console for development error page (via `hanami-webconsole` gem)
 - CLI: register callbacks for `hanami` commands (`Hanami::CLI.after("db migrate", MyCallback.new)` or `Hanami::CLI.after("db migrate") { ... }`)
-- Project level Rack middleware stack (`Hanami.configure { middleware.use MyRackMiddleware }`)
+- Project level Rack middleware stack (`Hanami.configure { middleware.use MyRackMiddlewre }`)
 - Plugins can hook into project configuration (`Hanami.plugin { middleware.use AnotherRackMiddleware }`)
 - Custom repository commands
 - Coloured logging

data/LICENSE.md

@@ -1,4 +1,4 @@
-Copyright © 2014-2021 Luca Guidi
+Copyright © 2014-2017 Luca Guidi
 
 MIT License
 

data/README.md

@@ -2,10 +2,6 @@
 
 The web, with simplicity.
 
-## Version
-
-**This branch contains the code for `hanami` 1.3.x.**
-
 ## Frameworks
 
 Hanami is a **full-stack** Ruby web framework.
@@ -22,6 +18,7 @@ which provides the glue that ties all the parts together:
 * [**Hanami::Helpers**](https://github.com/hanami/helpers) - View helpers for Ruby applications
 * [**Hanami::Mailer**](https://github.com/hanami/mailer) - Mail for Ruby applications
 * [**Hanami::Assets**](https://github.com/hanami/assets) - Assets management for Ruby
+* [**Hanami::CLI**](https://github.com/hanami/cli) - Ruby command line interface
 * [**Hanami::Utils**](https://github.com/hanami/utils) - Ruby core extensions and class utilities
 
 These components are designed to be used independently or together in a Hanami application.
@@ -29,14 +26,14 @@ These components are designed to be used independently or together in a Hanami a
 ## Status
 
 [![Gem Version](https://badge.fury.io/rb/hanami.svg)](https://badge.fury.io/rb/hanami)
-[![CI](https://github.com/hanami/hanami/workflows/ci/badge.svg?branch=1.3.x)](https://github.com/hanami/hanami/actions?query=workflow%3Aci+branch%3A1.3.x)
-[![Test Coverage](https://codecov.io/gh/hanami/hanami/branch/1.3.x/graph/badge.svg)](https://codecov.io/gh/hanami/hanami)
+[![TravisCI](https://travis-ci.org/hanami/hanami.svg?branch=master)](https://travis-ci.org/hanami/hanami)
+[![Test Coverage](https://codecov.io/gh/hanami/hanami/branch/master/graph/badge.svg)](https://codecov.io/gh/hanami/hanami)
 [![Depfu](https://badges.depfu.com/badges/ba000e0f69e6ef1c44cd3038caaa1841/overview.svg)](https://depfu.com/github/hanami/hanami?project=Bundler)
 [![Inline Docs](http://inch-ci.org/github/hanami/hanami.svg)](http://inch-ci.org/github/hanami/hanami)
 
 ## Installation
 
-__Hanami__ supports Ruby (MRI) 2.3+
+__Hanami__ supports Ruby (MRI) 2.5+
 
 ```shell
 gem install hanami
@@ -140,4 +137,4 @@ Released under MIT License.
 
 This project was formerly known as Lotus (`lotusrb`).
 
-Copyright © 2014-2021 Luca Guidi.
+Copyright © 2014-2019 Luca Guidi.

data/bin/hanami

@@ -1,6 +1,8 @@
 #!/usr/bin/env ruby
-require 'bundler'
-require 'hanami/cli/commands'
+# frozen_string_literal: true
 
-::Bundler.require(:plugins) if File.exist?(ENV["BUNDLE_GEMFILE"] || "Gemfile")
-Dry::CLI.new(Hanami::CLI::Commands).call
+require "bundler"
+require "hanami/cli/commands"
+
+Bundler.require(*Hanami.bundler_groups) if File.exist?(ENV["BUNDLE_GEMFILE"] || "Gemfile")
+Hanami::CLI.new(Hanami::CLI::Commands).call

data/hanami.gemspec

@@ -1,40 +1,36 @@
-# coding: utf-8
-lib = File.expand_path('../lib', __FILE__)
+# frozen_string_literal: true
+
+lib = File.expand_path("../lib", __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'hanami/version'
+require "hanami/version"
 
 Gem::Specification.new do |spec|
-  spec.name          = 'hanami'
+  spec.name          = "hanami"
   spec.version       = Hanami::VERSION
-  spec.authors       = ['Luca Guidi']
-  spec.email         = ['me@lucaguidi.com']
-  spec.summary       = 'The web, with simplicity'
-  spec.description   = 'Hanami is a web framework for Ruby'
-  spec.homepage      = 'http://hanamirb.org'
-  spec.license       = 'MIT'
+  spec.authors       = ["Luca Guidi"]
+  spec.email         = ["me@lucaguidi.com"]
+  spec.summary       = "The web, with simplicity"
+  spec.description   = "Hanami is a web framework for Ruby"
+  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.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test)/})
-  spec.require_paths = ['lib']
-  spec.required_ruby_version = '>= 2.3.0', '< 3'
+  spec.require_paths = ["lib"]
+  spec.required_ruby_version = ">= 2.5.0"
 
-  spec.metadata['allowed_push_host'] = 'https://rubygems.org'
+  spec.metadata["allowed_push_host"] = "https://rubygems.org"
 
-  spec.add_dependency 'hanami-utils',       '~> 1.3'
-  spec.add_dependency 'hanami-validations', '>= 1.3', '< 3'
-  spec.add_dependency 'hanami-router',      '~> 1.3'
-  spec.add_dependency 'hanami-controller',  '~> 1.3', '>= 1.3.3'
-  spec.add_dependency 'hanami-view',        '~> 1.3'
-  spec.add_dependency 'hanami-helpers',     '~> 1.3'
-  spec.add_dependency 'hanami-mailer',      '~> 1.3'
-  spec.add_dependency 'hanami-assets',      '~> 1.3'
-  spec.add_dependency 'dry-cli',            '~> 0.5'
-  spec.add_dependency 'concurrent-ruby',    '~> 1.0'
-  spec.add_dependency 'bundler',            '>= 1.6', '< 3'
+  spec.add_dependency "hanami-utils",      "~> 2.0.alpha"
+  spec.add_dependency "hanami-router",     "~> 2.0.alpha"
+  spec.add_dependency "hanami-controller", "~> 2.0.alpha"
+  spec.add_dependency "hanami-cli",        "~> 1.0.alpha"
+  spec.add_dependency "dry-system",        "~> 0.10"
+  spec.add_dependency "dry-inflector",     "~> 0.1", ">= 0.1.2"
+  spec.add_dependency "bundler",           ">= 1.16", "< 3"
 
-  spec.add_development_dependency 'rspec',     '~> 3.7'
-  spec.add_development_dependency 'rack-test', '~> 1.1'
-  spec.add_development_dependency 'aruba',     '~> 0.14'
-  spec.add_development_dependency 'rake',      '~> 13.0'
+  spec.add_development_dependency "rspec",     "~>  3.8"
+  spec.add_development_dependency "rack-test", "~> 1.1"
+  spec.add_development_dependency "rake",      "~> 12.0"
 end

data/lib/hanami/application.rb

@@ -1,202 +1,70 @@
-require 'thread'
-require 'concurrent'
-require 'hanami/application_name'
-require 'hanami/application_namespace'
-require 'hanami/application_configuration'
-require 'hanami/environment_application_configurations'
-require 'hanami/rendering_policy'
+# frozen_string_literal: true
+
+require "hanami/configuration"
+require "hanami/routes"
+require "hanami/router"
 
 module Hanami
-  # A full stack Hanami application
-  #
-  # @since 0.1.0
-  #
-  # @example
-  #   require 'hanami'
+  # Hanami application
   #
-  #   module Bookshelf
-  #     class Application < Hanami::Application
-  #     end
-  #   end
+  # @since 2.0.0
   class Application
-    # Override Ruby's Class#inherited
-    #
-    # @since 0.2.0
-    # @api private
-    #
-    # @see http://www.ruby-doc.org/core/Class.html#method-i-inherited
-    def self.inherited(base)
-      super
+    @_mutex = Mutex.new
 
-      base.extend(ClassMethods)
-      base.namespace.module_eval do
-        class << self
-          # Routes for this application
-          #
-          # @return [Hanami::Routes] the routes for this Hanami application
-          #
-          # @since 0.9.0
-          # @api public
-          #
-          # @example
-          #
-          #   Web.routes
-          #   Admin.routes
-          attr_accessor :routes
+    def self.inherited(app)
+      @_mutex.synchronize do
+        app.class_eval do
+          @_mutex         = Mutex.new
+          @_configuration = Hanami::Configuration.new(env: Hanami.env)
+
+          extend ClassMethods
+          include InstanceMethods
         end
+
+        Hanami.application = app
       end
     end
 
-    # Class interface for Hanami applications
+    # Class method interface
     #
-    # @since 0.9.0
-    # @api private
+    # @since 2.0.0
     module ClassMethods
-      # Override Ruby's Class#extended
-      #
-      # @since 0.9.0
-      # @api private
-      #
-      # @see http://www.ruby-doc.org/core/Class.html#method-i-extended
-      def self.extended(base) # rubocop:disable Metrics/MethodLength
-        super
-
-        base.class_eval do
-          @namespace      = ApplicationNamespace.resolve(name)
-          @configurations = EnvironmentApplicationConfigurations.new
-          @_lock          = Mutex.new
+      def configuration
+        @_configuration
+      end
 
-          class << self
-            # @since 0.9.0
-            # @api private
-            attr_reader :namespace
+      alias config configuration
 
-            # @since 0.9.0
-            # @api private
-            attr_reader :configurations
+      def routes(&blk)
+        @_mutex.synchronize do
+          if blk.nil?
+            raise "Hanami.application.routes not configured" unless defined?(@_routes)
 
-            # @since 0.9.0
-            # @api private
-            attr_reader :configuration
+            @_routes
+          else
+            @_routes = Routes.new(&blk)
           end
         end
       end
+    end
 
-      # Hanami application name
-      #
-      # @return [String] the Hanami application name
-      #
-      # @since 0.9.0
-      # @api private
-      #
-      # @example
-      #   require 'hanami'
-      #
-      #   module Web
-      #     class Application < Hanami::Application
-      #     end
-      #   end
-      #
-      #   Web::Application.app_name # => "web"
-      def app_name
-        ApplicationName.new(name).to_s
-      end
+    # Instance method interface
+    #
+    # @since 2.0.0
+    module InstanceMethods
+      def initialize(configuration: self.class.configuration, routes: self.class.routes)
+        @app = Rack::Builder.new do
+          configuration.for_each_middleware do |m, *args|
+            use m, *args
+          end
 
-      # Set configuration
-      #
-      # @param configuration [Hanami::ApplicationConfiguration] the application configuration
-      #
-      # @raise [RuntimeError] if the configuration is assigned more than once
-      #
-      # @since 0.1.0
-      # @api private
-      def configuration=(configuration)
-        @_lock.synchronize do
-          # raise "Can't assign configuration more than once (#{app_name})" unless @configuration.nil?
-          @configuration = configuration
+          run Hanami::Router.new(**configuration.router_settings, &routes)
         end
       end
 
-      # Configure the application.
-      # It yields the given block in the context of the configuration
-      #
-      # @param environment [Symbol,nil] the configuration environment name
-      # @param blk [Proc] the configuration block
-      #
-      # @since 0.1.0
-      #
-      # @see Hanami::ApplicationConfiguration
-      #
-      # @example
-      #   require 'hanami'
-      #
-      #   module Bookshelf
-      #     Application < Hanami::Application
-      #       configure do
-      #         # ...
-      #       end
-      #     end
-      #   end
-      def configure(environment = nil, &blk)
-        configurations.add(environment, &blk)
+      def call(env)
+        @app.call(env)
       end
     end
-
-    # Initialize and load a new instance of the application
-    #
-    # @return [Hanami::Application] a new instance of the application
-    #
-    # @since 0.1.0
-    # @api private
-    def initialize
-      @renderer   = RenderingPolicy.new(configuration)
-      @middleware = configuration.middleware
-    end
-
-    # Process a request.
-    # This method makes Hanami applications compatible with the Rack protocol.
-    #
-    # @param env [Hash] a Rack env
-    #
-    # @return [Array] a serialized Rack response
-    #
-    # @since 0.1.0
-    #
-    # @see http://rack.github.io
-    # @see Hanami::RenderingPolicy#render
-    # @see Hanami::Application#middleware
-    def call(env)
-      renderer.render(env, middleware.call(env))
-    end
-
-    private
-
-    # Return the configuration for this application
-    #
-    # @since 0.1.0
-    # @api private
-    #
-    # @see Hanami::Application.configuration
-    def configuration
-      self.class.configuration
-    end
-
-    # Rendering policy
-    #
-    # @since 0.2.0
-    # @api private
-    #
-    # @see Hanami::RenderingPolicy
-    attr_reader :renderer
-
-    # Rack middleware stack
-    #
-    # @return [Hanami::MiddlewareStack] the middleware stack
-    #
-    # @since 0.1.0
-    # @api private
-    #
-    # @see Hanami::MiddlewareStack
-    attr_reader :middleware
   end
 end

data/lib/hanami/boot.rb

@@ -0,0 +1,6 @@
+# frozen_string_literal: true
+
+require "bundler/setup"
+require "hanami"
+
+Hanami.boot

data/lib/hanami/cli/commands/command.rb

@@ -1,12 +1,10 @@
-require 'hanami'
-require 'hanami/environment'
-require 'hanami/components'
-require 'dry/cli/command'
-require 'hanami/cli/commands/project'
-require 'hanami/cli/commands/templates'
-require 'concurrent'
-require 'hanami/utils/files'
-require 'erb'
+# frozen_string_literal: true
+
+require "hanami"
+require "hanami/cli/command"
+require "concurrent"
+require "hanami/utils/files"
+require "erb"
 
 module Hanami
   # Hanami CLI
@@ -17,7 +15,7 @@ module Hanami
       # Abstract command
       #
       # @since 1.1.0
-      class Command < Dry::CLI::Command
+      class Command < Hanami::CLI::Command
         # @since 1.1.0
         # @api private
         def self.inherited(component)
@@ -72,17 +70,8 @@ module Hanami
           # @since 1.1.0
           # @api private
           def call(**options)
-            if self.class.requirements.any?
-              environment = Hanami::Environment.new(options)
-              environment.require_project_environment
-
-              requirements.resolved('environment', environment)
-              requirements.resolve(self.class.requirements)
-
-              options = environment.to_options.merge(options)
-            end
-
-            super(**options)
+            # FIXME: merge ENV vars (like HANAMI_ENV) into **options
+            super(options)
           rescue StandardError => e
             warn e.message
             warn e.backtrace.join("\n\t")
@@ -92,10 +81,11 @@ module Hanami
 
         # @since 1.1.0
         # @api private
-        def initialize(out: $stdout, files: Utils::Files)
-          @out       = out
-          @files     = files
-          @templates = Templates.new(self.class)
+        def initialize(command_name:, out: $stdout, files: Utils::Files)
+          super(command_name: command_name)
+
+          @out   = out
+          @files = files
         end
 
         private
@@ -107,7 +97,7 @@ module Hanami
         class Renderer
           # @since 1.1.0
           # @api private
-          TRIM_MODE = "-".freeze
+          TRIM_MODE = "-"
 
           # @since 1.1.0
           # @api private
@@ -124,7 +114,7 @@ module Hanami
 
         # @since 1.1.0
         # @api private
-        SAY_FORMATTER = "%<operation>12s  %<path>s\n".freeze
+        SAY_FORMATTER = "%<operation>12s  %<path>s\n"
 
         # @since 1.1.0
         # @api private
@@ -165,13 +155,15 @@ module Hanami
         # @since 1.1.0
         # @api private
         def project
-          Project
+          # FIXME: is this still useful?
+          raise "it used to be implemented as Project"
         end
 
         # @since 1.1.0
         # @api private
         def requirements
-          Hanami::Components
+          # FIXME: require components via the new Hanami::Container
+          raise "it used to be implemented as Hanami::Components"
         end
       end
     end