low 0.0.11 → 0.0.12

data/lib/low/scoped_logger.rb

@@ -1,48 +1,25 @@
 require 'logger'
 
 module Low
-  # `Low::ScopedLogger` is a tiny wrapper around `Logger`. It allows
+  # `Low::ScopedLogger` is a tiny extension to `Logger`. It allows
   # `scope` to be specified, making it easy to grep any messages generated
   # by a particular instance.
-  class ScopedLogger
+  class ScopedLogger < Logger
     attr_accessor :scope
 
-    def initialize(io = $stdout)
-      @logger = ::Logger.new(io)
-    end
-
-    def level=(level)
-      @logger.level = level
-    end
-
-    def level
-      @logger.level
-    end
-
-    def fatal(message = nil, progname = nil, &block)
-      add ::Logger::FATAL, message, progname, &block
-    end
-
-    def error(message = nil, progname = nil, &block)
-      add ::Logger::ERROR, message, progname, &block
-    end
-
-    def warn(message = nil, progname = nil, &block)
-      add ::Logger::WARN, message, progname, &block
-    end
-
-    def info(message = nil, progname = nil, &block)
-      add ::Logger::INFO, message, progname, &block
-    end
-
-    def debug(message = nil, progname = nil, &block)
-      add ::Logger::DEBUG, message, progname, &block
-    end
+    def add(severity, message = nil, progname = nil, &block)
+      if message.nil?
+        if block_given?
+          message = yield
+        else
+          message = progname
+          progname = @progname
+        end
+      end
 
-    def add(level, message = nil, progname = nil, &block)
       formatted_message = message
       formatted_message = "[#{@scope}] #{formatted_message}" if @scope
-      @logger.add level, formatted_message, progname, &block
+      super severity, formatted_message, progname, &block
     end
   end
 end

data/lib/low/version.rb

@@ -1,3 +1,3 @@
 module Low
-  VERSION = '0.0.11'
+  VERSION = '0.0.12'
 end

data/spec/low/scoped_logger_spec.rb

@@ -82,5 +82,16 @@ describe Low::ScopedLogger do
       message.should =~ /abc123/
       message.should =~ /Yadda$/
     end
+
+    it 'should append the key if the message is specified in a block' do
+      io = StringIO.new
+      logger = Low::ScopedLogger.new(io)
+      logger.scope = 'abc123'
+      logger.info { 'Yadda' }
+
+      io.rewind; message = io.read
+      message.should =~ /abc123/
+      message.should =~ /Yadda$/
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: low
 version: !ruby/object:Gem::Version
-  version: 0.0.11
+  version: 0.0.12
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-13 00:00:00.000000000 Z
+date: 2012-10-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack