tagged_logger 0.3.3 → 0.4.0

data/Rakefile

@@ -3,7 +3,7 @@ require 'rake/testtask'
 
 Rake::TestTask.new do |t|
   t.libs << "test"
-  t.test_files = FileList['test/test.rb', 'test/test_examples.rb']
+  t.test_files = FileList['test/test.rb', 'test/test_rails.rb', 'test/test_examples.rb']
   t.verbose = true
 end
 

data/lib/tagged_logger.rb

@@ -14,14 +14,37 @@ class TaggedLogger
     end
     
     def rules(options = {}, &block)
-      klasses = []
-#      klasses << AbstractController::Base if Object.const_defined? :AbstractController
-      klasses << Object
+      @old_methods_restored = false
       override = options.delete :override
+      klasses = overridees
       klasses = klasses.select{ |klass| !klass.respond_to?(:logger, true)}  if !override
       klasses.each{ |klass| inject_logger_method_in_call_chain(klass)}
       instance_eval(&block)
     end
+
+    def klass_has_method?(klass, method)
+      klass.instance_methods(false).include?(RUBY_VERSION >= '1.9' ? method.to_sym : method.to_s)
+    end
+    
+    def restore_old_logger_methods
+      return if @old_methods_restored
+      @old_methods_restored = true
+      overridees.each do |klass|
+        if klass_has_method?(klass, :tagged_logger_original_logger)
+          klass.class_eval {alias_method :logger, :tagged_logger_original_logger}
+        elsif klass_has_method?(klass, :logger)
+          klass.class_eval {remove_method :logger}
+        end
+      end
+    end
+    
+    def overridees
+      klasses = []
+      klasses << ActionController::Base if Object.const_defined? :ActionController
+      klasses << Object
+      klasses
+    end
+    
     
     def blocks_for(level, tag)
       blocks = []
@@ -125,6 +148,10 @@ class TaggedLogger
     end
     
     def inject_logger_method_in_call_chain(definee_klass)
+      if klass_has_method?(definee_klass, :logger)
+        #so we could resurrect old :logger method if we need
+        definee_klass.class_eval { alias_method :tagged_logger_original_logger, :logger }
+      end
       definee_klass.class_eval do
         def logger
           klass = self.class == Class ? self : self.class

data/test/test.rb

@@ -1,19 +1,6 @@
-require 'rubygems'
-require 'test/unit'
-require 'shoulda'
-require 'logger'
-require 'rr'
+$LOAD_PATH.unshift File.dirname(__FILE__)
+require 'test_helper'
 
-require File.dirname(__FILE__) + '/../tagged_logger'
-
-class TestLogDevice
-  attr_reader :last
-  def write(msg); @last = msg; end
-  def close; end;  
-  def to_s; @last || ""; end
-  def inspect; to_s; end
-  def clear; write(""); end
-end
 
 class TaggedLoggerTest < Test::Unit::TestCase
   include RR::Adapters::TestUnit
@@ -24,7 +11,7 @@ class TaggedLoggerTest < Test::Unit::TestCase
     end
     
     teardown do
-      Object.class_eval { remove_method :logger }
+      TaggedLogger.restore_old_logger_methods
     end
     
     should "be able to intialize with minimal effort, without defining any rules" do

data/test/test_helper.rb

@@ -0,0 +1,8 @@
+$LOAD_PATH.unshift File.dirname(__FILE__) + '/../'
+require 'rubygems'
+require 'tagged_logger'
+require 'test/unit'
+require 'shoulda'
+require 'logger'
+require 'rr'
+require 'test_log_device'

data/test/test_log_device.rb

@@ -0,0 +1,8 @@
+class TestLogDevice
+  attr_reader :last
+  def write(msg); @last = msg; end
+  def close; end;  
+  def to_s; @last || ""; end
+  def inspect; to_s; end
+  def clear; write(""); end
+end

data/test/test_rails.rb

@@ -0,0 +1,57 @@
+$LOAD_PATH.unshift File.dirname(__FILE__)
+require 'test_helper'
+require 'rails/all'
+
+module Test
+  def self.rails_log_device
+    @rails_log_device ||= TestLogDevice.new
+  end
+  
+  class Application < Rails::Application
+    config.logger = Logger.new(Test.rails_log_device)
+  end
+end
+
+class TestController < ActionController::Base
+  def hi
+    logger.info "hi"
+  end
+end
+
+Test::Application.initialize!
+
+class TaggedLoggerRailsTest < Test::Unit::TestCase
+  include RR::Adapters::TestUnit
+
+  context "stub output device @@stub_out;" do
+    setup do
+      @@stub_out = TestLogDevice.new
+    end
+    
+    teardown do
+      TaggedLogger.restore_old_logger_methods
+    end
+
+    should "be able possible to initialize in the way to override Rails existing logger" do
+      assert TestController.new.respond_to? :logger
+      TaggedLogger.rules(:override=>true) do 
+        info /.*/ do |level, tag, message|
+          @@stub_out.write(tag.to_s)
+        end
+      end
+      @@stub_out.write("TestController")
+      TestController.new.hi
+    end
+    
+    should "be possible to restore old logger methods" do
+      TaggedLogger.rules(:override=>true) do 
+        info(/.*/) {|level, tag, message| debugger; stop = 9}
+      end
+      TaggedLogger.restore_old_logger_methods
+      mock(Test.rails_log_device).write("hi\n")
+      TestController.new.hi
+    end
+    
+  end    
+end
+

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: tagged_logger
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 15
   prerelease: false
   segments: 
   - 0
-  - 3
-  - 3
-  version: 0.3.3
+  - 4
+  - 0
+  version: 0.4.0
 platform: ruby
 authors: 
 - Aleksandr Furmanov
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-17 00:00:00 -05:00
+date: 2010-10-19 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -60,6 +60,22 @@ dependencies:
         version: "0"
   type: :development
   version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: rails
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">"
+      - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 3
+        - 0
+        - 0
+        version: 3.0.0
+  type: :development
+  version_requirements: *id004
 description: Detaches _what_ is logged from _how_ it is logged
 email: 
 - aleksandr.furmanov@gmail.com
@@ -79,7 +95,10 @@ files:
 - test/expected_examples_output.txt
 - test/test.rb
 - test/test_examples.rb
+- test/test_helper.rb
+- test/test_log_device.rb
 - test/test_performance.rb
+- test/test_rails.rb
 - examples/changing_format.rb
 - examples/one_log_per_classes.rb
 - examples/one_tag_per_classes.rb