logging 0.9.1 → 0.9.2

data/History.txt

@@ -1,3 +1,10 @@
+== 0.9.2 / 2008-09-03
+
+2 bug fixes
+  - Properly generates logger names for anonymous classes and
+    modules and meta-classes
+  - Fixed the rescue clause when 'turn' cannot be required
+
 == 0.9.1 / 2008-08-14
 
 1 minor enhancement

data/Rakefile

@@ -16,11 +16,13 @@ PROJ.rdoc.dir = 'doc/rdoc'
 #PROJ.rdoc.remote_dir = 'rdoc'
 PROJ.rdoc.remote_dir = ''
 PROJ.version = Logging::VERSION
-PROJ.release_name = %q{Green Eggs & Ham}
+PROJ.release_name = %q{Meta Class Madness}
 
 PROJ.exclude << %w[^tags$ ^tasks/archive ^coverage]
 PROJ.rdoc.exclude << '^data'
-PROJ.svn.path = ''
+
+PROJ.ann.email[:server] = 'smtp.gmail.com'
+PROJ.ann.email[:port] = 587
 
 depend_on 'flexmock'
 depend_on 'lockfile'

data/lib/logging.rb

@@ -10,7 +10,7 @@ unless defined? Logging
 module Logging
 
   # :stopdoc:
-  VERSION = '0.9.1'
+  VERSION = '0.9.2'
   LIBPATH = ::File.expand_path(::File.dirname(__FILE__)) + ::File::SEPARATOR
   PATH = ::File.dirname(LIBPATH) + ::File::SEPARATOR
   WIN32 = %r/djgpp|(cyg|ms|bcc)win|mingw/ =~ RUBY_PLATFORM

data/lib/logging/repository.rb

@@ -170,8 +170,8 @@ module Logging
       when :root, 'root'; :root
       when String; key
       when Symbol; key.to_s
-      when Module; key.name
-      when Object; key.class.name
+      when Module; key.logger_name
+      when Object; key.class.logger_name
       end
     end
 

data/lib/logging/utils.rb

@@ -45,8 +45,8 @@ class String
   # call-seq:
   #    reduce( width, ellipses = '...' )    #=> string
   #
-  # Reduce the size of the current string to the given _width_ by remove
-  # characters from the middle of ths tring and replacing them with
+  # Reduce the size of the current string to the given _width_ by removing
+  # characters from the middle of the string and replacing them with
   # _ellipses_. If the _width_ is greater than the length of the string, the
   # string is returned unchanged. If the _width_ is less than the length of
   # the _ellipses_, then the _ellipses_ are returned.
@@ -69,4 +69,37 @@ class String
   end
 end
 
+class Module
+
+  # call-seq:
+  #    logger_name    #=> string
+  #
+  # Returns a predictable logger name for the current module or class. If
+  # used within an anonymous class, the first non-anonymous class name will
+  # be used as the logger name. If used within a meta-class, the name of the
+  # actual class will be used as the logger name. If used within an
+  # anonymous module, the string 'anonymous' will be returned.
+  #
+  def logger_name
+    return name unless name.empty?
+
+    # check if this is a metaclass (or eigenclass)
+    if ancestors.include? Class
+      inspect =~ %r/#<Class:([^#>]+)>/
+      return $1
+    end
+
+    # see if we have a superclass
+    if respond_to? :superclass
+      return superclass.logger_name
+    end
+
+    # we are an anonymous module
+    ::Logging.log_internal(-2) {
+      'cannot return a predictable, unique name for anonymous modules'
+    }
+    return 'anonymous'
+  end
+end
+
 # EOF

data/test/setup.rb

@@ -8,7 +8,9 @@ require 'rubygems'
 require 'test/unit'
 require 'fileutils'
 require 'stringio'
-require 'turn' rescue nil
+begin
+  require 'turn'
+rescue LoadError; end
 
 # This line is needed for Ruby 1.9 -- hashes throw a "KeyError" in 1.9
 # whereas they throw an "IndexError" in 1.8

data/test/test_utils.rb

@@ -84,6 +84,30 @@ module TestLogging
       assert_equal '##', r
     end
 
+    def test_logger_name
+      assert_equal 'Array', Array.logger_name
+
+      c = Class.new(Array)
+      assert_equal '', c.name
+      assert_equal 'Array', c.logger_name
+
+      meta = class << Array; self; end
+      assert_equal '', meta.name
+      assert_equal 'Array', meta.logger_name
+
+      m = Module.new
+      assert_equal '', m.name
+      assert_equal 'anonymous', m.logger_name
+
+      c = Class.new(::Logging::Logger)
+      assert_equal '', c.name
+      assert_equal 'Logging::Logger', c.logger_name
+      
+      meta = class << ::Logging::Logger; self; end
+      assert_equal '', meta.name
+      assert_equal 'Logging::Logger', meta.logger_name
+    end
+
   end  # class TestUtils
 end  # module TestLogging
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: logging
 version: !ruby/object:Gem::Version 
-  version: 0.9.1
+  version: 0.9.2
 platform: ruby
 authors: 
 - Tim Pease
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-08-14 00:00:00 -06:00
+date: 2008-09-03 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency