lograge 0.3.4 → 0.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b0ffc5818b2ecfea5d750c2d0e82ffbfca2114dd
-  data.tar.gz: 18937487f75539149f07e6f35eadb31b8e8485d4
+  metadata.gz: b1b3f1b11217a5fdbe044df974283ba02ba1f105
+  data.tar.gz: ab5e62fd370c4772e68119f26cad9f2323bb28bb
 SHA512:
-  metadata.gz: ba756dfa89f7112bf6677b1c5be3b495a629e8fec32a10f52c07aec06637c15e63df55d30d33dfc27db3113c9043ddd91c2aa15cc8b26bc439a57b7844b1ef53
-  data.tar.gz: 2fec943a32467da1728ae77aba093e8e6d8a9fde4b4b7bd3a6b6a07dbe5acc28b7234b4914b43ed486449a81770218666c42ba24107c5325a6e682cc5a76ae9e
+  metadata.gz: 015146b24e6e3eb7e67d65b405157b7d2e0835266ab81fbb5bbc5b2a09cfbfd00ee2e515b35eadc7aa8aee08dc148ae222ce167bbd43749e895f5f3f0eee939e
+  data.tar.gz: 7b72e262404d7de0ce4e318091e875b6e3337ba006262896e436637d56e9c7de77f1fb69198196bf793e28e5e0a4e111c8abf30b86e0cb88eaadcbf569021440

data/lib/lograge/formatters/l2met.rb

@@ -29,7 +29,7 @@ module Lograge
       end
 
       def source_field(data)
-        "#{data[:controller].to_s.gsub('/', '-')}:#{data[:action]}"
+        "#{data[:controller].to_s.tr('/', '-')}:#{data[:action]}"
       end
     end
   end

data/lib/lograge/log_subscriber.rb

@@ -1,4 +1,5 @@
 require 'json'
+require 'action_pack'
 require 'active_support/core_ext/class/attribute'
 require 'active_support/log_subscriber'
 
@@ -8,13 +9,7 @@ module Lograge
       return if Lograge.ignore?(event)
 
       payload = event.payload
-
-      data = extract_request(payload)
-      extract_status(data, payload)
-      runtimes(data, event)
-      location(data)
-      custom_options(data, event)
-
+      data = extract_request(event, payload)
       data = before_format(data, payload)
       formatted_message = Lograge.formatter.call(data)
       logger.send(Lograge.log_level, formatted_message)
@@ -24,13 +19,28 @@ module Lograge
       Thread.current[:lograge_location] = event.payload[:location]
     end
 
+    def unpermitted_parameters(event)
+      Thread.current[:lograge_unpermitted_params] ||= []
+      Thread.current[:lograge_unpermitted_params].concat(event.payload[:keys])
+    end
+
     def logger
       Lograge.logger.presence || super
     end
 
     private
 
-    def extract_request(payload)
+    def extract_request(event, payload)
+      payload = event.payload
+      data = initial_data(payload)
+      data.merge!(extract_status(payload))
+      data.merge!(extract_runtimes(event, payload))
+      data.merge!(extract_location)
+      data.merge!(extract_unpermitted_params)
+      data.merge!(custom_options(event))
+    end
+
+    def initial_data(payload)
       {
         method: payload[:method],
         path: extract_path(payload),
@@ -56,15 +66,14 @@ module Lograge
       end
     end
 
-    def extract_status(data, payload)
+    def extract_status(payload)
       if (status = payload[:status])
-        data[:status] = status.to_i
+        { status: status.to_i }
       elsif (error = payload[:exception])
         exception, message = error
-        data[:status] = get_error_status_code(exception)
-        data[:error] = "#{exception}: #{message}"
+        { status: get_error_status_code(exception), error: "#{exception}: #{message}" }
       else
-        data[:status] = 0
+        { status: 0 }
       end
     end
 
@@ -73,28 +82,35 @@ module Lograge
       Rack::Utils.status_code(status)
     end
 
-    def custom_options(data, event)
-      options = Lograge.custom_options(event)
-      data.merge! options if options
+    def custom_options(event)
+      Lograge.custom_options(event) || {}
     end
 
     def before_format(data, payload)
       Lograge.before_format(data, payload)
     end
 
-    def runtimes(data, event)
-      payload = event.payload
-      data[:duration] = event.duration.to_f.round(2)
-      data[:view]     = payload[:view_runtime].to_f.round(2) if payload.key?(:view_runtime)
-      data[:db]       = payload[:db_runtime].to_f.round(2) if payload.key?(:db_runtime)
+    def extract_runtimes(event, payload)
+      data = { duration: event.duration.to_f.round(2) }
+      data[:view] = payload[:view_runtime].to_f.round(2) if payload.key?(:view_runtime)
+      data[:db] = payload[:db_runtime].to_f.round(2) if payload.key?(:db_runtime)
+      data
     end
 
-    def location(data)
+    def extract_location
       location = Thread.current[:lograge_location]
-      return unless location
+      return {} unless location
 
       Thread.current[:lograge_location] = nil
-      data[:location] = location
+      { location: location }
+    end
+
+    def extract_unpermitted_params
+      unpermitted_params = Thread.current[:lograge_unpermitted_params]
+      return {} unless unpermitted_params
+
+      Thread.current[:lograge_unpermitted_params] = nil
+      { unpermitted_params: unpermitted_params }
     end
   end
 end

data/lib/lograge/version.rb

@@ -1,3 +1,3 @@
 module Lograge
-  VERSION = '0.3.4'
+  VERSION = '0.3.5'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lograge
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.3.5
 platform: ruby
 authors:
 - Mathias Meyer
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-07 00:00:00.000000000 Z
+date: 2015-11-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -25,20 +25,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: guard-rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -128,4 +114,3 @@ signing_key:
 specification_version: 4
 summary: Tame Rails' multi-line logging into a single line per request
 test_files: []
-has_rdoc: