hanami 1.3.3 → 1.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9ec1be46fff34a0e6278e8c08a20742d87622bb24ef82b5320c7f71c9900bc6d
-  data.tar.gz: b88a1a45b04427a79a7c7d828353bca49df12de456815d35ff84c18ff09dcda0
+  metadata.gz: 92d8362c387abfc24cda9234c81c671d544f03a2ae2680c9f71d492c7172410a
+  data.tar.gz: 57643cd0ca74fd851e800edbe62c18464dc5ca0dcd09c66189ed53b256beb5f0
 SHA512:
-  metadata.gz: 97ff7cbc39b2dca8623431ff84024f854d504618742035242f3ee6ca84af419ba6126812e2e7316f4cb1025f1b5be1b0f383ea7c9acc4947a726c4012e301ec0
-  data.tar.gz: 53c4e2fe586a644adc84a32fa8f19ea41553796e0aeb33d40e0d60185a99bb225a6809b618693e0663569acd7bd040c402928629d8a54cdc63ee9e0a55bc5df2
+  metadata.gz: 6570e1184cc95fe719bbb366f59f082ccafdc55dddae70496c98579cd53f4d46a31bd740030b500e5d2b7ed03e2df8f42148344170c1a90453209b2575960441
+  data.tar.gz: f2409cb5bc4d8bf3c7fe4bfa026eb03a9315fb6ccb80e95aa2b44e9b94600427cab0814a00d32035128a3ace49b42ed35644e1d0652ffc584be2ac5ea6564db5

data/CHANGELOG.md

@@ -1,6 +1,20 @@
 # 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)
@@ -24,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
@@ -41,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
@@ -158,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
@@ -247,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
@@ -386,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,10 @@
 
 ## 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)
@@ -26,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-2019 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-2019 Luca Guidi.
+Copyright © 2014-2021 Luca Guidi.

data/bin/hanami

@@ -3,4 +3,4 @@ require 'bundler'
 require 'hanami/cli/commands'
 
 ::Bundler.require(:plugins) if File.exist?(ENV["BUNDLE_GEMFILE"] || "Gemfile")
-Hanami::CLI.new(Hanami::CLI::Commands).call
+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', '< 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 'rack-test', '~> 1.1'
   spec.add_development_dependency 'aruba',     '~> 0.14'
-  spec.add_development_dependency 'rake',      '~> 12.0'
+  spec.add_development_dependency 'rake',      '~> 13.0'
 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/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/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'

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.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/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/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/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/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hanami
 version: !ruby/object:Gem::Version
-  version: 1.3.3
+  version: 1.3.5
 platform: ruby
 authors:
 - Luca Guidi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-09-20 00:00:00.000000000 Z
+date: 2021-10-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hanami-utils
@@ -65,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
@@ -72,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
@@ -129,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
@@ -224,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
@@ -395,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.3
+rubygems_version: 3.2.2
 signing_key: 
 specification_version: 4
 summary: The web, with simplicity