hanami-controller 0.7.1 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 19ed324ba067df9dae1f836edc8232f5ab9ec658
-  data.tar.gz: 83d999e3d478d6b5048da0f57bc6ce9e4a3bd42e
+  metadata.gz: f54bdf6d87a22221ce3dae2d7c17ceb8b8097fcc
+  data.tar.gz: 1a7108c3fcb857a3a6f5a84055f25afb144b65af
 SHA512:
-  metadata.gz: 4df22338de1f7d4ec7fc609327917a905db7939f28dbb2113d54e1bc2394b6877bccecd94aba0047e3a745a8098a6341e9afc7fbd36a81b1cd56d2a494685140
-  data.tar.gz: dcb8ffe55c81813c9bd976a04cc840811b9ee0993f46ad76282d8e1f27eb58d9c069807c5f900afffacb9767d0ac900b55c2a49c0955c0c19a1a93e71488d300
+  metadata.gz: 41cebc4b699df51ee187a0423ae9b062299cc374f24e0511defe3ec869aab0833b04044e10aacb0b7b96ff9416b7e975e99576b1d8afd4cef535f7047d5e2f4a
+  data.tar.gz: d852c7b7c2a3de1f9fdeb2b6a21d034bed9d61efdb0e1187a38e16a2addba194a40094c31f578d0674b6b1dd30a194b2c7e33e2ffd24fa45a58e8349de4c0675

data/CHANGELOG.md

@@ -1,6 +1,17 @@
 # Hanami::Controller
 Complete, fast and testable actions for Rack
 
+## v0.8.0 - 2016-11-15
+### Added
+- [Marion Duprey] Allow `BaseParams#get` to read (nested) arrays
+
+### Fixed
+- [Russell Cloak] Respect custom formats when referenced by HTTP `Accept`
+- [Kyle Chong] Don't symbolize raw params
+
+### Changed
+- [Luca Guidi] Let `BaseParams#get` to accept a list of keys (symbols) instead of string with dot notation (`params.get(:customer, :address, :city)` instead of `params.get('customer.address.city')`)
+
 ## v0.7.1 - 2016-10-06
 ### Added
 - [Kyle Chong] Introduced `parsed_request_body` for action

data/README.md

