exceptional 2.0.19 → 2.0.20

data/init.rb

@@ -14,13 +14,22 @@ if (defined?(Exceptional::VERSION::STRING) rescue nil) && %w(development test).i
   exit -1
 else
   begin
-    Exceptional::Config.load(File.join(RAILS_ROOT, "/config/exceptional.yml"))
-    Exceptional.logger.info("Loading Exceptional for #{Rails::VERSION::STRING}")
+
+    if (Rails::VERSION::MAJOR < 3)    
+      Exceptional::Config.load(File.join(RAILS_ROOT, "/config/exceptional.yml"))
+      Exceptional.logger.info("Loading Exceptional for #{Rails::VERSION::STRING}")
     
-    require File.join('exceptional', 'integration', 'rails')    
-    require File.join('exceptional', 'integration', 'dj') if defined?(Delayed::Job)
+      require File.join('exceptional', 'integration', 'rails')    
+      require File.join('exceptional', 'integration', 'dj') if defined?(Delayed::Job)
+    else
+      if Exceptional::Config.should_send_to_api?
+        Exceptional.logger.info("Loading Exceptional for #{Rails::VERSION::STRING}")      
+        Rails.configuration.middleware.use "Rack::RailsExceptional"
+        require File.join('exceptional', 'integration', 'dj') if defined?(Delayed::Job)
+      end      
+    end
   rescue => e
-    STDERR.puts "Problem starting Exceptional Plugin. Your app will run as normal."
+    STDERR.puts "Problem starting Exceptional Plugin. Your app will run as normal. #{e.message}"
     Exceptional.logger.error(e.message)
     Exceptional.logger.error(e.backtrace)
   end

data/lib/exceptional/config.rb

@@ -56,7 +56,7 @@ module Exceptional
       end
 
       def application_root
-        defined?(RAILS_ROOT) ? RAILS_ROOT : Dir.pwd
+        defined?(Rails) ? Rails.root : Dir.pwd
       end
 
       def ssl?

data/lib/exceptional/railtie.rb

@@ -4,8 +4,9 @@ require 'rails'
 module Exceptional
   class Railtie < Rails::Railtie
 
+    Exceptional::Config.load(File.join(Rails.root, "/config/exceptional.yml"))
+
     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"

data/lib/exceptional/version.rb

@@ -1,3 +1,3 @@
 module Exceptional
-  VERSION = '2.0.19'
+  VERSION = '2.0.20'
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: exceptional
 version: !ruby/object:Gem::Version 
-  hash: 41
+  hash: 39
   prerelease: false
   segments: 
   - 2
   - 0
-  - 19
-  version: 2.0.19
+  - 20
+  version: 2.0.20
 platform: ruby
 authors: 
 - Contrast
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-29 00:00:00 +01:00
+date: 2010-08-09 00:00:00 +01:00
 default_executable: 
 dependencies: []