Merge branch '2.1'

orchestral · Dec 28, 2013 · a6e8a0b · a6e8a0b
2 parents 0ee20ac + 7f09b73
commit a6e8a0b
Show file tree

Hide file tree

Showing 7 changed files with 170 additions and 8 deletions.
diff --git a/src/Orchestra/Notifier/LaravelNotifier.php b/src/Orchestra/Notifier/LaravelNotifier.php
@@ -0,0 +1,43 @@
+<?php namespace Orchestra\Notifier;
+
+use Illuminate\Mail\Mailer as IlluminateMailer;
+use Illuminate\Auth\Reminders\RemindableInterface;
+
+class LaravelNotifier implements NotifierInterface
+{
+    /**
+     * Mailer instance.
+     *
+     * @var \Illuminate\Mail\Mailer
+     */
+    protected $mailer;
+
+    /**
+     * Setup Illuminate Mailer.
+     *
+     * @param  \Illuminate\Mail\Mailer  $mailer
+     */
+    public function __construct(IlluminateMailer $mailer)
+    {
+        $this->mailer = $mailer;
+    }
+
+    /**
+     * Send notification via API.
+     *
+     * @param  \Illuminate\Auth\Reminders\RemindableInterface  $user
+     * @param  string                                          $subject
+     * @param  string|array                                    $view
+     * @param  array                                           $data
+     * @return boolean
+     */
+    public function send(RemindableInterface $user, $subject, $view, array $data = array())
+    {
+        $sent = $this->mailer->send($view, $data, function ($mail) use ($user, $subject) {
+            $mail->to($user->getReminderEmail());
+            $mail->subject($subject);
+        });
+
+        return (count($sent) > 0);
+    }
+}
diff --git a/src/Orchestra/Notifier/NotifierInterface.php b/src/Orchestra/Notifier/NotifierInterface.php
@@ -9,7 +9,7 @@ interface NotifierInterface
      *
      * @param  \Illuminate\Auth\Reminders\RemindableInterface  $user
      * @param  string                                          $subject
-     * @param  string                                          $view
+     * @param  string|array                                    $view
      * @param  array                                           $data
      * @return boolean
      */

diff --git a/src/Orchestra/Notifier/NotifierManager.php b/src/Orchestra/Notifier/NotifierManager.php
@@ -4,6 +4,16 @@
 
 class NotifierManager extends Manager
 {
+    /**
+     * Create Laravel driver.
+     *
+     * @return OrchestraNotifier
+     */
+    protected function createLaravelDriver()
+    {
+        return new LaravelNotifier($this->app['mailer']);
+    }
+
     /**
      * Create Orchestra Platform driver.
      *
@@ -24,6 +34,6 @@ protected function createOrchestraDriver()
      */
     public function getDefaultDriver()
     {
-        return $this->app['config']->get('orchestra/notifier::driver', 'orchestra');
+        return $this->app['config']->get('orchestra/notifier::driver', 'laravel');
     }
 }
diff --git a/src/Orchestra/Notifier/OrchestraNotifier.php b/src/Orchestra/Notifier/OrchestraNotifier.php
@@ -27,7 +27,7 @@ public function __construct(Mailer $mailer)
      *
      * @param  \Illuminate\Auth\Reminders\RemindableInterface  $user
      * @param  string                                          $subject
-     * @param  string                                          $view
+     * @param  string|array                                    $view
      * @param  array                                           $data
      * @return boolean
      */

diff --git a/src/config/config.php b/src/config/config.php
@@ -1,5 +1,5 @@
 <?php
 
 return array(
-    'default' => 'orchestra',
+    'default' => 'laravel',
 );
