hanami-controller 0.6.1 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d9cfb818515da7bb2f825a1016ebfd221cfb3c75
-  data.tar.gz: e459b2afa444cd3a7e5ddb6f77ee7594cedf59c0
+  metadata.gz: 4e9a92b39aa9c373400fe07e64b270d3066af888
+  data.tar.gz: f146d4da77a9c4ced2bfdfea31826db63f0ef992
 SHA512:
-  metadata.gz: bd1689d659b55ee1a01114eba2c37e27768ad926c0c3e1adf9b90c5030a92e5b35383e297c494e7e4ce037183a0b356c6410d76b3b6a948a3db2ece4f7cade22
-  data.tar.gz: a2fa0502c2e59c9eb6d22f5850ed0454fe4ea59531460575f7fcdc383fc90f9ca399e487013940b3b7c6fb743035cd190765fd67d12fd1ffc2c18f678c308cea
+  metadata.gz: 089577daf70c460f7bedaa4d613c65551b0a9bd10af1e7725e0654398ad81c8d5abd7df550f0cce0f97b73f5d00cbf3072f039753a1eb9255218b555705f7e57
+  data.tar.gz: 34ce5a95575dc90669f87469d5494c7b8208b9ac1efc1015c8f6078ca906178d0cdeed585b02f36c4eda64f4977d0a825d0785bfd4f65728da352821cac57df3

data/CHANGELOG.md

@@ -1,6 +1,23 @@
 # Hanami::Controller
 Complete, fast and testable actions for Rack
 
+## v0.7.0 - 2016-07-22
+### Added
+- [Luca Guidi] Introduced `Hanami::Action::Params#error_messages` which returns a flat collection of full error messages
+
+### Fixed
+- [Luca Guidi] Params are deeply symbolized
+- [Artem Nistratov] Send only changed cookies in HTTP response
+
+### Changed
+- [Luca Guidi] Drop support for Ruby 2.0 and 2.1. Official support for JRuby 9.0.5.0+.
+- [Luca Guidi] Param validations now require you to add `hanami-validations` in `Gemfile`.
+- [Luca Guidi] Removed "_indifferent access_" for params. Since now on, only symbols are allowed.
+- [Luca Guidi] Params are immutable
+- [Luca Guidi] Params validations syntax has changed
+- [Luca Guidi] `Hanami::Action::Params#errors` now returns a Hash. Keys are symbols representing invalid params, while values are arrays of strings with a message of the failure.
+- [Vasilis Spilka] Made `Hanami::Action::Session#errors` public
+
 ## v0.6.1 - 2016-02-05
 ### Changed
 - [Anatolii Didukh] Optimise memory usage by freezing MIME types constant

data/README.md

@@ -60,7 +60,7 @@ class Show
   include Hanami::Action
 
   def call(params)
-    @article = Article.find params[:id]
+    @article = ArticleRepository.find params[:id]
   end
 end
 ```
@@ -74,7 +74,7 @@ This is important, because you can implement your own initialization strategy.
 __An action is an object__. That's important because __you have the full control on it__.
 In other words, you have the freedom to instantiate, inject dependencies and test it, both at the unit and integration level.
 
-In the example below, the default repository is `Article`. During a unit test we can inject a stubbed version, and invoke `#call` with the params.
+In the example below, the default repository is `ArticleRepository`. During a unit test we can inject a stubbed version, and invoke `#call` with the params.
 __We're avoiding HTTP calls__, we're also going to avoid hitting the database (it depends on the stubbed repository), __we're just dealing with message passing__.
 Imagine how **fast** the unit test could be.
 
@@ -82,7 +82,7 @@ Imagine how **fast** the unit test could be.
 class Show
   include Hanami::Action
 
-  def initialize(repository = Article)
+  def initialize(repository = ArticleRepository)
     @repository = repository
   end
 
