rack-action_logger 0.1.8 → 0.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fd9926ff15cdf99768758b6946e374ea48f42fce
-  data.tar.gz: f736d95165fadbb43eaddf0dfa25f23d3898db53
+  metadata.gz: 22b077d4a3c2233f2cc7ad125f6327a38097439c
+  data.tar.gz: 7afbcbfe31b62c9062529e271038d432527c271e
 SHA512:
-  metadata.gz: 8833c6e2df55310fc9cfa311bdb161300864e4ab967b9361eb65d875a940f6de6ab6cdc7077e3ecb969aa4849e7873c8465876509af1b6bea5daca5f5ce4ffbb
-  data.tar.gz: ede7423c9b93e464c9585babb93cde6d81130dba15b2434fbaf5d9c6cd5ef0ecfebad8064bc71b4edd8d85456f0451ae5b17d034bd50e337da95b823261bc04c
+  metadata.gz: 294f9871ddd3695e7b1f3bfff2583029172a3e9ac45384901b3120ebb38881be1a97a07ecbf91a2d46f5c10150ac610cbc4784050af5ac2cdb6b930380c9ad59
+  data.tar.gz: 2e90f1d3f4abdb0024203c4fc4041c8c8b629f61f4930d4beb51948fb593a3a01766bdff2a970ea6e09ff44e217c6f693edd93852d40e4c3a3750d2c347b049c

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rack-action_logger (0.1.8)
+    rack-action_logger (0.1.9)
       activesupport
       fluent-logger (~> 0.5)
       woothee (~> 1.4)

data/README.md

@@ -69,6 +69,24 @@ It is intended to collect user request log, action log and any other custome log
 
 Under example folder, there are sample Rails applications to see how these sample logs are created.
 
+### Model log
+
+```json
+{
+  "message": {
+    "user_id": null,
+    "request_id": "5aae4cc6-125b-4049-b555-502d6968e041",
+    "_method": "update",
+    "_after:updated_at": "2016-11-18 18:40:15 +0900",
+    "_before:updated_at": "2016-11-18 18:33:56 +0900",
+    "_after:views": 96,
+    "_before:views": 95,
+    "tag": "action.model_articles"
+  },
+  "tag": "action.model_articles"
+}
+```
+
 ## Installation
 
 Add this line to your rails application's Gemfile:

data/lib/rack/action_logger/active_record_extension.rb

@@ -16,6 +16,7 @@ module Rack::ActionLogger
       self.class.column_names.each do |column_name|
         record["_#{column_name}"] = self.try(column_name)
       end
+      record = Rack::ActionLogger::ParameterFiltering.apply_filter(record)
       Rack::ActionLogger::Container.set_append_log(record, "model_#{self.class.table_name}")
     end
 
@@ -29,6 +30,7 @@ module Rack::ActionLogger
           record["_before:#{column_name}"] = self.try("#{column_name}_was")
         end
       end
+      record = Rack::ActionLogger::ParameterFiltering.apply_filter(record)
       Rack::ActionLogger::Container.set_append_log(record, "model_#{self.class.table_name}")
     end
 
@@ -39,6 +41,7 @@ module Rack::ActionLogger
           record["_#{column_name}"] = self.try(column_name)
         end
       end
+      record = Rack::ActionLogger::ParameterFiltering.apply_filter(record)
       Rack::ActionLogger::Container.set_append_log(record, "model_#{self.class.table_name}")
     end
   end

data/lib/rack/action_logger/container.rb

@@ -7,9 +7,6 @@ module Rack::ActionLogger
     EXPORT_KEYS = [:rack_action_logger_attributes]
 
     class << self
-      def store
-        Thread.current[THREAD_KEY] ||= {}
-      end
 
       def clear
         Thread.current[THREAD_KEY] = nil
@@ -72,6 +69,10 @@ module Rack::ActionLogger
 
       private
 
+      def store
+        Thread.current[THREAD_KEY] ||= {}
+      end
+
       def is_valid_hash(hash)
         if hash.is_a? Hash
           true

data/lib/rack/action_logger/metrics/rack_metrics.rb

@@ -21,8 +21,6 @@ module Rack::ActionLogger::Metrics
       @request = Rack::Request.new(env)
       @response = Rack::Response.new(body, status_code, headers)
       @ua = Woothee.parse(@request.user_agent)
-      filters = Rack::ActionLogger.configuration.filters
-      @compiled_filters = Rack::ActionLogger::ParameterFiltering.compile(filters)
     end
 
     def tag_suffix
@@ -53,7 +51,7 @@ module Rack::ActionLogger::Metrics
     end
 
     def params
-      Rack::ActionLogger::ParameterFiltering.apply_filter(@request.params, @compiled_filters)
+      Rack::ActionLogger::ParameterFiltering.apply_filter(@request.params)
     end
 
     def request_headers
@@ -108,7 +106,7 @@ module Rack::ActionLogger::Metrics
       response_bodies = []
       @body.each { |part| response_bodies << part } if @body
       result = JSON.parse(response_bodies.join('')) rescue {}
-      Rack::ActionLogger::ParameterFiltering.apply_filter(result, @compiled_filters)
+      Rack::ActionLogger::ParameterFiltering.apply_filter(result)
     end
   end
 end

data/lib/rack/action_logger/parameter_filtering.rb

@@ -4,16 +4,16 @@ module Rack::ActionLogger
 
     class << self
 
-      def apply_filter(original_params, compiled_filters)
+      def apply_filter(original_params)
         filtered_params = {}
 
         original_params.each do |key, value|
           if compiled_filters.any? { |r| key =~ r }
             value = FILTERED
           elsif value.is_a?(Hash)
-            value = apply_filter(value, compiled_filters)
+            value = apply_filter(value)
           elsif value.is_a?(Array)
-            value = value.map { |v| v.is_a?(Hash) ? apply_filter(v, compiled_filters) : v }
+            value = value.map { |v| v.is_a?(Hash) ? apply_filter(v) : v }
           end
 
           filtered_params[key] = value
@@ -22,10 +22,17 @@ module Rack::ActionLogger
         filtered_params
       end
 
+      private
+
+      def compiled_filters
+        @compiled_filters ||= compile(Rack::ActionLogger.configuration.filters)
+      end
+
       def compile(filters)
         filter_strings = filters.map(&:to_s)
         filter_strings.map { |item| Regexp.compile(Regexp.escape(item)) }
       end
+
     end
   end
 end

data/lib/rack/action_logger/version.rb

@@ -1,5 +1,5 @@
 module Rack
   module ActionLogger
-    VERSION = '0.1.8'
+    VERSION = '0.1.9'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rack-action_logger
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.1.9
 platform: ruby
 authors:
 - Koichi Ishida
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-11-18 00:00:00.000000000 Z
+date: 2016-11-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport