grape-middleware-logger 1.10.0 → 1.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: 421305ab3efc9b480a96c04d1edd306803af900faca7925ee959c049a74c6cf2
-  data.tar.gz: '0967327228cc11fb4d4138e14861d8b0d296a1bf0f56d142c9fc61f124095238'
+SHA1:
+  metadata.gz: 2c5c1cd11fde12c58ac9ed7797f349e57ec3acbd
+  data.tar.gz: 1d128607f858d906b9e2cea9891e8b5b7b178e89
 SHA512:
-  metadata.gz: 7afd6866acce4c69122522c8e17cd082e48ae0aa3992f3eb55e98e0bdda06d3590a10fbc72a13eeafe0f66f43a0c995e302916cf7b55d5dc03ba48b638d1855f
-  data.tar.gz: d0af89b33122fe1c82352b9f05f0650cba0a88ad0c97a99d1953463806560bb00b23f2a70c6e27b1adcf7cf93e21bdbfe999ccef4e7a34c9c76e495e8fa13b9f
+  metadata.gz: 0e2304580ebf6d655f4a691d59a7fdb19f8e21354c16527d9912725288e46d0b98a841fdd984c9f0149227faecda1648474aff57abedf3335c9c8871d6957622
+  data.tar.gz: 3a5a6fd19706bba95a06354fd32a43db9c32a63096315a1e60ab726e7e7264ae539ff44430305346481979835587bad8199cd45ad48521183d3ff7a55d8dff86

data/grape-middleware-logger.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |spec|
   spec.name          = 'grape-middleware-logger'
-  spec.version       = '1.10.0'
+  spec.version       = '1.11.0'
   spec.platform      = Gem::Platform::RUBY
   spec.authors       = ['Ryan Buckley']
   spec.email         = ['arebuckley@gmail.com']
@@ -24,9 +24,8 @@ Grape::Middleware::Logger 1.7+ should be mounted with +insert_after+ to properly
 
   }
 
-  spec.add_dependency 'grape', '>= 0.17', '<= 1.1'
-
-  spec.add_development_dependency 'bundler', '~> 1.7'
+  spec.add_dependency 'grape', '>= 0.17'
+  spec.add_development_dependency 'bundler', '~> 2.0'
   spec.add_development_dependency 'mime-types', '~> 2'
   spec.add_development_dependency 'rake', '~> 10.0'
   spec.add_development_dependency 'rspec', '>= 3.2', '< 4'

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

@@ -1,5 +1,6 @@
 class Grape::Middleware::Logger::Railtie < Rails::Railtie
-  initializer 'grape.middleware.logger', after: :load_config_initializers do
+  options = Rails::VERSION::MAJOR < 5 ? { after: :load_config_initializers } : {}
+  initializer 'grape.middleware.logger', options do
     Grape::Middleware::Logger.logger = Rails.application.config.logger || Rails.logger.presence
     Grape::Middleware::Logger.filter = ActionDispatch::Http::ParameterFilter.new Rails.application.config.filter_parameters
   end

data/lib/grape/middleware/logger.rb

@@ -7,7 +7,7 @@ class Grape::Middleware::Logger < Grape::Middleware::Globals
   attr_reader :logger
 
   class << self
-    attr_accessor :logger, :filter, :headers
+    attr_accessor :logger, :filter, :headers, :condensed
 
     def default_logger
       default = Logger.new(STDOUT)
@@ -20,6 +20,7 @@ class Grape::Middleware::Logger < Grape::Middleware::Globals
     super
     @options[:filter] ||= self.class.filter
     @options[:headers] ||= self.class.headers
+    @options[:condensed] ||= false
     @logger = options[:logger] || self.class.logger || self.class.default_logger
   end
 
@@ -27,15 +28,19 @@ class Grape::Middleware::Logger < Grape::Middleware::Globals
     start_time
     # sets env['grape.*']
     super
-    logger.info ''
-    logger.info %Q(Started %s "%s" at %s) % [
-      env[Grape::Env::GRAPE_REQUEST].request_method,
-      env[Grape::Env::GRAPE_REQUEST].path,
-      start_time.to_s
-    ]
-    logger.info %Q(Processing by #{processed_by})
-    logger.info %Q(  Parameters: #{parameters})
-    logger.info %Q(  Headers: #{headers}) if @options[:headers]
+
+    log_statements = [
+      '',
+      %Q(Started %s "%s" at %s) % [
+        env[Grape::Env::GRAPE_REQUEST].request_method,
+        env[Grape::Env::GRAPE_REQUEST].path,
+        start_time.to_s
+      ],
+      %Q(Processing by #{processed_by}),
+      %Q(  Parameters: #{parameters})]
+
+    log_statements.append(%Q(  Headers: #{headers})) if @options[:headers]
+    log_info(log_statements)
   end
 
   # @note Error and exception handling are required for the +after+ hooks
@@ -64,8 +69,12 @@ class Grape::Middleware::Logger < Grape::Middleware::Globals
   end
 
   def after(status)
-    logger.info "Completed #{status} in #{((Time.now - start_time) * 1000).round(2)}ms"
-    logger.info ''
+    log_info(
+      [
+        "Completed #{status} in #{((Time.now - start_time) * 1000).round(2)}ms",
+        ''
+      ]
+    )
   end
 
   #
@@ -120,6 +129,14 @@ class Grape::Middleware::Logger < Grape::Middleware::Globals
     result.concat endpoint.options[:path].map { |path| path.to_s.sub(BACKSLASH, '') }
     endpoint.options[:for].to_s << result.join(BACKSLASH)
   end
+
+  def log_info(log_statements=[])
+    if @options[:condensed]
+      logger.info log_statements.compact.delete_if(&:empty?).each(&:strip!).join(" - ")
+    else
+      log_statements.each { |log_statement| logger.info log_statement }
+    end
+  end
 end
 
 require_relative 'logger/railtie' if defined?(Rails)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: grape-middleware-logger
 version: !ruby/object:Gem::Version
-  version: 1.10.0
+  version: 1.11.0
 platform: ruby
 authors:
 - Ryan Buckley
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-21 00:00:00.000000000 Z
+date: 2019-03-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: grape
@@ -17,9 +17,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0.17'
-    - - "<="
-      - !ruby/object:Gem::Version
-        version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -27,23 +24,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0.17'
-    - - "<="
-      - !ruby/object:Gem::Version
-        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: mime-types
   requirement: !ruby/object:Gem::Requirement
@@ -124,7 +118,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.3
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: A logger for the Grape framework