refactor logger to not use hierarchical namespaced structure

lib/grape/middleware/logger.rb

@@ -3,79 +3,74 @@ require 'grape'
 
 # avoid superclass mismatch when version file gets loaded first
 Grape::Middleware.send :remove_const, :Logger if defined? Grape::Middleware::Logger
-module Grape
+class Grape::Middleware::Logger < Grape::Middleware::Globals
-  module Middleware
+  def before
-    class Logger < Grape::Middleware::Globals
+    start_time
+    super # sets env['grape.*']
+    logger.info ''
+    logger.info %Q(Started #{env['grape.request'].request_method} "#{env['grape.request'].path}")
+    logger.info %Q(  Parameters: #{parameters})
+  end
 
-      def before
+  # @note Error and exception handling are required for the +after+ hooks
-        start_time
+  #   Exceptions are logged as a 500 status and re-raised
-        super # sets env['grape.*']
+  #   Other "errors" are caught, logged and re-thrown
-        logger.info ''
+  def call!(env)
-        logger.info %Q(Started #{env['grape.request'].request_method} "#{env['grape.request'].path}")
+    @env = env
-        logger.info %Q(  Parameters: #{parameters})
+    before
-      end
+    error = catch(:error) do
-
+      begin
-      # @note Error and exception handling are required for the +after+ hooks
+        @app_response = @app.call(@env)
-      #   Exceptions are logged as a 500 status and re-raised
+      rescue => e
-      #   Other "errors" are caught, logged and re-thrown
+        after_exception(e)
-      def call!(env)
+        raise e
-        @env = env
-        before
-        error = catch(:error) do
-          begin
-            @app_response = @app.call(@env)
-          rescue => e
-            after_exception(e)
-            raise e
-          end
-          nil
-        end
-        if error
-          after_failure(error)
-          throw(:error, error)
-        else
-          after(@app_response.status)
-        end
-        @app_response
-      end
-
-      def after(status)
-        logger.info "Completed #{status} in #{((Time.now - start_time) * 1000).round(2)}ms"
-        logger.info ''
-      end
-
-      #
-      # Helpers
-      #
-
-      def after_exception(e)
-        logger.info %Q(  Error: #{e.message})
-        after(500)
-      end
-
-      def after_failure(error)
-        logger.info %Q(  Error: #{error[:message]}) if error[:message]
-        after(error[:status])
-      end
-
-      def parameters
-        request_params = env['grape.request.params'].to_hash
-        request_params.merge!(env['action_dispatch.request.request_parameters'] || {}) # for Rails
-        if @options[:filter]
-          @options[:filter].filter(request_params)
-        else
-          request_params
-        end
-      end
-
-      def start_time
-        @start_time ||= Time.now
-      end
-
-      def logger
-        @logger ||= @options[:logger] || ::Logger.new(STDOUT)
       end
+      nil
     end
+    if error
+      after_failure(error)
+      throw(:error, error)
+    else
+      after(@app_response.status)
+    end
+    @app_response
+  end
+
+  def after(status)
+    logger.info "Completed #{status} in #{((Time.now - start_time) * 1000).round(2)}ms"
+    logger.info ''
+  end
+
+  #
+  # Helpers
+  #
+
+  def after_exception(e)
+    logger.info %Q(  Error: #{e.message})
+    after(500)
+  end
+
+  def after_failure(error)
+    logger.info %Q(  Error: #{error[:message]}) if error[:message]
+    after(error[:status])
+  end
+
+  def parameters
+    request_params = env['grape.request.params'].to_hash
+    request_params.merge!(env['action_dispatch.request.request_parameters'] || {}) # for Rails
+    if @options[:filter]
+      @options[:filter].filter(request_params)
+    else
+      request_params
+    end
+  end
+
+  def start_time
+    @start_time ||= Time.now
+  end
+
+  def logger
+    @logger ||= @options[:logger] || Logger.new(STDOUT)
   end
 end