hanami-controller 1.3.0 → 2.0.0.alpha2

data/lib/hanami/action/validatable.rb

@@ -1,7 +1,7 @@
 require 'hanami/action/params'
 
 module Hanami
-  module Action
+  class Action
     module Validatable
       # Defines the class name for anonymous params
       #
@@ -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,6 +1,4 @@
-require 'hanami/utils/class_attribute'
 require 'hanami/action'
-require 'hanami/controller/configuration'
 require 'hanami/controller/version'
 require 'hanami/controller/error'
 
@@ -46,230 +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
-
-    include Utils::ClassAttribute
-
-    # Framework configuration
-    #
-    # @since 0.2.0
-    # @api private
-    class_attribute :configuration
-    self.configuration = Configuration.new
-
-    # Configure the framework.
-    # It yields the given block in the context of the configuration
-    #
-    # @param blk [Proc] the configuration block
-    #
-    # @since 0.2.0
-    #
-    # @see Hanami::Controller::Configuration
-    #
-    # @example
-    #   require 'hanami/controller'
-    #
-    #   Hanami::Controller.configure do
-    #     handle_exceptions false
-    #   end
-    def self.configure(&blk)
-      configuration.instance_eval(&blk)
-    end
-
-    # Duplicate Hanami::Controller in order to create a new separated instance
-    # of the framework.
-    #
-    # The new instance of the framework will be completely decoupled from the
-    # original. It will inherit the configuration, but all the changes that
-    # happen after the duplication, won't be reflected on the other copies.
-    #
-    # @return [Module] a copy of Hanami::Controller
-    #
-    # @since 0.2.0
-    # @api private
-    #
-    # @example Basic usage
-    #   require 'hanami/controller'
-    #
-    #   module MyApp
-    #     Controller = Hanami::Controller.dupe
-    #   end
-    #
-    #   MyApp::Controller == Hanami::Controller # => false
-    #
-    #   MyApp::Controller.configuration ==
-    #     Hanami::Controller.configuration # => false
-    #
-    # @example Inheriting configuration
-    #   require 'hanami/controller'
-    #
-    #   Hanami::Controller.configure do
-    #     handle_exceptions false
-    #   end
-    #
-    #   module MyApp
-    #     Controller = Hanami::Controller.dupe
-    #   end
-    #
-    #   module MyApi
-    #     Controller = Hanami::Controller.dupe
-    #     Controller.configure do
-    #       handle_exceptions true
-    #     end
-    #   end
-    #
-    #   Hanami::Controller.configuration.handle_exceptions # => false
-    #   MyApp::Controller.configuration.handle_exceptions # => false
-    #   MyApi::Controller.configuration.handle_exceptions # => true
-    def self.dupe
-      dup.tap do |duplicated|
-        duplicated.configuration = configuration.duplicate
-      end
-    end
-
-    # Duplicate the framework and generate modules for the target application
-    #
-    # @param mod [Module] the Ruby namespace of the application
-    # @param controllers [String] the optional namespace where the application's
-    #   controllers will live
-    # @param blk [Proc] an optional block to configure the framework
-    #
-    # @return [Module] a copy of Hanami::Controller
-    #
-    # @since 0.2.0
-    #
-    # @see Hanami::Controller#dupe
-    # @see Hanami::Controller::Configuration
-    # @see Hanami::Controller::Configuration#action_module
-    #
-    # @example Basic usage
-    #   require 'hanami/controller'
-    #
-    #   module MyApp
-    #     Controller = Hanami::Controller.duplicate(self)
-    #   end
-    #
-    #   # It will:
-    #   #
-    #   # 1. Generate MyApp::Controller
-    #   # 2. Generate MyApp::Action
-    #   # 3. Generate MyApp::Controllers
-    #   # 4. Configure MyApp::Action as the default module for actions
-    #
-    #  module MyApp::Controllers::Dashboard
-    #    include MyApp::Controller
-    #
-    #    action 'Index' do # this will inject MyApp::Action
-    #      def call(params)
-    #        # ...
-    #      end
-    #    end
-    #  end
-    #
-    # @example Compare code
-    #   require 'hanami/controller'
-    #
-    #   module MyApp
-    #     Controller = Hanami::Controller.duplicate(self) do
-    #       # ...
-    #     end
-    #   end
-    #
-    #   # it's equivalent to:
-    #
-    #   module MyApp
-    #     Controller = Hanami::Controller.dupe
-    #     Action     = Hanami::Action.dup
-    #
-    #     module Controllers
-    #     end
-    #
-    #     Controller.configure do
-    #       action_module MyApp::Action
-    #     end
-    #
-    #     Controller.configure do
-    #       # ...
-    #     end
-    #   end
-    #
-    # @example Custom controllers module
-    #   require 'hanami/controller'
-    #
-    #   module MyApp
-    #     Controller = Hanami::Controller.duplicate(self, 'Ctrls')
-    #   end
-    #
-    #   defined?(MyApp::Controllers) # => nil
-    #   defined?(MyApp::Ctrls)       # => "constant"
-    #
-    #   # Developers can namespace controllers under Ctrls
-    #   module MyApp::Ctrls::Dashboard
-    #     # ...
-    #   end
-    #
-    # @example Nil controllers module
-    #   require 'hanami/controller'
-    #
-    #   module MyApp
-    #     Controller = Hanami::Controller.duplicate(self, nil)
-    #   end
-    #
-    #   defined?(MyApp::Controllers) # => nil
-    #
-    #   # Developers can namespace controllers under MyApp
-    #   module MyApp::DashboardController
-    #     # ...
-    #   end
-    #
-    # @example Block usage
-    #   require 'hanami/controller'
-    #
-    #   module MyApp
-    #     Controller = Hanami::Controller.duplicate(self) do
-    #       handle_exceptions false
-    #     end
-    #   end
-    #
-    #   Hanami::Controller.configuration.handle_exceptions # => true
-    #   MyApp::Controller.configuration.handle_exceptions # => false
-    def self.duplicate(mod, controllers = 'Controllers', &blk)
-      dupe.tap do |duplicated|
-        mod.module_eval %{ module #{ controllers }; end } if controllers
-        mod.module_eval %{ Action = Hanami::Action.dup }
-
-        duplicated.module_eval %{
-          configure do
-            action_module #{ mod }::Action
-          end
-        }
-
-        duplicated.configure(&blk) if block_given?
-      end
-    end
-
-    # Framework loading entry point
-    #
-    # @return [void]
-    #
-    # @since 0.3.0
-    def self.load!
-      configuration.load!
-    end
   end
 end

data/lib/hanami/controller/version.rb

@@ -3,6 +3,6 @@ module Hanami
     # Defines the version
     #
     # @since 0.1.0
-    VERSION = '1.3.0'.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: 1.3.0
+  version: 2.0.0.alpha2
 platform: ruby
 authors:
 - Luca Guidi
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-10-24 00:00:00.000000000 Z
+date: 2021-05-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -30,28 +30,48 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: 2.0.alpha
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: 2.0.alpha
 - !ruby/object:Gem::Dependency
-  name: bundler
+  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
+    requirements:
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.6'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.6'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: rack-test
   requirement: !ruby/object:Gem::Requirement
@@ -72,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
@@ -105,36 +125,34 @@ 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/callable.rb
-- lib/hanami/action/callbacks.rb
-- lib/hanami/action/configurable.rb
+- lib/hanami/action/configuration.rb
 - lib/hanami/action/cookie_jar.rb
 - lib/hanami/action/cookies.rb
-- lib/hanami/action/exposable.rb
-- lib/hanami/action/exposable/guard.rb
+- lib/hanami/action/csrf_protection.rb
 - lib/hanami/action/flash.rb
 - lib/hanami/action/glue.rb
-- lib/hanami/action/head.rb
+- lib/hanami/action/halt.rb
 - lib/hanami/action/mime.rb
 - lib/hanami/action/params.rb
-- lib/hanami/action/rack.rb
-- lib/hanami/action/rack/callable.rb
 - lib/hanami/action/rack/file.rb
-- lib/hanami/action/redirect.rb
 - lib/hanami/action/request.rb
+- lib/hanami/action/response.rb
 - lib/hanami/action/session.rb
-- lib/hanami/action/throwable.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
@@ -142,7 +160,7 @@ homepage: http://hanamirb.org
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -150,16 +168,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.3.0
+      version: 2.6.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.7
-signing_key: 
+rubygems_version: 3.2.4
+signing_key:
 specification_version: 4
 summary: Complete, fast and testable actions for Rack and Hanami
 test_files: []