hanami 1.3.0.beta1 → 1.3.4

data/lib/hanami/cli/commands/generate/app/routes.erb

@@ -1,5 +1,5 @@
 # Configure your routes here
-# See: http://hanamirb.org/guides/routing/overview/
+# See: https://guides.hanamirb.org/routing/overview
 #
 # Example:
 # get '/hello', to: ->(env) { [200, {}, ['Hello from Hanami!']] }

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

@@ -301,7 +301,7 @@ module Hanami
             application_name: options.fetch(:application_name),
             application_base_url: options.fetch(:application_base_url),
             hanami_head: options.fetch(:hanami_head),
-            hanami_model_version: '~> 1.3.beta',
+            hanami_model_version: '~> 1.3',
             code_reloading: code_reloading?,
             hanami_version: hanami_version,
             project_module: Utils::String.classify(project),
@@ -502,7 +502,7 @@ module Hanami
         # @since 1.1.0
         # @api private
         def generate_app(context)
-          Hanami::CLI::Commands::New::App.new(command_name: "generate app", out: @out, files: @files).call(app: context.application_name, application_base_url: context.application_base_url, **context.options)
+          Hanami::CLI::Commands::New::App.new(out: @out, files: @files).call(app: context.application_name, application_base_url: context.application_base_url, **context.options)
         end
 
         # @since 1.1.0
@@ -565,8 +565,8 @@ module Hanami
 
           # @since 1.1.0
           # @api private
-          def initialize(*)
-            super
+          def initialize(*args, **kwargs)
+            super(*args, **kwargs)
             @templates = Templates.new(self.class.superclass)
           end
         end

data/lib/hanami/cli/commands/new/Gemfile.erb

@@ -10,7 +10,6 @@ gem 'hanami-controller',  require: false, git: 'https://github.com/hanami/contro
 gem 'hanami-view',        require: false, git: 'https://github.com/hanami/view.git',        branch: 'develop'
 gem 'hanami-helpers',     require: false, git: 'https://github.com/hanami/helpers.git',     branch: 'develop'
 gem 'hanami-mailer',      require: false, git: 'https://github.com/hanami/mailer.git',      branch: 'develop'
-gem 'hanami-cli',         require: false, git: 'https://github.com/hanami/cli.git',         branch: 'develop'
 gem 'hanami-assets',      require: false, git: 'https://github.com/hanami/assets.git',      branch: 'develop'
 gem 'hanami-model',       require: false, git: 'https://github.com/hanami/model.git',       branch: 'develop'
 gem 'hanami',                             git: 'https://github.com/hanami/hanami.git',      branch: 'develop'
@@ -34,7 +33,7 @@ gem 'haml'
 <%- if code_reloading -%>
 group :development do
   # Code reloading
-  # See: http://hanamirb.org/guides/projects/code-reloading
+  # See: https://guides.hanamirb.org/projects/code-reloading
   gem 'shotgun', platforms: :ruby
   gem 'hanami-webconsole'
 end

data/lib/hanami/cli/commands/new/README.md.erb

@@ -30,4 +30,4 @@ How to prepare (create and migrate) DB for `development` and `test` environments
 % HANAMI_ENV=test bundle exec hanami db prepare
 ```
 
-Explore Hanami [guides](http://hanamirb.org/guides/), [API docs](http://docs.hanamirb.org/<%= Hanami::VERSION %>/), or jump in [chat](http://chat.hanamirb.org) for help. Enjoy! 🌸
+Explore Hanami [guides](https://guides.hanamirb.org/), [API docs](http://docs.hanamirb.org/<%= Hanami::VERSION %>/), or jump in [chat](http://chat.hanamirb.org) for help. Enjoy! 🌸

data/lib/hanami/cli/commands/new/config.ru.erb

@@ -1,3 +1,3 @@
-require './config/environment'
+require_relative 'config/environment'
 
 run Hanami.app

data/lib/hanami/cli/commands/new/config/environment.erb

@@ -30,12 +30,12 @@ Hanami.configure do
   mailer do
     root 'lib/<%= project %>/mailers'
 
-    # See http://hanamirb.org/guides/mailers/delivery
+    # See https://guides.hanamirb.org/mailers/delivery
     delivery :test
   end
 
   environment :development do
-    # See: http://hanamirb.org/guides/projects/logging
+    # See: https://guides.hanamirb.org/projects/logging
     logger level: :debug
   end
 

data/lib/hanami/cli/commands/new/gitignore.erb

@@ -1,2 +1,4 @@
 /public/assets*
 /tmp
+.env.local
+.env.*.local

data/lib/hanami/cli/commands/new/gitignore_with_sqlite.erb

@@ -1,3 +1,5 @@
 /db/*.sqlite
 /public/assets*
 /tmp
+.env.local
+.env.*.local

data/lib/hanami/common_logger.rb

@@ -1,4 +1,5 @@
 require 'rack/common_logger'
+require 'hanami/utils/hash'
 
 module Hanami
   # Rack logger for Hanami.app
@@ -44,13 +45,17 @@ module Hanami
     # @api private
     FORM_HASH            = 'rack.request.form_hash'.freeze
 
+    # @since 1.3.0
+    # @api private
+    ROUTER_PARAMS        = 'router.params'.freeze
+
     # @since 1.0.0
     # @api private
     #
     # rubocop:disable Metrics/AbcSize
     # rubocop:disable Metrics/MethodLength
     def log(env, status, header, began_at)
-      now    = Time.now
+      now    = ElapsedTime.call
       length = extract_content_length(header)
 
       msg = Hash[
@@ -58,7 +63,7 @@ module Hanami
         verb:    env[REQUEST_METHOD],
         status:  status.to_s[0..3],
         ip:      env[HTTP_X_FORWARDED_FOR] || env[REMOTE_ADDR],
-        path:    env[SCRIPT_NAME] + env[PATH_INFO],
+        path:    env[SCRIPT_NAME] + env[PATH_INFO].to_s,
         length:  length,
         params:  extract_params(env),
         elapsed: now - began_at
@@ -73,11 +78,32 @@ module Hanami
         logger.info(msg)
       end
     end
+    # rubocop:enable Metrics/MethodLength
+    # rubocop:enable Metrics/AbcSize
 
     # @since 1.1.0
     # @api private
     def extract_params(env)
-      (env[QUERY_HASH] || {}).merge(env[FORM_HASH] || {})
+      result = env.fetch(QUERY_HASH, {})
+      result.merge!(env.fetch(FORM_HASH, {}))
+      result.merge!(Utils::Hash.deep_stringify(env.fetch(ROUTER_PARAMS, {})))
+      result
+    end
+
+    # Wrapper which uses Rack's monotonic clock_time (used for began_at since Rack 2.1.0)
+    #
+    # @since 1.3.4
+    # @api private
+    class ElapsedTime
+      @clock = if Gem::Version.new(Rack::RELEASE) >= Gem::Version.new('2.1.0')
+                 -> { Rack::Utils.clock_time }
+               else
+                 -> { Time.now }
+               end.freeze
+
+      def self.call
+        @clock.call
+      end
     end
   end
 end

data/lib/hanami/components/app/assets.rb

@@ -5,7 +5,7 @@ module Hanami
     # @since 0.9.0
     # @api private
     module App
-      # hanami-assets configuration for a sigle Hanami application in the project.
+      # hanami-assets configuration for a single Hanami application in the project.
       #
       # @since 0.9.0
       # @api private

data/lib/hanami/components/app/controller.rb

@@ -8,7 +8,7 @@ module Hanami
     # @since 0.9.0
     # @api private
     module App
-      # hanami-controller configuration for a sigle Hanami application in the project.
+      # hanami-controller configuration for a single Hanami application in the project.
       #
       # @since 0.9.0
       # @api private

data/lib/hanami/components/app/routes.rb

@@ -8,7 +8,7 @@ module Hanami
     # @since 0.9.0
     # @api private
     module App
-      # hanami-router configuration for a sigle Hanami application in the project.
+      # hanami-router configuration for a single Hanami application in the project.
       #
       # @since 0.9.0
       # @api private
@@ -39,17 +39,19 @@ module Hanami
           resolver    = Hanami::Routing::EndpointResolver.new(pattern: config.controller_pattern, namespace: namespace)
           default_app = Hanami::Routing::Default.new
 
-          Hanami::Router.new(
+          options = {
             resolver:    resolver,
             default_app: default_app,
-            parsers:     config.body_parsers,
             scheme:      config.scheme,
             host:        config.host,
             port:        config.port,
             prefix:      config.path_prefix,
-            force_ssl:   config.force_ssl,
-            &config.routes
-          )
+            force_ssl:   config.force_ssl
+          }
+
+          options[:parsers] = config.body_parsers if config.body_parsers.any?
+
+          Hanami::Router.new(options, &config.routes)
         end
       end
     end

data/lib/hanami/components/app/view.rb

@@ -5,7 +5,7 @@ module Hanami
     # @since 0.9.0
     # @api private
     module App
-      # hanami-view configuration for a sigle Hanami application in the project.
+      # hanami-view configuration for a single Hanami application in the project.
       #
       # @since 0.9.0
       # @api private

data/lib/hanami/components/routes_inspector.rb

@@ -51,7 +51,7 @@ module Hanami
       # @since 0.9.0
       # @api private
       def hanami_app?(klass)
-        klass.ancestors.include?(Hanami::Application)
+        klass <= Hanami::Application
       end
 
       # @since 0.9.0

data/lib/hanami/configuration.rb

@@ -20,6 +20,7 @@ module Hanami
     # @param app [#call] an application compatible with Rack SPEC
     # @param options [Hash] a set of options
     # @option :at [String] options the mount point
+    # @option :host [String] options the mount point
     #
     # @since 0.9.0
     #
@@ -27,12 +28,14 @@ module Hanami
     #   # config/environment.rb
     #   # ...
     #   Hanami.configure do
+    #     mount Beta::Application, at: '/', host: 'beta.bookshelf.com'
+    #     mount Admin::Application, at: '/api'
     #     mount Web::Application, at: '/'
     #
     #     # ...
     #   end
     def mount(app, options)
-      mounted[app] = App.new(app, options.fetch(:at))
+      mounted[app] = App.new(app, options)
     end
 
     # Configure database
@@ -75,7 +78,7 @@ module Hanami
     #     mailer do
     #       root 'lib/bookshelf/mailers'
     #
-    #       # See http://hanamirb.org/guides/mailers/delivery
+    #       # See https://guides.hanamirb.org/mailers/delivery
     #       delivery :test
     #     end
     #
@@ -138,7 +141,7 @@ module Hanami
     # @api private
     def apps
       mounted.each_pair do |klass, app|
-        yield(app) if klass.ancestors.include?(Hanami::Application)
+        yield(app) if klass <= Hanami::Application
       end
     end
 
@@ -151,7 +154,7 @@ module Hanami
     # @see Hanami.logger
     # @see Hanami::Logger
     #
-    # @see http://hanamirb.org/guides/projects/logging/
+    # @see https://guides.hanamirb.org/projects/logging
     #
     # @example Basic Usage
     #   # config/environment.rb

data/lib/hanami/configuration/app.rb

@@ -7,11 +7,14 @@ module Hanami
     class App < SimpleDelegator
       # @api private
       attr_reader :path_prefix
+      # @api private
+      attr_reader :host
 
       # @api private
-      def initialize(app, path_prefix)
+      def initialize(app, options = {})
         super(app)
-        @path_prefix = path_prefix
+        @path_prefix = options[:at]
+        @host = options[:host]
       end
     end
   end

data/lib/hanami/early_hints.rb

@@ -3,7 +3,7 @@
 module Hanami
   # HTTP/2 Early Hints Rack middleware
   #
-  # It sends extra responses **before** the main reponse is sent.
+  # It sends extra responses **before** the main response is sent.
   # These extra responses are HTTP/2 Early Hints (103).
   # They specify the web assets (javascripts, stylesheets, etc..) to be "pushed",
   # so modern browsers pre-fetch them in parallel with the main HTTP response.

data/lib/hanami/environment.rb

@@ -36,6 +36,12 @@ module Hanami
     # @api private
     DEFAULT_ENV    = 'development'.freeze
 
+    # Test environment
+    #
+    # @since 1.3.3
+    # @api private
+    TEST_ENV = 'test'.freeze
+
     # Production environment
     #
     # @since 0.6.0
@@ -48,11 +54,21 @@ module Hanami
     # @api private
     RACK_ENV_DEPLOYMENT = 'deployment'.freeze
 
-    # Default `.env` per environment file name
+    # @since 1.3.3
+    # @api private
+    DOTENV_LOCAL_FILE = '.env.local'.freeze
+
+    # Default `.env` files that are loaded. The entries are ordered from highest
+    # to lowest priority.
     #
-    # @since 0.2.0
+    # @since 1.3.3
     # @api private
-    DEFAULT_DOTENV_ENV = '.env.%s'.freeze
+    DOTENV_FILES = [
+      '.env.%{environment}.local'.freeze,
+      DOTENV_LOCAL_FILE,
+      '.env.%{environment}'.freeze,
+      '.env'.freeze
+    ].freeze
 
     # Default configuration directory under application root
     #
@@ -132,9 +148,8 @@ module Hanami
     # located under the config directory. All the settings in those files will
     # be exported as `ENV` variables.
     #
-    # Master .env file is ignored to suggest clear separation of environment
-    # configurations and discourage putting sensitive information into source
-    # control.
+    # This table: https://github.com/bkeepers/dotenv#what-other-env-files-can-i-use
+    # has more info on the priority of the .env files.
     #
     # The format of those `.env.<environment>` files follows UNIX and UNIX-like
     # operating system environment variable declaration format and compatible
@@ -391,7 +406,7 @@ module Hanami
     # @since 0.4.0
     # @api private
     def require_application_environment
-      Bundler.setup(*bundler_groups)
+      ::Bundler.setup(*bundler_groups)
       require project_environment_configuration.to_s # if project_environment_configuration.exist?
     end
 
@@ -487,10 +502,13 @@ module Hanami
     # @since 0.2.0
     # @api private
     def set_application_env_vars!
-      dotenv = root.join(DEFAULT_DOTENV_ENV % environment)
-      return unless dotenv.exist?
+      DOTENV_FILES.each do |filename_format|
+        file = filename_format % { environment: environment }
+        next unless dotenv_applicable?(file)
 
-      env.load!(dotenv)
+        path = root.join(file)
+        env.load!(path) if path.exist?
+      end
     end
 
     # @since 0.1.0
@@ -509,5 +527,15 @@ module Hanami
         env[RACK_ENV]
       end
     end
+
+    # @api private
+    # @since 1.3.3
+    #
+    # @see https://github.com/bkeepers/dotenv#what-other-env-files-can-i-use
+    def dotenv_applicable?(file)
+      return false if file == DOTENV_LOCAL_FILE && environment == TEST_ENV
+
+      true
+    end
   end
 end

data/lib/hanami/{middleware.rb → middleware_stack.rb}

@@ -6,12 +6,12 @@ module Hanami
   #
   # @since 0.1.0
   # @api private
-  class Middleware
+  class MiddlewareStack
     # Instantiate a middleware stack
     #
     # @param configuration [Hanami::ApplicationConfiguration] the application's configuration
     #
-    # @return [Hanami::Middleware] the new stack
+    # @return [Hanami::MiddlewareStack] the new stack
     #
     # @since 0.1.0
     # @api private
@@ -25,7 +25,7 @@ module Hanami
 
     # Load the middleware stack
     #
-    # @return [Hanami::Middleware] the loaded middleware stack
+    # @return [Hanami::MiddlewareStack] the loaded middleware stack
     #
     # @since 0.2.0
     # @api private
@@ -62,7 +62,7 @@ module Hanami
     #
     # @since 0.2.0
     #
-    # @see Hanami::Middleware#prepend
+    # @see Hanami::MiddlewareStack#prepend
     #
     # @example
     #   # apps/web/application.rb
@@ -89,7 +89,7 @@ module Hanami
     #
     # @since 0.6.0
     #
-    # @see Hanami::Middleware#use
+    # @see Hanami::MiddlewareStack#use
     #
     # @example
     #   # apps/web/application.rb