rollbar 0.10.3 → 0.10.4

data/Appraisals

@@ -11,6 +11,6 @@ appraise "rails32" do
 end
 
 appraise "rails40" do
-  gem "rails", "4.0.0.rc2"
+  gem "rails", "4.0.0"
   gem "protected_attributes"
 end

data/CHANGELOG.md

@@ -1,5 +1,8 @@
 # Change Log
 
+**0.10.4**
+- Fix exception in the exception catcher when Rollbar is disabled
+
 **0.10.3**
 - Rework how request params are extracted so that json params are properly extracted in rails 4.0
 - Fix rollbar:test rake task

data/UPGRADE_FROM_RATCHET.md

@@ -4,7 +4,7 @@
 
 Add this line to your application's Gemfile:
 
-    gem 'rollbar', '~> 0.8.2'
+    gem 'rollbar', '~> 0.10.3'
 
 And remove:
 

data/gemfiles/rails40.gemfile

@@ -7,7 +7,7 @@ gem "jruby-openssl", :platform=>:jruby
 gem "activerecord-jdbcsqlite3-adapter", :platform=>:jruby
 gem "girl_friday"
 gem "appraisal"
-gem "rails", "4.0.0.rc2"
+gem "rails", "4.0.0"
 gem "protected_attributes"
 
 gemspec :path=>"../"

data/lib/rollbar/better_errors.rb

@@ -22,12 +22,13 @@ module BetterErrors
       
       # if an exception was reported, save uuid in the env
       # so it can be displayed to the user on the error page
-      if exception_data
-        begin
-          env['rollbar.exception_uuid'] = exception_data[:uuid]
-        rescue => e
-          puts "[Rollbar] Exception saving uuid in env: #{e}"
-        end
+      if exception_data.is_a?(Hash)
+        env['rollbar.exception_uuid'] = exception_data[:uuid]
+        puts "[Rollbar] Exception uuid saved in env: #{exception_data[:uuid]}"
+      elsif exception_data == 'disabled'
+        puts "[Rollbar] Exception not reported because Rollbar is disabled"
+      elsif exception_data == 'ignored'
+        puts "[Rollbar] Exception not reported because it was ignored"
       end
       
       # now continue as normal

data/lib/rollbar/exception_reporter.rb

@@ -7,8 +7,15 @@ module Rollbar
       request_data = extract_request_data_from_rack(env)
       person_data = extract_person_data_from_controller(env)
       exception_data = Rollbar.report_exception(exception, request_data, person_data)
-      env['rollbar.exception_uuid'] = exception_data[:uuid]
-      rollbar_debug "[Rollbar] Exception uuid saved in env: #{exception_data[:uuid]}"
+      
+      if exception_data.is_a?(Hash)
+        env['rollbar.exception_uuid'] = exception_data[:uuid]
+        rollbar_debug "[Rollbar] Exception uuid saved in env: #{exception_data[:uuid]}"
+      elsif exception_data == 'disabled'
+        rollbar_debug "[Rollbar] Exception not reported because Rollbar is disabled"
+      elsif exception_data == 'ignored'
+        rollbar_debug "[Rollbar] Exception not reported because it was ignored"
+      end
     rescue => e
       rollbar_debug "[Rollbar] Exception while reporting exception to Rollbar: #{e.try(:message)}"
     end

data/lib/rollbar/goalie.rb

@@ -18,12 +18,13 @@ module Goalie
       
       # if an exception was reported, save uuid in the env
       # so it can be displayed to the user on the error page
-      if exception_data
-        begin
-          env['rollbar.exception_uuid'] = exception_data[:uuid]
-        rescue => e
-          puts "[Rollbar] Exception saving uuid in env: #{e}"
-        end
+      if exception_data.is_a?(Hash)
+        env['rollbar.exception_uuid'] = exception_data[:uuid]
+        puts "[Rollbar] Exception uuid saved in env: #{exception_data[:uuid]}"
+      elsif exception_data == 'disabled'
+        puts "[Rollbar] Exception not reported because Rollbar is disabled"
+      elsif exception_data == 'ignored'
+        puts "[Rollbar] Exception not reported because it was ignored"
       end
 
       # now continue as normal

data/lib/rollbar/version.rb

@@ -1,3 +1,3 @@
 module Rollbar
-  VERSION = "0.10.3"
+  VERSION = "0.10.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rollbar
 version: !ruby/object:Gem::Version
-  version: 0.10.3
+  version: 0.10.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-25 00:00:00.000000000 Z
+date: 2013-06-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json