lograge 0.9.0 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 6c2af15f529c6ed8ac38b2ac369f9f4219f4d6d1
-  data.tar.gz: 73939dbdbd086eff89fc0b670863d3f4086d0f91
+SHA256:
+  metadata.gz: 90e32e509e2b788089246d22c8755d69d495d54f807a8e52e3e0fee3406a448c
+  data.tar.gz: 1f969f77c0d5b3878e8a090be723888ba037f982d9688b12ace2f672ce450d9f
 SHA512:
-  metadata.gz: 64727cc9391dc0a896c6cc9a473ea79bd68cc370b9c6b0a830a15d7a20bc3434b978940808fe11fb9b02aa45c5343dcc7c77998072577ea243f6a8afc26ce5f9
-  data.tar.gz: 6e67fcfbbee0e9ca0f069d76bbea563b3333e4ff3aac09437917ae33ef7796af2d82bf1f585abb8d33b566385b97d4f904c05a8aa35cf99972d000b5324ac44b
+  metadata.gz: b253f8a2a86557ed264df935b94379f61ef90c426d83d901672c4deef286e40a934c9e596f23ddf22195d8549207ce213ea67a35a039008ace6202c0b131f29b
+  data.tar.gz: 0112025bfd732a2b41a52c8325e5cc090b94c2056f2d819d8afe9491f063d01c7be3950e25a2707de4955d15b5d8ca59368eab5236ef634f9ceb1c3ac301dafe

data/lib/lograge/formatters/key_value.rb

@@ -2,27 +2,29 @@ module Lograge
   module Formatters
     class KeyValue
       def call(data)
-        fields = fields_to_display(data)
-
-        event = fields.map { |key| format(key, data[key]) }
-        event.join(' ')
+        fields_to_display(data)
+          .map { |key| format(key, data[key]) }
+          .join(' ')
       end
 
+      protected
+
       def fields_to_display(data)
         data.keys
       end
 
       def format(key, value)
-        if key == :error
-          # Exactly preserve the previous output
-          # Parsing this can be ambigious if the error messages contains
-          # a single quote
-          value = "'#{value}'"
-        elsif value.is_a? Float
-          value = Kernel.format('%.2f', value)
-        end
+        "#{key}=#{parse_value(key, value)}"
+      end
+
+      def parse_value(key, value)
+        # Exactly preserve the previous output
+        # Parsing this can be ambigious if the error messages contains
+        # a single quote
+        return "'#{value}'" if key == :error
+        return Kernel.format('%.2f', value) if value.is_a? Float
 
-        "#{key}=#{value}"
+        value
       end
     end
   end

data/lib/lograge/formatters/l2met.rb

@@ -16,20 +16,31 @@ module Lograge
         :location
       ].freeze
 
+      UNWANTED_FIELDS = [
+        :controller,
+        :action
+      ].freeze
+
       def call(data)
         super(modify_payload(data))
       end
 
+      protected
+
+      def fields_to_display(data)
+        L2MET_FIELDS + additional_fields(data)
+      end
+
+      def additional_fields(data)
+        (data.keys - L2MET_FIELDS) - UNWANTED_FIELDS
+      end
+
       def format(key, value)
         key = "measure#page.#{key}" if value.is_a?(Float)
 
         super(key, value)
       end
 
-      def fields_to_display(data)
-        L2MET_FIELDS + (data.keys - L2MET_FIELDS) - [:controller, :action]
-      end
-
       def modify_payload(data)
         data[:source] = source_field(data) if data[:controller] && data[:action]
 

data/lib/lograge/log_subscriber.rb

@@ -53,6 +53,10 @@ module Lograge
 
     def extract_path(payload)
       path = payload[:path]
+      strip_query_string(path)
+    end
+
+    def strip_query_string(path)
       index = path.index('?')
       index ? path[0, index] : path
     end
@@ -104,7 +108,7 @@ module Lograge
       return {} unless location
 
       RequestStore.store[:lograge_location] = nil
-      { location: location }
+      { location: strip_query_string(location) }
     end
 
     def extract_unpermitted_params

data/lib/lograge/version.rb

@@ -1,3 +1,3 @@
 module Lograge
-  VERSION = '0.9.0'.freeze
+  VERSION = '0.10.0'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lograge
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.10.0
 platform: ruby
 authors:
 - Mathias Meyer
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-12 00:00:00.000000000 Z
+date: 2018-03-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -138,7 +138,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.14
+rubygems_version: 2.7.3
 signing_key: 
 specification_version: 4
 summary: Tame Rails' multi-line logging into a single line per request