hanami-controller 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4597e54bfdd73cec8513d4eaa87e44a3c4b60639
-  data.tar.gz: 2c0198763912801b11209c23fb92a5e5d61d4364
+  metadata.gz: 515508087dbc6e4c68bcb8deb1dea2afaef25717
+  data.tar.gz: cc6fdaa0c425ca9391c8951e60637d1c15cd1982
 SHA512:
-  metadata.gz: 47cae71662655adfaae7df0d1f15b8e108a3f55c2e4e13e5663b201d1c9541e6ca4495fd30b44d1f79a33186a2b186bdad1e2fc758b87a17089a98d66ff1a870
-  data.tar.gz: 1d106a2a12d884f6a96e33a12a922909cfc17b4430caec78ca351b3248d8cfa7a293884f5004dc90208db30797b8a2857cc4a82e758b147b1378983e4c330871
+  metadata.gz: 0ce65d579990a9e4295a1f5906d927f80911358331e49545188860b72f783f26841628c5466b57c74d1d028f9fac0ec9b905b91ef67abc8df812d36b21277773
+  data.tar.gz: 7c3cbcfd5066a33489c20c391124b806b5e3275c851d2268cc495451c22d76bf673291b8fe372b18ef1928c1842e50e16465452ba38d5d8046e6e76e55673480

data/CHANGELOG.md

@@ -1,6 +1,11 @@
 # Hanami::Controller
 Complete, fast and testable actions for Rack
 
+## v1.0.1 - 2017-07-10
+### Fixed
+- [Marcello Rocha] Ensure validation params to be symbolized in all the environments
+- [Marcello Rocha] Fix regression (`1.0.0`) about MIME type priority, during the evaluation of a weighted `Accept` HTTP header
+
 ## v1.0.0 - 2017-04-06
 
 ## v1.0.0.rc1 - 2017-03-31

data/hanami-controller.gemspec

@@ -15,7 +15,7 @@ Gem::Specification.new do |spec|
 
   spec.files         = `git ls-files -- lib/* CHANGELOG.md LICENSE.md README.md hanami-controller.gemspec`.split($/)
   spec.executables   = []
-  spec.test_files    = spec.files.grep(%r{^(test)/})
+  spec.test_files    = spec.files.grep(%r{^(spec)/})
   spec.require_paths = ['lib']
   spec.required_ruby_version = '>= 2.3.0'
 
@@ -25,4 +25,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'bundler',   '~> 1.6'
   spec.add_development_dependency 'rack-test', '~> 0.6'
   spec.add_development_dependency 'rake',      '~> 11'
+  spec.add_development_dependency 'rspec',     '~> 3.5'
 end

data/lib/hanami/action/mime.rb

@@ -265,13 +265,8 @@ module Hanami
       #   end
       def 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
+        @content_type = content_type_from_accept_header if accept_header?
+        @content_type || default_response_type || default_content_type || DEFAULT_CONTENT_TYPE
       end
 
       # Action charset setter, receives new charset value
@@ -565,33 +560,61 @@ module Hanami
       # @see https://github.com/rack/rack/pull/659
       # @see https://github.com/hanami/controller/issues/59
       # @see https://github.com/hanami/controller/issues/104
+      # @see https://github.com/hanami/controller/issues/275
       def best_q_match(q_value_header, available_mimes)
-        values = ::Rack::Utils.q_values(q_value_header)
-        values = values.map do |req_mime, quality|
-          if req_mime == DEFAULT_ACCEPT
-            # See https://github.com/hanami/controller/issues/167
-            match = default_content_type
-          else
-            match = available_mimes.find { |am| ::Rack::Mime.match?(am, req_mime) }
-          end
+        ::Rack::Utils.q_values(q_value_header).each_with_index.map do |(req_mime, quality), index|
+          match = available_mimes.find { |am| ::Rack::Mime.match?(am, req_mime) }
           next unless match
-          [match, quality]
-        end.compact
-
-        if Hanami::Utils.jruby?
-          # See https://github.com/hanami/controller/issues/59
-          # See https://github.com/hanami/controller/issues/104
-          values.reverse!
-        else
-          # See https://github.com/jruby/jruby/issues/3004
-          values.sort!
+          RequestMimeWeight.new(req_mime, quality, index, match)
+        end.compact.max&.format
+      end
+
+      # @since 1.0.1
+      # @api private
+      class RequestMimeWeight
+        include Comparable
+
+        # @since 1.0.1
+        # @api private
+        attr_reader :quality
+
+        # @since 1.0.1
+        # @api private
+        attr_reader :index
+
+        # @since 1.0.1
+        # @api private
+        attr_reader :mime
+
+        # @since 1.0.1
+        # @api private
+        attr_reader :format
+
+        # @since 1.0.1
+        # @api private
+        attr_reader :priority
+
+        # @since 1.0.1
+        # @api private
+        def initialize(mime, quality, index, format = mime)
+          @quality, @index, @format = quality, index, format
+          calculate_priority(mime)
         end
 
-        value = values.sort_by do |match, quality|
-          (match.split('/'.freeze, 2).count('*'.freeze) * -10) + quality
-        end.last
+        # @since 1.0.1
+        # @api private
+        def <=>(other)
+          return priority <=> other.priority unless priority == other.priority
+          other.index <=> index
+        end
+
+        private
 
-        value.first if value
+        # @since 1.0.1
+        # @api private
+        def calculate_priority(mime)
+          @priority ||= (mime.split('/'.freeze, 2).count('*'.freeze) * -10) + quality
+        end
       end
     end
   end

data/lib/hanami/action/params.rb

@@ -146,7 +146,7 @@ module Hanami
 
       # @api private
       def _params
-        @result.output.merge(_router_params)
+        _router_params.merge(@result.output)
       end
     end
   end

data/lib/hanami/controller/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hanami-controller
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Luca Guidi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-06 00:00:00.000000000 Z
+date: 2017-07-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -80,6 +80,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '11'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.5'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.5'
 description: Complete, fast and testable actions for Rack
 email:
 - me@lucaguidi.com