l2meter 0.7.0 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0f840ff86f170320c7b8800247ff31827ea8ebba
-  data.tar.gz: 048da3851b32cf7f79fe481c9f62882fec540004
+  metadata.gz: 4f4adb53ff781efc36f715a3cace441b9020719f
+  data.tar.gz: fd0e1932d11244637a20f3d63430ea176cf69441
 SHA512:
-  metadata.gz: 96f55fe64f2ea359780693faa6ed160d340fa83528fadf1200e4bb5972ea9692f4ee994cb6e4fc51f53e1f0c6e80fd467e962e046e05b7dee55fbf6b6301c040
-  data.tar.gz: 7dc8a4cd1fbf39654320f1cc96d18a90322ac8046fed7b55cfd49b1857c92bca1aff18a7b072b060cd37ef21ab3f039513a726d34621cd6299fadd95a51c7401
+  metadata.gz: 8aeeb27f3afa5ddcb71db8dce17ee624e339cae4fccc7ba064cbdf65372e51609da4849e93d575297332e40851d11d618d0c40266ba2ac198cf485bfb07b8033
+  data.tar.gz: 8a8a6555a573d7743f2a94939c1a7e8b51cbff0c226e8fb9de3f1f660dc748857ed32e4d18fc901545764a99223d59b074520661744fdea23d4a31fe7ba4cea1

data/lib/l2meter/configuration.rb

@@ -1,35 +1,26 @@
 module L2meter
   class Configuration
     attr_writer :output
-    attr_accessor :source, :prefix
-    attr_reader :context, :key_formatter, :value_formatter, :output
+    attr_accessor :source, :prefix, :float_precision
+    attr_reader :context, :key_formatter, :output
 
     DEFAULT_KEY_FORMATTER = ->(key) do