@@ -149,20 +149,21 @@ Params represent an untrusted input.
 For security reasons it's recommended to whitelist them.
 
 ```ruby
+require 'hanami/validations'
 require 'hanami/controller'
 
 class Signup
   include Hanami::Action
 
   params do
-    param :first_name
-    param :last_name
-    param :email
-    
-    param :address do
-      param :line_one
-      param :state
-      param :country
+    required(:first_name).filled(:str?)
+    required(:last_name).filled(:str?)
+    required(:email).filled(:str?)
+
+    required(:address).schema do
+      required(:line_one).filled(:str?)
+      required(:state).filled(:str?)
+      required(:country).filled(:str?)
     end
   end
 
@@ -174,7 +175,7 @@ class Signup
     # Whitelist :first_name, but not :admin
     puts params[:first_name]     # => "Luca"
     puts params[:admin]          # => nil
-    
+
     # Whitelist nested params [:address][:line_one], not [:address][:line_two]
     puts params[:address][:line_one] # => '69 Tender St'
     puts params[:address][:line_two] # => nil
@@ -191,6 +192,7 @@ when params are invalid.
 If you specify the `:type` option, the param will be coerced.
 
 ```ruby
+require 'hanami/validations'
 require 'hanami/controller'
 
 class Signup
@@ -198,13 +200,13 @@ class Signup
   include Hanami::Action
 
   params do
-    param :first_name,       presence: true
-    param :last_name,        presence: true
-    param :email,            presence: true, format: /@/,   confirmation: true
-    param :password,         presence: true,                confirmation: true
-    param :terms_of_service, acceptance: true
-    param :avatar,           size: 0..(MEGABYTE * 3)
-    param :age,              type: Integer, size: 18..99
+    required(:first_name).filled(:str?)
+    required(:last_name).filled(:str?)
+    required(:email).confirmation.filled?(:str?, format?: /@/)
+    required(:password).confirmation.filled(:str?)
+    required(:terms_of_service).filled(:bool?)
+    required(:age).filled(:int?, included_in?: 18..99)
+    optional(:avatar).filled(size?: 1..(MEGABYTE * 3))
   end
 
   def call(params)
@@ -219,10 +221,10 @@ action.call(valid_params) # => [200, {}, ...]
 action.errors.empty?      # => true
 
 action.call(invalid_params) # => [400, {}, ...]
-action.errors               # =>  #<Hanami::Validations::Errors:0x007fabe4b433d0 @errors={...}>
+action.errors.empty?        # =>  false
 
-action.errors.for(:email)
-  # => [#<Hanami::Validations::Error:0x007fabe4b432e0 @attribute=:email, @validation=:presence, @expected=true, @actual=nil>]
+action.errors.fetch(:email)
+  # => ['is missing', 'is in invalid format']
 ```
 
 ### Response
@@ -280,7 +282,7 @@ class Show
   expose :article
 
   def call(params)
-    @article = Article.find params[:id]
+    @article = ArticleRepository.find params[:id]
   end
 end
 
@@ -312,7 +314,7 @@ class Show
 
   # `params` in the method signature is optional
   def set_article(params)
-    @article = Article.find params[:id]
+    @article = ArticleRepository.find params[:id]
   end
 end
 ```
@@ -324,7 +326,7 @@ class Show
   include Hanami::Action
 
   before { ... } # do some authentication stuff
-  before { |params| @article = Article.find params[:id] }
+  before { |params| @article = ArticleRepository.find params[:id] }
 
   def call(params)
   end
@@ -356,7 +358,7 @@ class Show
   handle_exception RecordNotFound => 404
 
   def call(params)
-    @article = Article.find params[:id]
+    @article = ArticleRepository.find params[:id]
   end
 end
 
@@ -397,7 +399,7 @@ class Show
   include Hanami::Action
 
   def call(params)
-    @article = Article.find params[:id]
+    @article = ArticleRepository.find params[:id]
   end
 end
 
@@ -423,7 +425,7 @@ module Articles
     end
 
     def call(params)
-      @article = Article.find params[:id]
+      @article = ArticleRepository.find params[:id]
     end
   end
 end
@@ -991,10 +993,10 @@ The following examples are valid constructors:
 def initialize
 end
 
-def initialize(repository = Article)
+def initialize(repository = ArticleRepository)
 end
 
-def initialize(repository: Article)
+def initialize(repository: ArticleRepository)
 end
 
 def initialize(options = {})

data/hanami-controller.gemspec

