lib/lograge/formatters/key_value.rb in lograge-0.3.0 vs lib/lograge/formatters/key_value.rb in lograge-0.3.1

@@ -1,36 +1,28 @@
 module Lograge
   module Formatters
     class KeyValue
-      LOGRAGE_FIELDS = [
-        :method, :path, :format, :controller, :action, :status, :error,
-        :duration, :view, :db, :location
-      ]
-
       def call(data)
         fields = fields_to_display(data)
 
-        event = fields.inject([]) do |message, key|
-          next message unless data.has_key?(key)
-
-          message << format(key, data[key])
-          message
-        end
-        event.join(" ")
+        event = fields.map { |key| format(key, data[key]) }
+        event.join(' ')
       end
 
       def fields_to_display(data)
-        LOGRAGE_FIELDS + (data.keys - LOGRAGE_FIELDS)
+        data.keys
       end
 
       def format(key, value)
-        # Exactly preserve the previous output
-        # Parsing this can be ambigious if the error messages contains
-        # a single quote
-        value = "'#{value}'" if key == :error
-
-        # Ensure that we always have exactly two decimals
-        value = "%.2f" % value if value.is_a? Float
+        if key == :error
+          # Exactly preserve the previous output
+          # Parsing this can be ambigious if the error messages contains
+          # a single quote
+          value = "'#{value}'"
+        else
+          # Ensure that we always have exactly two decimals
+          value = Kernel.format('%.2f', value) if value.is_a? Float
+        end
 
         "#{key}=#{value}"
       end
     end
   end