getaround_utils 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 332ad483c78dd5d7d92f9b7e48f0fb7f43eed7e90ee0303c1533cecb927c9cd6
-  data.tar.gz: 707339a17d38f7eca21a5bab223b12c9270c144de3137049fc4317c4f3d7d347
+  metadata.gz: 482b5de4b125e852c88c47c579abf2fc0b1dc3cb529cfae3297867bd9230dd77
+  data.tar.gz: 10aa0c47f8f1c8c2fb121364b04106f3d301616976fee63a8328be497edafe65
 SHA512:
-  metadata.gz: 7b498cdd79016cbc5840f6187e355bacedc4179aa0e431d2b35912668fa7ae1a268303fc503153cc233f92e32f1cdaac16d4ef10525414154d9cd5c9206d9714
-  data.tar.gz: 1510d194aa141f950c91130bbf5463dca4c9fe3a10bad88d6b4c93296d3123ea73762a4ffafdaaadbadca48713d9781ccedccabd5c0696e908f419324d23b34e
+  metadata.gz: 903d6190ddd4afb07c60807aaf0ad4d027ec631ec71c2df264ce4cc288cfd103e0d22417f672fd996e1cd0d1556ec7f92a78b0f3f10ebe2cf9e511808392de5e
+  data.tar.gz: eb1428e5f52272c858d54413155177a6d8f1c87fad418a67efa3012ed27489444b15f5f71cd6e79c9c617446d22173353d1c5a09d63ffd79cc335b7c09464312

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    getaround_utils (0.1.5)
+    getaround_utils (0.1.6)
 
 GEM
   remote: https://rubygems.org/

data/lib/getaround_utils/log_formatters/deep_key_value.rb

@@ -1,40 +1,62 @@
 module GetaroundUtils; end
 module GetaroundUtils::LogFormatters; end
 
-class GetaroundUtils::LogFormatters::DeepKeyValue
-  def call(data)
-    case data
-    when Array
-      flattify(data).map { |key, value| "#{key}=#{value}" }.join(' ')
-    when Hash
-      flattify(data).map { |key, value| "#{key}=#{value}" }.join(' ')
-    when Numeric
-      data.to_s
-    when String
-      data =~ /^".*"$/ ? data : data.inspect
-    else
-      data.to_s.inspect
+module GetaroundUtils::LogFormatters
+  class DeepKeyValue
+    def serialize(data)
+      case data
+      when Array
+        flattify(data).map { |key, value| "#{key}=#{value}" }.join(' ')
+      when Hash
+        flattify(data).map { |key, value| "#{key}=#{value}" }.join(' ')
+      when Numeric
+        data.to_s
+      when String
+        data =~ /^".*"$/ ? data : data.inspect
+      else
+        data.to_s.inspect
+      end
     end
-  end
 
-  # https://stackoverflow.com/questions/48836464/how-to-flatten-a-hash-making-each-key-a-unique-value
-  def flattify(value, result = {}, path = [])
-    case value
-    when Array
-      value.each.with_index(0) do |v, i|
-        flattify(v, result, path + [i])
+    # https://stackoverflow.com/questions/48836464/how-to-flatten-a-hash-making-each-key-a-unique-value
+    def flattify(value, result = {}, path = [])
+      case value
+      when Array
+        value.each.with_index(0) do |v, i|
+          flattify(v, result, path + [i])
+        end
+      when Hash
+        value.each do |k, v|
+          flattify(v, result, path + [k])
+        end
+      when Numeric
+        result[path.join(".")] = value.to_s
+      when String
+        result[path.join(".")] = value =~ /^".*"$/ ? value : value.inspect
+      else
+        result[path.join(".")] = value.to_s.inspect
       end
-    when Hash
-      value.each do |k, v|
-        flattify(v, result, path + [k])
+      result
+    end
+
+    def call(severity, datetime, appname, message)
+      payload = { severity: severity, datetime: datetime, appname: appname }
+      if message.is_a?(Hash)
+        payload.merge!(message)
+      else
+        payload[:message] = message.to_s
       end
-    when Numeric
-      result[path.join(".")] = value.to_s
-    when String
-      result[path.join(".")] = value =~ /^".*"$/ ? value : value.inspect
-    else
-      result[path.join(".")] = value.to_s.inspect
+      serialize(payload)
+    end
+
+    module Lograge
+      def call(data)
+        serialize(data)
+      end
+    end
+
+    def self.for_lograge
+      new.extend(Lograge)
     end
-    result
   end
 end

data/lib/getaround_utils/patches/key_value_log_tags.rb

@@ -17,11 +17,11 @@ class GetaroundUtils::Patches::KeyValueLogTags
       @taggers.collect do |tag|
         case tag
         when Proc
-          @kv_formatter.call(tag.call(request))
+          @kv_formatter.serialize(tag.call(request))
         when Symbol
-          @kv_formatter.call(tag => request.send(tag))
+          @kv_formatter.serialize(tag => request.send(tag))
         else
-          @kv_formatter.call(tag => tag)
+          @kv_formatter.serialize(tag => tag)
         end
       end
     end

data/lib/getaround_utils/railties/lograge.rb

@@ -26,7 +26,7 @@ class GetaroundUtils::Railties::Lograge < Rails::Railtie
   end
 
   config.lograge.enabled = true
-  config.lograge.formatter = GetaroundUtils::LogFormatters::DeepKeyValue.new
+  config.lograge.formatter = GetaroundUtils::LogFormatters::DeepKeyValue.for_lograge
   config.lograge.custom_options = lambda do |event|
     event.payload[:lograge].compact
   end

data/lib/getaround_utils/version.rb

@@ -1,3 +1,3 @@
 module GetaroundUtils
-  VERSION = '0.1.5'.freeze
+  VERSION = '0.1.6'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: getaround_utils
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - Drivy