bullhorn 0.0.2 → 0.0.3

data/README.rdoc

@@ -33,7 +33,7 @@ See http://bullhorn.it and signup for a free account!
       :filters => %w(password password_confirmation credit_card)
 
 == Rails 2.3.5 backward compatibility
-    
+
     # in config/environment.rb
 
     config.gem 'bullhorn'
@@ -61,4 +61,4 @@ See http://bullhorn.it and signup for a free account!
 
 == Copyright
 
-Copyright (c) 2010 Cyril David. See LICENSE for details.
+Copyright (c) 2010 Cyril David. See LICENSE for details.

data/Rakefile

@@ -53,4 +53,4 @@ Rake::RDocTask.new do |rdoc|
   rdoc.title = "bullhorn #{version}"
   rdoc.rdoc_files.include('README*')
   rdoc.rdoc_files.include('lib/**/*.rb')
-end
+end

data/VERSION

@@ -1 +1 @@
-0.0.2
+0.0.3

data/bullhorn.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{bullhorn}
-  s.version = "0.0.2"
+  s.version = "0.0.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Cyril David"]
-  s.date = %q{2010-05-16}
+  s.date = %q{2010-05-17}
   s.description = %q{drop in rack middleware for bullhorn.it}
   s.email = %q{cyx.ucron@gmail.com}
   s.extra_rdoc_files = [
@@ -81,7 +81,8 @@ Gem::Specification.new do |s|
      "lib/bullhorn/sender.rb",
      "test/helper.rb",
      "test/test_bullhorn.rb",
-     "test/test_bullhorn_plugin.rb"
+     "test/test_bullhorn_plugin.rb",
+     "test/test_ignore_exceptions.rb"
   ]
   s.homepage = %q{http://github.com/sinefunc/bullhorn}
   s.rdoc_options = ["--charset=UTF-8"]
@@ -92,6 +93,7 @@ Gem::Specification.new do |s|
     "test/helper.rb",
      "test/test_bullhorn.rb",
      "test/test_bullhorn_plugin.rb",
+     "test/test_ignore_exceptions.rb",
      "examples/foobar/app/controllers/application_controller.rb",
      "examples/foobar/app/controllers/raiser_controller.rb",
      "examples/foobar/app/helpers/application_helper.rb",

data/lib/bullhorn.rb

@@ -18,14 +18,16 @@ class Bullhorn
   attr :filters
   attr :api_key
   attr :url
+  attr :ignore_exceptions
 
   include Sender
 
   def initialize(app, options = {})
-    @app     = app
-    @api_key = options[:api_key] || raise(ArgumentError, ":api_key is required")
-    @filters = Array(options[:filters])
-    @url     = options[:url] || URL
+    @app               = app
+    @api_key           = options[:api_key] || raise(ArgumentError, ":api_key is required")
+    @filters           = Array(options[:filters])
+    @url               = options[:url] || URL
+    @ignore_exceptions = Array(options[:ignore_exceptions] || default_ignore_exceptions)
   end
 
   def call(env)
@@ -33,10 +35,22 @@ class Bullhorn
       begin
         @app.call(env)
       rescue Exception => ex
-        notify ex, env
+        unless ignore_exceptions.include?(ex.class)
+          notify ex, env
+        end
+
         raise ex
       end
 
     [status, headers, body]
   end
-end
+
+protected
+  def default_ignore_exceptions
+    [].tap do |exceptions|
+      exceptions << ActiveRecord::RecordNotFound if defined? ActiveRecord
+      exceptions << AbstractController::ActionNotFound if defined? AbstractController
+      exceptions << ActionController::RoutingError if defined? ActionController
+    end
+  end
+end

data/lib/bullhorn/plugin.rb

@@ -25,7 +25,7 @@ class Bullhorn
     end
 
     def notify_with_bullhorn!(exception)
-      unless Bullhorn::Plugin.ignored_exceptions.include?(exception)
+      unless Bullhorn::Plugin.ignored_exceptions.include?(exception.class)
         bullhorn = Bullhorn.new(self, Bullhorn::Plugin.options)
         bullhorn.notify(exception, request.env)
       end

data/lib/bullhorn/sender.rb

@@ -56,7 +56,7 @@ class Bullhorn
     end
 
     def sha1(exception)
-      Digest::SHA1.hexdigest(exception.message + exception.backtrace.inspect) 
+      Digest::SHA1.hexdigest(exception.message + exception.backtrace.inspect)
     end
   end
-end
+end

data/test/test_bullhorn.rb

@@ -103,4 +103,83 @@ class TestBullhorn < Test::Unit::TestCase
       end
     end
   end
-end
+
+  context "given ignore_exceptions" do
+    IgnoredError = Class.new(StandardError)
+    RaisedError  = Class.new(StandardError)
+
+    setup do
+      @app = lambda { |env| raise IgnoredError, "Ignored!" }
+
+      @bullhorn = Bullhorn.new(@app, :api_key => "_key_",
+                                     :ignore_exceptions => [IgnoredError])
+
+      FakeWeb.allow_net_connect = false
+    end
+
+    should "not notify the server of the exception" do
+      assert_raise IgnoredError do
+        @bullhorn.call({})
+      end
+    end
+
+    should "notify when raising RaisedError" do
+      @app = lambda { |env| raise RaisedError, "Raised!" }
+
+      @bullhorn = Bullhorn.new(@app, :api_key => "_key_",
+                                     :ignore_exceptions => [IgnoredError])
+
+      assert_raise RaisedError, FakeWeb::NetConnectNotAllowedError do
+        @bullhorn.call({})
+      end
+    end
+  end
+
+  context "when ActiveRecord exists" do
+    module ::ActiveRecord
+      RecordNotFound = Class.new(StandardError)
+    end
+
+    teardown do
+      Object.send :remove_const, :ActiveRecord
+    end
+
+    should "include it in the default ignore_exceptions by default" do
+      bullhorn = Bullhorn.new(lambda {}, :api_key => "_key")
+
+      assert bullhorn.ignore_exceptions.include?(ActiveRecord::RecordNotFound)
+    end
+  end
+
+  context "when AbstractController exists" do
+    module ::AbstractController
+      ActionNotFound = Class.new(StandardError)
+    end
+
+    teardown do
+      Object.send :remove_const, :AbstractController
+    end
+
+    should "include it in the default ignore_exceptions" do
+      bh = Bullhorn.new(lambda {}, :api_key => "_key")
+
+      assert bh.ignore_exceptions.include?(AbstractController::ActionNotFound)
+    end
+  end
+
+  context "when ActionController exists" do
+    module ::ActionController
+      RoutingError = Class.new(StandardError)
+    end
+
+    teardown do
+      Object.send :remove_const, :ActionController
+    end
+
+    should "include it in the default ignored_exceptions" do
+      bh = Bullhorn.new(lambda {}, :api_key => "_key")
+
+      assert bh.ignore_exceptions.include?(ActionController::RoutingError)
+    end
+  end
+end

data/test/test_ignore_exceptions.rb

@@ -0,0 +1,5 @@
+require "helper"
+
+class TestIgnoreExceptions < Test::Unit::TestCase
+
+end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 2
-  version: 0.0.2
+  - 3
+  version: 0.0.3
 platform: ruby
 authors: 
 - Cyril David
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-16 00:00:00 +08:00
+date: 2010-05-17 00:00:00 +08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -140,6 +140,7 @@ files:
 - test/helper.rb
 - test/test_bullhorn.rb
 - test/test_bullhorn_plugin.rb
+- test/test_ignore_exceptions.rb
 has_rdoc: true
 homepage: http://github.com/sinefunc/bullhorn
 licenses: []
@@ -174,6 +175,7 @@ test_files:
 - test/helper.rb
 - test/test_bullhorn.rb
 - test/test_bullhorn_plugin.rb
+- test/test_ignore_exceptions.rb
 - examples/foobar/app/controllers/application_controller.rb
 - examples/foobar/app/controllers/raiser_controller.rb
 - examples/foobar/app/helpers/application_helper.rb