Merge pull request #804 from iosadchii/fix-media-type-matching

Fix media type matching

Author: lgebhardt

lib/jsonapi/acts_as_resource_controller.rb

@@ -2,7 +2,7 @@
 
 module JSONAPI
   module ActsAsResourceController
-    MEDIA_TYPE_MATCHER = /(.+".+"[^,]*|[^,]+)/
+    MEDIA_TYPE_MATCHER = /.+".+"[^,]*|[^,]+/
     ALL_MEDIA_TYPES = '*/*'
 
     def self.included(base)
@@ -169,7 +169,7 @@ def valid_accept_media_type?
 
     def media_types_for(header)
       (request.headers[header] || '')
-        .match(MEDIA_TYPE_MATCHER)
+        .scan(MEDIA_TYPE_MATCHER)
         .to_a
         .map(&:strip)
     end

test/integration/requests/request_test.rb

@@ -93,6 +93,14 @@ def test_get_camelized_route_and_links
     JSONAPI.configuration = original_config
   end
 
+  def test_get_accepting_multiple_content_types
+    get '/posts', headers:
+      {
+        'Accept' => "application/json, #{JSONAPI::MEDIA_TYPE}, */*"
+      }
+    assert_equal 200, status
+  end
+
   def test_put_single_without_content_type
     put '/posts/3', params:
       {