hanami 1.3.0.beta1 → 1.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f4e30a96ce43cea6ebf7eaffdafbc799a0c02152e0f373a752da8c56f937780b
-  data.tar.gz: d2633353af5f2d4f49283aac9a231ae08956b4c4bb49c7c48013d0e495c9faa3
+  metadata.gz: 97ed1063935d45a4613fd2361498251b968a462f4b01df368fbea563903958b7
+  data.tar.gz: 475fbab907b3f7f09988ac0872da11341133be9606796d8f9cb99ea6a8cea9fe
 SHA512:
-  metadata.gz: b312e7fe93fc48c2d3ec11cfa5a3f508e238347727d5fe90e6e8cd91e6aefb42e2e805dc0ced0d23bd4c27fcc977eb3c1adf6903e7909dddb5669a7706b03186
-  data.tar.gz: 2c096428a5bc74542c902ac2de30ac5475c5507ab9f7a01220386d438673f05500c69a4ebbd5fb1212c2a9990cf7f3bbebda7549a71fe7d467b288b9530560dc
+  metadata.gz: edeec9fbca157fe6b6a368d7be2a71d622071e5aa0aee19fb23b4180f344c1aaccad5cdf00c488d0cd7fcff04e661338272a19ee9d5a0358893510e3ac0bfa57
+  data.tar.gz: c52ec459e71ed05d2624a8007a9c7252ab397cf4f496a5b72cd2c4c56d66b88f4d9e33129681a2c9d3876c0ff4bca74be1de2dc63aa5aa25e0966cba1323ab3b

data/CHANGELOG.md

@@ -1,6 +1,45 @@
 # Hanami
 The web, with simplicity.
 
+## 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
+- [Luca Guidi] Support `bundler` 2.0+
+
+### Fixed
+- [Aidan Coyle] Remove from app generator support for deprecated `force_ssl` setting
+- [Alessandro Caporrini] Remove from app generator support for deprecated `body_parsers` setting
+- [Daphne Rouw & Sean Collins] Make app generator to work when code in `config/environment.rb` uses double quotes
+
+## v1.3.0 - 2018-10-24
+### Added
+- [Luca Guidi] Automatically log body payload from body parsers
+
+### Fixed
+- [Luca Guidi] Generate correct syntax for layout unit tests
+- [Vladislav Yashin] Fix concatenation of `Pathname` and `String` in `Hanami::CommonLogger`
+
 ## v1.3.0.beta1 - 2018-08-08
 ### Added
 - [Sean Collins] Generate new projects with RSpec as default testing framework
@@ -8,7 +47,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
@@ -125,7 +164,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
@@ -214,11 +253,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
@@ -353,7 +392,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,7 +3,22 @@
 
 ## Features
 
-## v1.3.0 (unreleased)
+## 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
+
+- Default testing framework is RSpec
+- Introduced `Hanami::Middleware::BodyParser` Rack middleware
+- Log payload (body) for non-GET HTTP requests coming from body parsers
+- Added support for `reply_to` in mailers
+- Variadic arguments for `hanami-cli`
+- Array as argument or option for `hanami-cli`
 
 ## v1.2.0 - 2018-04-11
 
@@ -11,7 +26,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

