hedgelog 0.1.5 → 0.1.6

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NzJmODIwYjUzZjJhZjgwY2E2M2EyODQ2NzY2YTcyY2RlYThlMjllZQ==
+    ODU3YjJkYTc4ODU2ZGQ4YTNiMmY0YjZiODIzYTZiMjk1ZjA4ZmZmNA==
   data.tar.gz: !binary |-
-    ZmQ4OWI5NmQ2ODQ5MDk4ODYxZjEyMTYwZDkwZTFkMjIxYTk4YzVkMA==
+    YjkwNTQyZjNjYmE4ZWIxNDMyNTliMGNkZDFhYzQ5MzJlMzM2NmJiNg==
 SHA512:
   metadata.gz: !binary |-
-    NTgyM2U3ZmIzZmYxN2I4OWMzZmQyOTg3MmJlMmNmY2Y2YWEzNzVlN2IyYTYx
-    NDM3NGViMjEzNmEzMzRjN2MwNzEwZTA0NTcyMTU4ODQ0MTEyN2M4NzI1Mzhi
-    Yjg2NDM4ZTdlZjM4YmM3NjZiMzk5Y2I4YWJkMWM3ZTNkZmEyZWU=
+    NDQxNTQ3OWNjM2Y0YTUyMWE0OTQyMWYyMzNhZDA1NTM1NzkxOTI2NjlmNzFh
+    MDA3YmI0YTgzZWVjNzk3ZDJjM2QzMDFhOTAyNzI1NTZkMzNiMmZhZjU5YjM3
+    ZDY1NzhkZWNiNWNiN2IzNTQ1NmZmNmM4YTQ5ODdlODlhZDZhMDc=
   data.tar.gz: !binary |-
-    MDBjNzFlMjgyMGU3Y2IwMGVmZmQ5YTM3NGI5ZDlmZThlZTQzYTIwOTY4ZWJl
-    YTI0NmUzYmJjMzRkODI4NGE2ODczYjVmZTQwYjM0Y2E0YzdmZjU2MjQ4MjMy
-    YjNlNmJiMmU0YTNkZTUzYjYyYzZiNmEwY2YyMzIxNWM2ODYxNGE=
+    MjgxZjEwM2E0MmQzZDUyMjdjOGJlZGE3YzdjNjI0YWEwODczZjFlYTViYzA2
+    ZWI3ZWNhODBlNzI5MjQzN2UzZmViYzU1NTdiOWNjNzMzZjAzZGRhZjMyMzAy
+    ZmRlZGY2NDIwYjcwMjc4OTk0N2E2NzU2OWM5NmNjYTc0OWQyZjU=

data/lib/hedgelog/context.rb

@@ -1,12 +1,14 @@
 require 'hedgelog/scrubber'
+require 'hedgelog/normalizer'
 
 class Hedgelog
   class Context
-    def initialize(scrubber, data = {})
+    def initialize(scrubber, normalizer, data = {})
       raise ::ArgumentError, "#{self.class}: argument must be Hash got #{data.class}." unless data.is_a? Hash
       check_reserved_keys(data)
       @data = data
       @scrubber = scrubber
+      @normalizer = normalizer
     end
 
     def []=(key, val)
@@ -50,6 +52,11 @@ class Hedgelog
       self
     end
 
+    def normalize!
+      @data = @normalizer.normalize(@data)
+      self
+    end
+
     def to_h
       @data
     end

data/lib/hedgelog/normalizer.rb

@@ -0,0 +1,33 @@
+class Hedgelog
+  class Normalizer
+    def normalize(data)
+      # Need to Marshal.dump/Marshal.load to deep copy the input so that scrubbing doesn't change global state
+      d = Marshal.load(Marshal.dump(data))
+      normalize_hash(d)
+    end
+
+    def normalize_struct(struct)
+      normalize_hash(Hash[struct.each_pair.to_a])
+    end
+
+    def normalize_hash(hash)
+      Hash[hash.map do |key, val|
+        [key, normalize_thing(val)]
+      end]
+    end
+
+    def normalize_array(array)
+      array.to_json
+    end
+
+    private
+
+    def normalize_thing(thing)
+      return '' if thing.nil?
+      return normalize_struct(thing) if thing.is_a?(Struct)
+      return normalize_array(thing) if thing.is_a?(Array)
+      return normalize_hash(thing) if thing.is_a?(Hash)
+      thing
+    end
+  end
+end

data/lib/hedgelog/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 class Hedgelog
-  VERSION = '0.1.5'.freeze
+  VERSION = '0.1.6'.freeze
 end

data/lib/hedgelog.rb

@@ -2,6 +2,7 @@
 require 'hedgelog/version'
 require 'hedgelog/context'
 require 'hedgelog/scrubber'
+require 'hedgelog/normalizer'
 require 'logger'
 require 'yajl'
 
@@ -26,7 +27,8 @@ class Hedgelog
     @logdev = nil
     @app = nil
     @scrubber = Hedgelog::Scrubber.new
-    @channel_context = Hedgelog::Context.new(@scrubber)
+    @normalizer = Hedgelog::Normalizer.new
+    @channel_context = Hedgelog::Context.new(@scrubber, @normalizer)
 
     if logdev.is_a?(self.class)
       @channel = logdev
@@ -51,7 +53,7 @@ class Hedgelog
     message, context = *yield if block
     context ||= {}
 
-    context = Hedgelog::Context.new(@scrubber, context) unless context.is_a? Hedgelog::Context
+    context = Hedgelog::Context.new(@scrubber, @normalizer, context) unless context.is_a? Hedgelog::Context
     context.merge!(@channel_context)
     context[:message] ||= message
 
@@ -119,6 +121,7 @@ class Hedgelog
   def write(severity, context)
     return true if @logdev.nil?
 
+    context.normalize!
     context.scrub!
 
     data = context.merge(default_data(severity))

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hedgelog
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - Jeff Utter
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-02-24 00:00:00.000000000 Z
+date: 2016-03-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: yajl-ruby
@@ -64,6 +64,7 @@ files:
 - hedgelog.gemspec
 - lib/hedgelog.rb
 - lib/hedgelog/context.rb
+- lib/hedgelog/normalizer.rb
 - lib/hedgelog/scrub_replacement.rb
 - lib/hedgelog/scrubber.rb
 - lib/hedgelog/version.rb