#23 ensure sender_email works with inbound and other events

evendis · Mar 30, 2015 · ad4cdf4 · ad4cdf4
1 parent ebc31df
commit ad4cdf4
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/lib/mandrill/web_hook/event_decorator.rb b/lib/mandrill/web_hook/event_decorator.rb
@@ -66,9 +66,10 @@ def headers
   end
 
   # Returns the email (String) of the sender.
-  # Applicable events: inbound
+  # Inbound messages: references 'from_email' message attribute.
+  # Send/Open/Click messages: references 'sender' message attribute.
   def sender_email
-    msg['sender']
+    msg['from_email']||msg['sender']
   end
 
   # Returns the subject user email address.

diff --git a/spec/mandrill/web_hook/event_decorator_spec.rb b/spec/mandrill/web_hook/event_decorator_spec.rb
@@ -86,7 +86,7 @@
       :in_reply_to => nil,
       :references => [],
       :headers => {},
-      :sender_email => nil,
+      :sender_email => '[email protected]',
       :user_email => '[email protected]',
       :recipients => [],
       :recipient_emails => [],
@@ -113,7 +113,7 @@
       :in_reply_to => nil,
       :references => [],
       :headers => {},
-      :sender_email => nil,
+      :sender_email => '[email protected]',
       :user_email => '[email protected]',
       :recipients => [],
       :recipient_emails => [],
@@ -130,7 +130,7 @@
       :in_reply_to => nil,
       :references => [],
       :headers => {},
-      :sender_email => nil,
+      :sender_email => '[email protected]',
       :user_email => '[email protected]',
       :recipients => [],
       :recipient_emails => [],