slf4r 0.3.0 → 0.3.1

data/lib/log4r_adapter.rb

@@ -4,7 +4,7 @@ module Log4r
     def initialize(_fullname, _level=nil, _additive=true, _trace=false)
       @logger = ::Slf4r::LoggerFacade.new(_fullname)
     end
-    
+
     def method_missing(method, *args, &block)
       @logger.send(method, *args, &block) if @logger.respond_to?(method)
     end

data/lib/logging_adapter.rb

@@ -8,7 +8,7 @@ module Logging
     class << self
       alias :[] :new
     end
-    
+
     def method_missing(method, *args, &block)
       @logger.send(method, *args, &block) if @logger.respond_to?(method)
     end

data/lib/slf4r/abstract_logger_facade.rb

@@ -6,7 +6,7 @@ module Slf4r
     def format(exception)
       (": #{exception.message}:\n\t#{exception.backtrace.join("\n\t") if exception.backtrace }") if exception
     end
-    
+
     def _debug(msg)
       raise NotImplementedError
     end
@@ -23,7 +23,11 @@ module Slf4r
       raise NotImplementedError
     end
 
-    public 
+    def _fatal(msg)
+      raise NotImplementedError
+    end
+
+    public
 
     attr_reader :name
 
@@ -36,8 +40,10 @@ module Slf4r
     end
 
     def debug(msg = nil, exception = nil)
-      msg, exception = yield if block_given?
-      _debug("#{msg}#{format(exception)}")
+      if(debug?)
+        msg, exception = yield if block_given?
+        _debug("#{msg}#{format(exception)}")
+      end
     end
 
     def info?
@@ -45,8 +51,10 @@ module Slf4r
     end
 
     def info(msg = nil, exception = nil)
-      msg, exception = yield if block_given?
-      _info("#{msg}#{format(exception)}")
+      if(info?)
+        msg, exception = yield if block_given?
+        _info("#{msg}#{format(exception)}")
+      end
     end
 
     def warn?
@@ -54,8 +62,10 @@ module Slf4r
     end
 
     def warn(msg = nil, exception = nil)
-      msg, exception = yield if block_given?
-      _warn("#{msg}#{format(exception)}")
+      if(warn?)
+        msg, exception = yield if block_given?
+        _warn("#{msg}#{format(exception)}")
+      end
     end
 
     def error?
@@ -63,8 +73,21 @@ module Slf4r
     end
 
     def error(msg = nil, exception = nil)
-      msg, exception = yield if block_given?
-      _error("#{msg}#{format(exception)}")
+      if(error?)
+        msg, exception = yield if block_given?
+        _error("#{msg}#{format(exception)}")
+      end
+    end
+
+    def fatal?
+      raise NotImplementedError
+    end
+
+    def fatal(msg = nil, exception = nil)
+      if(fatal?)
+        msg, exception = yield if block_given?
+        _fatal("#{msg}#{format(exception)}")
+      end
     end
   end
 end

data/lib/slf4r/java_logger.rb

@@ -13,13 +13,13 @@ module Slf4r
     attr_reader :name
 
     attr_reader :logger
-    
+
     def initialize(name)
       @name = name
       @logger = org.slf4j.LoggerFactory.getLogger(name.to_s.sub(/^::/, '').gsub(/::/, '.'))
     end
 
-    [:debug, :info, :warn, :error].each do |level|
+    [:debug, :info, :warn, :error, :fatal].each do |level|
       class_eval <<-CODE
     def #{level}?
       @logger.is_#{level}_enabled
