Merge pull request github#210 from github/mail-gem

replace the tmail gem with the mail gem.

Author: technoweenie

Gemfile

@@ -10,7 +10,7 @@ gem "oauth",         "0.4.4"
 gem "sinatra",       "~> 1.2.6"
 gem "tilt",          "~> 1.2.1"
 gem "tinder",        "1.7.0"
-gem "tmail",         "1.2.7.1"
+gem "mail",          "~>2.3"
 gem "xml-simple",    "1.0.11", :require => 'xmlsimple'
 gem "xmpp4r-simple", "0.8.8"
 #gem "yammer4r",      "0.1.5"

Gemfile.lock

@@ -30,11 +30,16 @@ GEM
     json (1.6.1)
     jwt (0.1.3)
       json (>= 1.2.4)
+    mail (2.3.0)
+      i18n (>= 0.4.0)
+      mime-types (~> 1.16)
+      treetop (~> 1.4.8)
     mash (0.1.1)
     mime-types (1.16)
     multi_json (1.0.3)
     multipart-post (1.1.3)
     oauth (0.4.4)
+    polyglot (0.3.3)
     rack (1.3.0)
     rake (0.8.7)
     ruby-hmac (0.4.0)
@@ -58,7 +63,9 @@ GEM
       multi_json (~> 1.0)
       multipart-post (~> 1.1)
       twitter-stream (~> 0.1)
-    tmail (1.2.7.1)
+    treetop (1.4.10)
+      polyglot
+      polyglot (>= 0.3.1)
     twilio-ruby (3.4.2)
       builder (>= 2.1.2)
       jwt (>= 0.1.2)
@@ -81,6 +88,7 @@ DEPENDENCIES
   amqp (= 0.6.7)
   faraday (= 0.7.5.pre)
   httparty (= 0.7.4)
+  mail (~> 2.3)
   mash (~> 0.1.1)
   mime-types (~> 1.15)
   oauth (= 0.4.4)
@@ -91,7 +99,6 @@ DEPENDENCIES
   thin (= 1.2.2)
   tilt (~> 1.2.1)
   tinder (= 1.7.0)
-  tmail (= 1.2.7.1)
   twilio-ruby (= 3.4.2)
   xml-simple (= 1.0.11)
   xmpp4r-simple (= 0.8.8)

config/load.rb

@@ -93,7 +93,7 @@
 require 'tinder'
 require 'yajl/json_gem'
 require 'basecamp'
-require 'tmail'
+require 'mail'
 require 'xmpp4r'
 require 'xmpp4r/jid.rb'
 require 'xmpp4r/presence.rb'

lib/app.rb

@@ -31,7 +31,7 @@ def self.service(svc)
         status 400
         "Service Timeout"
       rescue Object => boom
-        report_exception svc, data, boom
+        report_exception svc, data, boom, params[:event], payload
         status 500
         "ERROR"
       end
@@ -56,7 +56,7 @@ def parse_payload(json)
   # exception - An Exception instance.
   #
   # Returns nothing.
-  def report_exception(service_class, service_data, exception)
+  def report_exception(service_class, service_data, exception, event, payload)
     backtrace = Array(exception.backtrace)[0..500]
 
     data = {
@@ -67,8 +67,10 @@ def report_exception(service_class, service_data, exception)
       'message'   => exception.message[0..254],
       'backtrace' => backtrace.join("\n"),
       'rollup'    => Digest::MD5.hexdigest(exception.class.to_s + backtrace[0]),
-      'service'   => service_class.to_s
+      'service'   => service_class.to_s,
     }
+    data['event'] = event if event
+    data['payload'] = payload.inspect if payload
 
     if exception.kind_of?(Service::Error)
       if exception.original_exception