@@ -17,14 +17,12 @@ Gem::Specification.new do |spec|
   spec.executables   = []
   spec.test_files    = spec.files.grep(%r{^(test)/})
   spec.require_paths = ['lib']
-  spec.required_ruby_version = '>= 2.0.0'
+  spec.required_ruby_version = '>= 2.2.0'
 
-  spec.add_dependency 'rack',               '~> 1.6', '>= 1.6.2'
-  spec.add_dependency 'hanami-utils',       '~> 0.7'
-  spec.add_dependency 'hanami-validations', '~> 0.5'
+  spec.add_dependency 'rack',         '~> 1.6', '>= 1.6.2'
+  spec.add_dependency 'hanami-utils', '~> 0.8'
 
   spec.add_development_dependency 'bundler',   '~> 1.6'
-  spec.add_development_dependency 'minitest',  '~> 5'
   spec.add_development_dependency 'rack-test', '~> 0.6'
-  spec.add_development_dependency 'rake',      '~> 10'
+  spec.add_development_dependency 'rake',      '~> 11'
 end

data/lib/hanami/action.rb

@@ -5,7 +5,11 @@ require 'hanami/action/redirect'
 require 'hanami/action/exposable'
 require 'hanami/action/throwable'
 require 'hanami/action/callbacks'
-require 'hanami/action/validatable'
+begin
+  require 'hanami/validations'
+  require 'hanami/action/validatable'
+rescue LoadError
+end
 require 'hanami/action/head'
 require 'hanami/action/callable'
 
@@ -53,7 +57,7 @@ module Hanami
         include Exposable
         include Throwable
         include Callbacks
-        include Validatable
+        include Validatable if defined?(Validatable)
         include Configurable
         include Head
         prepend Callable
@@ -65,7 +69,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 reponse will be returned to the
+    # order to prepare their data before the response will be returned to the
     # webserver.
     #
     # @since 0.1.0

data/lib/hanami/action/base_params.rb

@@ -0,0 +1,151 @@
+require 'rack/request'
+require 'hanami/utils/hash'
+
+module Hanami
+  module Action
+    class BaseParams
+      # The key that returns raw input from the Rack env
+      #
+      # @since 0.7.0
+      RACK_INPUT    = 'rack.input'.freeze
+
+      # The key that returns router params from the Rack env
+      # This is a builtin integration for Hanami::Router
+      #
+      # @since 0.7.0
+      ROUTER_PARAMS = 'router.params'.freeze
+
+      # Separator for #get
+      #
+      # @since 0.7.0
+      # @api private
+      #
+      # @see Hanami::Action::Params#get
+      GET_SEPARATOR = '.'.freeze
+
+      # @attr_reader env [Hash] the Rack env
+      #
+      # @since 0.7.0
+      # @api private
+      attr_reader :env
+
+      # @attr_reader raw [Hash] the raw params from the request
+      #
+      # @since 0.7.0
+      # @api private
+      attr_reader :raw
+
+      # Initialize the params and freeze them.
+      #
+      # @param env [Hash] a Rack env or an hash of params.
+      #
+      # @return [Params]
+      #
+      # @since 0.7.0
+      def initialize(env)
+        @env    = env
+        @raw    = _extract_params
+        @params = Utils::Hash.new(@raw).symbolize!.to_h
+        freeze
+      end
+
+      # Returns the object associated with the given key
+      #
+      # @param key [Symbol] the key
+      #
+      # @return [Object,nil] return the associated object, if found
+      #
+      # @since 0.7.0
+      def [](key)
+        @params[key]
+      end
+
+      # Get an attribute value associated with the given key.
+      # Nested attributes are reached with a dot notation.
+      #
+      # @param key [String] the key
+      #
+      # @return [Object,NilClass] return the associated value, if found
+      #
+      # @raise [NoMethodError] if key is nil
+      #
+      # @since 0.7.0
+      #
+      # @example
+      #   require 'hanami/controller'
+      #
+      #   module Deliveries
+      #     class Create
+      #       include Hanami::Action
+      #
+      #       def call(params)
+      #         params.get('customer_name')   # => "Luca"
+      #         params.get('uknown')          # => nil
+      #
+      #         params.get('address.city')    # => "Rome"
+      #         params.get('address.unknown') # => nil
+      #
+      #         params.get(nil)               # => nil
+      #       end
+      #     end
+      #   end
+      def get(key)
+        key, *keys = key.to_s.split(GET_SEPARATOR)
+        return if key.nil?
+
+        result = self[key.to_sym]
+
+        Array(keys).each do |k|
+          break if result.nil?
+          result = result[k.to_sym]
+        end
+
+        result
+      end
+
+      # Provide a common interface with Params
+      #
+      # @return [TrueClass] always returns true
+      #
+      # @since 0.7.0
+      #
+      # @see Hanami::Action::Params#valid?
+      def valid?
+        true
+      end
+
+      # Serialize params to Hash
+      #
+      # @return [::Hash]
+      #
+      # @since 0.7.0
+      def to_h
+        @params
+      end
+      alias_method :to_hash, :to_h
+
+      private
+
+      # @since 0.7.0
+      # @api private
+      def _extract_params
+        result = {}
+
+        if env.key?(RACK_INPUT)
+          result.merge! ::Rack::Request.new(env).params
+          result.merge! _router_params
+        else
+          result.merge! _router_params(env)
+        end
+
+        result
+      end
+
+      # @since 0.7.0
+      # @api private
+      def _router_params(fallback = {})
+        env.fetch(ROUTER_PARAMS, fallback)
+      end
+    end
+  end
+end

data/lib/hanami/action/cache/cache_control.rb

@@ -17,7 +17,10 @@ module Hanami
         HEADER = 'Cache-Control'.freeze
 
         def self.included(base)
-          base.extend ClassMethods
+          base.class_eval do
+            extend ClassMethods
+            @cache_control_directives = nil
+          end
         end
 
         module ClassMethods

data/lib/hanami/action/cache/expires.rb

@@ -17,7 +17,10 @@ module Hanami
         HEADER = 'Expires'.freeze
 
         def self.included(base)
-          base.extend ClassMethods
+          base.class_eval do
+            extend ClassMethods
+            @expires_directives = nil
+          end
         end
 
         module ClassMethods

data/lib/hanami/action/callable.rb

@@ -1,5 +1,3 @@
-require 'hanami/action/params'
-
 module Hanami
   module Action
     module Callable

data/lib/hanami/action/cookie_jar.rb

@@ -69,7 +69,10 @@ module Hanami
       # @see Hanami::Action::Cookies#finish
       def finish
         @cookies.delete(RACK_SESSION_KEY)
-        @cookies.each { |k,v| v.nil? ? delete_cookie(k) : set_cookie(k, _merge_default_values(v)) }
+        @cookies.each do |k,v|
+          next unless changed?(k)
+          v.nil? ? delete_cookie(k) : set_cookie(k, _merge_default_values(v))
+        end if changed?
       end
 
       # Returns the object associated with the given key
@@ -103,11 +106,33 @@ module Hanami
       #
       # @see http://en.wikipedia.org/wiki/HTTP_cookie
       def []=(key, value)
+        changes << key
         @cookies[key] = value
       end
 
       private
 
+      # Keep track of changed keys
+      #
+      # @since 0.7.0
+      # @api private
+      def changes
+        @changes ||= Set.new
+      end
+
+      # Check if the entire set of cookies has changed within the current request.
+      # If <tt>key</tt> is given, it checks the associated cookie has changed.
+      #
+      # @since 0.7.0
+      # @api private
+      def changed?(key = nil)
+        if key.nil?
+          changes.any?
+        else
+          changes.include?(key)
+        end
+      end
+
       # Merge default cookies options with values provided by user
       #
       # Cookies values provided by user are respected

data/lib/hanami/action/exposable.rb

@@ -16,7 +16,10 @@ module Hanami
       #
       # @see http://www.ruby-doc.org/core-2.1.2/Module.html#method-i-included
       def self.included(base)
-        base.extend ClassMethods
+        base.class_eval do
+          extend ClassMethods
+          expose :params
+        end
       end
 
       # Exposures API class methods

