mini_logger 0.3.0 → 0.4.0

data/lib/mini_logger.rb

@@ -4,41 +4,64 @@ require 'logger'
 
 module MiniLogger
   extend self
+    
+  LOG_LEVEL_MAP = {
+    :debug   =>::Logger::DEBUG,
+    :info    =>::Logger::INFO,
+    :warn    =>::Logger::WARN,
+    :error   =>::Logger::ERROR,
+    :faltal  =>::Logger::FATAL
+  }
   
-  DEBUG = ::Logger::DEBUG
-  INFO  = ::Logger::INFO
-  WARN  = ::Logger::WARN
-  ERROR = ::Logger::ERROR
-  FATAL = ::Logger::FATAL
+  DEBUG   = LOG_LEVEL_MAP[:debug]
+  INFO    = LOG_LEVEL_MAP[:info]
+  WARN    = LOG_LEVEL_MAP[:warn]
+  ERROR   = LOG_LEVEL_MAP[:error]
+  FATAL   = LOG_LEVEL_MAP[:fatal]
 
   DEFAULT_LOGCHANNEL      = STDERR
-  DEFAULT_LOGLEVEL        = DEBUG
+  DEFAULT_LOGLEVEL        = LOG_LEVEL_MAP[:info]
   DEFAULT_DATETIME_FORMAT = "%Y/%m/%d %H:%M:%S"
 
 
   def configure( atts = {} )
     
-    @logger                 ||= ::Logger.new( atts[:log_channel] ? atts[:log_channel] : DEFAULT_LOGCHANNEL )
-    @logger.level           = atts[:log_level] ? atts[:log_level] : DEFAULT_LOGLEVEL
-    @logger.datetime_format = atts[:dt_format] ? atts[:dt_format] : DEFAULT_DATETIME_FORMAT
+    log_channel = atts[:log_channel] ? atts[:log_channel] : DEFAULT_LOGCHANNEL
+    log_level   = LOG_LEVEL_MAP.has_value?( atts[:log_level] ) ? atts[:log_level] : DEFAULT_LOGLEVEL
+    dt_format   = atts[:dt_format] ? atts[:dt_format] : DEFAULT_DATETIME_FORMAT  
+      
+    @logger                 ||= ::Logger.new( log_channel )
+    @logger.level           ||= log_level
+    @logger.datetime_format ||= dt_format
     
     self
   end
 
+
+  def level( )
+    self.configure unless @logger
+    
+    @logger.level
+  end
+  
+  
+  def level=( new_log_level )
+    
+    self.configure unless @logger
+
+    if LOG_LEVEL_MAP.has_value?( new_log_level )
+      @logger.level = new_log_level
+    else
+      raise ArgumentError.new( "Bad log level: #{new_log_level}" )
+    end 
+  end
+  
   
   def method_missing( method, *arguments, &block )
 
     self.configure unless @logger
 
     return unless( [:debug, :debug?, :info, :info?, :warn, :warn?, :error, :error?, :fatal].include?( method ) )
-
-    case arguments.length
-      when 0
-        @logger.send( method )
-      when 1 
-        @logger.send( method, arguments[0] )
-      else
-        @logger.send( method, arguments )
-    end
+    @logger.send( method, *arguments, &block )
   end  
 end

data/lib/version.rb

@@ -2,7 +2,7 @@ module MiniLogger
   module Version
     INFO = {
       :major =>0,
-      :minor =>3,
+      :minor =>4,
       :patch =>0
     }
 

data/test/test_mini_logger.rb

@@ -11,47 +11,56 @@ class TestMiniLogger < Test::Unit::TestCase
   context "A Default Logger" do
     
     setup do
-      MiniLogger.configure( :log_channel=>"/dev/null", :log_level=>MiniLogger::DEBUG )
+      @mini_logger_debug = MiniLogger.configure( :log_channel=>"/dev/null", :log_level=>MiniLogger::DEBUG )
     end
-  
+    
     should "write a debug line" do
-      assert( MiniLogger.debug( "debug" ) )
+      assert( @mini_logger_debug.debug( "debug" ) )
     end  
 
     should "write a info line" do
-      assert( MiniLogger.info( "info" ) )
+      assert( @mini_logger_debug.info( "info" ) )
     end  
   
     should "write a warn line" do
-      assert( MiniLogger.warn( "warn" ) )
+      assert( @mini_logger_debug.warn( "warn" ) )
     end  
   
     should "write a error line" do
-      assert( MiniLogger.error( "error" ) )
+      assert( @mini_logger_debug.error( "error" ) )
     end  
   
     should "write a fatal line" do
-      assert( MiniLogger.fatal( "fatal" ) )
+      assert( @mini_logger_debug.fatal( "fatal" ) )
+    end
+
+    should "change log level to ERROR" do
+      
+      @mini_logger_debug.level = MiniLogger::ERROR
+      assert( @mini_logger_debug.error? )
     end
 
-    should "log level ERROR" do
-      MiniLogger.configure( :log_level=>MiniLogger::ERROR )
-      assert( MiniLogger.error? )
+    should "change log level to WARN" do
+      
+      @mini_logger_debug.level = MiniLogger::WARN 
+      assert( @mini_logger_debug.warn? )
     end
 
-    should "log level WARN" do
-      MiniLogger.configure( :log_level=>MiniLogger::WARN )
-      assert( MiniLogger.warn? )
+    should "change log level to INFO" do
+      
+      @mini_logger_debug.level = MiniLogger::INFO 
+      assert( @mini_logger_debug.info? )
     end
 
-    should "log level INFO" do
-      MiniLogger.configure( :log_level=>MiniLogger::INFO )
-      assert( MiniLogger.info? )
+    should "change log level to DEBUG" do
+      
+      @mini_logger_debug.level = MiniLogger::DEBUG 
+      assert( @mini_logger_debug.debug? )
     end
 
-    should "log level DEBUG" do
-      MiniLogger.configure( :log_level=>MiniLogger::DEBUG )
-      assert( MiniLogger.debug? )
+    should "raise an ArgumentError" do
+      
+      assert_raise( ArgumentError ) { @mini_logger_debug.level = "bad value" }
     end
   end
 end

metadata

@@ -2,7 +2,7 @@
 name: mini_logger
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors: 
 - Javier Juarez
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-06 00:00:00 +01:00
+date: 2011-03-14 00:00:00 +01:00
 default_executable: 
 dependencies: []
 
@@ -51,7 +51,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: http://github.com/jjuarez/mini_logger
-rubygems_version: 1.5.2
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: A real simple logger utility