lwes-logger 1.0.0 → 1.0.1

data/History.txt

@@ -1,3 +1,10 @@
+=== 1.0.1 / 2010-10-11
+
+* Enhancements:
+
+  * Added support for blocks for meta event data and additional logging data.
+
+
 === 1.0.0 / 2010-10-05
 
 * 1 major enhancement

data/lib/lwes_logger.rb

@@ -10,7 +10,7 @@ require 'uuidtools'
 
 class LwesLogger < Logger
 
-  VERSION = '1.0.0'
+  VERSION = '1.0.1'
 
   HOSTNAME = Socket.gethostname
   FORMAT   = "%s [%s#%d] %5s -- %s: %s\n"
@@ -74,7 +74,7 @@ class LwesLogger < Logger
 
   ##
   # Dump given message to the log device without any formatting.
-  # Creates an LwesLogger::Any event.
+  # Creates an LwesLogger::Any event.@options[:request].
 
   def << msg
     emit_log nil, msg
@@ -132,8 +132,12 @@ class LwesLogger < Logger
       :timestamp => Time.now.strftime(@datetime_format),
       :event_id  => event_id
 
-    data = data.dup
-    data.each{|k, v| event_hash[k] = v.to_s}
+    event_hash.merge! data
+
+    event_hash.each do |key, val|
+      val = val.call if Proc === val
+      event_hash[key] = val.to_s
+    end
 
     event_hash
   end
@@ -147,6 +151,15 @@ class LwesLogger < Logger
   end
 
 
+  ##
+  # Access the meta-event hash to set default values. If given a key and block,
+  # the block will be run on every log output.
+
+  def meta_event_attr key, value=nil, &block
+    @meta_event[key] = value || (block if block_given?)
+  end
+
+
   private
 
 

data/test/test_lwes_logger.rb

@@ -225,6 +225,19 @@ class TestLwesLogger < Test::Unit::TestCase
   end
 
 
+  def test_build_log_event_proc_data
+    @logger.meta_event_attr :test1 do
+      "value1"
+    end
+
+    block = lambda{:value2}
+    hash = @logger.build_log_event nil, nil, nil, :test2 => block
+
+    assert_equal "value1", hash[:test1]
+    assert_equal "value2", hash[:test2]
+  end
+
+
   def test_emit_log
     event_hash = @logger.build_log_event Logger::DEBUG, "log msg"
 
@@ -259,6 +272,23 @@ class TestLwesLogger < Test::Unit::TestCase
   end
 
 
+  def test_meta_event_attr
+    @logger.meta_event_attr :test1, "value1"
+
+    @logger.meta_event_attr :test2 do
+      "value2"
+    end
+
+    @logger.meta_event_attr :test3, "value3" do
+      "not this value!"
+    end
+
+    assert_equal "value1", @logger.meta_event[:test1]
+    assert_equal "value2", @logger.meta_event[:test2].call
+    assert_equal "value3", @logger.meta_event[:test3]
+  end
+
+
   def test_call_format
     time = Time.now
     timestamp = time.strftime("%b %d %H:%M:%S")
@@ -289,13 +319,18 @@ class TestLwesLogger < Test::Unit::TestCase
 
   def add_emit_hooks emitter
     emitter.instance_eval do
+      undef emit
       def emit *args
         @emitted ||= []
         @emitted << args
       end
+
+      undef emitted if defined?(emitted)
       def emitted
         @emitted
       end
+
+      undef reset_emitted if defined?(reset_emitted)
       def reset_emitted
         @emitted = []
       end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: lwes-logger
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: false
   segments: 
   - 1
   - 0
-  - 0
-  version: 1.0.0
+  - 1
+  version: 1.0.1
 platform: ruby
 authors: 
 - Jeremie Castagna
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-08 00:00:00 -07:00
+date: 2010-10-11 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency