grape-middleware-logger 1.2.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f63142a0d4492b945ce6c7b7e18cab18c01778e9
-  data.tar.gz: 227a402abcf2efeb5cef60db3c1b028e56d06d1a
+  metadata.gz: 037217ed02fd0f73c8438b8c488cb52958ce78ed
+  data.tar.gz: ed4e59b2e754b3e495c96a35e3463db8a19f0876
 SHA512:
-  metadata.gz: 6c700fbdf6193b19d5c18efe2373dd7b9d94dd964ab737405a568946a40916b03b7c3182a92abfdb951805926f1927c0b0f066fed2e1291d0b277c7c9b16153a
-  data.tar.gz: 82426e4a718cd35b84457831ef2dc4aa0b5545ac4d540749da97583432074950ce0af7da52ff09bc846f02ef5007f8538f8c424e003334a8fa3175cd0c5131ac
+  metadata.gz: 9a37f8ba7c40f25201a6102b2d63ca040ff4ace3ce77460b96b1ef8f2fbf743014e90f9d3014e10cf4f7d6d521e5fc8095991fabaef6243205ade1cb849d26f8
+  data.tar.gz: 85df55e6c2f0581a3b56755f9088f55f6ef1cab952f9a2327fe1e88b62e8c80981f0e1114b0c523dbeb62332be1bee4dd0a06f2f2bbfa8372abcb6cac841ba6a

data/.travis.yml

@@ -0,0 +1,7 @@
+language: ruby
+rvm:
+  - 1.9.3
+  - 2.2.1
+  - 2.2.2
+  - 2.2.3
+before_install: gem install bundler -v 1.10.5

data/Gemfile

@@ -2,3 +2,7 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in grape-middleware-logger.gemspec
 gemspec
+
+group :test do
+  gem 'rake'
+end

data/README.md

@@ -1,5 +1,6 @@
 # Grape::Middleware::Logger
 [![Code Climate](https://codeclimate.com/github/ridiculous/grape-middleware-logger/badges/gpa.svg)](https://codeclimate.com/github/ridiculous/grape-middleware-logger) [![Gem Version](https://badge.fury.io/rb/grape-middleware-logger.svg)](http://badge.fury.io/rb/grape-middleware-logger)
+[![Build Status](https://travis-ci.org/ridiculous/grape-middleware-logger.svg)](https://travis-ci.org/ridiculous/grape-middleware-logger)
 
 Simple logger for Grape apps. Logs request path, parameters, status and time taken. Also logs exceptions and error responses (thrown by `error!`).
 

data/Rakefile

@@ -1,7 +1,3 @@
 require 'rspec/core/rake_task'
-RSpec::Core::RakeTask.new(:spec) do |spec|
-  spec.pattern = 'spec/**/*_spec.rb'
-end
-
-desc 'Run specs'
+RSpec::Core::RakeTask.new(:spec)
 task default: :spec

data/grape-middleware-logger.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |spec|
   spec.name          = 'grape-middleware-logger'
-  spec.version       = '1.2.0'
+  spec.version       = '1.2.1'
   spec.platform      = Gem::Platform::RUBY
   spec.authors       = ['Ryan Buckley']
   spec.email         = ['arebuckley@gmail.com']

data/lib/grape/middleware/logger.rb

@@ -2,6 +2,15 @@ require 'logger'
 require 'grape'
 
 class Grape::Middleware::Logger < Grape::Middleware::Globals
+  attr_reader :logger
+
+  def initialize(_, options = {})
+    super
+    @logger = options[:logger]
+    @logger ||= Rails.logger if defined?(Rails) && Rails.logger.present?
+    @logger ||= Logger.new(STDOUT)
+  end
+
   def before
     start_time
     super # sets env['grape.*']
@@ -72,9 +81,4 @@ class Grape::Middleware::Logger < Grape::Middleware::Globals
   def start_time
     @start_time ||= Time.now
   end
-
-  def logger
-    @logger ||= @options[:logger]
-    @logger ||= defined?(Rails) && Rails.logger.present? ? Rails.logger : Logger.new(STDOUT)
-  end
 end

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

@@ -116,9 +116,11 @@ describe Grape::Middleware::Logger do
       let(:options) { {} }
 
       context 'when Rails is defined' do
-        module Rails
-          class << self
-            attr_accessor :logger
+        before do
+          module Rails
+            class << self
+              attr_accessor :logger
+            end
           end
         end
 
@@ -127,11 +129,21 @@ describe Grape::Middleware::Logger do
         end
 
         context 'when Rails.logger is defined' do
-          before { Rails.logger = double('rails_logger') }
+          before do
+            Rails.logger = double('rails_logger')
+          end
 
           it 'sets @logger to Rails.logger' do
             expect(subject.logger).to be Rails.logger
           end
+
+          after do
+            Rails.logger = nil
+          end
+        end
+
+        after do
+          Object.send :remove_const, :Rails
         end
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: grape-middleware-logger
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors:
 - Ryan Buckley
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-27 00:00:00.000000000 Z
+date: 2015-12-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: grape
@@ -86,6 +86,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".travis.yml"
 - Gemfile
 - LICENSE.txt
 - README.md