@@ -22,7 +22,7 @@ Complete, fast and testable actions for Rack and [Hanami](http://hanamirb.org)
 
 ## Rubies
 
-__Hanami::Controller__ supports Ruby (MRI) 2.2+
+__Hanami::Controller__ supports Ruby (MRI) 2.3+ and JRuby 9.1.5.0+
 
 ## Installation
 

data/hanami-controller.gemspec

@@ -17,10 +17,10 @@ Gem::Specification.new do |spec|
   spec.executables   = []
   spec.test_files    = spec.files.grep(%r{^(test)/})
   spec.require_paths = ['lib']
-  spec.required_ruby_version = '>= 2.2.0'
+  spec.required_ruby_version = '>= 2.3.0'
 
   spec.add_dependency 'rack',         '~> 1.6', '>= 1.6.2'
-  spec.add_dependency 'hanami-utils', '~> 0.8'
+  spec.add_dependency 'hanami-utils', '~> 0.9'
 
   spec.add_development_dependency 'bundler',   '~> 1.6'
   spec.add_development_dependency 'rack-test', '~> 0.6'

data/lib/hanami/action/base_params.rb

@@ -15,14 +15,6 @@ module Hanami
       # @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
@@ -45,7 +37,7 @@ module Hanami
       def initialize(env)
         @env    = env
         @raw    = _extract_params
-        @params = Utils::Hash.new(@raw).symbolize!.to_h
+        @params = Utils::Hash.new(@raw).deep_dup.symbolize!.to_h
         freeze
       end
 
@@ -61,14 +53,12 @@ module Hanami
       end
 
       # Get an attribute value associated with the given key.
-      # Nested attributes are reached with a dot notation.
+      # Nested attributes are reached by listing all the keys to get to the value.
       #
-      # @param key [String] the key
+      # @param keys [Array<Symbol,Integer>] the key
       #
       # @return [Object,NilClass] return the associated value, if found
       #
-      # @raise [NoMethodError] if key is nil
-      #
       # @since 0.7.0
       #
       # @example
@@ -79,30 +69,30 @@ module Hanami
       #       include Hanami::Action
       #
       #       def call(params)
-      #         params.get('customer_name')   # => "Luca"
-      #         params.get('uknown')          # => nil
+      #         params.get(:customer_name)     # => "Luca"
+      #         params.get(:uknown)            # => nil
       #
-      #         params.get('address.city')    # => "Rome"
-      #         params.get('address.unknown') # => nil
+      #         params.get(:address, :city)    # => "Rome"
+      #         params.get(:address, :unknown) # => nil
       #
-      #         params.get(nil)               # => nil
+      #         params.get(:tags, 0)           # => "foo"
+      #         params.get(:tags, 1)           # => "bar"
+      #         params.get(:tags, 999)         # => 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
+      def get(*keys)
+        @params.dig(*keys)
       end
 
+      # This is for compatibility with Hanami::Helpers::FormHelper::Values
+      #
+      # @api private
+      # @since 0.8.0
+      alias dig get
+
       # Provide a common interface with Params
       #
       # @return [TrueClass] always returns true

data/lib/hanami/action/mime.rb

@@ -41,12 +41,6 @@ module Hanami
       # @api private
       DEFAULT_CHARSET = 'utf-8'.freeze
 
-      # The default mime types list
-      #
-      # @since 0.6.1
-      # @api private
-      MIME_TYPES = ::Rack::Mime::MIME_TYPES.values.freeze
-
       # Override Ruby's hook for modules.
       # It includes Mime types logic
       #
@@ -180,9 +174,11 @@ module Hanami
       # The content type that will be automatically set in the response.
       #
       # It prefers, in order:
-      #   * Explicit set value (see #format=)
-      #   * Weighted value from Accept
-      #   * Default content type
+      #   * Explicit set value (see Hanami::Action::Mime#format=)
+      #   * Weighted value from Accept header based on all known MIME Types:
+      #     - Custom registered MIME Types (see Hanami::Controller::Configuration#format)
+      #   * Configured default content type (see Hanami::Controller::Configuration#default_response_format)
+      #   * Hard-coded default content type (see Hanami::Action::Mime::DEFAULT_CONTENT_TYPE)
       #
       # To override the value, use <tt>#format=</tt>
       #
@@ -194,6 +190,8 @@ module Hanami
       # @see Hanami::Configuration#default_request_format
       # @see Hanami::Action::Mime#default_content_type
       # @see Hanami::Action::Mime#DEFAULT_CONTENT_TYPE
+      # @see Hanami::Controller::Configuration#format
+      # @see Hanami::Controller::Configuration#default_response_format
       #
       # @example
       #   require 'hanami/controller'
@@ -207,7 +205,14 @@ module Hanami
       #     end
       #   end
       def content_type
-        @content_type || default_response_type || accepts || default_content_type || DEFAULT_CONTENT_TYPE
+        return @content_type unless @content_type.nil?
+
+        if accept_header?
+          type = content_type_from_accept_header
+          return type if type
+        end
+
+        default_response_type || default_content_type || DEFAULT_CONTENT_TYPE
       end
 
       # Action charset setter, receives new charset value
@@ -427,20 +432,37 @@ module Hanami
         end
       end
 
-      private
-
       # @since 0.1.0
       # @api private
       def accept
         @accept ||= @_env[HTTP_ACCEPT] || DEFAULT_ACCEPT
       end
 
-      # @since 0.1.0
+      # Checks if there is an Accept header for the current request.
+      #
+      # @return [TrueClass,FalseClass] the result of the check
+      #
+      # @since 0.8.0
       # @api private
-      def accepts
-        unless accept == DEFAULT_ACCEPT
-          best_q_match(accept, MIME_TYPES)
-        end
+      def accept_header?
+        accept != DEFAULT_ACCEPT
+      end
+
+      # Look at the Accept header for the current request and see if it
+      # matches any of the common MIME types (see Hanami::Action::Mime#MIME_TYPES)
+      # or the custom registered ones (see Hanami::Controller::Configuration#format).
+      #
+      # @return [String,Nil] The matched MIME type for the given Accept header.
+      #
+      # @since 0.8.0
+      # @api private
+      #
+      # @see Hanami::Action::Mime#MIME_TYPES
+      # @see Hanami::Controller::Configuration#format
+      #
+      # @api private
+      def content_type_from_accept_header
+        best_q_match(accept, configuration.mime_types)
       end
 
       # @since 0.5.0

data/lib/hanami/controller/configuration.rb

@@ -402,8 +402,22 @@ module Hanami
       def format(hash)
         symbol, mime_type = *Utils::Kernel.Array(hash)
 
-        @formats.merge! Utils::Kernel.String(mime_type) =>
-          Utils::Kernel.Symbol(symbol)
+        @formats[Utils::Kernel.String(mime_type)] = Utils::Kernel.Symbol(symbol)
+        @mime_types = nil
+      end
+
+      # Return the configured format's MIME types
+      #
+      # @since 0.8.0
+      # @api private
+      #
+      # @see Hanami::Controller::Configuration#format
+      # @see Hanami::Action::Mime::MIME_TYPES
+      def mime_types
+        @mime_types ||= begin
+                          ((@formats.keys - DEFAULT_FORMATS.keys) +
+                          ::Rack::Mime::MIME_TYPES.values).freeze
+                        end
       end
 
       # Set a format as default fallback for all the requests without a strict
@@ -650,6 +664,7 @@ module Hanami
         @handled_exceptions      = {}
         @modules                 = []
         @formats                 = DEFAULT_FORMATS.dup
+        @mime_types              = nil
         @default_request_format  = nil
         @default_response_format = nil
         @default_charset         = nil

data/lib/hanami/controller/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hanami-controller
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.8.0
 platform: ruby
 authors:
 - Luca Guidi
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-06 00:00:00.000000000 Z
+date: 2016-11-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -38,14 +38,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '0.9'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '0.9'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -146,7 +146,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.2.0
+      version: 2.3.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="