l2meter 0.11.0 → 0.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e11fd798f796a3a70084ef2989c0f3d233d55d7f
-  data.tar.gz: 57141bec2eaee516c4913432720d653f52c3009a
+  metadata.gz: a8758c9423aad4f0d392487036c92d4501e6a8fc
+  data.tar.gz: 14250d1270dabf5f366ee22c7bbab6dff0e8abcf
 SHA512:
-  metadata.gz: 7f0b4f401895a9b09705d488b96451e8f965d862f24f60255a4db401d2ef0f8b87dc45b960815cd3c64878c28cf63fcbdd43c4124e714e0ef39ccd3876417a51
-  data.tar.gz: ff395e97f4c500d9bd3cada7b0e4ed68af6ae1d8f23eb1bacc16c58217b6cabd197d185b6c3950042e2f254344c7f917bcbe0322a2307a9526d3c916cb77e91e
+  metadata.gz: ed94d0f0a82ec17c59e4b57a0598adaac7f0eb6bd2d4662e42bd9ec785a3f563cf56b1ee582bc5fb104b2f676f1ebd161aed76f45ce8c8d37823a8d895a5099b
+  data.tar.gz: c53adc609873409a3a9f5edaf3acce2d6732cc811f347a16764ea3a41cee55b01f96cd2567e6a9b2d1597a64c04e3697c701d4bbb5e0d480b06e4cce59cd0936

data/lib/l2meter/emitter.rb

@@ -80,15 +80,19 @@ module L2meter
     end
 
     def batch
+      autoflush = @autoflush
       @autoflush = false
       yield
     ensure
-      @autoflush = true
-      fire!
+      @autoflush = autoflush
+      write
     end
 
     def merge!(*args)
-      @buffer.merge! format_keys(unwrap(args))
+      unwrap(args).each do |key, value|
+        key = configuration.key_formatter.call(key)
+        @buffer[key] = value
+      end
     end
 
     def fire!
@@ -124,7 +128,6 @@ module L2meter
 
     def build_token(key, value)
       value = value.call if Proc === value
-      return if value.nil?
       value = scrub_value(key, value)
       return if value.nil?
       value == true ? key : "#{key}=#{format_value(value)}"
@@ -149,28 +152,19 @@ module L2meter
 
     def format_value(value)
       case value
-      when /[^\w,.:@\-\]\[]/
-        value.strip.gsub(/\s+/, " ").inspect
-      when String
-        value.to_s
       when Float
         format_float(value)
       when Time
         value.iso8601
-      when Hash
-        format_value(value.inspect)
       when Array
         value.map(&method(:format_value)).join(?,)
       else
-        format_value(value.to_s)
+        format_string_value(value.to_s)
       end
     end
 
-    def format_keys(hash)
-      hash.each_with_object({}) do |(key, value), acc|
-        key = configuration.key_formatter.call(key)
-        acc[key] = value
-      end
+    def format_string_value(value)
+      value =~ /[^\w,.:@\-\]\[]/ ? value.strip.gsub(/\s+/, " ").inspect : value.to_s
     end
 
     def write(params = nil)
@@ -223,7 +217,7 @@ module L2meter
     end
 
     def scrub_value(key, value)
-      if scrubber = configuration.scrubber
+      if !value.nil? && scrubber = configuration.scrubber
         scrubber.call(key, value)
       else
         value

data/lib/l2meter/version.rb

@@ -1,3 +1,3 @@
 module L2meter
-  VERSION = "0.11.0".freeze
+  VERSION = "0.12.0".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: l2meter
 version: !ruby/object:Gem::Version
-  version: 0.11.0
+  version: 0.12.0
 platform: ruby
 authors:
 - Pavel Pravosud
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-26 00:00:00.000000000 Z
+date: 2017-09-07 00:00:00.000000000 Z
 dependencies: []
 description: 
 email:
@@ -45,7 +45,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.6.12
 signing_key: 
 specification_version: 4
 summary: L2met friendly log formatter