grape-middleware-logger 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bdd1d91790c08e781a650d7a86940ff36b134b34
-  data.tar.gz: 5ba7043cfc03c3f7f895069ae3d1c63d3a89e6ef
+  metadata.gz: ef676f453ae5872cc3267134ec2e74ca58d16438
+  data.tar.gz: 36a9bd808bcd222b54c6634abe9946c867473451
 SHA512:
-  metadata.gz: ee6e3ed6f1f736358989522e1fe4f0ef66e60d2d35a30c5ae54eb073738db8ef1868b07ef76f6b583a9c36268946f4fc576d11709c81dc46d05aee5dde78a0f4
-  data.tar.gz: b365b76db8fcdbbf47f1cf871501bfc7f160d24747bc581bdae2651c13cc6befce54a9d55733cf129bbca32a9f0ab2628a754bfa9afed12b04e913a36c9303d1
+  metadata.gz: 28469e0366ee321b7578e3f739cc02b000c5f80edd3933a5ce53f2283ee9eb1856a7947051652f7221332a6a15ce69a50fdc66881fb2bac697d1a06cc7395693
+  data.tar.gz: 884e76d28eecbd5dd5ba39e44e24ef1bc43e3b85de597f894a030041e0eeeccaa2c435d81598667926e0447a2afd361bcbb6e91f573a62a18c257f27a76bd358

data/lib/grape/middleware/logger.rb

@@ -31,7 +31,13 @@ class Grape::Middleware::Logger < Grape::Middleware::Globals
       after_failure(error)
       throw(:error, error)
     else
-      after(@app_response.status)
+      # Usually a rack response object is returned: https://github.com/ruby-grape/grape/blob/master/UPGRADING.md#changes-in-middleware
+      # However, rack/auth/abstract/handler.rb still returns an array instead of a rack response object.
+      if @app_response.is_a?(Array)
+        after(@app_response[0])
+      else
+        after(@app_response.status)
+      end
     end
     @app_response
   end

data/lib/grape/middleware/logger/version.rb

@@ -1,7 +1,7 @@
 module Grape
   module Middleware
     class Logger
-      VERSION = '1.1.0'
+      VERSION = '1.1.1'
     end
   end
 end

data/spec/lib/grape/middleware/logger_spec.rb

@@ -49,6 +49,24 @@ describe Grape::Middleware::Logger do
         expect(subject.call!(env)).to eq app_response
       end
     end
+
+    context 'when calling the app results in an array response' do
+      let(:app_response_array) { [401, {}, []] }
+
+      it 'calls +after+ with the correct status' do
+        expect(app).to receive(:call).with(env).and_return(app_response_array)
+        expect(subject).to receive(:before)
+        expect(subject).to receive(:after).with(401)
+        subject.call!(env)
+      end
+
+      it 'returns the @app_response' do
+        expect(app).to receive(:call).with(env).and_return(app_response_array)
+        allow(subject).to receive(:before)
+        allow(subject).to receive(:after)
+        expect(subject.call!(env)).to eq app_response_array
+      end
+    end
   end
 
   describe '#after_failure' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: grape-middleware-logger
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Ryan Buckley
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-23 00:00:00.000000000 Z
+date: 2015-11-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: grape