add support for cc, bcc and added tests

Author: marickvantuil

README.md

@@ -111,6 +111,5 @@ During the creation of an e-mail, the recipient will be replaced by the test e-m
 
 ## Todo
 
-- Add support for CC, BCC and attachments
+- Add support attachments
 - Add support for Mailables
-- Add tests

composer.json

@@ -18,11 +18,21 @@
             "Buildcode\\LaravelDatabaseEmails\\": "src/"
         }
     },
+    "autoload-dev": {
+        "psr-4": {
+            "Tests\\": "tests/"
+        }
+    },
     "extra": {
         "laravel": {
             "providers": [
                 "Buildcode\\LaravelGhost\\LaravelDatabaseEmailsServiceProvider"
             ]
         }
+    },
+    "require-dev": {
+        "orchestra/testbench": "~3.4",
+        "phpunit/phpunit": "^6.2",
+        "orchestra/database": "~3.4"
     }
 }

config/laravel-database-emails.php

@@ -53,4 +53,16 @@
 
     ],
 
+    /*
+    |--------------------------------------------------------------------------
+    | Cronjob Limit
+    |--------------------------------------------------------------------------
+    |
+    | Limit the number of e-mails the cronjob may send at a time. This is useful
+    | if you want to prevent overlapping cronjobs. Keep in mind we already
+    | handle overlapping gracefully, however setting a limit is adviced.
+    |
+    */
+
+    'limit' => 20
 ];

database/migrations/emails.stub

@@ -16,8 +16,10 @@ class Create{{tableClassName}}Table extends Migration
         Schema::create('{{table}}', function (Blueprint $table) {
             $table->increments('id');
             $table->string('label')->nullable();
-            $table->string('recipient', 255);
-            $table->binary('subject', 60);
+            $table->binary('recipient');
+            $table->binary('cc')->nullable();
+            $table->binary('bcc')->nullable();
+            $table->binary('subject');
             $table->string('view', 255);
             $table->binary('variables')->nullable();
             $table->binary('body');

phpunit.xml

@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<phpunit backupGlobals="false"
+         backupStaticAttributes="false"
+         bootstrap="vendor/autoload.php"
+         colors="true"
+         convertErrorsToExceptions="true"
+         convertNoticesToExceptions="true"
+         convertWarningsToExceptions="true"
+         processIsolation="false"
+         stopOnFailure="false"
+         syntaxCheck="false">
+
+    <testsuites>
+        <testsuite name="Orchestra\Testbench Test Suite">
+            <directory suffix="Test.php">./tests/</directory>
+        </testsuite>
+    </testsuites>
+    <php>
+        <env name="APP_ENV" value="testing"/>
+        <env name="APP_KEY" value="AckfSECXIvnK5r28GVIWUAxmbBSjTsmF"/>
+        <env name="CACHE_DRIVER" value="array"/>
+        <env name="SESSION_DRIVER" value="array"/>
+        <env name="QUEUE_DRIVER" value="sync"/>
+        <env name="MAIL_DRIVER" value="log"/>
+        <env name="DB_CONNECTION" value="sqlite"/>
+        <env name="DB_DATABASE" value=":memory:"/>
+    </php>
+
+    <filter>
+        <whitelist addUncoveredFilesFromWhitelist="false">
+            <directory suffix=".php">src/</directory>
+        </whitelist>
+    </filter>
+</phpunit>

src/Config.php

@@ -0,0 +1,60 @@
+<?php
+
+namespace Buildcode\LaravelDatabaseEmails;
+
+class Config
+{
+    /**
+     * Get the maximum number of times an e-mail may be attempted to be sent.
+     *
+     * @return int
+     */
+    public static function maxRetryCount()
+    {
+        return max(config('laravel-database-emails.retry.attempts', 1), 1);
+    }
+
+    /**
+     * Determine if newly created e-mails should be encrypted.
+     *
+     * @return bool
+     */
+    public static function encryptEmails()
+    {
+        return config('laravel-database-emails.encrypt', false);
+    }
+
+    /**
+     * Determine if newly created e-mails should be sent to the test e-mail address.
+     *
+     * @return bool
+     */
+    public static function testing()
+    {
+        return config('laravel-database-emails.testing.enabled', function () {
+            return function () {
+                return false;
+            };
+        })();
+    }
+
+    /**
+     * Get the test e-mail address.
+     *
+     * @return string
+     */
+    public static function testEmailAddress()
+    {
+        return config('laravel-database-emails.testing.email');
+    }
+
+    /**
+     * Get the number of e-mails the cronjob may send at a time.
+     *
+     * @return int
+     */
+    public static function cronjobEmailLimit()
+    {
+        return config('laravel-database-emails.limit', 20);
+    }
+}

src/CreateEmailTableCommand.php

@@ -38,8 +38,8 @@ class CreateEmailTableCommand extends Command
     /**
      * Create a new queue job table command instance.
      *
-     * @param  \Illuminate\Filesystem\Filesystem  $files
-     * @param  \Illuminate\Support\Composer    $composer
+     * @param  \Illuminate\Filesystem\Filesystem $files
+     * @param  \Illuminate\Support\Composer $composer
      * @return void
      */
     public function __construct(Filesystem $files, Composer $composer)
@@ -71,30 +71,30 @@ public function fire()
     /**
      * Create a base migration file for the table.
      *
-     * @param  string  $table
+     * @param  string $table
      * @return string
      */
     protected function createBaseMigration($table = 'emails')
     {
         return $this->laravel['migration.creator']->create(
-            'create_'.$table.'_table', $this->laravel->databasePath().'/migrations'
+            'create_' . $table . '_table', $this->laravel->databasePath() . '/migrations'
         );
     }
 
     /**
      * Replace the generated migration with the job table stub.
      *
-     * @param  string  $path
-     * @param  string  $table
-     * @param  string  $tableClassName
+     * @param  string $path
+     * @param  string $table
+     * @param  string $tableClassName
      * @return void
      */
     protected function replaceMigration($path, $table, $tableClassName)
     {
         $stub = str_replace(
             ['{{table}}', '{{tableClassName}}'],
             [$table, $tableClassName],
-            $this->files->get(__DIR__.'/../database/migrations/emails.stub')
+            $this->files->get(__DIR__ . '/../database/migrations/emails.stub')
         );
 
         $this->files->put($path, $stub);

src/Decorators/EncryptEmail.php

@@ -16,6 +16,14 @@ public function __construct(EmailDecorator $decorator)
             'variables' => encrypt(json_encode($this->email->getVariables())),
             'body'      => encrypt(view($this->email->getView(), $this->email->getVariables())->render()),
         ]);
+
+        if ($this->email->hasCc()) {
+            $this->email->cc = encrypt($this->email->getCc());
+        }
+
+        if ($this->email->hasBcc()) {
+            $this->email->bcc = encrypt($this->email->getBcc());
+        }
     }
 
     public function getEmail()

src/Decorators/PrepareEmail.php

@@ -2,6 +2,7 @@
 
 namespace Buildcode\LaravelDatabaseEmails\Decorators;
 
+use Buildcode\LaravelDatabaseEmails\Config;
 use Buildcode\LaravelDatabaseEmails\Email;
 
 class PrepareEmail implements EmailDecorator
@@ -12,21 +13,48 @@ public function __construct(Email $email)
     {
         $this->email = $email;
 
-        $email->body = view($email->getView(), $email->getVariables());
+        if ($email->hasCc()) {
+            if (!is_array($email->cc)) {
+                $email->cc = [$email->cc];
+            }
 
-        $email->variables = json_encode($email->getVariables());
+            if (Config::testing()) {
+                $email->cc = array_map(function () {
+                    return Config::testEmailAddress();
+                }, $email->cc);
+            }
 
-        if ($email->hasScheduledDate()) {
-            $email->scheduled_at = $email->getScheduledDateAsCarbon()->toDateTimeString();
+            $email->cc = json_encode($email->cc);
+        }
+
+        if ($email->hasBcc()) {
+            if (!is_array($email->bcc)) {
+                $email->bcc = [$email->bcc];
+            }
+
+            if (Config::testing()) {
+                $email->bcc = array_map(function () {
+                    return Config::testEmailAddress();
+                }, $email->bcc);
+            }
+
+            $email->bcc = json_encode($email->bcc);
         }
 
-        $this->email->encrypted = config('laravel-database-emails.encrypt', false);
 
-        $test = config('laravel-database-emails.testing.enabled', false);
+        $email->body = view($email->getView(), $email->hasVariables() ? $email->getVariables() : [])->render();
 
-        if ($test()) {
-            $email->recipient = config('laravel-database-emails.testing.email');
+        $email->variables = json_encode($email->getVariables());
+
+        if ($email->isScheduled()) {
+            $email->scheduled_at = $email->getScheduledDateAsCarbon()->toDateTimeString();
         }
+
+        if (Config::testing()) {
+            $email->recipient = Config::testEmailAddress();
+        }
+
+        $this->email->encrypted = Config::encryptEmails();
     }
 
     public function getEmail()