l2meter 0.4.1 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1cb1df98a25ea5a5da6e78bc8b074601d36bd00a
-  data.tar.gz: a720220af04ea3d3a2d12c2090072e25c002e58c
+  metadata.gz: e9da3c4d1d2be86ce7bd40b98d85467eea70490e
+  data.tar.gz: 2e8a3deb41608f27ae8ddc67cbeda41938cdb454
 SHA512:
-  metadata.gz: bbcf29e153ecb87f62e9fb090863c4a57b96b0c8a8ab73685e3acd16052648a2163510a62ff6e5df1d2d2abeb79c1484ada7eb250eb77858054798d349fdca3b
-  data.tar.gz: cecb45d744a0818bdf16f62f74edb4c48ec724a40083d475c6ccc16e0559419874aab0e77d166befdb61cd4323df2d71d081e2e704554367b6c60abbeda6f603
+  metadata.gz: 32ee41b3d8f5cd1c13583bea3fa05204ccef57aadcdfdcc1703a2a740ed7be288dec294fc6f6a0de8555e8b0329d79ed28a786cd28c3e5126f67fe4aecad08df
+  data.tar.gz: 496b78a386a8eb6968323b319db4e766b6013a8362916e609f6c1da6886fc9c90cfef5ddc510154ad81f51875e943d4573fea0de3409b4cee6350b9e7caa1449

data/lib/l2meter/emitter.rb

@@ -4,6 +4,8 @@ module L2meter
 
     def initialize(configuration: Configuration.new)
       @configuration = configuration
+      @buffer = {}
+      @autoflush = true
       @start_times = []
       @contexts = []
       @outputs = []
@@ -63,7 +65,7 @@ module L2meter
       push_context context_data
       yield
     ensure
-      context_data.length.times { @contexts.pop }
+      context_data.length.times { @contexts.pop } if block_given?
     end
 
     def clone
@@ -71,10 +73,11 @@ module L2meter
     end
 
     def batch
-      @outputs.push StringIO.new
+      @autoflush = false
       yield
     ensure
-      flush_buffer @outputs.pop
+      @autoflush = true
+      flush_buffer
     end
 
     protected
@@ -93,8 +96,11 @@ module L2meter
 
     def unwrap(*args)
       params = Hash === args.last ? args.pop : {}
-      args = args.compact.map { |key| [key, true] }.to_h
-      args.merge(params)
+      args.compact.map { |key| [key, true] }.to_h.merge(params)
+    end
+
+    def stringify_keys(hash)
+      hash.each_with_object({}) { |(k, v), a| a[k.to_s] = v }
     end
 
     def merge_contexts(params)
@@ -129,22 +135,9 @@ module L2meter
       configuration.key_formatter.call(key)
     end
 
-    def format_keys(params)
-      params.inject({}) do |normalized, (key, value)|
-        normalized.tap { |n| n[format_key(key)] = value }
-      end
-    end
-
     def write(params)
-      tokens = format_keys(params).map do |key, value|
-        value == true ? key : [key, format_value(value)] * ?=
-      end
-
-      emit configuration.sort?? tokens.sort : tokens
-    end
-
-    def emit(tokens)
-      output_queue.last.puts [*tokens].join(" ")
+      @buffer.merge! stringify_keys(params)
+      flush_buffer if @autoflush
     end
 
     def log_with_prefix(method, key, value, unit: nil)
@@ -185,11 +178,17 @@ module L2meter
       [configuration.output, *@outputs].compact
     end
 
-    def flush_buffer(buffer)
-      output = buffer.tap(&:rewind).read
-      tokens = output.split(/\s+/).reverse
-      tokens.uniq! { |token| token.split(?=, 2).first }
-      emit tokens.reverse
+    def flush_buffer
+      tokens = @buffer.map do |key, value|
+        key = format_key(key)
+        value == true ? key : "#{key}=#{format_value(value)}"
+      end
+
+      tokens.sort! if configuration.sort?
+
+      output_queue.last.puts [*tokens].join(" ")
+    ensure
+      @buffer.clear
     end
   end
 end

data/lib/l2meter/version.rb

@@ -1,3 +1,3 @@
 module L2meter
-  VERSION = "0.4.1".freeze
+  VERSION = "0.5.0".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: l2meter
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.5.0
 platform: ruby
 authors:
 - Pavel Pravosud
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-06 00:00:00.000000000 Z
+date: 2016-04-11 00:00:00.000000000 Z
 dependencies: []
 description: 
 email: