hanami-controller 2.0.0.alpha2 → 2.0.0.alpha3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d159c89cbe6b24762a475776ae1585e76925c8f26501c6334c908893624587e5
-  data.tar.gz: b5f4b394c5337ae9b46f2482f86f69aaf151dbaee9cd2ac95be15f69a12ce65a
+  metadata.gz: 015e9bf69c01ea01cbdd9a27e7bf4d4cb4f8f9a98f01a14d707fd68457096006
+  data.tar.gz: 0f2c2e2569453264b41e131451caae329cfbd7d6773d50f610355f5f6fd0b62b
 SHA512:
-  metadata.gz: aac599272b21e8ca56b2c519b93a47593dc126d442be727d87b4e8884e1c2da3d349d480399e1ed781560acb9e450e24b1985fbcd7083d65d79fb8573c3db606
-  data.tar.gz: 75beecc46dce543367e7869887cda80937c2d838a65996f9bd831e56dfade6fa1ccccc03c7c0a0ace5aad833e26db10638e6c51e869b70cb6dc95abd351b7000
+  metadata.gz: 7eb2b778608f9dd27cbf777dd00b98e079bc1ec790da5e388113d645babbc9972d10272c083e187dfafa875fe0e2387592f34fc4d48b0ff96be920d1d82c12b8
+  data.tar.gz: e1290141bb9128031b0593b1edcf2975fe5f01eadb4661fe0bf18c164f339671bf195b43f8933731cab13180b68a7141a4ce6caa01e1df9aabe3e5afb9e0c9a7

data/CHANGELOG.md

@@ -1,6 +1,15 @@
 # Hanami::Controller
 Complete, fast and testable actions for Rack
 
+## v2.0.0.alpha3 - 2021-11-09
+### Added
+- [Luca Guidi] Automatically include session behavior in `Hanami::Action` when sessions are enabled via Hanami application config
+- [Sean Collins] Pass exposures from action to view
+
+### Changed
+- [Tim Riley] (Internal) Updated settings to use updated `setting` API in dry-configurable 0.13.0
+- [Sean Collins] Move automatic view rendering from `handle` to `finish`
+
 ## v2.0.0.alpha2 - 2021-05-04
 ### Added
 - [Luca Guidi] Official support for Ruby: MRI 3.0

data/README.md

@@ -2,11 +2,15 @@
 
 Complete, fast and testable actions for Rack and [Hanami](http://hanamirb.org)
 
+## Version
+
+**This branch contains the code for `hanami-controller` 2.x.**
+
 ## Status
 
 [![Gem Version](https://badge.fury.io/rb/hanami-controller.svg)](https://badge.fury.io/rb/hanami-controller)
-[![CI](https://github.com/hanami/controller/workflows/ci/badge.svg?branch=unstable)](https://github.com/hanami/controller/actions?query=workflow%3Aci+branch%3Aunstable)
-[![Test Coverage](https://codecov.io/gh/hanami/controller/branch/unstable/graph/badge.svg)](https://codecov.io/gh/hanami/controller)
+[![CI](https://github.com/hanami/controller/workflows/ci/badge.svg?branch=main)](https://github.com/hanami/controller/actions?query=workflow%3Aci+branch%3Amain)
+[![Test Coverage](https://codecov.io/gh/hanami/controller/branch/main/graph/badge.svg)](https://codecov.io/gh/hanami/controller)
 [![Depfu](https://badges.depfu.com/badges/7cd17419fba78b726be1353118fb01de/overview.svg)](https://depfu.com/github/hanami/controller?project=Bundler)
 [![Inline Docs](http://inch-ci.org/github/hanami/controller.svg)](http://inch-ci.org/github/hanami/controller)
 
@@ -22,7 +26,7 @@ Complete, fast and testable actions for Rack and [Hanami](http://hanamirb.org)
 
 ## Rubies
 
-__Hanami::Controller__ supports Ruby (MRI) 2.5+
+__Hanami::Controller__ supports Ruby (MRI) 2.6+
 
 ## Installation
 

data/hanami-controller.gemspec

@@ -21,7 +21,7 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency 'rack',         '~> 2.0'
   spec.add_dependency 'hanami-utils', '~> 2.0.alpha'
-  spec.add_dependency 'dry-configurable', '~> 0.12'
+  spec.add_dependency 'dry-configurable', '~> 0.13', '>= 0.13.0'
 
   spec.add_development_dependency 'bundler',   '>= 1.6', '< 3'
   spec.add_development_dependency 'rack-test', '~> 1.0'

data/lib/hanami/action/application_action.rb

@@ -68,6 +68,11 @@ module Hanami
       end
 
       def extend_behavior(action_class)
+        if application.config.actions.sessions.enabled?
+          require "hanami/action/session"
+          action_class.include Hanami::Action::Session
+        end
+
         if application.config.actions.csrf_protection
           require "hanami/action/csrf_protection"
           action_class.include Hanami::Action::CSRFProtection
@@ -83,16 +88,6 @@ module Hanami
         attr_reader :view
         attr_reader :view_context
 
-        protected
-
-        def handle(request, response)
-          if view
-            response.render view, **request.params
-          end
-        end
-
-        private
-
         def build_response(**options)
           options = options.merge(view_options: method(:view_options))
           super(**options)
@@ -105,6 +100,12 @@ module Hanami
         def view_context_options(req, res)
           {request: req, response: res}
         end
+
+        # Automatically render the view, if the body hasn't been populated yet
+        def finish(req, res, halted)
+          res.render(view, **req.params, **res.exposures) if view && res.body.empty?
+          super
+        end
       end
     end
   end

data/lib/hanami/action/application_configuration.rb

@@ -10,14 +10,14 @@ module Hanami
     class ApplicationConfiguration
       include Dry::Configurable
 
-      setting(:cookies, {}) { |options| Cookies.new(options) }
-      setting(:sessions) { |storage, *options| Sessions.new(storage, *options) }
+      setting :cookies, default: {}, constructor: -> options { Cookies.new(options) }
+      setting :sessions, constructor: proc { |storage, *options| Sessions.new(storage, *options) }
       setting :csrf_protection
 
-      setting :name_inference_base, "actions"
-      setting :view_context_identifier, "view.context"
-      setting :view_name_inferrer, ViewNameInferrer
-      setting :view_name_inference_base, "views"
+      setting :name_inference_base, default: "actions"
+      setting :view_context_identifier, default: "view.context"
+      setting :view_name_inferrer, default: ViewNameInferrer
+      setting :view_name_inference_base, default: "views"
 
       def initialize(*)
         super

data/lib/hanami/action/configuration.rb

@@ -58,7 +58,7 @@ module Hanami
       #   @see handled_exceptions=
       #
       #   @since 0.2.0
-      setting :handled_exceptions, {}
+      setting :handled_exceptions, default: {}
 
       # Specifies how to handle exceptions with an HTTP status
       #
@@ -122,7 +122,7 @@ module Hanami
       #   @see formats=
       #
       #   @since 0.2.0
-      setting :formats, DEFAULT_FORMATS.dup
+      setting :formats, default: DEFAULT_FORMATS.dup
 
       # Registers a MIME type to format mapping
       #
@@ -211,9 +211,9 @@ module Hanami
       #   @see default_request_format=
       #
       #   @since 0.5.0
-      setting :default_request_format do |format|
+      setting :default_request_format, constructor: -> format {
         Utils::Kernel.Symbol(format) unless format.nil?
-      end
+      }
 
       # @!method default_response_format=(format)
       #
@@ -243,9 +243,9 @@ module Hanami
       #   @see default_request_format=
       #
       #   @since 0.5.0
-      setting :default_response_format do |format|
+      setting :default_response_format, constructor: -> format {
         Utils::Kernel.Symbol(format) unless format.nil?
-      end
+      }
 
       # @!method default_charset=(charset)
       #
@@ -299,9 +299,7 @@ module Hanami
       #   @since 0.4.0
       #
       #   @see default_headers=
-      setting :default_headers, {} do |headers|
-        headers.compact
-      end
+      setting :default_headers, default: {}, constructor: -> headers { headers.compact }
 
       # @!method cookies=(cookie_options)
       #
@@ -332,11 +330,11 @@ module Hanami
       #   @since 0.4.0
       #
       #   @see cookies=
-      setting :cookies, {} do |cookie_options|
+      setting :cookies, default: {}, constructor: -> cookie_options {
         # Call `to_h` here to permit `ApplicationConfiguration::Cookies` object to be
         # provided when application actions are configured
         cookie_options.to_h.compact
-      end
+      }
 
       # @!method root_directory=(dir)
       #
@@ -364,11 +362,11 @@ module Hanami
       #   @since 1.0.0
       #
       #   @api private
-      setting :root_directory do |dir|
+      setting :root_directory, constructor: -> dir {
         dir ||= Dir.pwd
 
         Pathname(dir).realpath
-      end
+      }
 
       # Default public directory
       #
@@ -393,7 +391,7 @@ module Hanami
       #
       #   @see root_directory
       #   @see public_directory
-      setting :public_directory, DEFAULT_PUBLIC_DIRECTORY
+      setting :public_directory, default: DEFAULT_PUBLIC_DIRECTORY
 
       # Returns the configured public directory, appended onto the root directory.
       #

data/lib/hanami/action/standalone_action.rb

@@ -553,9 +553,7 @@ module Hanami
 
         # Finalize the response
         #
-        # This method is abstract and COULD be implemented by included modules in
-        # order to prepare their data before the response will be returned to the
-        # webserver.
+        # Prepare the data before the response will be returned to the webserver
         #
         # @since 0.1.0
         # @api private

data/lib/hanami/controller/version.rb

@@ -3,6 +3,6 @@ module Hanami
     # Defines the version
     #
     # @since 0.1.0
-    VERSION = '2.0.0.alpha2'.freeze
+    VERSION = '2.0.0.alpha3'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hanami-controller
 version: !ruby/object:Gem::Version
-  version: 2.0.0.alpha2
+  version: 2.0.0.alpha3
 platform: ruby
 authors:
 - Luca Guidi
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-05-04 00:00:00.000000000 Z
+date: 2021-11-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -44,14 +44,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.12'
+        version: '0.13'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.13.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.12'
+        version: '0.13'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.13.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -175,7 +181,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
-rubygems_version: 3.2.4
+rubygems_version: 3.2.3
 signing_key:
 specification_version: 4
 summary: Complete, fast and testable actions for Rack and Hanami