lumber 0.9.6 → 0.10.0

data/CHANGELOG

@@ -1,3 +1,8 @@
+0.9.6
+-----
+
+Made LoggerSupport module actually set up inherited loggers. <6758d73> [Kevin Menard]
+
 0.9.5
 -----
 

data/VERSION

@@ -1 +1 @@
-0.9.6
+0.10.0

data/lib/lumber/lumber.rb

@@ -10,8 +10,15 @@ rescue LoadError
   require "active_support/core_ext/object/duplicable"
 end
 
-require "active_support/core_ext/class"
-require "active_support/core_ext/module"
+begin
+  # attempt to explicitly load ActiveSupport::Deprecation for rails 3.2 (needed for active_support/core_ext/module)
+  # this doesn't appear to be necessary for earlier versions of rails (and may raise a LoadError)
+  require "active_support/deprecation"
+ensure
+  require "active_support/core_ext/class"
+  require "active_support/core_ext/module"
+end
+
 
 module Lumber
 
@@ -77,10 +84,16 @@ module Lumber
     begin
       clazz = class_name.constantize
 
-      if clazz.respond_to? :class_inheritable_accessor
-        clazz.class_eval do
-          class_inheritable_accessor :logger
-          self.logger = Log4r::Logger.new(class_logger_fullname)
+      # ActiveSupport 3.2 introduced class_attribute, which is supposed to be used instead of class_inheritable_accessor if available
+      [:class_attribute, :class_inheritable_accessor].each do |class_attribute_method|
+
+        if clazz.respond_to? class_attribute_method
+          clazz.class_eval do
+            send class_attribute_method, :logger
+            self.logger = Log4r::Logger.new(class_logger_fullname)
+          end
+
+          break
         end
       end
 
@@ -123,7 +136,13 @@ module Lumber
 
   def self.add_lumber_logger(clazz, logger_name)
     clazz.class_eval do
-      class_inheritable_accessor :logger
+      # ActiveSupport 3.2 introduced class_attribute, which is supposed to be used instead of class_inheritable_accessor if available
+      if respond_to? :class_attribute
+        class_attribute :logger
+      else
+        class_inheritable_accessor :logger
+      end
+
       self.logger = Log4r::Logger.new(logger_name)
 
       class << self

metadata

@@ -1,76 +1,61 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: lumber
-version: !ruby/object:Gem::Version 
-  hash: 55
-  prerelease: false
-  segments: 
-  - 0
-  - 9
-  - 6
-  version: 0.9.6
+version: !ruby/object:Gem::Version
+  version: 0.10.0
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Matt Conway
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2010-10-12 00:00:00 -04:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-03-23 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: shoulda
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &70359307360500 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: log4r
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *70359307360500
+- !ruby/object:Gem::Dependency
+  name: log4r
+  requirement: &70359307359560 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: activesupport
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *70359307359560
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: &70359307345720 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id003
-description: Lumber tries to make it easy to use the more robust log4r logging system within your rails application.  To do this it sets up log4r configuration from a yml file, and provides utility methods for adding a :logger accessor to classes dynamicaly as they get created.
+  prerelease: false
+  version_requirements: *70359307345720
+description: Lumber tries to make it easy to use the more robust log4r logging system
+  within your rails application.  To do this it sets up log4r configuration from a
+  yml file, and provides utility methods for adding a :logger accessor to classes
+  dynamicaly as they get created.
 email: matt@conwaysplace.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - LICENSE
 - README.rdoc
 - TODO
-files: 
+files:
 - CHANGELOG
 - LICENSE
 - README.rdoc
@@ -83,44 +68,28 @@ files:
 - 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
 homepage: http://github.com/wr0ngway/lumber
 licenses: []
-
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
-require_paths: 
+rdoc_options: []
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.8.15
 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
+test_files: []

data/test/logger_support_test.rb

@@ -1,43 +0,0 @@
-require 'test_helper.rb'
-
-class LoggerSupportTest < Test::Unit::TestCase
-
-  def setup
-    root = "#{File.dirname(__FILE__)}/.."
-    Lumber.init(:root => root,
-                :env => 'test',
-                :config_file => "#{root}/generators/lumber/templates/log4r.yml",
-                :log_file => "/tmp/lumber-test.log")
-  end
-
-  def teardown
-    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
-    class Bar < Foo; end;
-    assert_equal Foo.logger, Log4r::Logger["rails::LoggerSupportTest::Foo"]
-    assert_equal Bar.logger, Log4r::Logger["rails::LoggerSupportTest::Foo::Bar"]
-    assert_equal Bar.logger.parent, Log4r::Logger["rails::LoggerSupportTest::Foo"]
-  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/lumber_test.rb

