lograge 0.5.1 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 57b34d36877b6275a24039405e6bfa710feaab24
-  data.tar.gz: daa60dab98e3b64b97b8888bfd2f5c7d0fa8553f
+  metadata.gz: 6b484346cdeb170f3d4a180e7d9b4c3d15285fbe
+  data.tar.gz: 799da82f5ca643edd61a67b6733edd8dddd46cbf
 SHA512:
-  metadata.gz: e1d73dc707c54f7976358ee9746c440d0bdc16f9fa399ce6763d168ddb34596e88c5625284892d673cb40933fb6e59ac6990d47dcab6b3ee11010ccf466b037d
-  data.tar.gz: cb59d1f691a3af0abc751425c8de1ad29d363072b88abbaef8678072a7f56afa41b622eaa4ef2df53c89e3644574455bdc760073da30ef1358090a82adc52f99
+  metadata.gz: 6718376476946cee57fe6761d334a105cf3f6d3aa3b74519c314ba4a54344a4bca6130dc216702a7745ab46f6d30fbd15119ab7c006b119df082ff2a927a76e9
+  data.tar.gz: fbbab8b00be5c385447ee2da45a157c8fcfbd1e2e4170ff56f95a16246d12a3f0a8496ff3e0920a82374e15c62aa7f3c1eb60b4b7f431a544507415d4842de18

data/lib/lograge.rb

@@ -9,9 +9,9 @@ require 'lograge/formatters/logstash'
 require 'lograge/formatters/ltsv'
 require 'lograge/formatters/raw'
 require 'lograge/log_subscriber'
+require 'lograge/ordered_options'
 require 'active_support/core_ext/module/attribute_accessors'
 require 'active_support/core_ext/string/inflections'
-require 'active_support/ordered_options'
 
 # rubocop:disable ModuleLength
 module Lograge
@@ -123,6 +123,7 @@ module Lograge
 
     attach_to_action_controller
     set_lograge_log_options
+    setup_custom_payload
     support_deprecated_config # TODO: Remove with version 1.0
     set_formatter
     set_ignores
@@ -141,6 +142,17 @@ module Lograge
     Lograge::RequestLogSubscriber.attach_to :action_controller
   end
 
+  def setup_custom_payload
+    return unless lograge_config.custom_payload_method.respond_to?(:call)
+    append_payload_method = ActionController::Base.instance_method(:append_info_to_payload)
+    custom_payload_method = lograge_config.custom_payload_method
+
+    ActionController::Base.send(:define_method, :append_info_to_payload) do |payload|
+      append_payload_method.bind(self).call(payload)
+      payload[:custom_payload] = custom_payload_method.call(self)
+    end
+  end
+
   def set_lograge_log_options
     Lograge.logger = lograge_config.logger
     Lograge.custom_options = lograge_config.custom_options

data/lib/lograge/log_subscriber.rb

@@ -2,6 +2,7 @@ require 'json'
 require 'action_pack'
 require 'active_support/core_ext/class/attribute'
 require 'active_support/log_subscriber'
+require 'request_store'
 
 module Lograge
   class RequestLogSubscriber < ActiveSupport::LogSubscriber
@@ -16,12 +17,12 @@ module Lograge
     end
 
     def redirect_to(event)
-      Thread.current[:lograge_location] = event.payload[:location]
+      RequestStore.store[:lograge_location] = event.payload[:location]
     end
 
     def unpermitted_parameters(event)
-      Thread.current[:lograge_unpermitted_params] ||= []
-      Thread.current[:lograge_unpermitted_params].concat(event.payload[:keys])
+      RequestStore.store[:lograge_unpermitted_params] ||= []
+      RequestStore.store[:lograge_unpermitted_params].concat(event.payload[:keys])
     end
 
     def logger
@@ -83,7 +84,8 @@ module Lograge
     end
 
     def custom_options(event)
-      Lograge.custom_options(event) || {}
+      options = Lograge.custom_options(event) || {}
+      options.merge event.payload[:custom_payload] || {}
     end
 
     def before_format(data, payload)
@@ -98,18 +100,18 @@ module Lograge
     end
 
     def extract_location
-      location = Thread.current[:lograge_location]
+      location = RequestStore.store[:lograge_location]
       return {} unless location
 
-      Thread.current[:lograge_location] = nil
+      RequestStore.store[:lograge_location] = nil
       { location: location }
     end
 
     def extract_unpermitted_params
-      unpermitted_params = Thread.current[:lograge_unpermitted_params]
+      unpermitted_params = RequestStore.store[:lograge_unpermitted_params]
       return {} unless unpermitted_params
 
-      Thread.current[:lograge_unpermitted_params] = nil
+      RequestStore.store[:lograge_unpermitted_params] = nil
       { unpermitted_params: unpermitted_params }
     end
   end

data/lib/lograge/ordered_options.rb

@@ -0,0 +1,9 @@
+require 'active_support/ordered_options'
+
+module Lograge
+  class OrderedOptions < ActiveSupport::OrderedOptions
+    def custom_payload(&block)
+      self.custom_payload_method = block
+    end
+  end
+end

data/lib/lograge/railtie.rb

@@ -4,7 +4,7 @@ require 'action_controller/log_subscriber'
 
 module Lograge
   class Railtie < Rails::Railtie
-    config.lograge = ActiveSupport::OrderedOptions.new
+    config.lograge = Lograge::OrderedOptions.new
     config.lograge.enabled = false
 
     config.after_initialize do |app|

data/lib/lograge/version.rb

@@ -1,3 +1,3 @@
 module Lograge
-  VERSION = '0.5.1'.freeze
+  VERSION = '0.6.0'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lograge
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.6.0
 platform: ruby
 authors:
 - Mathias Meyer
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-13 00:00:00.000000000 Z
+date: 2017-08-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -99,6 +99,20 @@ dependencies:
     - - <
       - !ruby/object:Gem::Version
         version: '5.2'
+- !ruby/object:Gem::Dependency
+  name: request_store
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.0'
 description: Tame Rails' multi-line logging into a single line per request
 email:
 - meyer@paperplanes.de
@@ -118,6 +132,7 @@ files:
 - lib/lograge/formatters/ltsv.rb
 - lib/lograge/formatters/raw.rb
 - lib/lograge/log_subscriber.rb
+- lib/lograge/ordered_options.rb
 - lib/lograge/rails_ext/rack/logger.rb
 - lib/lograge/railtie.rb
 - lib/lograge/version.rb