data/lib/hanami/action/mime.rb

@@ -57,7 +57,10 @@ module Hanami
       #
       # @see http://www.ruby-doc.org/core-2.1.2/Module.html#method-i-included
       def self.included(base)
-        base.extend ClassMethods
+        base.class_eval do
+          extend ClassMethods
+          prepend InstanceMethods
+        end
       end
 
       module ClassMethods
@@ -111,12 +114,24 @@ module Hanami
         end
       end
 
+      # @since 0.7.0
+      # @api private
+      module InstanceMethods
+        # @since 0.7.0
+        # @api private
+        def initialize(*)
+          super
+          @content_type = nil
+          @charset      = nil
+        end
+      end
+
       # Returns a symbol representation of the content type.
       #
       # The framework automatically detects the request mime type, and returns
       # the corresponding format.
       #
-      # However, if this value was explicitely set by `#format=`, it will return
+      # However, if this value was explicitly set by `#format=`, it will return
       # that value
       #
       # @return [Symbol] a symbol that corresponds to the content type
@@ -275,7 +290,7 @@ module Hanami
       # If a client asks for an `HTTP_ACCEPT` `*/*`, but we want to force the
       # response to be a `text/html` we can use this method.
       #
-      # When the format is set, the framework searchs for a corresponding mime
+      # When the format is set, the framework searches for a corresponding mime
       # type to be set as the `Content-Type` header of the response.
       # This lookup is performed first in the configuration, and then in
       # `Rack::Mime::MIME_TYPES`. If the lookup fails, it raises an error.

data/lib/hanami/action/params.rb

@@ -1,6 +1,5 @@
-require 'hanami/validations'
-require 'hanami/utils/attributes'
-require 'set'
+require 'hanami/action/base_params'
+require 'hanami/validations/form'
 
 module Hanami
   module Action
@@ -14,130 +13,22 @@ module Hanami
     #   * Default: it returns the given hash as it is. It's useful for testing purposes.
     #
     # @since 0.1.0
-    class Params
-      # The key that returns raw input from the Rack env
-      #
-      # @since 0.1.0
-      RACK_INPUT    = 'rack.input'.freeze
-
-      # The key that returns router params from the Rack env
-      # This is a builtin integration for Hanami::Router
-      #
-      # @since 0.1.0
-      ROUTER_PARAMS = 'router.params'.freeze
-
-      # CSRF params key
-      #
-      # This key is shared with <tt>hanamirb</tt> and <tt>hanami-helpers</tt>
-      #
-      # @since 0.4.4
-      # @api private
-      CSRF_TOKEN = '_csrf_token'.freeze
-
-      # Set of params that are never filtered
-      #
-      # @since 0.4.4
-      # @api private
-      DEFAULT_PARAMS = Hash[CSRF_TOKEN => true].freeze
-
-      # Separator for #get
-      #
-      # @since 0.4.0
-      # @api private
-      #
-      # @see Hanami::Action::Params#get
-      GET_SEPARATOR = '.'.freeze
-
-      # Whitelist and validate a parameter
-      #
-      # @param name [#to_sym] The name of the param to whitelist
-      #
-      # @raise [ArgumentError] if one the validations is unknown, or if
-      #   the size validator is used with an object that can't be coerced to
-      #   integer.
-      #
-      # @return void
-      #
-      # @since 0.3.0
-      #
-      # @see http://rdoc.info/gems/hanami-validations/Hanami/Validations
-      #
-      # @example Whitelisting
-      #   require 'hanami/controller'
-      #
-      #   class SignupParams < Hanami::Action::Params
-      #     param :email
-      #   end
-      #
-      #   params = SignupParams.new({id: 23, email: 'mjb@example.com'})
-      #
-      #   params[:email] # => 'mjb@example.com'
-      #   params[:id]    # => nil
-      #
-      # @example Validation
-      #   require 'hanami/controller'
-      #
-      #   class SignupParams < Hanami::Action::Params
-      #     param :email, presence: true
-      #   end
-      #
-      #   params = SignupParams.new({})
-      #
-      #   params[:email] # => nil
-      #   params.valid?  # => false
-      #
-      # @example Unknown validation
-      #   require 'hanami/controller'
-      #
-      #   class SignupParams < Hanami::Action::Params
-      #     param :email, unknown: true # => raise ArgumentError
-      #   end
-      #
-      # @example Wrong size validation
-      #   require 'hanami/controller'
-      #
-      #   class SignupParams < Hanami::Action::Params
-      #     param :email, size: 'twentythree'
-      #   end
-      #
-      #   params = SignupParams.new({})
-      #   params.valid? # => raise ArgumentError
-      def self.param(name, options = {}, &block)
-        attribute name, options, &block
-        nil
-      end
-
-      include Hanami::Validations
-
-      def self.whitelisting?
-        defined_attributes.any?
-      end
+    class Params < BaseParams
+      include Hanami::Validations::Form
 
-      # Overrides the method in Hanami::Validation to build a class that
-      # inherits from Params rather than only Hanami::Validations.
+      # This is a Hanami::Validations extension point
       #
-      # @since 0.3.2
+      # @since 0.7.0
       # @api private
-      def self.build_validation_class(&block)
-        kls = Class.new(Params) do
-          def hanami_nested_attributes?
-            true
-          end
+      def self._base_rules
+        lambda do
+          optional(:_csrf_token).filled(:str?)
         end
-        kls.class_eval(&block)
-        kls
       end
 
-      # @attr_reader env [Hash] the Rack env
-      #
-      # @since 0.2.0
-      # @api private
-      attr_reader :env
-
-      # @attr_reader raw [Hanami::Utils::Attributes] all request's attributes
-      #
-      # @since 0.3.2
-      attr_reader :raw
+      def self.params(&blk)
+        validations(&blk || ->() {})
+      end
 
       # Initialize the params and freeze them.
       #
@@ -148,65 +39,59 @@ module Hanami
       # @since 0.1.0
       def initialize(env)
         @env = env
-        super(_compute_params)
-        # freeze
+        super(_extract_params)
+        @result = validate
+        @params = _params
+        freeze
       end
 
-      # Returns the object associated with the given key
+      # Returns raw params from Rack env
       #
-      # @param key [Symbol] the key
+      # @return [Hash]
       #
-      # @return [Object,nil] return the associated object, if found
-      #
-      # @since 0.2.0
-      def [](key)
-        @attributes.get(key)
+      # @since 0.3.2
+      def raw
+        @input
       end
 
-      # Get an attribute value associated with the given key.
-      # Nested attributes are reached with a dot notation.
+      # Returns structured error messages
       #
-      # @param key [String] the key
+      # @return [Hash]
       #
-      # @return [Object,NilClass] return the associated value, if found
-      #
-      # @since 0.4.0
+      # @since 0.7.0
       #
       # @example
-      #   require 'hanami/controller'
-      #
-      #   module Deliveries
-      #     class Create
-      #       include Hanami::Action
-      #
-      #       params do
-      #         param :customer_name
-      #         param :address do
-      #           param :city
-      #         end
-      #       end
+      #   params.errors
+      #     # => {:email=>["is missing", "is in invalid format"], :name=>["is missing"], :tos=>["is missing"], :age=>["is missing"], :address=>["is missing"]}
+      def errors
+        @result.messages
+      end
+
+      # Returns flat collection of full error messages
       #
-      #       def call(params)
-      #         params.get('customer_name')   # => "Luca"
-      #         params.get('uknown')          # => nil
+      # @return [Array]
       #
-      #         params.get('address.city')    # => "Rome"
-      #         params.get('address.unknown') # => nil
+      # @since 0.7.0
       #
-      #         params.get(nil)               # => nil
-      #       end
-      #     end
-      #   end
-      def get(key)
-        key, *keys = key.to_s.split(GET_SEPARATOR)
-        result     = self[key]
+      # @example
+      #   params.error_messages
+      #     # => ["Email is missing", "Email is in invalid format", "Name is missing", "Tos is missing", "Age is missing", "Address is missing"]
+      def error_messages(error_set = errors)
+        error_set.each_with_object([]) do |(key, messages), result|
+          k = Utils::String.new(key).titleize
+
+          _messages = if messages.is_a?(Hash)
+            error_messages(messages)
+          else
+            messages.map { |message| "#{k} #{message}" }
+          end
 
