hanami 1.3.0.beta1 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f4e30a96ce43cea6ebf7eaffdafbc799a0c02152e0f373a752da8c56f937780b
-  data.tar.gz: d2633353af5f2d4f49283aac9a231ae08956b4c4bb49c7c48013d0e495c9faa3
+  metadata.gz: 870b0c86168d11ad956299e21d5539258f7ee546cc2464f1fcb574613077a924
+  data.tar.gz: eadbb4b369ae677fdfab342efaefdf7306b9f51cd6cb16563bab3c193e54df93
 SHA512:
-  metadata.gz: b312e7fe93fc48c2d3ec11cfa5a3f508e238347727d5fe90e6e8cd91e6aefb42e2e805dc0ced0d23bd4c27fcc977eb3c1adf6903e7909dddb5669a7706b03186
-  data.tar.gz: 2c096428a5bc74542c902ac2de30ac5475c5507ab9f7a01220386d438673f05500c69a4ebbd5fb1212c2a9990cf7f3bbebda7549a71fe7d467b288b9530560dc
+  metadata.gz: '03280999dd346b5d755e4a125750556cb2e7060f0191f6f5a77ad44c4f6844c50af036694edcad618c02e04ab39d5ed0911415d897a384519d95d15178a5e4fd'
+  data.tar.gz: 671e094c229f016afb38022c8253a85a89b1e3ecc9ef2f9662505c97677f4635c66f85d18519a3d79735187bc4923edacee489e65e2ed79aee60f2b4dd4e746f

data/CHANGELOG.md

@@ -1,6 +1,14 @@
 # Hanami
 The web, with simplicity.
 
+## 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

data/FEATURES.md

@@ -3,7 +3,14 @@
 
 ## Features
 
-## v1.3.0 (unreleased)
+## 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
 

data/README.md

@@ -47,7 +47,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 +63,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

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'
+  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 'hanami-cli',         '~> 0.3'
   spec.add_dependency 'concurrent-ruby',    '~> 1.0'
   spec.add_dependency 'bundler'
 
   spec.add_development_dependency 'rspec',     '~>  3.7'
-  spec.add_development_dependency 'rack-test', '~>  0.6'
+  spec.add_development_dependency 'rack-test', '~> 1.1'
   spec.add_development_dependency 'aruba',     '~>  0.14'
   spec.add_development_dependency 'rake',      '~> 12.0'
 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/generate/app/layout_spec.minitest.erb

@@ -1,9 +1,8 @@
 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 %>')

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 %>')

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),

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,6 +45,10 @@ 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
     #
@@ -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,16 @@ 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
   end
 end

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

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

@@ -138,7 +138,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
 

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

data/lib/hanami/version.rb

@@ -6,7 +6,7 @@ module Hanami
   module Version
     # @since 0.9.0
     # @api private
-    VERSION = '1.3.0.beta1'.freeze
+    VERSION = '1.3.0'.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.0.beta1
+  version: 1.3.0
 platform: ruby
 authors:
 - Luca Guidi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-08 00:00:00.000000000 Z
+date: 2018-10-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hanami-utils
@@ -16,126 +16,126 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.beta
+        version: '1.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.beta
+        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: hanami-validations
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.beta
+        version: '1.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.beta
+        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: hanami-router
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.beta
+        version: '1.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.beta
+        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: hanami-controller
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.beta
+        version: '1.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.beta
+        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: hanami-view
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.beta
+        version: '1.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.beta
+        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: hanami-helpers
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.beta
+        version: '1.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.beta
+        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: hanami-mailer
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.beta
+        version: '1.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.beta
+        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: hanami-assets
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.beta
+        version: '1.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.beta
+        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: hanami-cli
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.beta
+        version: '0.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.beta
+        version: '0.3'
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
   requirement: !ruby/object:Gem::Requirement
@@ -184,14 +184,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: '1.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: aruba
   requirement: !ruby/object:Gem::Requirement
@@ -353,7 +353,7 @@ files:
 - lib/hanami/frameworks.rb
 - lib/hanami/hanamirc.rb
 - lib/hanami/mailer/glue.rb
-- lib/hanami/middleware.rb
+- lib/hanami/middleware_stack.rb
 - lib/hanami/rake_helper.rb
 - lib/hanami/rake_tasks.rb
 - lib/hanami/rendering_policy.rb
@@ -385,9 +385,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.3.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.7.7