lumber 0.9.2 → 0.9.3

data/CHANGELOG

@@ -1,3 +1,8 @@
+0.9.3
+-----
+
+don't throw excpetion for delegate classes (generators) <54dd68a> [Matt Conway]
+
 0.9.2
 -----
 

data/VERSION

@@ -1 +1 @@
-0.9.2
+0.9.3

data/lib/lumber/lumber.rb

@@ -139,12 +139,11 @@ module Lumber
     # logger of the new class
     parent = clazz.superclass
     while ! parent.nil?
-      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}")
-          break
-        end
+      parent_logger_name = parent.logger.fullname rescue ''
+      parent_is_registered = @@registered_loggers.values.find {|v| parent_logger_name.index(v) == 0}
+      if parent_is_registered && parent.method_defined?(:logger=)
+        clazz.logger = Log4r::Logger.new("#{parent_logger_name}::#{clazz.name}")
+        break
       end
       parent = parent.superclass
     end

data/test/lumber_test.rb

@@ -1,5 +1,5 @@
 require 'test_helper'
-
+require 'delegate'
 
 def new_class(class_name, super_class=nil, super_module=nil)
   s = "class #{class_name}"
@@ -61,6 +61,18 @@ class LumberTest < Test::Unit::TestCase
     assert Foo3.new.logger == Foo1.logger
   end
 
+  should "no logger when parent is via delegate class" do
+    assert !defined?(Foo1)
+    assert !defined?(Foo2)
+    assert !defined?(Foo3)
+    Lumber.setup_logger_hierarchy("Foo1", "root::foo1")
+    eval "class ::Foo1; end"
+    eval "class ::Foo2 < DelegateClass(Foo1); end"
+    eval "class ::Foo3 < Foo2; end"
+    assert_valid_logger('Foo1', "root::foo1")
+    assert ! defined?(Foo3.logger)
+  end
+
   should "allow registering independent loggers for classes in a hierarchy" do
     assert !defined?(Foo1)
     assert !defined?(Foo2)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: lumber
 version: !ruby/object:Gem::Version 
-  version: 0.9.2
+  version: 0.9.3
 platform: ruby
 authors: 
 - Matt Conway
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-16 00:00:00 -04:00
+date: 2009-10-20 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency