relevance-chatterbox 0.2.2 → 0.3.0

data/chatterbox.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{chatterbox}
-  s.version = "0.2.2"
+  s.version = "0.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Rob Sanheim"]
-  s.date = %q{2009-08-14}
+  s.date = %q{2009-08-31}
   s.email = %q{rsanheim@gmail.com}
   s.extra_rdoc_files = [
     "LICENSE",
@@ -38,11 +38,10 @@ Gem::Specification.new do |s|
      "version.yml",
      "views/chatterbox/mailer/exception_notification.erb"
   ]
-  s.has_rdoc = true
   s.homepage = %q{http://github.com/relevance/chatterbox}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.2}
+  s.rubygems_version = %q{1.3.5}
   s.summary = %q{TODO}
   s.test_files = [
     "examples/chatterbox_example.rb",

data/examples/lib/chatterbox/notification_example.rb

@@ -14,13 +14,6 @@ describe Chatterbox::Notification do
       }.should_not raise_error
     end
     
-    it "should convert exception to notice" do
-      exception = RuntimeError.new
-      notification = Chatterbox::Notification.new(exception)
-      notification.expects(:exception_to_notice).with(exception).returns({})
-      notification.notice
-    end
-    
     it "should use to_hash if message is not an exception and it responds_to possible" do
       some_object = mock(:to_hash => {:foo => "bar"})
       Chatterbox::Notification.new(some_object).notice.should include({:foo => "bar"})
@@ -74,6 +67,22 @@ describe Chatterbox::Notification do
       data[:backtrace].should == exception.backtrace
     end
     
+    it "should extract exception info from an exception in a hash" do
+      exception = raised_exception
+      data = Chatterbox::Notification.new(:exception => exception, :other_info => "yo dawg").notice
+      data[:summary].should == "RuntimeError: Your zing bats got mixed up with the snosh frazzles."
+      data[:error_class].should == "RuntimeError"
+      data[:error_message].should == "Your zing bats got mixed up with the snosh frazzles."
+      data[:backtrace].should == exception.backtrace
+      data[:other_info].should == "yo dawg"
+    end
+    
+    it "should let extra data win over auto extracted exception data" do
+      exception = raised_exception
+      data = Chatterbox::Notification.new(:exception => exception, :summary => "I know what I'm doing, and we got an error").notice
+      data[:summary].should == "I know what I'm doing, and we got an error"
+    end
+    
     it "merges rails info and ruby info into the exception info" do
       notification = Chatterbox::Notification.new(raised_exception)
       rails = stub_everything(:version => "2.0", :root => "/rails/root", :env => "production")

data/lib/chatterbox/notification.rb

@@ -10,13 +10,14 @@ module Chatterbox
     
     def notice
       hash = normalize_message_to_hash(message)
+      hash = exception_to_notice(hash)
       default_info.merge(hash)
     end
     
     def normalize_message_to_hash(message)
       case
       when Exception === message
-        exception_to_notice(message)
+        { :exception => message }
       when message.respond_to?(:to_hash)
         message.to_hash
       when message.respond_to?(:to_s)
@@ -40,13 +41,15 @@ module Chatterbox
       { :summary => message }
     end
     
-    def exception_to_notice(exception)
+    def exception_to_notice(hash)
+      return hash unless hash.key?(:exception)
+      exception = hash[:exception]
       {
         :summary => "#{exception.class.name}: #{exception.message}",
         :error_class   => exception.class.name,
         :error_message => exception.message,
         :backtrace     => exception.backtrace,
-      }
+      }.merge(hash)
     end
     
     def add_rails_info(data)

data/version.yml

@@ -1,4 +1,4 @@
 --- 
 :major: 0
-:minor: 2
-:patch: 2
+:minor: 3
+:patch: 0

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: relevance-chatterbox
 version: !ruby/object:Gem::Version 
-  version: 0.2.2
+  version: 0.3.0
 platform: ruby
 authors: 
 - Rob Sanheim
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-08-14 00:00:00 -07:00
+date: 2009-08-31 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -44,9 +44,8 @@ files:
 - todo.markdown
 - version.yml
 - views/chatterbox/mailer/exception_notification.erb
-has_rdoc: true
+has_rdoc: false
 homepage: http://github.com/relevance/chatterbox
-licenses: 
 post_install_message: 
 rdoc_options: 
 - --charset=UTF-8
@@ -67,7 +66,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.2.0
 signing_key: 
 specification_version: 3
 summary: TODO