@@ -1,153 +0,0 @@
-require 'test_helper'
-require 'delegate'
-
-def new_class(class_name, super_class=nil, super_module=nil)
-  s = "class #{class_name}"
-  s << " < #{super_class}" if super_class
-  s << "; end"
-
-  s = "module #{super_module}; #{s}; end" if super_module
-  
-  eval s
-end
-
-class LumberTest < Test::Unit::TestCase
-
-  def setup
-    root = "#{File.dirname(__FILE__)}/.."
-    Lumber.init(:root => root,
-                :env => 'test',
-                :config_file => "#{root}/generators/lumber/templates/log4r.yml",
-                :log_file => "/tmp/lumber-test.log")
-  end
-
-  def teardown
-    Object.constants.grep(/^Foo/).each do |c|
-      Object.send(:remove_const, c)
-    end
-  end
-
-  def assert_valid_logger(class_name, logger_name)
-    clazz = eval class_name
-    assert clazz
-    assert clazz.respond_to?(:logger)
-    lgr = clazz.logger
-    assert lgr.instance_of?(Log4r::Logger)
-    assert_equal logger_name, lgr.fullname
-  end
-
-  should "not do anything if no loggers registered" do
-    assert defined?(Object.inherited_with_lumber_log4r)
-    assert ! defined?(Object.logger)
-  end
-
-  should "allow registering logger for a class before the class is defined" do
-    assert !defined?(Foo1)
-    Lumber.setup_logger_hierarchy("Foo1", "root::foo1")
-    new_class('Foo1')
-    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 "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)
-    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")
-    new_class('Foo1')
-    Foo1.class_eval do
-      cattr_accessor :logger, :foo
-    end
-    assert defined?(Foo1.foo)
-    assert_valid_logger('Foo1', "root::foo1")
-  end
-
-  should "allow registering logger for a nested class before the class is defined" do
-    assert !defined?(Bar1::Foo1)
-    Lumber.setup_logger_hierarchy("Bar1::Foo1", "root::foo1")
-    new_class('Foo1', nil, 'Bar1')
-    assert_valid_logger('Bar1::Foo1', "root::foo1")
-  end
-
-  should "allow registering logger for a class after the class is defined" do
-    assert !defined?(Foo1)
-    new_class('Foo1')
-    assert defined?(Foo1)
-
-    Lumber.setup_logger_hierarchy("Foo1", "root::Foo1")
-    assert_valid_logger('Foo1', "root::Foo1")
-  end
-
-  should "register loggers for subclasses of registered classes" do
-    assert !defined?(Foo1)
-    assert !defined?(Foo2)
-    assert !defined?(Foo3)
-    Lumber.setup_logger_hierarchy("Foo1", "root::Foo1")
-    new_class('Foo1')
-    new_class('Foo2', 'Foo1')
-    new_class('Foo3')
-    assert_valid_logger('Foo1', "root::Foo1")
-    assert_valid_logger('Foo2', "root::Foo1::Foo2")
-    assert ! defined?(Foo3.logger)
-  end
-
-  should "register loggers for sub-subclasses of registered classes" do
-    assert !defined?(Foo1)
-    assert !defined?(Foo2)
-    assert !defined?(Foo3)
-    Lumber.setup_logger_hierarchy("Foo1", "root::Foo1")
-    new_class('Foo1')
-    new_class('Foo2', 'Foo1')
-    new_class('Foo3', 'Foo2')
-    assert_valid_logger('Foo1', "root::Foo1")
-    assert_valid_logger('Foo2', "root::Foo1::Foo2")
-    assert_valid_logger('Foo3', "root::Foo1::Foo2::Foo3")
-  end
-
-  should "register loggers for sub-subclasses of registered classes even when middle class not a logger" do
-    assert !defined?(Foo1)
-    assert !defined?(Foo2)
-    assert !defined?(Foo3)
-    new_class('Foo1')
-    new_class('Foo2', 'Foo1')
-    Lumber.setup_logger_hierarchy("Foo1", "root::Foo1")
-    new_class('Foo3', 'Foo2')
-    assert_valid_logger('Foo1', "root::Foo1")
-    assert !defined?(Foo2.logger) || Foo2.logger.nil?
-    assert_valid_logger('Foo3', "root::Foo1::Foo3")
-  end
-  
-end

data/test/test_helper.rb

@@ -1,11 +0,0 @@
-require 'rubygems'
-require 'test/unit'
-require 'shoulda'
-require 'mocha'
-
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
-$LOAD_PATH.unshift(File.dirname(__FILE__))
-require 'lumber'
-
-class Test::Unit::TestCase
-end