hanami 1.3.1 → 1.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6f8de5a13b2d729b7e98e30b5115b4ac469b14a8cdeb0ac8e3d7d298ec488e7d
-  data.tar.gz: bade8071e296c4ba2340e2128007dd32ff6e1a04dd0c8259f021c03edb20360b
+  metadata.gz: 92d8362c387abfc24cda9234c81c671d544f03a2ae2680c9f71d492c7172410a
+  data.tar.gz: 57643cd0ca74fd851e800edbe62c18464dc5ca0dcd09c66189ed53b256beb5f0
 SHA512:
-  metadata.gz: bee97cd8a6b879e1f58aee23dd04d35a121ce0352bf728e435bd86902a508533d2bf9b1312ff2482f15e76223131dcd7b91c9a68f2cd6149e25884d31fdaaf29
-  data.tar.gz: bebfb7bf05e39b8165b8465e3b6898b02e4d43b71708778a48c6175dcf9cda7272ca28e6542d277e2854631106fd850299a8ac0d7701995707ec48630ce1b17a
+  metadata.gz: 6570e1184cc95fe719bbb366f59f082ccafdc55dddae70496c98579cd53f4d46a31bd740030b500e5d2b7ed03e2df8f42148344170c1a90453209b2575960441
+  data.tar.gz: f2409cb5bc4d8bf3c7fe4bfa026eb03a9315fb6ccb80e95aa2b44e9b94600427cab0814a00d32035128a3ace49b42ed35644e1d0652ffc584be2ac5ea6564db5

data/CHANGELOG.md

@@ -1,6 +1,35 @@
 # 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
 ### Added
 - [Luca Guidi] Official support for Ruby: MRI 2.6
@@ -9,7 +38,7 @@ The web, with simplicity.
 ### 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/enviroment.rb` uses double quotes
+- [Daphne Rouw & Sean Collins] Make app generator to work when code in `config/environment.rb` uses double quotes
 
 ## v1.3.0 - 2018-10-24
 ### Added
@@ -26,7 +55,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/enviroment.rb`
+- [graywolf] Ensure `hanami generate app` to work without `require_relative` entries in `config/environment.rb`
 - [Makoto Tajitsu & Luca Guidi] Fixed regression for `hanami new .` that used to generate a broken project
 
 ### Fixed
@@ -143,7 +172,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/enviroment.rb`
+- [Luca Guidi] Changed mailer syntax in `config/environment.rb`
 
 ## v0.9.2 - 2016-12-19
 ## Added
@@ -232,11 +261,11 @@ The web, with simplicity.
 
 ## v0.7.2 - 2016-02-09
 ### Fixed
-- [Alfonso Uceda Pompa] Fixed routing issue when static assets server tried to hijiack paths that are matching directories in public directory
+- [Alfonso Uceda Pompa] Fixed routing issue when static assets server tried to hijack 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 hijiack requests belonging to dynamic endpoints
+- [Anton Davydov] Fixed routing issue when static assets server tried to hijack requests belonging to dynamic endpoints
 - [Anatolii Didukh] Ensure to fallback to default engine for `hanami console`
 
 ## v0.7.0 - 2016-01-22
@@ -371,7 +400,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 coookies options in application configuration. Eg. `cookies true, { domain: 'lotusrb.org' }`
+- [Alfonso Uceda Pompa] Allow to specify default cookies 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,6 +3,16 @@
 
 ## 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
 
 ## v1.3.0 - 2018-10-24