-        Array(keys).each do |k|
-          break if result.nil?
-          result = result[k]
+          result.concat(_messages)
         end
+      end
 
-        result
+      def valid?
+        @result.success?
       end
 
       # Serialize params to Hash
@@ -215,70 +100,37 @@ module Hanami
       #
       # @since 0.3.0
       def to_h
-        @attributes.to_h
+        @params
       end
       alias_method :to_hash, :to_h
 
-      # Assign CSRF Token.
-      # This method is here for compatibility with <tt>Hanami::Validations</tt>.
-      #
-      # NOTE: When we will not support indifferent access anymore, we can probably
-      # remove this method.
-      #
-      # @since 0.4.4
-      # @api private
-      def _csrf_token=(value)
-        @attributes.set(CSRF_TOKEN, value)
-      end
-
       private
-      # @since 0.3.1
-      # @api private
-      def _compute_params
-        if self.class.whitelisting?
-          _whitelisted_params
-        else
-          @attributes = _raw
-        end
-      end
 
-      # @since 0.3.2
+      # @since 0.7.0
       # @api private
-      def _raw
-        @raw ||= Utils::Attributes.new(_params)
+      def _extract_params
+        # FIXME: this is required for dry-v whitelisting
+        stringify!(super)
       end
 
-      # @since 0.3.1
-      # @api private
       def _params
-        {}.tap do |result|
-          if env.has_key?(RACK_INPUT)
-            result.merge! ::Rack::Request.new(env).params
-            result.merge! env.fetch(ROUTER_PARAMS, {})
-          else
-            result.merge! env.fetch(ROUTER_PARAMS, env)
-          end
-        end
+        @result.output.merge(_router_params)
       end
 
-      # @since 0.3.1
-      # @api private
-      def _whitelisted_params
-        {}.tap do |result|
-          _raw.to_h.each do |k, v|
-            next unless assign_attribute?(k)
-
-            result[k] = v
-          end
+      def stringify!(result)
+        result.keys.each do |key|
+          value = result.delete(key)
+          result[key.to_s] = case value
+                             when ::Hash
+                               stringify!(value)
+                             when ::Array
+                               value.map(&:to_s)
+                             else
+                               value.to_s
+                             end
         end
-      end
 
-      # Override <tt>Hanami::Validations</tt> method
-      #
-      # @since 0.4.4
-      # @api private
-      def assign_attribute?(key)
-        DEFAULT_PARAMS[key.to_s] || super
+        result
       end
     end
   end

data/lib/hanami/action/rack.rb

@@ -1,5 +1,6 @@
 require 'securerandom'
 require 'hanami/action/request'
+require 'hanami/action/base_params'
 require 'hanami/action/rack/callable'
 require 'hanami/action/rack/file'
 
@@ -51,7 +52,10 @@ module Hanami
       #
       # @see http://www.ruby-doc.org/core-2.1.2/Module.html#method-i-included
       def self.included(base)
-        base.extend ClassMethods
+        base.class_eval do
+          extend ClassMethods
+          prepend InstanceMethods
+        end
       end
 
       module ClassMethods
@@ -66,6 +70,7 @@ module Hanami
             rack_builder
           end
         end
+
         # Use a Rack middleware
         #
         # The middleware will be used as it is.
@@ -98,6 +103,32 @@ module Hanami
         def use(middleware, *args, &block)
           rack_builder.use middleware, *args, &block
         end
+
+        # Returns the class which defines the params
+        #
+        # Returns the class which has been provided to define the
+        # params. By default this will be Hanami::Action::Params.
+        #
+        # @return [Class] A params class (when whitelisted) or
+        #   Hanami::Action::Params
+        #
+        # @api private
+        # @since 0.7.0
+        def params_class
+          @params_class ||= BaseParams
+        end
+      end
+
+      # @since 0.7.0
+      # @api private
+      module InstanceMethods
+        # @since 0.7.0
+        # @api private
+        def initialize(*)
+          super
+          @_status = nil
+          @_body   = nil
+        end
       end
 
       protected