@@ -18,7 +18,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,7 +25,7 @@ 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)
+[![CI](https://github.com/hanami/hanami/workflows/ci/badge.svg?branch=master)](https://github.com/hanami/hanami/actions?query=workflow%3Aci+branch%3Amaster)
 [![Test Coverage](https://codecov.io/gh/hanami/hanami/branch/master/graph/badge.svg)](https://codecov.io/gh/hanami/hanami)
 [![Depfu](https://badges.depfu.com/badges/ba000e0f69e6ef1c44cd3038caaa1841/overview.svg)](https://depfu.com/github/hanami/hanami?project=Bundler)
 [![Inline Docs](http://inch-ci.org/github/hanami/hanami.svg)](http://inch-ci.org/github/hanami/hanami)
@@ -47,7 +46,7 @@ cd bookshelf && bundle
 bundle exec hanami server # visit http://localhost:2300
 ```
 
-Please follow along with the [Getting Started guide](http://hanamirb.org/guides/getting-started).
+Please follow along with the [Getting Started guide](https://guides.hanamirb.org/getting-started/).
 
 ## Donations
 
@@ -63,7 +62,8 @@ You can give back to Open Source, by supporting Hanami development via a [donati
 
 * Home page: http://hanamirb.org
 * Community: http://hanamirb.org/community
-* Guides: http://hanamirb.org/guides
+* Guides: https://guides.hanamirb.org
+* Snippets: https://snippets.hanamirb.org
 * Mailing List: http://hanamirb.org/mailing-list
 * API Doc: http://rdoc.info/gems/hanami
 * Bugs/Issues: https://github.com/hanami/hanami/issues
@@ -136,4 +136,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

@@ -21,20 +21,20 @@ Gem::Specification.new do |spec|
 
   spec.metadata['allowed_push_host'] = 'https://rubygems.org'
 
-  spec.add_dependency 'hanami-utils',       '~> 1.3.beta'
-  spec.add_dependency 'hanami-validations', '~> 1.3.beta'
-  spec.add_dependency 'hanami-router',      '~> 1.3.beta'
-  spec.add_dependency 'hanami-controller',  '~> 1.3.beta'
-  spec.add_dependency 'hanami-view',        '~> 1.3.beta'
-  spec.add_dependency 'hanami-helpers',     '~> 1.3.beta'
-  spec.add_dependency 'hanami-mailer',      '~> 1.3.beta'
-  spec.add_dependency 'hanami-assets',      '~> 1.3.beta'
-  spec.add_dependency 'hanami-cli',         '~> 0.3.beta'
+  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-view',        '~> 1.3'
+  spec.add_dependency 'hanami-helpers',     '~> 1.3'
+  spec.add_dependency 'hanami-mailer',      '~> 1.3'
+  spec.add_dependency 'hanami-assets',      '~> 1.3'
+  spec.add_dependency 'dry-cli',            '~> 0.5'
   spec.add_dependency 'concurrent-ruby',    '~> 1.0'
-  spec.add_dependency 'bundler'
+  spec.add_dependency 'bundler',            '>= 1.6', '< 3'
 
-  spec.add_development_dependency 'rspec',     '~>  3.7'
-  spec.add_development_dependency 'rack-test', '~>  0.6'
-  spec.add_development_dependency 'aruba',     '~>  0.14'
-  spec.add_development_dependency 'rake',      '~> 12.0'
+  spec.add_development_dependency 'rspec',     '~> 3.7'
+  spec.add_development_dependency 'rack-test', '~> 1.1'
+  spec.add_development_dependency 'aruba',     '~> 0.14'
+  spec.add_development_dependency 'rake',      '~> 13.0'
 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')

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

@@ -191,12 +191,12 @@ module Hanami
 
     # Rack middleware stack
     #
-    # @return [Hanami::Middleware] the middleware stack
+    # @return [Hanami::MiddlewareStack] the middleware stack
     #
     # @since 0.1.0
     # @api private
     #
-    # @see Hanami::Middleware
+    # @see Hanami::MiddlewareStack
     attr_reader :middleware
   end
 end

data/lib/hanami/application_configuration.rb

@@ -1,6 +1,6 @@
 require 'hanami/utils/kernel'
 require 'hanami/environment'
-require 'hanami/middleware'
+require 'hanami/middleware_stack'
 require 'hanami/config/cookies'
 require 'hanami/config/framework_configuration'
 require 'hanami/config/load_paths'
@@ -670,7 +670,7 @@ module Hanami
     # @since 0.2.0
     #
     # @see http://rdoc.info/gems/rack/Rack/Static
-    # @see Hanami::Middleware#use
+    # @see Hanami::MiddlewareStack#use
     #
     # @example
     #   require 'hanami'
@@ -684,7 +684,7 @@ module Hanami
     #     end
     #   end
     def middleware
-      @middleware ||= Hanami::Middleware.new(self)
+      @middleware ||= Hanami::MiddlewareStack.new(self)
     end
 
     # Adapter configuration.

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/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

@@ -97,19 +97,6 @@ module <%= app.classify %>
       #
       # default_response_format :html
 
-      # HTTP Body parsers
-      # Parse non GET responses body for a specific mime type
-      # Argument: Symbol, which represent the format of the mime type
-      #             (only `:json` is supported)
-      #           Object, the parser
-      #
-      # body_parsers :json
-
-      # When it's true and the router receives a non-encrypted request (http),
-      # it redirects to the secure equivalent (https). Disabled by default.
-      #
-      # force_ssl true
-
       ##
       # TEMPLATES
       #
@@ -135,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
@@ -148,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
@@ -305,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'
@@ -318,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

@@ -1,11 +1,10 @@
 require "spec_helper"
 
 describe <%= app.classify %>::Views::ApplicationLayout do
-  let(:layout)   { <%= app.classify %>::Views::ApplicationLayout.new(template, {}) }
+  let(:layout)   { <%= app.classify %>::Views::ApplicationLayout.new({ format: :html }, "contents") }
   let(:rendered) { layout.render }
-  let(:template) { Hanami::View::Template.new('apps/<%= app %>/templates/application.html.<%= template %>') }
 
   it 'contains application name' do
-    rendered.must_include('<%= app.classify %>')
+    _(rendered).must_include('<%= app.classify %>')
   end
 end

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

@@ -1,9 +1,8 @@
 require "spec_helper"
 
 RSpec.describe <%= app.classify %>::Views::ApplicationLayout, type: :view do
-  let(:layout)   { <%= app.classify %>::Views::ApplicationLayout.new(template, {}) }
+  let(:layout)   { <%= app.classify %>::Views::ApplicationLayout.new({ format: :html }, "contents") }
   let(:rendered) { layout.render }
-  let(:template) { Hanami::View::Template.new('apps/<%= app %>/templates/application.html.<%= template %>') }
 
   it 'contains application name' do
     expect(rendered).to include('<%= app.classify %>')