logcast 0.1.4 → 0.2.0

data/lib/logcast/broadcast.rb

@@ -7,4 +7,8 @@ module Logcast::Broadcast
   def subscribe(*args, &block)
     @log.subscribe(*args, &block)
   end
+
+  def subscribers
+    @log.subscribers
+  end
 end

data/lib/logcast/broadcaster.rb

@@ -14,8 +14,14 @@ class Logcast::Broadcaster < ::Logger
   end
 
   def subscribe(subscriber, &block)
+    unless subscriber.respond_to?(:add)
+      original_subscriber = subscriber
+      subscriber = Logger.new(subscriber)
+      subscriber.instance_variable_set(:@logcast_original_subscriber, original_subscriber)
+    end
+
     if block
-      if subscribers.include?(subscriber)
+      if already_subscribed?(subscriber)
         yield
       else
         begin
@@ -26,7 +32,7 @@ class Logcast::Broadcaster < ::Logger
         end
       end
     else
-      subscribers << subscriber unless subscribers.include?(subscriber)
+      subscribers << subscriber unless already_subscribed?(subscriber)
     end
   end
 
@@ -37,22 +43,22 @@ class Logcast::Broadcaster < ::Logger
   # Rails 3
   def add(*args)
     super
-
-    subscribers.each do |subscriber|
-      subscriber.add(*args)
-    end
+    subscribers.each { |subscriber| subscriber.add(*args) }
   end
 
   # Rails 2
   def write(msg)
     self << msg
+    subscribers.each { |subscriber| subscriber.add(level, msg.rstrip, progname) }
+  end
 
-    subscribers.each do |subscriber|
-      if subscriber.respond_to?(:write)
-        subscriber.write(msg)
-      else
-        subscriber.add(level, msg, progname)
-      end
-    end
+  private
+
+  def already_subscribed?(logger)
+    subscribers.map { |s| log_device(s) }.include?(log_device(logger))
+  end
+
+  def log_device(logger)
+    logger.instance_variable_get(:@logcast_original_subscriber) || logger
   end
 end

data/lib/logcast/rails.rb

@@ -1,11 +1,2 @@
 require 'logcast'
-
-logger = if defined?(Rails.logger)
-  Rails.logger
-elsif defined?(RAILS_DEFAULT_LOGGER)
-  RAILS_DEFAULT_LOGGER
-else
-  ActiveRecord::Base.logger
-end
-
-logger.extend(Logcast::Broadcast)
+Logcast.engage!

data/lib/logcast.rb

@@ -1,4 +1,18 @@
 module Logcast
   autoload :Broadcaster, 'logcast/broadcaster.rb'
   autoload :Broadcast, 'logcast/broadcast.rb'
+
+  def self.engage!
+    logger = if defined?(Rails.logger)
+      Rails.logger
+    elsif defined?(RAILS_DEFAULT_LOGGER)
+      RAILS_DEFAULT_LOGGER
+    else
+      ActiveRecord::Base.logger
+    end
+
+    logger = logger.instance_variable_get(:@logger) if logger.class.name == "ActiveSupport::TaggedLogging"
+
+    logger.extend(Logcast::Broadcast)
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: logcast
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-25 00:00:00.000000000 Z
+date: 2013-07-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake