hanami 2.0.0.beta2 → 2.0.0.beta4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9e9e5c35a72383ba29d2523a9b30da2a3170605bba5cee20562c897025a58524
-  data.tar.gz: 328e2e6aa30db94ce7dbae5f58d3ac0ce8435ec928ed71fa058345ca3a22553f
+  metadata.gz: afcc32f5e8f7ba0a0acb001c4c36ea5a654f73e705b22e73cfc2a2835858af3e
+  data.tar.gz: d183f4cdec177426f339eeae371320880927d15463982d82daeffacd632fe09f
 SHA512:
-  metadata.gz: 769a484cea4c2594afaece8ae368e16003d02f988b6c015370b0b8236de477042611d71432da8d89d885ebabd3e0e013e7dd9299d0622897f44ac3d511980daf
-  data.tar.gz: e5808f8d9195cb242cbc02d136c993167ab124dabda9b239469841c981c621410d80ace966378157f22cdfd4aaf683f885257d96713561e2e12ce54cdadcab0f
+  metadata.gz: a1cca2e0e675ba87e678c14d4733bc172af135ea8fbf751fb1d1749faef2cf9a96629eae77fac339c5d435f6d3744dc6da1f1c32bf63881563ceb435337725bb
+  data.tar.gz: 5a466e081c89ded4a30f4ba8655c2981ba26f9cbb16a5f5e8deb6034f806f4ec203a62556c4ad372b8fd4619e959eb8beb3781a6e8e0451e04aaa0dc2099129f

data/CHANGELOG.md

@@ -2,6 +2,34 @@
 
 The web, with simplicity.
 
