hatchet 0.0.6 → 0.0.7

data/lib/hatchet.rb

@@ -130,12 +130,11 @@ module Hatchet
   #
   # Returns nothing.
   def self.configure
-    @@config = Configuration.new
-    yield @@config
+    yield configuration
     default_formatter = StandardFormatter.new
-    @@config.appenders.each do |appender|
+    configuration.appenders.each do |appender|
       appender.formatter ||= default_formatter
-      appender.levels = @@config.levels if appender.levels.empty?
+      appender.levels = configuration.levels if appender.levels.empty?
     end
   end
 
@@ -153,12 +152,20 @@ module Hatchet
   # Internal: Returns the Array of configured appenders.
   #
   def self.appenders
-    if @@config and @@config.appenders
-      @@config.appenders
-    else
-      []
-    end
+    configuration.appenders
+  end
+
+  private
+
+  # Private: Returns the configuration object, initializing it when necessary.
+  #
+  def self.configuration
+    @config ||= Configuration.new
   end
 
 end
 
+# If we are running in a Rails environment include the Hatchet::Railtie class.
+#
+require_relative 'hatchet/railtie' if defined?(Rails)
+

data/lib/hatchet/configuration.rb

@@ -16,6 +16,12 @@ module Hatchet
     # Creates the levels Hash with a default logging level of info.
     #
     def initialize
+      reset!
+    end
+
+    # Public: Resets the configuration's internal state to the defaults.
+    #
+    def reset!
       @levels = { nil => :info }
       @appenders = []
     end

data/lib/hatchet/railtie.rb

@@ -0,0 +1,87 @@
+# -*- encoding: utf-8 -*-
+
+module Hatchet
+
+  # Public: Railtie to hook Hatchet into Rails.
+  #
+  # Wraps the default Rails.logger, Rails.application.assets.logger, and all log
+  # subscribers found in ActiveSupport::LogSubscriber.log_subscribers
+  # collection.
+  #
+  class Railtie < Rails::Railtie
+
+    # Expose Hatchet's configuration object to consumers through the Rails
+    # config object.
+    #
+    Hatchet.configure do |config|
+      self.config.hatchet = config
+    end
+
+    # Wrap the default Rails.logger, Rails.application.assets.logger, and all
+    # log subscribers found in ActiveSupport::LogSubscriber.log_subscribers
+    # collection on initialization.
+    #
+    initializer 'hatchet_railtie.replace_logger' do |app|
+
+      # Keep a handle to the original logger.
+      #
+      logger = Rails.logger
+
+      # Add an appender that delegates to the current Rails.logger to Hatchet's
+      # configuration.
+      #
+      Hatchet.configure do |config|
+        config.appenders << Hatchet::LoggerAppender.new(logger: logger)
+      end
+
+      # Extend the application with Hatchet.
+      #
+      app.extend Hatchet
+
+      begin
+        # Replace the Rails.logger with the application's Hatchet logger.
+        #
+        logger.debug 'Replacing Rails logger with Hatchet'
+        Rails.logger = app.logger
+
+        # Replace the logger of every subscriber in the
+        # ActiveSupport::LogSubscriber.log_subscribers collection by extending
+        #
+        ActiveSupport::LogSubscriber.log_subscribers.each do |subscriber|
+          logger.debug "Replacing #{subscriber.class} logger with Hatchet"
+          subscriber.extend Hatchet
+        end
+
+        # Replace the Rails.application.assets.logger with a logger that lives
+        # in a module beneath the application. This allows you to target the
+        # asset logger messages directly when managing levels.
+        #
+        # As you can guess by the description this is probably the riskiest so
+        # we do it last.
+        #
+        logger.debug 'Replacing Rails asset logger with Hatchet'
+
+        # Initially replace it with the application logger as it's better for
+        # this to be done if the next part fails.
+        #
+        Rails.application.assets.logger = app.logger
+
+        # Create the <Application>::Assets module and extend it with Hatchet so
+        # that it can replace the assets logger.
+        #
+        assets = Module.new
+        app.class.const_set 'Assets', assets
+        assets.extend Hatchet
+        Rails.application.assets.logger = assets.logger
+
+      rescue
+        # If anything goes wrong along the way log it and let the application
+        # continue.
+        #
+        logger.error 'Failed to replace logger with Hatchet'
+        logger.error $!
+      end
+    end
+  end
+
+end

data/lib/hatchet/standard_formatter.rb

@@ -41,7 +41,7 @@ module Hatchet
       end
 
       @millis = millis
-      @last = @date + "00#{millis}"[1..3]
+      @last = @date + "00#{millis}"[-3..-1]
     end
 
     # Private: Returns the name of the current thread from the processes pid and

data/lib/hatchet/version.rb

@@ -4,6 +4,6 @@ module Hatchet
 
   # Public: The version of Hatchet.
   #
-  VERSION = '0.0.6'
+  VERSION = '0.0.7'
 
 end

data/spec/configuration_spec.rb

@@ -3,6 +3,12 @@
 require_relative 'spec_helper'
 
 describe 'configuration' do
+  before do
+    Hatchet.configure do |config|
+      config.reset!
+    end
+  end
+
   describe 'appender defaults' do
     let(:set_levels) { { unique: :fake_level } }
     let(:appender)   { StoringAppender.new }
@@ -51,7 +57,7 @@ describe 'configuration' do
   end
 
   describe 'global default level' do
-    let(:appender)   { StoringAppender.new }
+    let(:appender) { StoringAppender.new }
 
     before do
       Hatchet.configure do |config|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hatchet
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-10 00:00:00.000000000 Z
+date: 2012-07-15 00:00:00.000000000 Z
 dependencies: []
 description: Logging library that provides the ability to add class/module specific
   filters
@@ -24,6 +24,7 @@ files:
 - lib/hatchet/level_manager.rb
 - lib/hatchet/logger_appender.rb
 - lib/hatchet/message.rb
+- lib/hatchet/railtie.rb
 - lib/hatchet/standard_formatter.rb
 - lib/hatchet/version.rb
 - lib/hatchet.rb