hanami-controller 2.0.0.beta1 → 2.0.0.beta4

data/lib/hanami/action/response.rb

@@ -3,7 +3,6 @@
 require "rack"
 require "rack/response"
 require "hanami/utils/kernel"
-require "hanami/action/flash"
 require "hanami/action/halt"
 require "hanami/action/cookie_jar"
 require "hanami/action/cache/cache_control"
@@ -27,7 +26,7 @@ module Hanami
 
       # @since 2.0.0
       # @api private
-      attr_reader :request, :action, :exposures, :format, :env, :view_options
+      attr_reader :request, :exposures, :format, :env, :view_options
 
       # @since 2.0.0
       # @api private
@@ -36,7 +35,7 @@ module Hanami
       # @since 2.0.0
       # @api private
       def self.build(status, env)
-        new(action: "", configuration: nil, content_type: Mime.best_q_match(env[Action::HTTP_ACCEPT]), env: env).tap do |r| # rubocop:disable Layout/LineLength
+        new(config: nil, content_type: Mime.best_q_match(env[Action::HTTP_ACCEPT]), env: env).tap do |r|
           r.status = status
           r.body   = Http::Status.message_for(status)
           r.set_format(Mime.format_for(r.content_type))
@@ -45,18 +44,18 @@ module Hanami
 
       # @since 2.0.0
       # @api private
-      def initialize(request:, action:, configuration:, content_type: nil, env: {}, headers: {}, view_options: nil) # rubocop:disable Metrics/ParameterLists
+      def initialize(request:, config:, content_type: nil, env: {}, headers: {}, view_options: nil, sessions_enabled: false) # rubocop:disable Layout/LineLength, Metrics/ParameterLists
         super([], 200, headers.dup)
         set_header(Action::CONTENT_TYPE, content_type)
 
         @request = request
-        @action = action
-        @configuration = configuration
+        @config = config
         @charset = ::Rack::MediaType.params(content_type).fetch("charset", nil)
         @exposures = {}
         @env = env
         @view_options = view_options || DEFAULT_VIEW_OPTIONS
 
+        @sessions_enabled = sessions_enabled
         @sending_file = false
       end
 
@@ -103,19 +102,27 @@ module Hanami
       # @since 2.0.0
       # @api public
       def session
-        env[Action::RACK_SESSION] ||= {}
+        unless @sessions_enabled
+          raise Hanami::Action::MissingSessionError.new("Hanami::Action::Response#session")
+        end
+
+        request.session
       end
 
       # @since 2.0.0
       # @api public
-      def cookies
-        @cookies ||= CookieJar.new(env.dup, headers, @configuration.cookies)
+      def flash
+        unless @sessions_enabled
+          raise Hanami::Action::MissingSessionError.new("Hanami::Action::Response#flash")
+        end
+
+        request.flash
       end
 
       # @since 2.0.0
       # @api public
-      def flash
-        @flash ||= Flash.new(session[Flash::KEY])
+      def cookies
+        @cookies ||= CookieJar.new(env.dup, headers, @config.cookies)
       end
 
       # @since 2.0.0
@@ -131,7 +138,7 @@ module Hanami
       # @api public
       def send_file(path)
         _send_file(
-          Rack::File.new(path, @configuration.public_directory).call(env)
+          Rack::File.new(path, @config.public_directory).call(env)
         )
       end
 
@@ -139,7 +146,7 @@ module Hanami
       # @api public
       def unsafe_send_file(path)
         directory = if Pathname.new(path).relative?
-                      @configuration.root_directory
+                      @config.root_directory
                     else
                       FILE_SYSTEM_ROOT
                     end
@@ -175,15 +182,6 @@ module Hanami
         end
       end
 
-      # @since 2.0.0
-      # @api private
-      def request_id
-        env.fetch(Action::REQUEST_ID) do
-          # FIXME: raise a meaningful error, by inviting devs to include Hanami::Action::Session
-          raise "Can't find request ID"
-        end
-      end
-
       # @since 2.0.0
       # @api public
       def set_format(value) # rubocop:disable Naming/AccessorMethodName

data/lib/hanami/action/session.rb

@@ -18,6 +18,10 @@ module Hanami
 
       private
 
+      def sessions_enabled?
+        true
+      end
+
       # Finalize the response
       #
       # @return [void]

data/lib/hanami/action.rb

@@ -1,12 +1,14 @@
 # frozen_string_literal: true
 
 begin
+  require "dry/core"
+  require "dry/types"
   require "hanami/validations"
   require "hanami/action/validatable"
 rescue LoadError # rubocop:disable Lint/SuppressedException
 end
 
-require "hanami/utils/class_attribute"
+require "dry/configurable"
 require "hanami/utils/callbacks"
 require "hanami/utils"
 require "hanami/utils/string"
@@ -14,14 +16,15 @@ require "hanami/utils/kernel"
 require "rack"
 require "rack/utils"
 
+require_relative "action/config"
 require_relative "action/constants"
 require_relative "action/base_params"
-require_relative "action/configuration"
 require_relative "action/halt"
 require_relative "action/mime"
 require_relative "action/rack/file"
 require_relative "action/request"
 require_relative "action/response"
+require_relative "action/error"
 
 module Hanami
   # An HTTP endpoint
@@ -36,7 +39,52 @@ module Hanami
   #       # ...
   #     end
   #   end
+  #
+  # @api public
   class Action
+    extend Dry::Configurable(config_class: Config)
+
+    # See {Config} for individual setting accessor API docs
+    setting :handled_exceptions, default: {}
+    setting :formats, default: Config::DEFAULT_FORMATS
+    setting :default_request_format, constructor: -> (format) {
+      Utils::Kernel.Symbol(format) unless format.nil?
+    }
+    setting :default_response_format, constructor: -> (format) {
+      Utils::Kernel.Symbol(format) unless format.nil?
+    }
+    setting :accepted_formats, default: []
+    setting :default_charset
+    setting :default_headers, default: {}, constructor: -> (headers) { headers.compact }
+    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
+    }
+    setting :root_directory, constructor: -> (dir) {
+      Pathname(File.expand_path(dir || Dir.pwd)).realpath
+    }
+    setting :public_directory, default: Config::DEFAULT_PUBLIC_DIRECTORY
+    setting :before_callbacks, default: Utils::Callbacks::Chain.new, cloneable: true
+    setting :after_callbacks, default: Utils::Callbacks::Chain.new, cloneable: true
+
+    # @!scope class
+
+    # @!method config
+    #   Returns the action's config. Use this to configure your action.
+    #
+    #   @example Access inside class body
+    #     class Show < Hanami::Action
+    #       config.default_response_format = :json
+    #     end
+    #
+    #   @return [Config]
+    #
+    #   @api public
+    #   @since 2.0.0
+
+    # @!scope instance
+
     # Override Ruby's hook for modules.
     # It includes basic Hanami::Action modules to the given class.
     #
@@ -49,31 +97,13 @@ module Hanami
 
       if subclass.superclass == Action
         subclass.class_eval do
-          include Utils::ClassAttribute
-
-          class_attribute :before_callbacks
-          self.before_callbacks = Utils::Callbacks::Chain.new
-
-          class_attribute :after_callbacks
-          self.after_callbacks = Utils::Callbacks::Chain.new
-
           include Validatable if defined?(Validatable)
         end
       end
 
-      subclass.instance_variable_set "@configuration", configuration.dup
-    end
-
-    # @since 2.0.0
-    # @api private
-    def self.configuration
-      @configuration ||= Configuration.new
-    end
-
-    class << self
-      # @since 2.0.0
-      # @api private
-      alias_method :config, :configuration
+      if instance_variable_defined?(:@params_class)
+        subclass.instance_variable_set(:@params_class, @params_class)
+      end
     end
 
     # Returns the class which defines the params
@@ -87,12 +117,7 @@ module Hanami
     # @api private
     # @since 0.7.0
     def self.params_class
-      @params_class ||= BaseParams
-    end
-
-    # FIXME: make this thread-safe
-    def self.accepted_formats
-      @accepted_formats ||= []
+      @params_class || BaseParams
     end
 
     # Placeholder implementation for params class method
@@ -167,7 +192,7 @@ module Hanami
     #   # 2. set the article
     #   # 3. `#handle`
     def self.append_before(...)
-      before_callbacks.append(...)
+      config.before_callbacks.append(...)
     end
 
     class << self
@@ -191,7 +216,7 @@ module Hanami
     #
     # @see Hanami::Action::Callbacks::ClassMethods#append_before
     def self.append_after(...)