-      key.to_s.strip.downcase.gsub(/[^-a-z\d.#]+/, ?_)
+      key.to_s.strip.downcase.gsub(/[^-a-z\d.#]+/, ?-)
     end
 
-    DEFAULT_VALUE_FORMATTER = ->(value) do
-      value = value.to_s.strip
-      value =~ /\s/ ? value.gsub(/\s+/, " ").inspect : value
-    end
-
-    private_constant :DEFAULT_KEY_FORMATTER, :DEFAULT_VALUE_FORMATTER
+    private_constant :DEFAULT_KEY_FORMATTER
 
     def initialize
       @sort = false
       @key_formatter = DEFAULT_KEY_FORMATTER
-      @value_formatter = DEFAULT_VALUE_FORMATTER
       @output = $stdout
+      @float_precision = 4
     end
 
     def format_keys(&block)
       @key_formatter = block
     end
 
-    def format_values(&block)
-      @value_formatter = block
-    end
-
     def sort?
       @sort
     end

data/lib/l2meter/emitter.rb

@@ -1,3 +1,5 @@
+require "time"
+
 module L2meter
   class Emitter
     attr_reader :configuration
@@ -12,13 +14,15 @@ module L2meter
     end
 
     def log(*args)
-      params = unwrap(*args)
-      params = merge_contexts(params)
+      merge! source: configuration.source
+      merge! *current_contexts
+      merge! *args
+      elapse!
 
       if block_given?
-        wrap params, &proc
+        wrap &proc
       else
-        write params
+        write
       end
     end
 
@@ -85,67 +89,90 @@ module L2meter
       yield
     ensure
       @autoflush = true
-      flush_buffer
+      fire!
     end
 
-    protected
-
-    def push_context(context_data)
-      @contexts.concat context_data.reverse
+    def merge!(*args)
+      @buffer.merge! format_keys(unwrap(args))
     end
 
-    private
+    def fire!
+      tokens = @buffer.map do |key, value|
+        next if value.nil?
+        key = format_key(key)
+        value == true ? key : "#{key}=#{format_value(value)}"
+      end.compact
 
-    def clone_with_context(context)
-      clone.tap do |emitter|
-        emitter.push_context context
-      end
-    end
+      tokens.sort! if configuration.sort?
 
-    def unwrap(*args)
-      params = Hash === args.last ? args.pop : {}
-      args.compact.map { |key| [key, true] }.to_h.merge(params)
+      output_queue.last.print [*tokens].join(" ") + "\n" if tokens.any?
+    ensure
+      @buffer.clear
     end
 
-    def stringify_keys(hash)
-      hash.each_with_object({}) { |(k, v), a| a[k.to_s] = v }
+    protected
+
+    def push_context(context_data)
+      @contexts.concat context_data
     end
 
-    def merge_contexts(params)
-      params = current_context.merge(params)
-      source = configuration.source
-      params = { source: source }.merge(params) if source
+    private
 
-      if start_time = @start_times.last
-        elapsed = Time.now - start_time
-        params = merge_elapsed(elapsed, params)
+    def unwrap(args)
+      args.each_with_object({}) do |context, result|
+        next if context.nil?
+        context = Hash[context, true] unless Hash === context
+        result.merge! context
       end
+    end
 
-      params
+    def format_float(value, unit: nil)
+      "%.#{configuration.float_precision}f#{unit}" % value
     end
 
-    def merge_elapsed(elapsed, params)
-      params.merge(elapsed: "%.4fs" % elapsed)
+    def clone_with_context(context)
+      clone.tap do |emitter|
+        emitter.push_context context
+      end
     end
 
-    def current_context
-      contexts_queue.inject({}) do |result, context|
+    def current_contexts
+      contexts_queue.map do |context|
         context = context.call if context.respond_to?(:call)
-        result.merge(unwrap(context))
-      end.to_a.reverse.to_h
+        context
+      end
     end
 
     def format_value(value)
-      configuration.value_formatter.call(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)
+      end
     end
 
     def format_key(key)
       configuration.key_formatter.call(key)
     end
 
-    def write(params)
-      @buffer.merge! stringify_keys(params)
-      flush_buffer if @autoflush
+    def format_keys(hash)
+      hash.each_with_object({}) { |(k, v), a| a[format_key(k)] = v }
+    end
+
+    def write(params = nil)
+      merge! params
+      fire! if @autoflush
     end
 
     def log_with_prefix(method, key, value, unit: nil)
@@ -153,31 +180,27 @@ module L2meter
       log Hash["#{method}##{key}", value]
     end
 
-    def wrap(params)
-      write params.merge(at: :start)
+    def wrap
+      start_time = Time.now
+      params = @buffer.clone
+      write at: :start
+      result = exception = nil
 
-      result, error, elapsed = execute_with_elapsed(&proc)
-
-      status = if error
-        { at: :exception, exception: error.class, message: error.message.strip }
-      else
-        { at: :finish }
+      begin
+        result = yield
+        merge! params, at: :finish
+      rescue Object => exception
+        merge! params, at: :exception, exception: exception.class, message: exception.message
       end
 
-      write params.merge(merge_elapsed(elapsed, status))
+      elapse! start_time
+      write
 
-      raise error if error
+      raise exception if exception
 
       result
     end
 
-    def execute_with_elapsed
-      time_at_start = Time.now
-      [yield, nil, Time.now - time_at_start]
-    rescue Object => exception
-      [nil, exception, Time.now - time_at_start]
-    end
-
     def contexts_queue
       [configuration.context, *@contexts].compact
     end
@@ -186,18 +209,9 @@ module L2meter
       [configuration.output, *@outputs].compact
     end
 
-    def flush_buffer
-      tokens = @buffer.map do |key, value|
-        next if value.nil?
-        key = format_key(key)
-        value == true ? key : "#{key}=#{format_value(value)}"
-      end.compact
-
-      tokens.sort! if configuration.sort?
-
-      output_queue.last.print [*tokens].join(" ") + "\n" if tokens.any?
-    ensure
-      @buffer.clear
+    def elapse!(since = @start_times.last)
+      return unless since
+      merge! elapsed: format_float(Time.now - since, unit: ?s)
     end
   end
 end

data/lib/l2meter/null_object.rb

@@ -1,5 +1,10 @@
 module L2meter
   class NullObject
+    # Silence forwardable stdlib warnings about forwarding private metods.
+    def log(*)
+      super
+    end
+
     def method_missing(*)
       yield if block_given?
     end

data/lib/l2meter/thread_safe.rb

@@ -12,8 +12,10 @@ module L2meter
       batch
       configuration
       count
+      fire!
       log
       measure
+      merge!
       push_context
       sample
       silence

data/lib/l2meter/version.rb

@@ -1,3 +1,3 @@
 module L2meter
-  VERSION = "0.7.0".freeze
+  VERSION = "0.8.0".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: l2meter
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.8.0
 platform: ruby
 authors:
 - Pavel Pravosud
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-02 00:00:00.000000000 Z
+date: 2017-01-12 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.7
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: L2met friendly log formatter