lumber 0.9.4 → 0.9.5

data/CHANGELOG

@@ -1,3 +1,8 @@
+0.9.4
+-----
+
+rails3 support <096ad75> [Matt Conway]
+
 0.9.3
 -----
 

data/README.rdoc

@@ -23,7 +23,14 @@ to config/environment.rb:
   # If you really want, you can make all classes have a logger
   # Lumber.setup_logger_hierarchy("Object", "root::object")
 
-    
+Additionally, you can also add loggers to individual classes by including the LumberLoggerSupport module
+  class Foo
+    include Lumber::LoggerSupport
+  end
+
+and Foo.logger/Foo.new.logger will log to a logger named "rails::Foo".  This creates a heirarchy of loggers for classes
+nested within modules, so you can use the namespace to enable/disable loggers
+
 If you want to change the log level for a different environment, add a line like below to the config/environments/<env>.rb
 
   # Set info as the default log level for production

data/VERSION

@@ -1 +1 @@
-0.9.4
+0.9.5

data/lib/lumber/logger_support.rb

@@ -0,0 +1,26 @@
+module Lumber
+
+  # Include this module to add a logger accessible from both class and instance methods.
+  # A logger heirarchy will be created if the class including this module is nested
+  module LoggerSupport
+
+    def self.included(receiver)
+      receiver.class_eval do
+        class_inheritable_accessor :logger
+        last_logger = nil
+        name_parts = self.name.split("::")
+        name_parts.insert(0, Lumber::BASE_LOGGER)
+        name_parts.each_with_index do |part, i|
+          partial = name_parts[0..i].join("::")
+          last_logger = Log4r::Logger[partial]
+          if ! last_logger
+            last_logger = Log4r::Logger.new(partial)
+          end
+        end
+        self.logger = last_logger
+      end
+    end
+
+  end
+  
+end

data/lib/lumber/lumber.rb

@@ -13,6 +13,9 @@ require "active_support/core_ext/module"
 
 module Lumber
 
+  # name of top level logger (can't be root as you can't have outputters on root)
+  BASE_LOGGER= 'rails'
+
   # Initializes log4r system.  Needs to happen in
   # config/environment.rb before Rails::Initializer.run
   #
@@ -45,7 +48,7 @@ module Lumber
     if defined?(RAILS_DEFAULT_LOGGER)
       Object.send(:remove_const, :RAILS_DEFAULT_LOGGER)
     end
-    Object.const_set('RAILS_DEFAULT_LOGGER', Log4r::Logger['rails'])
+    Object.const_set('RAILS_DEFAULT_LOGGER', Log4r::Logger[BASE_LOGGER])
 
     @@registered_loggers = {}
     self.register_inheritance_handler()

data/lib/lumber.rb

@@ -2,5 +2,6 @@ $:.unshift(File.dirname(__FILE__))
 
 # before config block
 require "lumber/lumber"
+require "lumber/logger_support"
 require "lumber/log4r"
 

data/test/logger_support_test.rb

@@ -0,0 +1,36 @@
+require 'test_helper.rb'
+
+class LoggerSupportTest < Test::Unit::TestCase
+
+  def teardown
+    Log4r::Logger::Repository.instance.loggers.clear
+    LoggerSupportTest.constants.grep(/^Foo/).each do |c|
+      LoggerSupportTest.send(:remove_const, c)
+    end
+  end
+
+  should "create logger for chain" do
+    class Foo; include Lumber::LoggerSupport; end
+    assert_equal Log4r::Logger["rails::LoggerSupportTest::Foo"], Foo.logger
+    assert_equal Log4r::Logger["rails::LoggerSupportTest"], Foo.logger.parent
+    assert_equal Log4r::Logger["rails"], Foo.logger.parent.parent
+    assert_equal Log4r::Logger.root, Foo.logger.parent.parent.parent
+  end
+
+  should "have a logger instance accessible from an instance method" do
+    logger = stub_everything()
+    Log4r::Logger.stubs(:new).returns(logger)
+    class Foo; include Lumber::LoggerSupport; def member_method; logger.debug('hi'); end; end
+    logger.expects(:debug).with('hi')
+    Foo.new.member_method
+  end
+
+  should "have a logger instance accessible from a class method " do
+    logger = stub_everything()
+    Log4r::Logger.stubs(:new).returns(logger)
+    class Foo; include Lumber::LoggerSupport; def self.class_method; logger.debug('hi'); end; end
+    logger.expects(:debug).with('hi')
+    Foo.class_method
+  end
+
+end

data/test/test_helper.rb

@@ -1,6 +1,7 @@
 require 'rubygems'
 require 'test/unit'
 require 'shoulda'
+require 'mocha'
 
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 $LOAD_PATH.unshift(File.dirname(__FILE__))

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 9
-  - 4
-  version: 0.9.4
+  - 5
+  version: 0.9.5
 platform: ruby
 authors: 
 - Matt Conway
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-25 00:00:00 -04:00
+date: 2010-07-01 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -77,7 +77,9 @@ files:
 - generators/lumber/templates/log4r.yml
 - lib/lumber.rb
 - lib/lumber/log4r.rb
+- lib/lumber/logger_support.rb
 - lib/lumber/lumber.rb
+- test/logger_support_test.rb
 - test/lumber_test.rb
 - test/test_helper.rb
 has_rdoc: true
@@ -113,5 +115,6 @@ signing_key:
 specification_version: 3
 summary: Lumber integrates the log4r logging system within your application.
 test_files: 
+- test/logger_support_test.rb
 - test/lumber_test.rb
 - test/test_helper.rb