-      after_callbacks.append(...)
+      config.after_callbacks.append(...)
     end
 
     class << self
@@ -215,7 +240,7 @@ module Hanami
     #
     # @see Hanami::Action::Callbacks::ClassMethods#prepend_after
     def self.prepend_before(...)
-      before_callbacks.prepend(...)
+      config.before_callbacks.prepend(...)
     end
 
     # Define a callback for an Action.
@@ -234,7 +259,7 @@ module Hanami
     #
     # @see Hanami::Action::Callbacks::ClassMethods#prepend_before
     def self.prepend_after(...)
-      after_callbacks.prepend(...)
+      config.after_callbacks.prepend(...)
     end
 
     # Restrict the access to the specified mime type symbols.
@@ -246,7 +271,7 @@ module Hanami
     #
     # @since 0.1.0
     #
-    # @see Hanami::Action::Configuration#format
+    # @see Config#format
     #
     # @example
     #   require "hanami/controller"
@@ -262,58 +287,28 @@ module Hanami
     #   # When called with "*/*"              => 200
     #   # When called with "text/html"        => 200
     #   # When called with "application/json" => 200
-    #   # When called with "application/xml"  => 406
+    #   # When called with "application/xml"  => 415
     def self.accept(*formats)
-      @accepted_formats = *formats
-      before :enforce_accepted_mime_types
+      config.accepted_formats = formats
     end
 
-    # Returns a new action
-    #
-    # @overload new(**deps, ...)
-    #   @param deps [Hash] action dependencies
-    #
-    # @overload new(configuration:, **deps, ...)
-    #   @param configuration [Hanami::Action::Configuration] action configuration
-    #   @param deps [Hash] action dependencies
-    #
-    # @return [Hanami::Action] Action object
+    # @see Config#handle_exception
     #
     # @since 2.0.0
-    def self.new(*args, configuration: self.configuration, **kwargs, &block)
-      allocate.tap do |obj|
-        obj.instance_variable_set(:@name, Name[name])
-        obj.instance_variable_set(:@configuration, configuration.dup.finalize!)
-        obj.instance_variable_set(:@accepted_mime_types, Mime.restrict_mime_types(configuration, accepted_formats))
-        obj.send(:initialize, *args, **kwargs, &block)
-        obj.freeze
-      end
+    # @api public
+    def self.handle_exception(...)
+      config.handle_exception(...)
     end
 
+    # Returns a new action
+    #
     # @since 2.0.0
-    # @api private
-    module Name
-      # @since 2.0.0
-      # @api private
-      MODULE_SEPARATOR_TRANSFORMER = [:gsub, "::", "."].freeze
-
-      # @since 2.0.0
-      # @api private
-      def self.call(name)
-        Utils::String.transform(name, MODULE_SEPARATOR_TRANSFORMER, :underscore) unless name.nil?
-      end
-
-      class << self
-        # @since 2.0.0
-        # @api private
-        alias_method :[], :call
-      end
+    # @api public
+    def initialize(config: self.class.config)
+      @config = config
+      freeze
     end
 
-    # @since 2.0.0
-    # @api private
-    attr_reader :name
-
     # Implements the Rack/Hanami::Action protocol
     #
     # @since 0.1.0
@@ -324,16 +319,22 @@ module Hanami
 
       halted = catch :halt do
         params   = self.class.params_class.new(env)
-        request  = build_request(env, params)
+        request  = build_request(
+          env: env,
+          params: params,
+          sessions_enabled: sessions_enabled?
+        )
         response = build_response(
           request: request,
-          action: name,
-          configuration: configuration,
-          content_type: Mime.calculate_content_type_with_charset(configuration, request, accepted_mime_types),
+          config: config,
+          content_type: Mime.calculate_content_type_with_charset(config, request, config.accepted_mime_types),
           env: env,
-          headers: configuration.default_headers
+          headers: config.default_headers,
+          sessions_enabled: sessions_enabled?
         )
 
+        enforce_accepted_mime_types(request)
+
         _run_before_callbacks(request, response)
         handle(request, response)
         _run_after_callbacks(request, response)
@@ -344,12 +345,6 @@ module Hanami
       finish(request, response, halted)
     end
 
-    # @since 2.0.0
-    # @api public
-    def initialize(**deps)
-      @_deps = deps
-    end
-
     protected
 
     # Hook for subclasses to apply behavior as part of action invocation
@@ -421,36 +416,44 @@ module Hanami
 
     # @since 2.0.0
     # @api private
-    attr_reader :configuration
+    attr_reader :config
 
     # @since 2.0.0
     # @api private
-    def accepted_mime_types
-      @accepted_mime_types || configuration.mime_types
-    end
+    def enforce_accepted_mime_types(request)
+      return if config.accepted_formats.empty?
 
-    # @since 2.0.0
-    # @api private
-    def enforce_accepted_mime_types(req, *)
-      Mime.accepted_mime_type?(req, accepted_mime_types, configuration) or halt 406
+      Mime.enforce_accept(request, config) { return halt 406 }
+      Mime.enforce_content_type(request, config) { return halt 415 }
     end
 
     # @since 2.0.0
     # @api private
     def exception_handler(exception)
-      configuration.handled_exceptions.each do |exception_class, handler|
+      config.handled_exceptions.each do |exception_class, handler|
         return handler if exception.is_a?(exception_class)
       end
 
       nil
     end
 
+    # @see Session#sessions_enabled?
     # @since 2.0.0
     # @api private
-    def build_request(env, params)
-      Request.new(env, params)
+    def sessions_enabled?
+      false
     end
 
+    # Hook to be overridden by `Hanami::Extensions::Action` for integrated actions
+    #
+    # @since 2.0.0
+    # @api private
+    def build_request(**options)
+      Request.new(**options)
+    end
+
+    # Hook to be overridden by `Hanami::Extensions::Action` for integrated actions
+    #
     # @since 2.0.0
     # @api private
     def build_response(**options)
@@ -507,14 +510,14 @@ module Hanami
     # @since 0.1.0
     # @api private
     def _run_before_callbacks(*args)
-      self.class.before_callbacks.run(self, *args)
+      config.before_callbacks.run(self, *args)
       nil
     end
 
     # @since 0.1.0
     # @api private
     def _run_after_callbacks(*args)
-      self.class.after_callbacks.run(self, *args)
+      config.after_callbacks.run(self, *args)
       nil
     end
 
@@ -589,9 +592,9 @@ module Hanami
       case value
       when Symbol
         format = Utils::Kernel.Symbol(value)
-        [format, Action::Mime.format_to_mime_type(format, configuration)]
+        [format, Action::Mime.format_to_mime_type(format, config)]
       when String
-        [Action::Mime.detect_format(value, configuration), value]
+        [Action::Mime.detect_format(value, config), value]
       else
         raise Hanami::Controller::UnknownFormatError.new(value)
       end
@@ -614,7 +617,7 @@ module Hanami
       _empty_headers(res) if _requires_empty_headers?(res)
       _empty_body(res) if res.head?
 
-      res.set_format(Action::Mime.detect_format(res.content_type, configuration))
+      res.set_format(Action::Mime.detect_format(res.content_type, config))
       res[:params] = req.params
       res[:format] = res.format
       res

data/lib/hanami/controller/version.rb

@@ -5,6 +5,6 @@ module Hanami
     # Defines the version
     #
     # @since 0.1.0
-    VERSION = "2.0.0.beta1"
+    VERSION = "2.0.0.beta4"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hanami-controller
 version: !ruby/object:Gem::Version
-  version: 2.0.0.beta1
+  version: 2.0.0.beta4
 platform: ruby
 authors:
 - Luca Guidi
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-07-20 00:00:00.000000000 Z
+date: 2022-10-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -152,11 +152,12 @@ files:
 - lib/hanami/action/cache/conditional_get.rb
 - lib/hanami/action/cache/directives.rb
 - lib/hanami/action/cache/expires.rb
-- lib/hanami/action/configuration.rb
+- lib/hanami/action/config.rb
 - lib/hanami/action/constants.rb
 - lib/hanami/action/cookie_jar.rb
 - lib/hanami/action/cookies.rb
 - lib/hanami/action/csrf_protection.rb
+- lib/hanami/action/error.rb
 - lib/hanami/action/flash.rb
 - lib/hanami/action/halt.rb
 - lib/hanami/action/mime.rb
@@ -191,7 +192,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
-rubygems_version: 3.3.3
+rubygems_version: 3.3.7
 signing_key:
 specification_version: 4
 summary: Complete, fast and testable actions for Rack and Hanami