@@ -20,7 +30,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 MyRackMiddlewre }`)
+- Project level Rack middleware stack (`Hanami.configure { middleware.use MyRackMiddleware }`)
 - 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-2017 Luca Guidi
+Copyright © 2014-2021 Luca Guidi
 
 MIT License
 

data/README.md

@@ -2,6 +2,10 @@
 
 The web, with simplicity.
 
+## Version
+
+**This branch contains the code for `hanami` 1.3.x.**
+
 ## Frameworks
 
 Hanami is a **full-stack** Ruby web framework.
@@ -18,7 +22,6 @@ 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.
@@ -26,8 +29,8 @@ 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)
-[![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)
+[![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)
 [![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)
 
@@ -137,4 +140,4 @@ Released under MIT License.
 
 This project was formerly known as Lotus (`lotusrb`).
 
-Copyright © 2014-2018 Luca Guidi.
+Copyright © 2014-2021 Luca Guidi.

data/bin/hanami

@@ -2,5 +2,5 @@
 require 'bundler'
 require 'hanami/cli/commands'
 
-Bundler.require(:plugins) if File.exist?(ENV["BUNDLE_GEMFILE"] || "Gemfile")
-Hanami::CLI.new(Hanami::CLI::Commands).call
+::Bundler.require(:plugins) if File.exist?(ENV["BUNDLE_GEMFILE"] || "Gemfile")
+Dry::CLI.new(Hanami::CLI::Commands).call

data/hanami.gemspec

@@ -17,24 +17,24 @@ Gem::Specification.new do |spec|
   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'
+  spec.required_ruby_version = '>= 2.3.0', '< 3'
 
   spec.metadata['allowed_push_host'] = 'https://rubygems.org'
 
   spec.add_dependency 'hanami-utils',       '~> 1.3'
-  spec.add_dependency 'hanami-validations', '~> 1.3'
+  spec.add_dependency 'hanami-validations', '>= 1.3', '< 3'
   spec.add_dependency 'hanami-router',      '~> 1.3'
-  spec.add_dependency 'hanami-controller',  '~> 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 'hanami-cli',         '~> 0.3'
+  spec.add_dependency 'dry-cli',            '~> 0.5'
   spec.add_dependency 'concurrent-ruby',    '~> 1.0'
   spec.add_dependency 'bundler',            '>= 1.6', '< 3'
 
-  spec.add_development_dependency 'rspec',     '~>  3.7'
+  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',      '~> 12.0'
+  spec.add_development_dependency 'aruba',     '~> 0.14'
+  spec.add_development_dependency 'rake',      '~> 13.0'
 end

data/lib/hanami/app.rb

@@ -62,7 +62,7 @@ module Hanami
     # @api private
     def mount(configuration)
       configuration.mounted.each do |klass, app|
-        routes.mount(klass, at: app.path_prefix)
+        routes.mount(klass, at: app.path_prefix, host: app.host)
       end
     end
 

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

@@ -1,7 +1,7 @@
 require 'hanami'
 require 'hanami/environment'
 require 'hanami/components'
-require 'hanami/cli/command'
+require 'dry/cli/command'
 require 'hanami/cli/commands/project'
 require 'hanami/cli/commands/templates'
 require 'concurrent'
@@ -17,7 +17,7 @@ module Hanami
       # Abstract command
       #
       # @since 1.1.0
-      class Command < Hanami::CLI::Command
+      class Command < Dry::CLI::Command
         # @since 1.1.0
         # @api private
         def self.inherited(component)
@@ -82,7 +82,7 @@ module Hanami
               options = environment.to_options.merge(options)
             end
 
-            super(options)
+            super(**options)
           rescue StandardError => e
             warn e.message
             warn e.backtrace.join("\n\t")
@@ -92,9 +92,7 @@ module Hanami
 
         # @since 1.1.0
         # @api private
-        def initialize(command_name:, out: $stdout, files: Utils::Files)
-          super(command_name: command_name)
-
+        def initialize(out: $stdout, files: Utils::Files)
           @out       = out
           @files     = files
           @templates = Templates.new(self.class)

data/lib/hanami/cli/commands/generate/action/action_spec.minitest.erb

@@ -6,6 +6,6 @@ describe <%= app.classify %>::Controllers::<%= classified_controller_name %>::<%
 
   it 'is successful' do
     response = action.call(params)
-    response[0].must_equal 200
+    _(response[0]).must_equal 200
   end
 end

data/lib/hanami/cli/commands/generate/action/view_spec.minitest.erb

@@ -7,6 +7,6 @@ describe <%= app.classify %>::Views::<%= classified_controller_name %>::<%= acti
   let(:rendered)  { view.render }
 
   it 'exposes #format' do
-    view.format.must_equal exposures.fetch(:format)
+    _(view.format).must_equal exposures.fetch(:format)
   end
 end

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

@@ -122,7 +122,7 @@ module <%= app.classify %>
         #   * :yui
         #   * :closure
         #
-        # See: http://hanamirb.org/guides/assets/compressors
+        # See: https://guides.hanamirb.org/assets/compressors
         #
         # In order to skip JavaScript compression comment the following line
         javascript_compressor :builtin
@@ -135,7 +135,7 @@ module <%= app.classify %>
         #   * :yui
         #   * :sass
         #
-        # See: http://hanamirb.org/guides/assets/compressors
+        # See: https://guides.hanamirb.org/assets/compressors
         #
         # In order to skip stylesheet compression comment the following line
         stylesheet_compressor :builtin
@@ -292,12 +292,12 @@ module <%= app.classify %>
 
         # Use fingerprint file name for asset paths
         #
-        # See: http://hanamirb.org/guides/assets/overview
+        # See: https://guides.hanamirb.org/assets/overview
         fingerprint true
 
         # Content Delivery Network (CDN)
         #
-        # See: http://hanamirb.org/guides/assets/content-delivery-network
+        # See: https://guides.hanamirb.org/assets/content-delivery-network
         #
         # scheme 'https'
         # host   'cdn.example.org'
@@ -305,7 +305,7 @@ module <%= app.classify %>
 
         # Subresource Integrity
         #
-        # See: http://hanamirb.org/guides/assets/content-delivery-network/#subresource-integrity
+        # See: https://guides.hanamirb.org/assets/content-delivery-network/#subresource-integrity
         subresource_integrity :sha256
       end
     end

data/lib/hanami/cli/commands/generate/app/layout_spec.minitest.erb

@@ -5,6 +5,6 @@ describe <%= app.classify %>::Views::ApplicationLayout do
   let(:rendered) { layout.render }
 
   it 'contains application name' do
-    rendered.must_include('<%= app.classify %>')
+    _(rendered).must_include('<%= app.classify %>')
   end
 end

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/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/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/config.ru.erb

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

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/cli/commands/new.rb

@@ -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.rb

@@ -1,4 +1,4 @@
-require 'hanami/cli'
+require 'dry/cli'
 require 'ostruct'
 
 module Hanami
@@ -54,7 +54,7 @@ module Hanami
     # @since 1.1.0
     # @api private
     module Commands
-      extend Hanami::CLI::Registry
+      extend Dry::CLI::Registry
 
       # CLI command context
       #

data/lib/hanami/common_logger.rb

@@ -55,7 +55,7 @@ module Hanami
     # 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[
@@ -89,5 +89,21 @@ module Hanami
       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

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/config/sessions.rb

@@ -33,6 +33,7 @@ module Hanami
       # @api private
       #
       # @see http://www.rubydoc.info/github/rack/rack/Rack/Session/Abstract/ID
+      # @see https://www.rubydoc.info/github/rack/rack/Rack/Session/Cookie
       def initialize(adapter = nil, options = {}, configuration = nil)
         @adapter       = adapter
         @options       = options
@@ -77,11 +78,17 @@ module Hanami
       # @since 0.2.0
       # @api private
       def default_options
-        if @configuration
+        result = if @configuration
           { domain: domain, secure: @configuration.ssl? }
         else
           {}
         end
+
+        if s = cookies_adapter_serializer
+          result[:coder] = s
+        end
+
+        result
       end
 
       # @since 0.2.0
@@ -98,6 +105,15 @@ module Hanami
       def ip_address?(string)
         !!IPAddr.new(string) rescue false
       end
+
+      # @since 1.3.5
+      # @api private
+      def cookies_adapter_serializer
+        return nil unless @adapter == :cookie
+
+        require "rack/session/cookie"
+        Rack::Session::Cookie::Base64::JSON.new
+      end
     end
   end
 end

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/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
     #
@@ -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/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/rake_helper.rb

@@ -71,7 +71,7 @@ module Hanami
     # @api private
     def run_hanami_command(command)
       require "hanami/cli/commands"
-      Hanami::CLI.new(Hanami::CLI::Commands).call(arguments: command.split(/[[:space:]]/))
+      Dry::CLI.new(Hanami::CLI::Commands).call(arguments: command.split(/[[:space:]]/))
     end
     # rubocop:enable Metrics/MethodLength
   end

data/lib/hanami/rake_tasks.rb

@@ -1,2 +1,3 @@
 require 'hanami/rake_helper'
+
 Hanami::RakeHelper.install_tasks

data/lib/hanami/rendering_policy.rb

@@ -1,6 +1,7 @@
 require 'hanami/utils/class'
 require 'hanami/views/default'
 require 'hanami/views/null_view'
+require 'hanami/action/rack/errors'
 
 module Hanami
   # Rendering policy
@@ -17,8 +18,6 @@ module Hanami
 
     # @api private
     HANAMI_ACTION = 'hanami.action'.freeze
-    # @api private
-    RACK_EXCEPTION = 'rack.exception'.freeze
 
     # @api private
     SUCCESSFUL_STATUSES = (200..201).freeze
@@ -57,7 +56,7 @@ module Hanami
           action.exposures
         )
       rescue StandardError => e
-        env[RACK_EXCEPTION] = e
+        Hanami::Action::Rack::Errors.set(env, e)
         raise e unless @configuration.handle_exceptions
 
         response[STATUS] = ERROR_STATUS

data/lib/hanami/routes.rb

@@ -147,7 +147,7 @@ module Hanami
     #
     # @since 0.8.0
     #
-    # @see http://hanamirb.org/guides/routing/testing
+    # @see https://guides.hanamirb.org/routing/testing
     #
     # @example Path Generation
     #   # spec/web/routes_spec.rb

data/lib/hanami/setup.rb

@@ -1,3 +1,3 @@
 require 'hanami'
 
-Bundler.require(*Hanami::Environment.new.bundler_groups)
+::Bundler.require(*Hanami::Environment.new.bundler_groups)

data/lib/hanami/templates/welcome.html.erb

@@ -32,13 +32,13 @@
 
       <h3>Hanami is Open Source Software for MVC web development with Ruby.</h3>
 
-      <p>Please generate a new action with:<br><code>bundle exec hanami generate action <%= application_name %> home#index --url=/</code></p>
+      <p>Please generate a new action with:<br><code>bundle exec hanami generate action <%= application_name %> 'home#index' --url=/</code></p>
 
       <hr style="margin-top: 4em;"/>
       <div id="content">
         <ul>
           <li><a href="http://hanamirb.org">Website</a></li>
-          <li><a href="http://hanamirb.org/guides">Guides</a></li>
+          <li><a href="https://guides.hanamirb.org/">Guides</a></li>
           <li><a href="http://www.rubydoc.info/gems/hanami">API docs</a></li>
           <li><a href="https://github.com/hanami/hanami">Source code</a></li>
           <li><a href="https://gitter.im/hanami/chat">Chat</a></li>

data/lib/hanami/version.rb

@@ -6,7 +6,7 @@ module Hanami
   module Version
     # @since 0.9.0
     # @api private
-    VERSION = '1.3.1'.freeze
+    VERSION = '1.3.5'.freeze
 
     # @since 0.9.0
     # @api private

data/lib/hanami/welcome.rb

@@ -14,6 +14,7 @@ module Hanami
     # @api private
     def call(env)
       @request_path = env['REQUEST_PATH'] || ''
+      @request_host = env['HTTP_HOST'] || ''
       @body = [ERB.new(@root.join('welcome.html.erb').read).result(binding)]
 
       [200, {}, @body]
@@ -29,7 +30,11 @@ module Hanami
     # @api private
     def application_class
       Hanami.configuration.apps do |app|
-        return app if @request_path.include?(app.path_prefix)
+        if app.host.nil?
+          return app if @request_path.include?(app.path_prefix)
+        else
+          return app if @request_host == app.host
+        end
       end
     end
   end

data/lib/hanami.rb

@@ -264,7 +264,7 @@ module Hanami
   # @since 1.0.0
   # @api private
   #
-  # @see http://hanamirb.org/guides/projects/code-reloading/
+  # @see https://guides.hanamirb.org/projects/code-reloading
   def self.code_reloading?
     environment
     Components.resolve('code_reloading')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hanami
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 1.3.5
 platform: ruby
 authors:
 - Luca Guidi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-18 00:00:00.000000000 Z
+date: 2021-10-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hanami-utils
@@ -28,16 +28,22 @@ dependencies:
   name: hanami-validations
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.3'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.3'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: hanami-router
   requirement: !ruby/object:Gem::Requirement
@@ -59,6 +65,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.3.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -66,6 +75,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.3.3
 - !ruby/object:Gem::Dependency
   name: hanami-view
   requirement: !ruby/object:Gem::Requirement
@@ -123,19 +135,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
-  name: hanami-cli
+  name: dry-cli
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '0.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '0.5'
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
   requirement: !ruby/object:Gem::Requirement
@@ -218,14 +230,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.0'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.0'
+        version: '13.0'
 description: Hanami is a web framework for Ruby
 email:
 - me@lucaguidi.com
@@ -389,13 +401,16 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ">="
     - !ruby/object:Gem::Version
       version: 2.3.0
+  - - "<"
+    - !ruby/object:Gem::Version
+      version: '3'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.2
+rubygems_version: 3.2.2
 signing_key: 
 specification_version: 4
 summary: The web, with simplicity