exceptional 2.0.17 → 2.0.18

data/init.rb

@@ -15,16 +15,10 @@ if (defined?(Exceptional::VERSION::STRING) rescue nil) && %w(development test).i
 else
   begin
     Exceptional::Config.load(File.join(RAILS_ROOT, "/config/exceptional.yml"))
-
     Exceptional.logger.info("Loading Exceptional for #{Rails::VERSION::STRING}")
-
-    if Rails::VERSION::STRING.to_i > 2 
-      puts "Exceptional Rails 3 Support via Rack"
-      ::Rails.configuration.middleware.insert_after 'ActionDispatch::ShowExceptions', Rack::RailsExceptional      
-    else    
-      require File.join('exceptional', 'integration', 'rails')
-      require File.join('exceptional', 'integration', 'dj')
-    end
+    
+    require File.join('exceptional', 'integration', 'rails')    
+    require File.join('exceptional', 'integration', 'dj') if defined?(Delayed::Job)
   rescue => e
     STDERR.puts "Problem starting Exceptional Plugin. Your app will run as normal."
     Exceptional.logger.error(e.message)

data/lib/exceptional.rb

@@ -14,6 +14,8 @@ require 'exceptional/integration/rack'
 require 'exceptional/integration/rack_rails'
 require 'exceptional/version'
 
+require 'exceptional/railtie' if defined?(Rails::Railtie)
+
 module Exceptional
   PROTOCOL_VERSION = 5
   CLIENT_NAME = 'getexceptional-gem'

data/lib/exceptional/integration/rack_rails.rb

@@ -10,12 +10,17 @@ module Rack
     
     def call(env)
       begin
-        status, headers, body =  @app.call(env)
-      rescue Exception => e                                                               
-        puts ">>>#{env['action_controller.instance']}"
+        body = @app.call(env)
+      rescue Exception => e
         ::Exceptional::Catcher.handle_with_controller(e,env['action_controller.instance'], Rack::Request.new(env))
         raise
       end
-    end
+
+      if env['rack.exception']
+        ::Exceptional::Catcher.handle_with_controller(env['rack.exception'],env['action_controller.instance'], Rack::Request.new(env))
+      end
+
+      body
+    end      
   end
 end

data/lib/exceptional/railtie.rb

@@ -0,0 +1,15 @@
+require 'exceptional'
+require 'rails'
+
+module Exceptional
+  class Railtie < Rails::Railtie
+
+    initializer "exceptional.middleware" do |app|
+      Exceptional::Config.load(File.join(Rails.root, "/config/exceptional.yml"))
+      if Exceptional::Config.should_send_to_api?
+        Exceptional.logger.info("Loading Exceptional for #{Rails::VERSION::STRING}")      
+        app.config.middleware.use Rack::RailsExceptional
+      end
+    end
+  end
+end

data/lib/exceptional/remote.rb

@@ -14,7 +14,6 @@ module Exceptional
       end
 
       def error(exception_data)
-        Exceptional.logger.info "Notifying Exceptional about an error"
         uniqueness_hash = exception_data.uniqueness_hash
         hash_param = uniqueness_hash.nil? ? nil: "&hash=#{uniqueness_hash}"
         url = "/api/errors?api_key=#{::Exceptional::Config.api_key}&protocol_version=#{::Exceptional::PROTOCOL_VERSION}#{hash_param}"

data/lib/exceptional/version.rb

@@ -1,3 +1,3 @@
 module Exceptional
-  VERSION = '2.0.17'
+  VERSION = '2.0.18'
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: exceptional
 version: !ruby/object:Gem::Version 
-  hash: 45
+  hash: 43
   prerelease: false
   segments: 
   - 2
   - 0
-  - 17
-  version: 2.0.17
+  - 18
+  version: 2.0.18
 platform: ruby
 authors: 
 - Contrast
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-27 00:00:00 +01:00
+date: 2010-07-28 00:00:00 +01:00
 default_executable: 
 dependencies: []
 
@@ -42,6 +42,7 @@ files:
 - lib/exceptional/log_factory.rb
 - lib/exceptional/monkeypatches.rb
 - lib/exceptional/rack_exception_data.rb
+- lib/exceptional/railtie.rb
 - lib/exceptional/remote.rb
 - lib/exceptional/startup.rb
 - lib/exceptional/version.rb