Merge remote-tracking branch 'origin/1.1'

Infrastructure/Message/Zend/AbstractMessageProvider.php

@@ -15,6 +15,7 @@
 namespace Diamante\EmailProcessingBundle\Infrastructure\Message\Zend;
 
 use Diamante\EmailProcessingBundle\Model\Message\MessageSender;
+use Diamante\EmailProcessingBundle\Model\Message\MessageRecipient;
 
 abstract class AbstractMessageProvider
 {
@@ -55,6 +56,31 @@ public function processTo($headers)
         return $messageTo;
     }
 
+    /**
+     * @param $headers
+     * @return string
+     */
+    public function processRecipients($headers)
+    {
+        $processAddressTypes = ['to', 'cc', 'from'];
+        $recipients = [];
+
+        foreach ($processAddressTypes as $type) {
+            if (!$headers->get($type)) {
+                continue;
+            }
+            /**
+             * @var string $email
+             * @var \Zend\Mail\Address $address
+             */
+            foreach ($headers->get($type)->getAddressList() as $email => $address) {
+                $recipients[] = new MessageRecipient($address->getEmail(), null);
+            }
+        }
+
+        return $recipients;
+    }
+
     /**
      * Retrieves Message Reference
      *

Infrastructure/Message/Zend/ImapMessageProvider.php

@@ -70,9 +70,10 @@ public function fetchMessagesToProcess()
                 $messageReference   = $this->processMessageReference($headers);
                 $messageAttachments = $this->processAttachments($imapMessage);
                 $isFailed           = $this->isFailed($headers);
+                $recipients         = $this->processRecipients($headers);
 
                 $messages[] = new Message($uniqueMessageId, $messageId, $messageSubject, $messageContent,
-                    $messageFrom, $messageTo, $messageReference, $messageAttachments, $isFailed);
+                    $messageFrom, $messageTo, $messageReference, $messageAttachments, $isFailed, $recipients);
             }
         } catch (\Exception $e) {
             throw new MessageProcessingException($e->getMessage());

Infrastructure/Message/Zend/RawMessageProvider.php

@@ -62,9 +62,10 @@ public function fetchMessagesToProcess()
         $messageTo          = $this->processTo($headers);
         $messageReference   = $this->processMessageReference($headers);
         $messageAttachments = $this->processAttachments($zendMailMessage);
+        $recipients          = $this->processRecipients($headers);
 
         $message = new Message($uniqueMessageId, $messageId, $messageSubject, $messageContent,
-            $messageFrom, $messageTo, $messageReference, $messageAttachments);
+            $messageFrom, $messageTo, $messageReference, $messageAttachments, $recipients);
         return array($message);
     }
 

Model/Message.php

@@ -54,6 +54,11 @@ class Message
      */
     private $to;
 
+    /**
+     * @var array
+     */
+    private $recipients;
+
     /**
      * @var array
      */
@@ -74,6 +79,7 @@ class Message
      * @param null          $reference
      * @param array         $attachments
      * @param bool          $isFailed
+     * @param array         $recipients
      */
     public function __construct(
         $uniqueId,
@@ -84,7 +90,8 @@ public function __construct(
         $to,
         $reference = null,
         array $attachments = null,
-        $isFailed = false
+        $isFailed = false,
+        $recipients = null
     ) {
         $this->uniqueId    = $uniqueId;
         $this->messageId   = $messageId;
@@ -95,6 +102,7 @@ public function __construct(
         $this->reference   = $reference;
         $this->attachments = $attachments;
         $this->isFailed    = $isFailed;
+        $this->recipients  = $recipients;
     }
 
     /**
@@ -176,4 +184,32 @@ public function isFailed()
     {
         return $this->isFailed;
     }
-}
+
+    /**
+     * Retrieve emails of recipients
+     *
+     * @return array|null
+     */
+    public function getRecipients()
+    {
+        return $this->recipients;
+    }
+
+    /**
+     * Add recipient/recipients to the message
+     *
+     * @param $recipients
+     */
+    public function addRecipients($recipients)
+    {
+        if (!is_array($recipients)) {
+            $recipients = [$recipients];
+        }
+
+        foreach ($recipients as $recipient) {
+            $this->recipients[] = $recipient;
+        }
+
+        $this->recipients = array_unique($this->recipients);
+    }
+}

Model/Message/MessageRecipient.php

@@ -0,0 +1,27 @@
+<?php
+/*
+ * Copyright (c) 2014 Eltrino LLC (http://eltrino.com)
+ *
+ * Licensed under the Open Software License (OSL 3.0).
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://opensource.org/licenses/osl-3.0.php
+ *
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@eltrino.com so we can send you a copy immediately.
+ */
+
+namespace Diamante\EmailProcessingBundle\Model\Message;
+
+class MessageRecipient extends MessageSender
+{
+    public function __construct($email, $name)
+    {
+        if (!$name) {
+            $name = strstr($email, '@', true);
+        }
+        parent::__construct($email, $name);
+    }
+}

Model/Message/MessageSender.php

@@ -50,6 +50,7 @@ public function __construct($email, $name)
     protected function parseName($name)
     {
         if (!empty($name)) {
+            $name = trim($name, "\"");
             $name = $this->canonicalizeName($name);
 
             if (strpos($name," ")) {
@@ -59,8 +60,8 @@ protected function parseName($name)
                 $lastName = "";
             }
 
-            $this->firstName = $firstName;
-            $this->lastName  = $lastName;
+            $this->firstName = ucfirst($firstName);
+            $this->lastName  = ucfirst($lastName);
         }
     }