@@ -27,7 +27,7 @@ module Slf4r
 
     def #{level}(msg = nil, exception = nil)
       if(@logger.is_#{level}_enabled)
-        msg, exception = yield if block_given?        
+        msg, exception = yield if block_given?
         if(exception.type == NativeException)
           @logger.#{level}(msg, exception.cause)
         else

data/lib/slf4r/log4r_logger.rb

@@ -3,18 +3,18 @@ require 'slf4r/abstract_logger_facade'
 
 module Slf4r
   class LoggerFacade < AbstractLoggerFacade
-    
+
     attr_reader :logger
-    
+
     def initialize(name)
       super
       @logger = ::Log4r::Logger::Repository[name] || ::Log4r::Logger.new(name)
     end
 
-    public 
+    public
 
     def debug?
-      @logger.level == 0
+      @logger.level == Log4r::DEBUG
     end
 
     def _debug(msg)
@@ -22,7 +22,7 @@ module Slf4r
     end
 
     def info?
-      @logger.level <= 1
+      @logger.level <= Log4r::INFO
     end
 
     def _info(msg)
@@ -30,7 +30,7 @@ module Slf4r
     end
 
     def warn?
-      @logger.level <= 2
+      @logger.level <= Log4r::WARN
     end
 
     def _warn(msg)
@@ -38,12 +38,20 @@ module Slf4r
     end
 
     def error?
-      @logger.level <= 3
+      @logger.level <= Log4r::ERROR
     end
 
     def _error(msg)
       @logger.error(msg)
     end
-    
+
+    def fatal?
+      @logger.level <= Log4r::FATAL
+    end
+
+    def _fatal(msg)
+      @logger.fatal(msg)
+    end
+
   end
 end

data/lib/slf4r/logging_logger.rb

@@ -3,9 +3,9 @@ require 'slf4r/abstract_logger_facade'
 
 module Slf4r
   class LoggerFacade < AbstractLoggerFacade
-    
+
     attr_reader :logger
-    
+
     def initialize(name)
       super
       log_name = nil
@@ -43,7 +43,11 @@ module Slf4r
       log(3, msg)
     end
 
-    public 
+    def _fatal(msg)
+      log(4, msg)
+    end
+
+    public
 
     def debug?
       @logger.level == 0
@@ -59,6 +63,10 @@ module Slf4r
 
     def error?
       @logger.level <= 3
-    end    
+    end
+
+    def fatal?
+      @logger.level <= 4
+    end
   end
 end

data/lib/slf4r/noop_logger.rb

@@ -5,10 +5,10 @@ module Slf4r
       @name = name
     end
 
-    public 
+    public
 
     attr_reader :name
-    
+
     def debug?
       false
     end
@@ -36,5 +36,12 @@ module Slf4r
 
     def error(msg = nil, exception = nil)
     end
+
+    def fatal?
+      false
+    end
+
+    def fatal(msg = nil, exception = nil)
+    end
   end
 end

data/lib/slf4r/ruby_logger.rb

@@ -3,7 +3,7 @@ require 'slf4r/abstract_logger_facade'
 
 module Slf4r
   class LoggerFacade4RubyLogger
-    
+
     @@file = STDERR
     @@datetime_format = "%Y-%m-%d %H:%M:%S "
 
@@ -17,7 +17,7 @@ module Slf4r
     end
 
     def self.level=(level)
-      @@level = level.instance_of?(Fixnum) ? level : 
+      @@level = level.instance_of?(Fixnum) ? level :
         ::Logger.const_get(level.to_s.upcase)
     end
 
@@ -29,9 +29,9 @@ module Slf4r
       @@file = file
     end
   end
-   
+
   class LoggerFacade < AbstractLoggerFacade
-     
+
     def initialize(name)
       super
       @logger = LoggerFacade4RubyLogger.new_logger_facade(name)
@@ -61,7 +61,11 @@ module Slf4r
       log(::Logger::ERROR, msg)
     end
 
-    public 
+    def _fatal(msg)
+      log(::Logger::FATAL, msg)
+    end
+
+    public
 
     def debug?
       @logger.debug?
@@ -78,5 +82,9 @@ module Slf4r
     def error?
       @logger.error?
     end
+
+    def fatal?
+      @logger.fatal?
+    end
   end
 end

data/lib/slf4r/version.rb

@@ -1,3 +1,3 @@
 module Slf4r
-  VERSION = '0.3.0'
+  VERSION = '0.3.1'
 end

data/lib/slf4r/wrapped_logger.rb

@@ -39,7 +39,11 @@ module Slf4r
       @logger.error(msg)
     end
 
-    public 
+    def _fatal(msg)
+      @logger.fatal(msg)
+    end
+
+    public
 
     def debug?
       @logger.debug?
@@ -56,5 +60,9 @@ module Slf4r
     def error?
       @logger.error?
     end
+
+    def fatal?
+      @logger.fatal?
+    end
   end
 end

data/lib/slf4r.rb

@@ -1,6 +1,6 @@
 require 'slf4r/logger'
 begin
   require 'slf4r/java_logger'
-rescue 
+rescue
   require 'slf4r/ruby_logger'
 end

data/licenses/mit-license.php

@@ -45,7 +45,7 @@
  <input type="text" maxlength="128" name="search_theme_form" id="edit-search-theme-form-1" size="15" value="" title="Enter the terms you wish to search for." class="form-text" />
 </div>
 <input type="submit" name="op" id="edit-submit-3" value="Search"  class="form-submit" />
-<input type="hidden" name="form_build_id" id="form-170ff38086b4f9c0f4a5721b05fc013c" value="form-170ff38086b4f9c0f4a5721b05fc013c"  />
+<input type="hidden" name="form_build_id" id="form-63b764693b5f6c8413114c00843ecb40" value="form-63b764693b5f6c8413114c00843ecb40"  />
 <input type="hidden" name="form_id" id="edit-search-theme-form" value="search_theme_form"  />
 </div>
 
@@ -89,7 +89,7 @@
 <input type="submit" name="op" id="edit-submit-2" value="Log in"  class="form-submit" />
 <div class="item-list"><ul><li class="first"><a href="/user/register" title="Create a new user account.">Create new account</a></li>
 <li class="last"><a href="/user/password" title="Request new password via e-mail.">Request new password</a></li>
-</ul></div><input type="hidden" name="form_build_id" id="form-fa0c8fdd7cb8c41199a3f7de7460d66e" value="form-fa0c8fdd7cb8c41199a3f7de7460d66e"  />
+</ul></div><input type="hidden" name="form_build_id" id="form-9d23b46f847d1b7fffaee3248559c653" value="form-9d23b46f847d1b7fffaee3248559c653"  />
 <input type="hidden" name="form_id" id="edit-user-login-block" value="user_login_block"  />
 
 </div></form>
@@ -141,7 +141,7 @@ THE SOFTWARE.</p>
 
   <h2>Comment viewing options</h2>
 
-  <div class="content"><div class="container-inline"><input type="hidden" name="form_build_id" id="form-10b484a00b7df2bbcad3d924d5376ac3" value="form-10b484a00b7df2bbcad3d924d5376ac3"  />
+  <div class="content"><div class="container-inline"><input type="hidden" name="form_build_id" id="form-d05b982852a0332231c0915c07da1792" value="form-d05b982852a0332231c0915c07da1792"  />
 <input type="hidden" name="form_id" id="edit-comment-controls" value="comment_controls"  />
 <div class="form-item" id="edit-mode-wrapper">
  <select name="mode" class="form-select" id="edit-mode" ><option value="1">Flat list - collapsed</option><option value="2">Flat list - expanded</option><option value="3">Threaded list - collapsed</option><option value="4" selected="selected">Threaded list - expanded</option></select>
@@ -402,7 +402,7 @@ Martin M. Musatov</p>
 
   <h2>Comment viewing options</h2>
 
-  <div class="content"><div class="container-inline"><input type="hidden" name="form_build_id" id="form-3e084c2c4b73ed012315ba6496924616" value="form-3e084c2c4b73ed012315ba6496924616"  />
+  <div class="content"><div class="container-inline"><input type="hidden" name="form_build_id" id="form-812da949335437287350d654a2bb21c6" value="form-812da949335437287350d654a2bb21c6"  />
 <input type="hidden" name="form_id" id="edit-comment-controls-1" value="comment_controls"  />
 <div class="form-item" id="edit-mode-1-wrapper">
  <select name="mode" class="form-select" id="edit-mode-1" ><option value="1">Flat list - collapsed</option><option value="2">Flat list - expanded</option><option value="3">Threaded list - collapsed</option><option value="4" selected="selected">Threaded list - expanded</option></select>

data/spec/log4r_logger_spec.rb

@@ -12,7 +12,7 @@ require 'slf4r/log4r_logger'
 
 Log4r::Logger.root.level = Log4r::DEBUG
 
-out = Log4r::FileOutputter.new('logfile', 
+out = Log4r::FileOutputter.new('logfile',
                                :filename => (basedir + 'tmp' + 'log4r.txt').to_s,
                                :trunc=>false,
                                :level => Log4r::DEBUG)

data/spec/logger_helper.rb

@@ -2,17 +2,17 @@ require 'pathname'
 require Pathname(__FILE__).dirname.expand_path + 'spec_helper'
 def Slf4r.flush(klass)
   remove_const(klass.to_sym) if const_defined? klass.to_sym
-end 
+end
 
 def behave_as_logger(logger)
   filename = logger.name
   describe logger.name do
-    
+
     it 'should have a name' do
       logger.name.should == filename
       logger.name.should_not be_nil
     end
-    
+
     it 'should log into a file - no method args' do
       len1 = File2String.new("tmp/#{filename}.txt").length
       logger.debug()
@@ -28,7 +28,7 @@ def behave_as_logger(logger)
       len1 = File2String.new("tmp/#{filename}.txt").length
       len1.should > len2
     end
-    
+
     it 'should log into a file - via block' do
       len1 = File2String.new("tmp/#{filename}.txt").length
       logger.debug{}
@@ -44,7 +44,7 @@ def behave_as_logger(logger)
       len1 = File2String.new("tmp/#{filename}.txt").length
       len1.should > len2
     end
-    
+
     it 'should log into a file - exception' do
       exception = StandardError.new
       len1 = File2String.new("tmp/#{filename}.txt").length
@@ -61,6 +61,6 @@ def behave_as_logger(logger)
       len1 = File2String.new("tmp/#{filename}.txt").length
       len1.should > len2
     end
-    
+
   end
 end

data/spec/spec_helper.rb

@@ -1,5 +1,5 @@
 class File2String < String
-  
+
   def initialize(file)
     content = ''
     f = File.open(file, "r")

data/spec/wrapper_logger_spec.rb

@@ -7,7 +7,7 @@ load basedir + 'lib' + 'slf4r' + 'wrapped_logger.rb'
 
 logger = ::Logger.new(basedir + 'tmp' + 'wrapped.txt')
 logger.level == ::Logger::DEBUG
- 
+
 Slf4r::LoggerFacade4WrappedLogger.logger = logger
 
 behave_as_logger(Slf4r::LoggerFacade.new('wrapped'))

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: slf4r
 version: !ruby/object:Gem::Version 
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors: 
   - Kristian Meier
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-09 00:00:00 +05:30
+date: 2010-05-12 00:00:00 +05:30
 default_executable: 
 dependencies: 
   - !ruby/object:Gem::Dependency