Merge pull request #1380 from renich/fix-accept-header-negotiation

Correctly parse and match HTTP Accept header parameters

Author: crimson-knight

spec/amber/controller/respond_with_spec.cr

@@ -152,6 +152,16 @@ module Amber::Controller
           context.response.headers["Content-Type"].should eq "application/json; charset=utf-8"
           context.response.status_code.should eq 403
         end
+
+        it "responds with json for complex Accept header with parameters" do
+          context.response.status_code = 200
+          expected_result = %({"type":"json","name":"Amberator"})
+          context.request.headers["Accept"] = "application/json; charset=utf-8, text/javascript, */*; q=0.0"
+          context.request.path = "/response/1"
+          ResponsesController.new(context).index.should eq expected_result
+          context.response.headers["Content-Type"].should eq "application/json; charset=utf-8"
+          context.response.status_code.should eq 200
+        end
       end
 
       describe "#proc input" do

src/amber/controller/helpers/responders.cr

@@ -65,7 +65,7 @@ module Amber::Controller::Helpers
         if @requested_responses.size != 1 || @requested_responses.includes?("*/*")
           @requested_responses << @available_responses.keys.first
         end
-        
+
         result = @requested_responses.find do |resp|
           @available_responses.keys.find { |r| r.includes?(resp) }
         end
@@ -96,8 +96,10 @@ module Amber::Controller::Helpers
     private def accepts_request_type
       accept = context.request.headers["Accept"]?
       if accept && !accept.empty?
-        accepts = accept.split(";").first?.try(&.split(Content::ACCEPT_SEPARATOR_REGEX))
-        return accepts if !accepts.nil? && !accepts.empty?
+        accepts = accept.split(Content::ACCEPT_SEPARATOR_REGEX).map do |part|
+          part.split(";").first.strip
+        end.reject(&.empty?)
+        return accepts unless accepts.empty?
       end
     end