diff --git a/tests/LaravelNotifierTest.php b/tests/LaravelNotifierTest.php
@@ -0,0 +1,74 @@
+<?php namespace Orchestra\Notifier\TestCase;
+
+use Mockery as m;
+use Orchestra\Notifier\LaravelNotifier;
+
+class LaravelNotifierTest extends \PHPUnit_Framework_TestCase
+{
+    /**
+     * Teardown the test environment.
+     */
+    public function tearDown()
+    {
+        m::close();
+    }
+
+    /**
+     * Test Orchestra\Notifier\LaravelNotifier::send() method without
+     * queue.
+     *
+     * @test
+     */
+    public function testSendMethodSucceed()
+    {
+        $mailer = m::mock('\Illuminate\Mail\Mailer');
+        $user = m::mock('\Illuminate\Auth\Reminders\RemindableInterface');
+        $subject = 'foobar';
+        $view = 'foo.bar';
+        $data = array();
+
+        $user->shouldReceive('getReminderEmail')->once()->andReturn('hello@orchestraplatform.com');
+
+        $mailer->shouldReceive('send')->once()->with($view, $data, m::type('Closure'))
+                ->andReturnUsing(function ($v, $d, $c) use ($mailer) {
+                    $c($mailer);
+
+                    return array('hello@orchestraplatform.com');
+                })
+            ->shouldReceive('to')->once()->with('hello@orchestraplatform.com')->andReturnNull()
+            ->shouldReceive('subject')->once()->with($subject)->andReturnNull();
+
+        $stub = new LaravelNotifier($mailer);
+
+        $this->assertTrue($stub->send($user, $subject, $view, $data));
+    }
+
+    /**
+     * Test Orchestra\Notifier\LaravelNotifier::send() method failed.
+     *
+     * @test
+     */
+    public function testSendMethodFailed()
+    {
+        $mailer = m::mock('\Illuminate\Mail\Mailer');
+        $user = m::mock('\Illuminate\Auth\Reminders\RemindableInterface');
+        $subject = 'foobar';
+        $view = 'foo.bar';
+        $data = array();
+
+        $user->shouldReceive('getReminderEmail')->once()->andReturn('hello@orchestraplatform.com');
+
+        $mailer->shouldReceive('send')->once()->with($view, $data, m::type('Closure'))
+                ->andReturnUsing(function ($v, $d, $c) use ($mailer) {
+                    $c($mailer);
+
+                    return array();
+                })
+            ->shouldReceive('to')->once()->with('hello@orchestraplatform.com')->andReturnNull()
+            ->shouldReceive('subject')->once()->with($subject)->andReturnNull();
+
+        $stub = new LaravelNotifier($mailer);
+
+        $this->assertFalse($stub->send($user, $subject, $view, $data));
+    }
+}
diff --git a/tests/NotifierManagerTest.php b/tests/NotifierManagerTest.php
@@ -14,6 +14,27 @@ public function tearDown()
         m::close();
     }
 
+    /**
+     * Test Orchestra\Notifier\NotifierManager::createDefaultDriver()
+     * method.
+     *
+     * @test
+     */
+    public function testCreateDefaultDriverMethod()
+    {
+        $app = new Container;
+
+        $app['config'] = $config = m::mock('\Illuminate\Config\Repository');
+        $app['mailer'] = $mailer = m::mock('\Illuminate\Mail\Mailer');
+
+        $config->shouldReceive('get')->once()
+            ->with('orchestra/notifier::driver', 'laravel')->andReturn('laravel');
+
+        $stub = new NotifierManager($app);
+
+        $this->assertInstanceOf('\Orchestra\Notifier\LaravelNotifier', $stub->driver());
+    }
+
     /**
      * Test Orchestra\Notifier\NotifierManager::createOrchestraDriver()
      * method.
@@ -24,16 +45,30 @@ public function testCreateOrchestraDriverMethod()
     {
         $app = new Container;
 
-        $app['config'] = $config = m::mock('\Illuminate\Config\Repository');
         $app['orchestra.mail'] = $mailer = m::mock('\Orchestra\Notifier\Mailer');
         $app['orchestra.memory'] = $memory = m::mock('\Orchestra\Memory\Drivers\Driver');
 
-        $config->shouldReceive('get')->once()
-            ->with('orchestra/notifier::driver', 'orchestra')->andReturn('orchestra');
         $memory->shouldReceive('makeOrFallback')->once()->andReturn($memory);
 
         $stub = new NotifierManager($app);
 
-        $this->assertInstanceOf('\Orchestra\Notifier\OrchestraNotifier', $stub->driver());
+        $this->assertInstanceOf('\Orchestra\Notifier\OrchestraNotifier', $stub->driver('orchestra'));
+    }
+
+    /**
+     * Test Orchestra\Notifier\NotifierManager::createLaravelDriver()
+     * method.
+     *
+     * @test
+     */
+    public function testCreateLaravelDriverMethod()
+    {
+        $app = new Container;
+
+        $app['mailer'] = $mailer = m::mock('\Illuminate\Mail\Mailer');
+
+        $stub = new NotifierManager($app);
+
+        $this->assertInstanceOf('\Orchestra\Notifier\LaravelNotifier', $stub->driver('laravel'));
     }
 }