From f842b399d6d1984ff3d08eb9fd76fd160fbfb47f Mon Sep 17 00:00:00 2001
From: Ryan Buckley <arebuckley@gmail.com>
Date: Thu, 7 May 2015 20:23:12 -0700
Subject: [PATCH] version 0.1.2 w/ some cleanup

---
 .gitignore                             |  1 +
 .ruby-gemset                           |  1 +
 .ruby-version                          |  1 +
 grape-middleware-logger.gemspec        |  2 +-
 lib/grape/middleware/logger.rb         | 14 ++++++++------
 lib/grape/middleware/logger/version.rb |  2 +-
 6 files changed, 13 insertions(+), 8 deletions(-)
 create mode 100644 .ruby-gemset
 create mode 100644 .ruby-version

diff --git a/.gitignore b/.gitignore
index ae3fdc2..70d4d2f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,3 +12,4 @@
 *.o
 *.a
 mkmf.log
+*.gem
diff --git a/.ruby-gemset b/.ruby-gemset
new file mode 100644
index 0000000..9fdfeb0
--- /dev/null
+++ b/.ruby-gemset
@@ -0,0 +1 @@
+grape-middleware-logger
diff --git a/.ruby-version b/.ruby-version
new file mode 100644
index 0000000..d427c89
--- /dev/null
+++ b/.ruby-version
@@ -0,0 +1 @@
+ruby-2.1.5
diff --git a/grape-middleware-logger.gemspec b/grape-middleware-logger.gemspec
index b0d523d..ce481f2 100644
--- a/grape-middleware-logger.gemspec
+++ b/grape-middleware-logger.gemspec
@@ -1,7 +1,7 @@
 # coding: utf-8
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'grape/middleware/logger'
+require 'grape/middleware/logger/version'
 
 Gem::Specification.new do |spec|
   spec.name          = 'grape-middleware-logger'
diff --git a/lib/grape/middleware/logger.rb b/lib/grape/middleware/logger.rb
index 6e64695..ca07d9a 100644
--- a/lib/grape/middleware/logger.rb
+++ b/lib/grape/middleware/logger.rb
@@ -1,16 +1,14 @@
 require 'logger'
 require 'grape/middleware/globals'
 
+# avoid superclass mismatch when version file gets loaded first
+Grape::Middleware.send :remove_const, :Logger if defined? Grape::Middleware::Logger
 module Grape
   module Middleware
     class Logger < Grape::Middleware::Globals
 
-      #
-      # Overrides
-      #
-
       def before
-        @start_time = Time.now
+        start_time
         super
         logger.info ''
         logger.info %Q(Started #{env['grape.request'].request_method} "#{env['grape.request'].path}")
@@ -31,7 +29,7 @@ module Grape
       end
 
       def after(status)
-        logger.info "Completed #{status} in #{((Time.now - @start_time) * 1000).round(2)}ms"
+        logger.info "Completed #{status} in #{((Time.now - start_time) * 1000).round(2)}ms"
         logger.info ''
       end
 
@@ -54,6 +52,10 @@ module Grape
         end
       end
 
+      def start_time
+        @start_time ||= Time.now
+      end
+
       def logger
         @logger ||= @options[:logger] || ::Logger.new(STDOUT)
       end
diff --git a/lib/grape/middleware/logger/version.rb b/lib/grape/middleware/logger/version.rb
index 19e5983..9229e30 100644
--- a/lib/grape/middleware/logger/version.rb
+++ b/lib/grape/middleware/logger/version.rb
@@ -1,7 +1,7 @@
 module Grape
   module Middleware
     class Logger
-      VERSION = '0.1.1'
+      VERSION = '0.1.2'
     end
   end
 end