lumber 0.9.1 → 0.9.2

data/CHANGELOG

@@ -1,3 +1,11 @@
+0.9.2
+-----
+
+custom task <a280ac8> [Matt Conway]
+handle logger delegation, a.l.a. ActionView->ActionController <54aa99a> [Matt Conway]
+extra test <0504aa9> [Matt Conway]
+use canonical gem <1e6d3f9> [Matt Conway]
+
 0.9.1
 -----
 

data/VERSION

@@ -1 +1 @@
-0.9.1
+0.9.2

data/lib/lumber/lumber.rb

@@ -139,7 +139,7 @@ module Lumber
     # logger of the new class
     parent = clazz.superclass
     while ! parent.nil?
-      if defined?(parent.logger) && parent.logger
+      if parent.method_defined?(:logger) && parent.method_defined?(:logger=) && parent.logger
         parent_is_registered = @@registered_loggers.values.find {|v| parent.logger.fullname.index(v) == 0}
         if parent_is_registered
           clazz.logger = Log4r::Logger.new("#{parent.logger.fullname}::#{clazz.name}")

data/test/lumber_test.rb

@@ -48,6 +48,30 @@ class LumberTest < Test::Unit::TestCase
     assert_valid_logger('Foo1', "root::foo1")
   end
 
+  should "not register new logger for subclasses of classes that delegate logger" do
+    assert !defined?(Foo1) # ActionController::Base
+    assert !defined?(Foo2) # ActionView::Base
+    assert !defined?(Foo3) # Subclass of ActionView::Base
+    Lumber.setup_logger_hierarchy("Foo1", "root::foo1")
+    eval "class ::Foo1; end"
+    eval "class ::Foo2; delegate :logger, :to => Foo1; end"
+    eval "class ::Foo3 < Foo2; end"
+    assert_valid_logger('Foo1', "root::foo1")
+    assert Foo2.new.logger == Foo1.logger
+    assert Foo3.new.logger == Foo1.logger
+  end
+
+  should "allow registering independent loggers for classes in a hierarchy" do
+    assert !defined?(Foo1)
+    assert !defined?(Foo2)
+    Lumber.setup_logger_hierarchy("Foo1", "root::foo1")
+    Lumber.setup_logger_hierarchy("Foo2", "root::foo2")
+    new_class('Foo1')
+    new_class('Foo2', 'Foo1')
+    assert_valid_logger('Foo1', "root::foo1")
+    assert_valid_logger('Foo2', "root::foo2")
+  end
+
   should "prevent cattr_accessor for a class registered before the class is defined" do
     assert !defined?(Foo1)
     Lumber.setup_logger_hierarchy("Foo1", "root::foo1")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: lumber
 version: !ruby/object:Gem::Version 
-  version: 0.9.1
+  version: 0.9.2
 platform: ruby
 authors: 
 - Matt Conway
@@ -13,7 +13,7 @@ date: 2009-10-16 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: thoughtbot-shoulda
+  name: shoulda
   type: :development
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement