apill 3.1.2 → 3.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3fa791e44bdfd3bfb19922debfcd161d62d7ce98
-  data.tar.gz: 58b303379f9ebf84ad8dc93584967abef46da482
+  metadata.gz: d4626664836143aaf78bf2b5b3484ba7da329a7d
+  data.tar.gz: 70758012561218a831754e3a6f85678f92da35c7
 SHA512:
-  metadata.gz: b914237f554c1a02846e2fbcd0c3b563b9614d53a3d3f92835e09578567083340d608afcb7a122da6bd570b9daf22c4bfb064b12f73eb9735d6f35463d45766b
-  data.tar.gz: a7c5cf857dc8a32d617e6cea906135c9995fd726aa37d0ce04f16d0c67f38da9cbf7ddb4203b788e57624a425e991e18cc5fc70bb212b049b5f40a92c51fdc4c
+  metadata.gz: e4fe0941c2ce6d10a1cf60950bd4742a78a6cb3fd3f5a17701932b1b35ec95c177637eddcd9caf75a0ad19ff872252266dda004c028d7cc254d2d247bd3b7c50
+  data.tar.gz: d021d2ebc2314c817889df412c77fa2718433b4f314a6066a6a74b503620f8512e0e99f31c767d03fbfb7e4d83750f379391d09c1519df392d7efe2d156d5ef9

data/lib/apill/middleware/api_request.rb

@@ -8,6 +8,8 @@ require 'apill/responses/invalid_subdomain_response'
 module  Apill
 module  Middleware
 class   ApiRequest
+  JSON_API_MIME_TYPE_PATTERN = %r{application/vnd\.api\+json(?=\z|;)}
+
   def initialize(app)
     @app = app
   end
@@ -22,10 +24,10 @@ class   ApiRequest
           Matchers::AcceptHeaderMatcher.new.matches?(env)
 
         env['QUERY_STRING'] = Parameters.process(env['QUERY_STRING'])
-
-        if env['CONTENT_TYPE'] == 'application/vnd.api+json'
-          env['CONTENT_TYPE'] = 'application/json'
-        end
+        env['CONTENT_TYPE'] = env['CONTENT_TYPE'].
+                              to_s.
+                              gsub! JSON_API_MIME_TYPE_PATTERN,
+                                    'application/json'
 
         @app.call(env)
       else

data/lib/apill/version.rb

@@ -1,3 +1,3 @@
 module Apill
-  VERSION = '3.1.2'
+  VERSION = '3.1.3'
 end

data/spec/apill/middleware/api_request_spec.rb

@@ -143,6 +143,42 @@ describe  ApiRequest, singletons: HumanError::Configuration do
                                            'nice_to_meet=you-bob&'  \
                                            'hows_the_weather=today-bob'
   end
+
+  it 'properly converts the content type for Rails when it is the only one' do
+    api_request_middleware = ApiRequest.new(app)
+
+    request = {
+      'CONTENT_TYPE' => 'application/vnd.api+json',
+      'HTTP_HOST'    => 'matrix.example.com',
+      'HTTP_ACCEPT'  => '',
+      'QUERY_STRING' => '',
+    }
+
+    allow(app).to receive(:call)
+
+    _response = api_request_middleware.call(request)
+
+    expect(app).to have_received(:call).
+                   with(a_hash_including('CONTENT_TYPE' => 'application/json'))
+  end
+
+  it 'properly converts the content type for Rails when it is not the only one' do
+    api_request_middleware = ApiRequest.new(app)
+
+    request = {
+      'CONTENT_TYPE' => 'application/vnd.api+json;other',
+      'HTTP_HOST'    => 'matrix.example.com',
+      'HTTP_ACCEPT'  => '',
+      'QUERY_STRING' => '',
+    }
+
+    allow(app).to receive(:call)
+
+    _response = api_request_middleware.call(request)
+
+    expect(app).to have_received(:call).
+                   with(a_hash_including('CONTENT_TYPE' => 'application/json;other'))
+  end
 end
 end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: apill
 version: !ruby/object:Gem::Version
-  version: 3.1.2
+  version: 3.1.3
 platform: ruby
 authors:
 - jfelchner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-22 00:00:00.000000000 Z
+date: 2015-10-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: human_error
@@ -147,3 +147,4 @@ test_files:
 - spec/apill/resource/processors/indexing_spec.rb
 - spec/apill/resource/processors/paging_spec.rb
 - spec/apill/resource/processors/sorting_spec.rb
+has_rdoc: