lograge 0.0.4 → 0.0.5

data/lib/lograge.rb

@@ -25,20 +25,23 @@ module Lograge
   end
 
   def self.remove_existing_log_subscriptions
-    %w(redirect_to process_action start_processing send_data send_file write_fragment read_fragment exist_fragment? expire_fragment expire_page write_page).each do |event|
-      unsubscribe_from_event(:action_controller, event)
-    end
-
-    %w{render_template render_partial render_collection}.each do |event|
-      unsubscribe_from_event(:action_view, event)
+    ActiveSupport::LogSubscriber.log_subscribers.each do |subscriber|
+      case subscriber
+      when ActionView::LogSubscriber
+        unsubscribe(:action_view, subscriber)
+      when ActionController::LogSubscriber
+        unsubscribe(:action_controller, subscriber)
+      end
     end
   end
 
-  def self.unsubscribe_from_event(component, event)
-    delegate_type = component.to_s.classify
-    ActiveSupport::Notifications.notifier.listeners_for("#{event}.#{component}").each do |listener|
-      if listener.inspect =~ /delegate[^a-z]+#{delegate_type}/
-        ActiveSupport::Notifications.unsubscribe listener
+  def self.unsubscribe(component, subscriber)
+    events = subscriber.public_methods(false).reject{ |method| method.to_s == 'call' }
+    events.each do |event|
+      ActiveSupport::Notifications.notifier.listeners_for("#{event}.#{component}").each do |listener|
+        if listener.instance_variable_get('@delegate') == subscriber
+          ActiveSupport::Notifications.unsubscribe listener
+        end
       end
     end
   end

data/lib/lograge/log_subscriber.rb

@@ -25,6 +25,8 @@ module Lograge
       elsif payload[:exception]
         exception, message = payload[:exception]
         " status=500 error='#{exception}:#{message}'"
+      else
+        " status=0"
       end
     end
 

data/lib/lograge/version.rb

@@ -1,3 +1,3 @@
 module Lograge
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

data/spec/lograge_logsubscriber_spec.rb

@@ -79,6 +79,13 @@ describe Lograge::RequestLogSubscriber do
       log_output.string.should =~ /error='AbstractController::ActionNotFound:Route not found'/
     end
 
+    it "should return an unknown status when no status or exception is found" do
+      event.payload[:status] = nil
+      event.payload[:exception] = nil
+      subscriber.process_action(event)
+      log_output.string.should =~ /status=0/
+    end
+
     describe "with a redirect" do
       before do
         Thread.current[:lograge_location] = "http://www.example.com"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lograge
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-16 00:00:00.000000000 Z
+date: 2012-07-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70345743126700 !ruby/object:Gem::Requirement
+  requirement: &70342810146560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70345743126700
+  version_requirements: *70342810146560
 - !ruby/object:Gem::Dependency
   name: guard-rspec
-  requirement: &70345743136340 !ruby/object:Gem::Requirement
+  requirement: &70342810146040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70345743136340
+  version_requirements: *70342810146040
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70345743177800 !ruby/object:Gem::Requirement
+  requirement: &70342810145560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70345743177800
+  version_requirements: *70342810145560
 - !ruby/object:Gem::Dependency
   name: actionpack
-  requirement: &70345743191500 !ruby/object:Gem::Requirement
+  requirement: &70342810144900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +54,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70345743191500
+  version_requirements: *70342810144900
 description: Tame Rails' multi-line logging into a single line per request
 email:
 - meyer@paperplanes.de