wrangler 0.1.10 → 0.1.11

data/lib/wrangler/exception_handler.rb

@@ -205,21 +205,24 @@ module Wrangler
 
     log_exception(exception, request_data, status_code)
 
+    exception_classname = exception.is_a?(Class) ? exception.name : exception.class.name
+    exception_string = exception.respond_to?(:to_str) ? exception.to_str : exception
+
     if notify_on_exception?(exception, status_code)
       if notify_with_delayed_job?
         # don't pass in request as it contains not-easily-serializable stuff
         log_error "Wrangler sending email notification asynchronously"
         Wrangler::ExceptionNotifier.send_later(:deliver_exception_notification,
-                                              exception,
-                                              exception.to_str,
+                                              exception_classname,
+                                              exception_string,
                                               proc_name,
                                               exception.backtrace,
                                               status_code,
                                               request_data)
       else
         log_error "Wrangler sending email notification synchronously"
-        Wrangler::ExceptionNotifier.deliver_exception_notification(exception,
-                                         exception.to_str,
+        Wrangler::ExceptionNotifier.deliver_exception_notification(exception_classname,
+                                         exception_string,
                                          proc_name,
                                          exception.backtrace,
                                          status_code,

data/lib/wrangler/exception_notifier.rb

@@ -52,7 +52,8 @@ module Wrangler
     # when you call ExceptionNotifier.deliver_exception_notification())
     #
     # arguments:
-    #   - exception: the exception that was raised
+    #   - exception_classname: the class of exception that was raised
+    #   - exception_message: the error message carried by the exception
     #   - proc_name: the name of the process in which the exception arised
     #   - backtrace: the stack trace from the exception (passing in excplicitly
     #                because serializing the exception does not preserve the
@@ -68,7 +69,7 @@ module Wrangler
     #              be nil and MUST be nil if calling this method with
     #              delayed_job. Optional.
     #---------------------------------------------------------------------------
-    def exception_notification(exception,
+    def exception_notification(exception_classname,
                                exception_message,
                                proc_name,
                                backtrace,
@@ -92,7 +93,7 @@ module Wrangler
       # scrutinize any use of @request in the views!
 
       body_hash =
-        { :exception =>    exception,
+        { :exception_classname =>    exception_classname,
           :exception_message => exception_message,
           :backtrace =>    backtrace,
           :status_code =>  status_code,
@@ -105,7 +106,7 @@ module Wrangler
       recipients   config[:recipient_addresses]
       subject      "[#{proc_name + (proc_name ? ' ' : '')}" +
                    "#{config[:subject_prefix]}] " +
-                   "#{exception.class.name}: " +
+                   "#{exception_classname}: " +
                    "#{exception_message}"
       body         body_hash
       sent_on      Time.now

data/lib/wrangler/wrangler_helper.rb

@@ -62,7 +62,7 @@ module Wrangler
   def log_exception(exception, request_data = nil, status_code = nil)
     msgs = []
     msgs << "An exception was caught (#{exception.class.name}):"
-    msgs << exception.to_str
+    msgs << exception.respond_to?(:to_str) ? exception.to_str : exception
 
     unless request_data.blank?
       msgs <<  "Request params were:"

data/lib/wrangler.rb

@@ -1,6 +1,7 @@
 require 'wrangler/wrangler_helper.rb'
 require 'wrangler/exception_handler.rb'
 require 'wrangler/exception_notifier.rb'
+require 'wrangler/wrangler_exceptions.rb'
 
 module Wrangler
 

data/views/wrangler/exception_notifier/exception_notification.text.plain.erb

@@ -8,7 +8,7 @@
   <%= @protocol %><%= @host %><%= @uri %>
 <% end -%>
 
-A <%= @exception.class %> occurred:
+A <%= @exception_classname %> occurred:
  * <%= @exception_message %>
 in <%= @backtrace.first %>
 

data/wrangler.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{wrangler}
-  s.version = "0.1.10"
+  s.version = "0.1.11"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Brian Percival"]
-  s.date = %q{2009-11-30}
+  s.date = %q{2009-12-06}
   s.description = %q{A gem for handling exceptions thrown inside your Rails app. If you include the
 gem in your application controller, wrangler will render the error pages you
 configure for each exception or HTTP error code. It will also handle notifying

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: wrangler
 version: !ruby/object:Gem::Version 
-  version: 0.1.10
+  version: 0.1.11
 platform: ruby
 authors: 
 - Brian Percival
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-30 00:00:00 -08:00
+date: 2009-12-06 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency