hanami-controller 2.0.0.alpha1 → 2.0.0.alpha2

data/lib/hanami/action/validatable.rb

@@ -50,7 +50,7 @@ module Hanami
         # @since 0.3.0
         #
         # @see Hanami::Action::Params
-        # @see http://hanamirb.org/guides/validations/overview/
+        # @see https://guides.hanamirb.org//validations/overview
         #
         # @example Anonymous Block
         #   require 'hanami/controller'

data/lib/hanami/action/view_name_inferrer.rb

@@ -0,0 +1,46 @@
+# frozen_string_literal: true
+
+module Hanami
+  class Action
+    class ViewNameInferrer
+      ALTERNATIVE_NAMES = {
+        "create" => "new",
+        "update" => "edit"
+      }.freeze
+
+      class << self
+        def call(action_name:, provider:)
+          application = provider.respond_to?(:application) ? provider.application : Hanami.application
+
+          action_identifier_base = application.config.actions.name_inference_base
+          view_identifier_base = application.config.actions.view_name_inference_base
+
+          identifier = action_identifier_name(action_name, provider, action_identifier_base)
+
+          view_name = [view_identifier_base, identifier].compact.join(".")
+
+          [view_name, alternative_view_name(view_name)].compact
+        end
+
+        private
+
+        def action_identifier_name(action_name, provider, name_base)
+          provider
+            .inflector
+            .underscore(action_name)
+            .sub(/^#{provider.namespace_path}\//, "")
+            .sub(/^#{name_base}\//, "")
+            .gsub("/", ".")
+        end
+
+        def alternative_view_name(view_name)
+          parts = view_name.split(".")
+
+          alternative_name = ALTERNATIVE_NAMES[parts.last]
+
+          [parts[0..-2], alternative_name].join(".") if alternative_name
+        end
+      end
+    end
+  end
+end

data/lib/hanami/controller.rb

@@ -1,5 +1,4 @@
 require 'hanami/action'
-require 'hanami/controller/configuration'
 require 'hanami/controller/version'
 require 'hanami/controller/error'
 
@@ -45,21 +44,5 @@ module Hanami
         super("Cannot find a corresponding Mime type for '#{ format }'. Please configure it with Hanami::Controller::Configuration#format.")
       end
     end
-
-    # Missing session error
-    #
-    # This error is raised when an action sends either `session` or `flash` to
-    # itself and it does not include `Hanami::Action::Session`.
-    #
-    # @since 1.2.0
-    #
-    # @see Hanami::Action::Session
-    # @see Hanami::Action#session
-    # @see Hanami::Action#flash
-    class MissingSessionError < Hanami::Controller::Error
-      def initialize(session_method)
-        super("To use `#{session_method}', add `include Hanami::Action::Session`.")
-      end
-    end
   end
 end

data/lib/hanami/controller/version.rb

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

data/lib/hanami/http/status.rb

@@ -31,7 +31,7 @@ module Hanami
 
       # Return a status for the given code
       #
-      # @param code [Fixnum] a valid HTTP code
+      # @param code [Integer] a valid HTTP code
       #
       # @return [Array] a pair of code and message for an HTTP status
       #
@@ -48,7 +48,7 @@ module Hanami
 
       # Return a message for the given status code
       #
-      # @param code [Fixnum] a valid HTTP code
+      # @param code [Integer] a valid HTTP code
       #
       # @return [String] a message for the given status code
       #

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hanami-controller
 version: !ruby/object:Gem::Version
-  version: 2.0.0.alpha1
+  version: 2.0.0.alpha2
 platform: ruby
 authors:
 - Luca Guidi
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-01-30 00:00:00.000000000 Z
+date: 2021-05-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -38,6 +38,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 2.0.alpha
+- !ruby/object:Gem::Dependency
+  name: dry-configurable
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.12'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.12'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -78,28 +92,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12'
+        version: '13'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12'
+        version: '13'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.7'
+        version: '3.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.7'
+        version: '3.9'
 description: Complete, fast and testable actions for Rack
 email:
 - me@lucaguidi.com
@@ -111,16 +125,21 @@ files:
 - LICENSE.md
 - README.md
 - hanami-controller.gemspec
-- lib/hanami-controller.rb
 - lib/hanami/action.rb
+- lib/hanami/action/application_action.rb
+- lib/hanami/action/application_configuration.rb
+- lib/hanami/action/application_configuration/cookies.rb
+- lib/hanami/action/application_configuration/sessions.rb
 - lib/hanami/action/base_params.rb
 - lib/hanami/action/cache.rb
 - lib/hanami/action/cache/cache_control.rb
 - 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/cookie_jar.rb
 - lib/hanami/action/cookies.rb
+- lib/hanami/action/csrf_protection.rb
 - lib/hanami/action/flash.rb
 - lib/hanami/action/glue.rb
 - lib/hanami/action/halt.rb
@@ -130,9 +149,10 @@ files:
 - lib/hanami/action/request.rb
 - lib/hanami/action/response.rb
 - lib/hanami/action/session.rb
+- lib/hanami/action/standalone_action.rb
 - lib/hanami/action/validatable.rb
+- lib/hanami/action/view_name_inferrer.rb
 - lib/hanami/controller.rb
-- lib/hanami/controller/configuration.rb
 - lib/hanami/controller/error.rb
 - lib/hanami/controller/version.rb
 - lib/hanami/http/status.rb
@@ -140,7 +160,7 @@ homepage: http://hanamirb.org
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -148,15 +168,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.5.0
+      version: 2.6.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">"
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
-rubygems_version: 3.0.2
-signing_key: 
+rubygems_version: 3.2.4
+signing_key:
 specification_version: 4
 summary: Complete, fast and testable actions for Rack and Hanami
 test_files: []

data/lib/hanami-controller.rb

@@ -1 +0,0 @@
-require 'hanami/controller'

data/lib/hanami/controller/configuration.rb

@@ -1,308 +0,0 @@
-require 'hanami/utils/class'
-require 'hanami/utils/kernel'
-require 'hanami/utils/string'
-
-module Hanami
-  module Controller
-    # Configuration for the framework, controllers and actions.
-    #
-    # Hanami::Controller has its own global configuration that can be manipulated
-    # via `Hanami::Controller.configure`.
-    #
-    # Every time that `Hanami::Controller` and `Hanami::Action` are included, that
-    # global configuration is being copied to the recipient. The copy will
-    # inherit all the settings from the original, but all the subsequent changes
-    # aren't reflected from the parent to the children, and viceversa.
-    #
-    # This architecture allows to have a global configuration that capture the
-    # most common cases for an application, and let controllers and single
-    # actions to specify exceptions.
-    #
-    # @since 0.2.0
-    class Configuration
-      # Default HTTP code for server side errors
-      #
-      # @since 0.2.0
-      # @api private
-      DEFAULT_ERROR_CODE = 500
-
-      # Default public directory
-      #
-      # It serves as base root for file downloads
-      #
-      # @since 1.0.0
-      # @api private
-      DEFAULT_PUBLIC_DIRECTORY = 'public'.freeze
-
-      # Default Mime type to format mapping
-      #
-      # @since 0.2.0
-      # @api private
-      DEFAULT_FORMATS = {
-        'application/octet-stream' => :all,
-        '*/*'                      => :all,
-        'text/html'                => :html
-      }.freeze
-
-      # Initialize a configuration instance
-      #
-      # @return [Hanami::Controller::Configuration] a new configuration's
-      #   instance
-      #
-      # @since 0.2.0
-      def initialize(&blk)
-        @handled_exceptions      = {}
-        @formats                 = DEFAULT_FORMATS.dup
-        @mime_types              = nil
-        @default_request_format  = nil
-        @default_response_format = nil
-        @default_charset         = nil
-        @default_headers         = {}
-        @cookies                 = {}
-        @root_directory          = ::Pathname.new(Dir.pwd).realpath
-        @public_directory        = root_directory.join(DEFAULT_PUBLIC_DIRECTORY).to_s
-        instance_eval(&blk) unless blk.nil?
-        freeze
-      end
-
-      # Specify how to handle an exception with an HTTP status
-      #
-      # Raised exceptions will return the configured HTTP status, only if
-      #   `handled_exceptions` is set on `true`.
-      #
-      # @param exception [Hash] the exception class must be the key and the HTTP
-      #   status the value
-      #
-      # @since 0.2.0
-      #
-      # @see Hanami::Controller#configure
-      # @see Hanami::Action::Throwable
-      #
-      # @example
-      #   require 'hanami/controller'
-      #
-      #   Hanami::Controller.configure do
-      #     handle_exception ArgumentError => 400
-      #   end
-      def handle_exception(exception)
-        @handled_exceptions.merge!(exception)
-      end
-
-      # Register a format
-      #
-      # @param hash [Hash] the symbol format must be the key and the mime type
-      #   string must be the value of the hash
-      #
-      # @since 0.2.0
-      #
-      # @see Hanami::Action::Mime
-      #
-      # @example
-      #   require 'hanami/controller'
-      #
-      #   Hanami::Controller.configure do
-      #     format custom: 'application/custom'
-      #   end
-      #
-      #   module Articles
-      #     class Index
-      #       include Hanami::Action
-      #
-      #       def call(params)
-      #         # ...
-      #       end
-      #     end
-      #
-      #     class Show
-      #       include Hanami::Action
-      #
-      #       def call(params)
-      #         # ...
-      #         self.format = :custom
-      #       end
-      #     end
-      #   end
-      #
-      #   action = Articles::Index.new
-      #
-      #   action.call({ 'HTTP_ACCEPT' => 'text/html' })
-      #     # => Content-Type "text/html"
-      #   action.format # => :html
-      #
-      #   action.call({ 'HTTP_ACCEPT' => 'application/custom' })
-      #     # => Content-Type "application/custom"
-      #   action.format # => :custom
-      #
-      #
-      #
-      #   action = Articles::Show.new
-      #
-      #   action.call({ 'HTTP_ACCEPT' => 'text/html' })
-      #     # => Content-Type "application/custom"
-      #   action.format # => :custom
-      def format(hash)
-        symbol, mime_type = *Utils::Kernel.Array(hash)
-
-        @formats[Utils::Kernel.String(mime_type)] = Utils::Kernel.Symbol(symbol)
-      end
-
-      # Return the configured format's MIME types
-      #
-      # @since 0.8.0
-      # @api private
-      #
-      # @see Hanami::Controller::Configuration#format
-      def mime_types
-        # FIXME: this isn't efficient. speed it up!
-        ((@formats.keys - DEFAULT_FORMATS.keys) +
-         Hanami::Action::Mime::TYPES.values).freeze
-      end
-
-      # Set a format as default fallback for all the requests without a strict
-      # requirement for the mime type.
-      #
-      # The given format must be coercible to a symbol, and be a valid mime type
-      # alias. If it isn't, at the runtime the framework will raise a
-      # `Hanami::Controller::UnknownFormatError`.
-      #
-      # By default this value is nil.
-      #
-      # @since 0.5.0
-      #
-      # @see Hanami::Action::Mime
-      #
-      # FIXME: new API docs
-      def default_request_format=(value)
-        @default_request_format = Utils::Kernel.Symbol(value) unless value.nil?
-      end
-
-      attr_reader :default_request_format
-
-      # Set a format to be used for all responses regardless of the request type.
-      #
-      # The given format must be coercible to a symbol, and be a valid mime type
-      # alias. If it isn't, at the runtime the framework will raise a
-      # `Hanami::Controller::UnknownFormatError`.
-      #
-      # By default this value is nil.
-      #
-      # @since 0.5.0
-      #
-      # @see Hanami::Action::Mime
-      #
-      # FIXME: new API docs
-      def default_response_format=(value)
-        @default_response_format = Utils::Kernel.Symbol(value) unless value.nil?
-      end
-
-      attr_reader :default_response_format
-
-      # Set a charset as default fallback for all the requests without a strict
-      # requirement for the charset.
-      #
-      # By default this value is nil.
-      #
-      # @since 0.3.0
-      #
-      # @see Hanami::Action::Mime
-      #
-      # FIXME: new API docs
-      attr_accessor :default_charset
-
-      attr_reader :default_headers
-
-      # Set default headers for all responses
-      #
-      # By default this value is an empty hash.
-      #
-      # @since 0.4.0
-      #
-      # @example Getting the value
-      #   require 'hanami/controller'
-      #
-      #   Hanami::Controller.configuration.default_headers # => {}
-      #
-      # @example Setting the value
-      #   require 'hanami/controller'
-      #
-      #   Hanami::Controller::Configuration.new do |config|
-      #     config.default_headers = {
-      #       'X-Frame-Options' => 'DENY'
-      #     }
-      #   end
-      def default_headers=(headers)
-        @default_headers.merge!(
-          headers.reject { |_, v| v.nil? }
-        )
-      end
-
-      attr_reader :cookies
-
-      # Set default cookies options for all responses
-      #
-      # By default this value is an empty hash.
-      #
-      # @since 0.4.0
-      #
-      # @example Getting the value
-      #   require 'hanami/controller'
-      #
-      #   Hanami::Controller.configuration.cookies # => {}
-      #
-      # @example Setting the value
-      #   require 'hanami/controller'
-      #
-      #   Hanami::Controller::Configuration.new do |config|
-      #     config.cookies = {
-      #       domain: 'hanamirb.org',
-      #       path: '/controller',
-      #       secure: true,
-      #       httponly: true
-      #     }
-      #   end
-      def cookies=(options)
-        @cookies.merge!(
-          options.reject { |_, v| v.nil? }
-        )
-      end
-
-      # Returns a format for the given mime type
-      #
-      # @param mime_type [#to_s,#to_str] A mime type
-      #
-      # @return [Symbol,nil] the corresponding format, if present
-      #
-      # @see Hanami::Controller::Configuration#format
-      #
-      # @since 0.2.0
-      # @api private
-      def format_for(mime_type)
-        @formats[mime_type]
-      end
-
-      # Returns a mime type for the given format
-      #
-      # @param format [#to_sym] a format
-      #
-      # @return [String,nil] the corresponding mime type, if present
-      #
-      # @since 0.2.0
-      # @api private
-      def mime_type_for(format)
-        @formats.key(format)
-      end
-
-      # @api private
-      # @since 1.0.0
-      attr_reader :root_directory
-
-      # FIXME: API docs
-      def public_directory=(value)
-        @public_directory = root_directory.join(value).to_s
-      end
-
-      attr_reader :public_directory
-      attr_reader :handled_exceptions
-    end
-  end
-end