+## v2.0.0.beta4 - 2022-10-24
+
+### Added
+
+- [Peter Solnica] Improve middleware config by avoiding class names and requires: symbols instead of classes can be passed as middleware identifiers (`config.middleware.use(:body_parser, :json)`); constant namespaces can be configured for resolving symbols into class names (`config.middleware.namespaces = [Hanami::Middleware, MyStuff::Middlewares]`), with the first match winning; first-party middleware classes are required automatically. (#1215)
+
+### Fixed
+
+- [Luca Guidi] Do not attempt to load routes if hanami-router is not bundled (#1214)
+- [Marc Busqué] Ensure nested slices are considered when auto-configuring application components using `Hanami::SliceConfigurable` (#1212)
+- [Tim Riley] Ensure errors are raised during settings loading for any settings that are missing entirely from ENV (#1222)
+
+### Changed
+
+- [Tim Riley] Rename `Hanami::App.configuration` to `Hanami::App.config` and `Hanami::Configuration` to `Hanami::Config` (#1218)
+- [Tim Riley] Make `Hanami::App.settings` available as a class method again (#1213)
+- [Tim Riley] `config/settings.rb` in apps no longer has access to autoloaded constants (changed back to behavior pre-beta3) (#1213)
+- [Tim Riley] Auto-generate a nested `Types` module in `Hanami::Settings` subclasses if dry-types is available, for added convenience in type checking settings (#1213)
+- [Marc Busqué] Hide values from `Hanami::Settings#inspect` (values may contain sensitive data). Values can be inspected via `#inspect_values` (#1217)
+
+## v2.0.0.beta3 - 2022-09-21
+
+### Changed
+
+- [Piotr Solnica] Simplify routes definition, by removing `routes` block from `config/routes.rb`
+
+### Added
+
 ## v2.0.0.beta2 - 2022-08-16
 
 ### Added
@@ -25,6 +53,7 @@ The web, with simplicity.
   Or by setting `HANAMI_SLICES=blog,shop` in the env.
 
   You can also specify arbitrarily nested slices using dot delimiters. For example, if you have an `admin` slice with nested `shop` and `blog` slices, you can specify `config.slices = %w[admin.shop]` to only load the admin slice and its nested shop slice.
+
 - [Tim Riley] Added `App.prepare_load_path`, which need only be called if you explicitly change your app's `config.root`. The `$LOAD_PATH` is otherwise still prepared automatically for the default `root` of `Dir.pwd`. [#1188]
 - [Marc Busqué, Tim Riley] Added `Hanami.setup` to find and load your Hanami app file (expected at `config/app.rb`). This will search in the current directory, and will search upwards through parent directories until the app file is found. [#1197]
 
@@ -62,6 +91,7 @@ The web, with simplicity.
     end
   end
   ```
+
 - [Tim Riley] Every slice has a distinct `Zeitwerk::Loader` instance at `Slice.autoloader`. This change enabled the autoloading within settings described above. [#1186]
 - [Tim Riley] `Slice.settings` reader method has been removed. Access settings via `App["settings"]` or `Slice["settings"]` (after the slice has been prepared) instead. [#1186]
 - [Tim Riley] dry-types is no longer a dependency specified in the gemspec. This is made available to generated app via a line in their `Gemfile` instead. [#1186]
@@ -133,7 +163,6 @@ The web, with simplicity.
 - [Tim Riley] Removed `Hanami::Configuration::Router#routes_path`, and `#routes_class_name` [#1175]
 - [Tim Riley] Make `Hanami::App` to inherit from `Hanami::Slice` [#1162]
 
-
 ## v2.0.0.alpha8 - 2022-05-19
 
 ### Added

data/hanami.gemspec

@@ -32,14 +32,14 @@ Gem::Specification.new do |spec|
   spec.metadata["allowed_push_host"] = "https://rubygems.org"
 
   spec.add_dependency "bundler",          ">= 1.16", "< 3"
-  spec.add_dependency "dry-configurable", "~> 0.15"
-  spec.add_dependency "dry-core",         "~> 0.7"
+  spec.add_dependency "dry-configurable", "~> 0.16", ">= 0.16.1"
+  spec.add_dependency "dry-core",         "~> 0.9", ">= 0.9.1"
   spec.add_dependency "dry-inflector",    "~> 0.2", ">= 0.2.1"
-  spec.add_dependency "dry-system",       "~> 0.25", ">= 0.25.0"
-  spec.add_dependency "dry-monitor",      "~> 0.6", ">= 0.6.3"
+  spec.add_dependency "dry-system",       "~> 0.27", ">= 0.27.2"
+  spec.add_dependency "dry-monitor",      "~> 0.7", ">= 0.7"
   spec.add_dependency "hanami-cli",       "~> 2.0.beta"
   spec.add_dependency "hanami-utils",     "~> 2.0.beta"
-  spec.add_dependency "zeitwerk",         "~> 2.4"
+  spec.add_dependency "zeitwerk",         "~> 2.6"
 
   spec.add_development_dependency "rspec",     "~> 3.8"
   spec.add_development_dependency "rack-test", "~> 1.1"

data/lib/hanami/app.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require_relative "configuration"
+require_relative "config"
 require_relative "constants"
 require_relative "slice"
 require_relative "slice_name"
@@ -29,7 +29,7 @@ module Hanami
 
       @_mutex.synchronize do
         subclass.class_eval do
-          @configuration = Hanami::Configuration.new(app_name: slice_name, env: Hanami.env)
+          @config = Hanami::Config.new(app_name: slice_name, env: Hanami.env)
 
           # Prepare the load path (based on the default root of `Dir.pwd`) as early as
           # possible, so you can make a `require` inside the body of an `App` subclass,
@@ -43,7 +43,7 @@ module Hanami
 
     # App class interface
     module ClassMethods
-      attr_reader :configuration
+      attr_reader :config
 
       def app_name
         slice_name
@@ -152,7 +152,7 @@ module Hanami
 
         # When auto-registering components in app/, ignore files in `app/lib/` (these will
         # be auto-registered as above), as well as the configured no_auto_register_paths
-        no_auto_register_paths = ([LIB_DIR] + configuration.no_auto_register_paths)
+        no_auto_register_paths = ([LIB_DIR] + config.no_auto_register_paths)
           .map { |path|
             path.end_with?(File::SEPARATOR) ? path : "#{path}#{File::SEPARATOR}"
           }

data/lib/hanami/assets/{app_configuration.rb → app_config.rb}

@@ -1,19 +1,19 @@
 # frozen_string_literal: true
 
-require "hanami/assets/configuration"
 require "dry/configurable"
+require_relative "config"
 
 module Hanami
   module Assets
     # @since 2.0.0
     # @api public
-    class AppConfiguration
+    class AppConfig
       include Dry::Configurable
 
       # @since 2.0.0
       # @api private
-      attr_reader :base_configuration
-      protected :base_configuration
+      attr_reader :base_config
+      protected :base_config
 
       setting :server_url, default: "http://localhost:8080"
 
@@ -22,12 +22,12 @@ module Hanami
       def initialize(*)
         super
 
-        @base_configuration = Assets::Configuration.new
+        @base_config = Config.new
       end
 
       def initialize_copy(source)
         super
-        @base_configuration = source.base_configuration.dup
+        @base_config = source.base_config.dup
       end
 
       # @since 2.0.0
@@ -42,7 +42,7 @@ module Hanami
       # @since 2.0.0
       # @api private
       def settings
-        base_configuration.settings + self.class.settings
+        base_config.settings + self.class.settings
       end
 
       private
@@ -52,8 +52,8 @@ module Hanami
       def method_missing(name, *args, &block)
         if config.respond_to?(name)
           config.public_send(name, *args, &block)
-        elsif base_configuration.respond_to?(name)
-          base_configuration.public_send(name, *args, &block)
+        elsif base_config.respond_to?(name)
+          base_config.public_send(name, *args, &block)
         else
           super
         end
@@ -62,7 +62,7 @@ module Hanami
       # @since 2.0.0
       # @api private
       def respond_to_missing?(name, _incude_all = false)
-        config.respond_to?(name) || base_configuration.respond_to?(name) || super
+        config.respond_to?(name) || base_config.respond_to?(name) || super
       end
     end
   end

data/lib/hanami/assets/{configuration.rb → config.rb}

@@ -6,14 +6,14 @@ module Hanami
   module Assets
     # @since 2.0.0
     # @api public
-    class Configuration
+    class Config
       include Dry::Configurable
 
-      # Initialize the Configuration
+      # Initialize the Config
       #
-      # @yield [config] the configuration object
+      # @yield [config] the config object
       #
-      # @return [Configuration]
+      # @return [Config]
       #
       # @since 2.0.0
       # @api private

data/lib/hanami/{configuration → config}/actions/content_security_policy.rb

@@ -1,9 +1,9 @@
 # frozen_string_literal: true
 
 module Hanami
-  class Configuration
+  class Config
     class Actions
-      # Configuration for Content Security Policy in Hanami apps
+      # Config for Content Security Policy in Hanami apps
       #
       # @since 2.0.0
       class ContentSecurityPolicy

data/lib/hanami/{configuration → config}/actions/cookies.rb

@@ -1,12 +1,13 @@
 # frozen_string_literal: true
 
 module Hanami
-  class Configuration
+  class Config
     class Actions
-      # Wrapper for app-level configuration of HTTP cookies for Hanami actions.
-      # This decorates the hash of cookie options that is otherwise directly configurable
-      # on actions, and adds the `enabled?` method to allow app base action to
-      # determine whether to include the `Action::Cookies` module.
+      # Wrapper for app-level config of HTTP cookies for Hanami actions.
+      #
+      # This decorates the hash of cookie options that is otherwise directly configurable on
+      # actions, and adds the `enabled?` method to allow app base action to determine whether to
+      # include the `Action::Cookies` module.
       #
       # @since 2.0.0
       class Cookies

data/lib/hanami/{configuration → config}/actions/sessions.rb

@@ -5,9 +5,9 @@ require "hanami/utils/string"
 require "hanami/utils/class"
 
 module Hanami
-  class Configuration
+  class Config
     class Actions
-      # Configuration for HTTP sessions in Hanami actions
+      # Config for HTTP sessions in Hanami actions
       #
       # @since 2.0.0
       class Sessions

data/lib/hanami/{configuration → config}/actions.rb

@@ -1,15 +1,14 @@
 # frozen_string_literal: true
 
 require "dry/configurable"
-require "hanami/action/configuration"
 require_relative "actions/cookies"
 require_relative "actions/sessions"
 require_relative "actions/content_security_policy"
 require_relative "../slice/view_name_inferrer"
 
 module Hanami
-  class Configuration
-    # Hanami actions configuration
+  class Config
+    # Hanami actions config
     #
     # @since 2.0.0
     class Actions
@@ -26,13 +25,13 @@ module Hanami
 
       attr_accessor :content_security_policy
 
-      attr_reader :base_configuration
-      protected :base_configuration
+      attr_reader :base_config
+      protected :base_config
 
       def initialize(*, **options)
         super()
 
-        @base_configuration = Hanami::Action::Configuration.new
+        @base_config = Hanami::Action.config.dup
         @content_security_policy = ContentSecurityPolicy.new do |csp|
           if assets_server_url = options[:assets_server_url]
             csp[:script_src] += " #{assets_server_url}"
@@ -45,7 +44,7 @@ module Hanami
 
       def initialize_copy(source)
         super
-        @base_configuration = source.base_configuration.dup
+        @base_config = source.base_config.dup
         @content_security_policy = source.content_security_policy.dup
       end
 
@@ -66,12 +65,12 @@ module Hanami
       # @since 2.0.0
       # @api private
       def settings
-        base_configuration.settings + self.class.settings
+        Hanami::Action.settings + self.class.settings
       end
 
       private
 
-      # Apply defaults for base configuration settings
+      # Apply defaults for base config
       def configure_defaults
         self.default_request_format = :html
         self.default_response_format = :html
@@ -86,15 +85,15 @@ module Hanami
       def method_missing(name, *args, &block)
         if config.respond_to?(name)
           config.public_send(name, *args, &block)
-        elsif base_configuration.respond_to?(name)
-          base_configuration.public_send(name, *args, &block)
+        elsif base_config.respond_to?(name)
+          base_config.public_send(name, *args, &block)
         else
           super
         end
       end
 
       def respond_to_missing?(name, _incude_all = false)
-        config.respond_to?(name) || base_configuration.respond_to?(name) || super
+        config.respond_to?(name) || base_config.respond_to?(name) || super
       end
     end
   end

data/lib/hanami/{configuration → config}/logger.rb

@@ -4,8 +4,8 @@ require "dry/configurable"
 require "hanami/logger"
 
 module Hanami
-  class Configuration
-    # Hanami logger configuration
+  class Config
+    # Hanami logger config
     #
     # @since 2.0.0
     class Logger

data/lib/hanami/config/null_config.rb

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

data/lib/hanami/{configuration → config}/router.rb

@@ -4,22 +4,22 @@ require "dry/configurable"
 require_relative "../slice/routing/resolver"
 
 module Hanami
-  class Configuration
-    # Hanami router configuration
+  class Config
+    # Hanami router config
     #
     # @since 2.0.0
     # @api private
     class Router
       include Dry::Configurable
 
-      # Base configuration is provided so router config can include the `base_url`
-      attr_reader :base_configuration
-      private :base_configuration
+      # Base config is provided so router config can include the `base_url`
+      attr_reader :base_config
+      private :base_config
 
       # @api private
       # @since 2.0.0
-      def initialize(base_configuration)
-        @base_configuration = base_configuration
+      def initialize(base_config)
+        @base_config = base_config
       end
 
       setting :resolver, default: Slice::Routing::Resolver
@@ -27,7 +27,7 @@ module Hanami
       # @api private
       # @since 2.0.0
       def options
-        {base_url: base_configuration.base_url}
+        {base_url: base_config.base_url}
       end
 
       private

data/lib/hanami/{configuration → config}/sessions.rb

@@ -4,8 +4,8 @@ require "hanami/utils/string"
 require "hanami/utils/class"
 
 module Hanami
-  class Configuration
-    # Hanami configuration for HTTP sessions
+  class Config
+    # Hanami config for HTTP sessions
     #
     # @since 2.0.0
     class Sessions

data/lib/hanami/{configuration → config}/views.rb

@@ -4,8 +4,8 @@ require "dry/configurable"
 require "hanami/view"
 
 module Hanami
-  class Configuration
-    # Hanami actions configuration
+  class Config
+    # Hanami views config
     #
     # @since 2.0.0
     class Views
@@ -13,20 +13,20 @@ module Hanami
 
       setting :parts_path, default: "views/parts"
 
-      attr_reader :base_configuration
-      protected :base_configuration
+      attr_reader :base_config
+      protected :base_config
 
       def initialize(*)
         super
 
-        @base_configuration = Hanami::View.config.dup
+        @base_config = Hanami::View.config.dup
 
         configure_defaults
       end
 
       def initialize_copy(source)
         super
-        @base_configuration = source.base_configuration.dup
+        @base_config = source.base_config.dup
       end
 
       # Returns the list of available settings
@@ -42,7 +42,7 @@ module Hanami
       def finalize!
         return self if frozen?
 
-        base_configuration.finalize!
+        base_config.finalize!
 
         super
       end
@@ -69,8 +69,8 @@ module Hanami
 
         if config.respond_to?(name)
           config.public_send(name, *args, &block)
-        elsif base_configuration.respond_to?(name)
-          base_configuration.public_send(name, *args, &block)
+        elsif base_config.respond_to?(name)
+          base_config.public_send(name, *args, &block)
         else
           super
         end
@@ -79,7 +79,7 @@ module Hanami
       def respond_to_missing?(name, _include_all = false)
         return false if NON_FORWARDABLE_METHODS.include?(name)
 
-        config.respond_to?(name) || base_configuration.respond_to?(name) || super
+        config.respond_to?(name) || base_config.respond_to?(name) || super
       end
     end
   end

data/lib/hanami/{configuration.rb → config.rb}

@@ -8,9 +8,8 @@ require "dry/inflector"
 require "pathname"
 
 require_relative "constants"
-require_relative "configuration/logger"
-require_relative "configuration/router"
-require_relative "configuration/sessions"
+require_relative "config/logger"
+require_relative "config/sessions"
 require_relative "settings/env_store"
 require_relative "slice/routing/middleware/stack"
 
@@ -18,7 +17,7 @@ module Hanami
   # Hanami app configuration
   #
   # @since 2.0.0
-  class Configuration
+  class Config
     include Dry::Configurable
 
     setting :root, constructor: ->(path) { Pathname(path) if path }
@@ -59,7 +58,7 @@ module Hanami
     # @api public
     attr_reader :env
 
-    # @return [Hanami::Configuration::Actions]
+    # @return [Hanami::Config::Actions]
     #
     # @api public
     attr_reader :actions
@@ -72,12 +71,12 @@ module Hanami
     # @api private
     alias_method :middleware_stack, :middleware
 
-    # @return [Hanami::Configuration::Router]
+    # @return [Hanami::Config::Router]
     #
     # @api public
     attr_reader :router
 
-    # @return [Hanami::Configuration::Views]
+    # @return [Hanami::Config::Views]
     #
     # @api public
     attr_reader :views
@@ -104,34 +103,36 @@ module Hanami
       self.root = Dir.pwd
       load_from_env
 
-      config.logger = Configuration::Logger.new(env: env, app_name: app_name)
+      config.logger = Config::Logger.new(env: env, app_name: app_name)
 
-      @assets = load_dependent_config("hanami/assets/app_configuration") {
-        Hanami::Assets::AppConfiguration.new
-      }
+      # TODO: Make assets config dependent
+      require "hanami/assets/app_config"
+      @assets = Hanami::Assets::AppConfig.new
 
-      @actions = load_dependent_config("hanami/action") {
-        require_relative "configuration/actions"
+      @actions = load_dependent_config("hanami-controller") {
+        require_relative "config/actions"
         Actions.new
       }
 
-      @middleware = Slice::Routing::Middleware::Stack.new
-
-      @router = Router.new(self)
+      @router = load_dependent_config("hanami-router") {
+        require_relative "config/router"
+        @middleware = Slice::Routing::Middleware::Stack.new
+        Router.new(self)
+      }
 
-      @views = load_dependent_config("hanami/view") {
-        require_relative "configuration/views"
+      @views = load_dependent_config("hanami-view") {
+        require_relative "config/views"
         Views.new
       }
 
       yield self if block_given?
     end
 
-    # Apply configuration for the given environment
+    # Apply config for the given environment
     #
     # @param env [String] the environment name
     #
-    # @return [Hanami::Configuration]
+    # @return [Hanami::Config]
     #
     # @api public
     def environment(env_name, &block)
@@ -163,7 +164,7 @@ module Hanami
       @actions = source.actions.dup
       @middleware = source.middleware.dup
       @router = source.router.dup.tap do |router|
-        router.instance_variable_set(:@base_configuration, self)
+        router.instance_variable_set(:@base_config, self)
       end
       @views = source.views.dup
     end
@@ -172,7 +173,7 @@ module Hanami
     def finalize!
       apply_env_config
 
-      # Finalize nested configurations
+      # Finalize nested configs
       assets.finalize!
       actions.finalize!
       views.finalize!
@@ -209,14 +210,13 @@ module Hanami
     end
 
     # @api private
-    def load_dependent_config(require_path)
-      require require_path
-      yield
-    rescue LoadError => e
-      raise e unless e.path == require_path
-
-      require_relative "configuration/null_configuration"
-      NullConfiguration.new
+    def load_dependent_config(gem_name)
+      if Hanami.bundled?(gem_name)
+        yield
+      else
+        require_relative "config/null_config"
+        NullConfig.new
+      end
     end
 
     def method_missing(name, *args, &block)

data/lib/hanami/errors.rb

@@ -12,4 +12,7 @@ module Hanami
 
   # @since 2.0.0
   ComponentLoadError = Class.new(Error)
+
+  # @since 2.0.0
+  UnsupportedMiddlewareSpecError = Class.new(Error)
 end

data/lib/hanami/extensions/action/slice_configured_action.rb

@@ -47,7 +47,7 @@ module Hanami
         end
 
         def configure_action(action_class)
-          action_class.config.settings.each do |setting|
+          action_class.settings.each do |setting|
             # Configure the action from config on the slice, _unless it has already been configured
             # by a parent slice_, and re-configuring it for this slice would make no change.
             #

data/lib/hanami/providers/inflector.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require "dry/system/provider/source"
-
 module Hanami
   module Providers
     class Inflector < Dry::System::Provider::Source

data/lib/hanami/providers/logger.rb

@@ -1,12 +1,10 @@
 # frozen_string_literal: true
 
-require "dry/system/provider/source"
-
 module Hanami
   module Providers
     class Logger < Dry::System::Provider::Source
       def start
-        register :logger, Hanami.app.configuration.logger_instance
+        register :logger, Hanami.app.config.logger_instance
       end
     end
   end

data/lib/hanami/providers/rack.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require "dry/system/provider/source"
-
 module Hanami
   module Providers
     class Rack < Dry::System::Provider::Source