data/lib/hanami/action/session.rb

@@ -61,6 +61,18 @@ module Hanami
         @_env[SESSION_KEY] ||= {}
       end
 
+      # Read errors from flash or delegate to the superclass
+      #
+      # @return [Hanami::Validations::Errors] A collection of validation errors
+      #
+      # @since 0.3.0
+      #
+      # @see Hanami::Action::Validatable
+      # @see Hanami::Action::Session#flash
+      def errors
+        flash[ERRORS_KEY] || params.respond_to?(:errors) && params.errors
+      end
+
       private
 
       # Container useful to transport data with the HTTP session
@@ -120,21 +132,11 @@ module Hanami
       #   # The validation errors caused by Comments::Create are available
       #   # **after the redirect** in the context of Comments::Index.
       def redirect_to(*args)
-        flash[ERRORS_KEY] = errors.to_a unless params.valid?
-        super
-      end
+        if params.respond_to?(:valid?)
+          flash[ERRORS_KEY] = errors.to_a unless params.valid?
+        end
 
-      # Read errors from flash or delegate to the superclass
-      #
-      # @return [Hanami::Validations::Errors] A collection of validation errors
-      #
-      # @since 0.3.0
-      # @api private
-      #
-      # @see Hanami::Action::Validatable
-      # @see Hanami::Action::Session#flash
-      def errors
-        flash[ERRORS_KEY] || super
+        super
       end
 
       # Finalize the response

data/lib/hanami/action/validatable.rb

@@ -1,17 +1,16 @@
+require 'hanami/action/params'
+
 module Hanami
   module Action
     module Validatable
-      # Defines the class name for anoymous params
+      # Defines the class name for anonymous params
       #
       # @api private
       # @since 0.3.0
       PARAMS_CLASS_NAME = 'Params'.freeze
 
       def self.included(base)
-        base.class_eval do
-          extend ClassMethods
-          expose :params, :errors
-        end
+        base.extend ClassMethods
       end
 
       # Validatable API class methods
@@ -93,36 +92,14 @@ module Hanami
         #     end
         #   end
         def params(klass = nil, &blk)
-          if block_given?
-            @params_class = const_set(PARAMS_CLASS_NAME,
-                                      Class.new(Params, &blk))
-          else
-            @params_class = klass
+          if klass.nil?
+            klass = const_set(PARAMS_CLASS_NAME, Class.new(Params))
+            klass.class_eval { params(&blk) }
           end
-        end
 
-        # Returns the class which defines the params
-        #
-        # Returns the class which has been provided to define the
-        # params. By default this will be Hanami::Action::Params.
-        #
-        # @return [Class] A params class (when whitelisted) or
-        #   Hanami::Action::Params
-        #
-        # @api private
-        # @since 0.3.0
-        def params_class
-          @params_class ||= params { }
+          @params_class = klass
         end
-
       end
     end
-
-    # Expose validation errors
-    #
-    # @since 0.3.0
-    def errors
-      params.errors
-    end
   end
 end

data/lib/hanami/controller/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hanami-controller
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.7.0
 platform: ruby
 authors:
 - Luca Guidi
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-05 00:00:00.000000000 Z
+date: 2016-07-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -38,28 +38,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '0.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.7'
-- !ruby/object:Gem::Dependency
-  name: hanami-validations
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.5'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '0.8'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -74,20 +60,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.6'
-- !ruby/object:Gem::Dependency
-  name: minitest
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '5'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '5'
 - !ruby/object:Gem::Dependency
   name: rack-test
   requirement: !ruby/object:Gem::Requirement
@@ -108,14 +80,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10'
+        version: '11'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10'
+        version: '11'
 description: Complete, fast and testable actions for Rack
 email:
 - me@lucaguidi.com
@@ -131,6 +103,7 @@ files:
 - hanami-controller.gemspec
 - lib/hanami-controller.rb
 - lib/hanami/action.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
@@ -172,7 +145,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.0.0
+      version: 2.2.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -180,9 +153,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.4
 signing_key: 
 specification_version: 4
 summary: Complete, fast and testable actions for Rack and Hanami
 test_files: []
-has_rdoc: