Refactor and added some tests

Author: petericebear

src/MessagebirdChannel.php

@@ -2,19 +2,14 @@
 
 namespace NotificationChannels\Messagebird;
 
-use Exception;
 use Illuminate\Notifications\Notification;
-use MessageBird\Exceptions\AuthenticateException;
-use MessageBird\Exceptions\BalanceException;
-use NotificationChannels\Messagebird\Exceptions\CouldNotSendNotification;
-use MessageBird\Client;
 
 class MessagebirdChannel
 {
     /** @var \MessageBird\Client */
     protected $client;
 
-    public function __construct(Client $client)
+    public function __construct(MessagebirdClient $client)
     {
         $this->client = $client;
     }
@@ -35,22 +30,6 @@ public function send($notifiable, Notification $notification)
             $message = MessagebirdMessage::create($message);
         }
 
-        if (empty($message->originator)) {
-            $message->setOriginator(config('services.messagebird.originator'));
-        }
-
-        if (empty($message->recipients)) {
-            $message->setRecipients(config('services.messagebird.recipients'));
-        }
-
-        try {
-            $this->client->messages->create($message);
-        } catch (AuthenticateException $exception) {
-            throw CouldNotSendNotification::couldNotAuthenticate();
-        } catch (BalanceException $exception) {
-            throw CouldNotSendNotification::notEnoughCredits();
-        } catch (Exception $exception) {
-            throw CouldNotSendNotification::serviceRespondedWithAnError($exception);
-        }
+        $this->client->send($message);
     }
 }

src/MessagebirdClient.php

@@ -0,0 +1,38 @@
+<?php
+
+namespace NotificationChannels\Messagebird;
+
+use Exception;
+use MessageBird\Exceptions\AuthenticateException;
+use MessageBird\Exceptions\BalanceException;
+use NotificationChannels\Messagebird\Exceptions\CouldNotSendNotification;
+use MessageBird\Client;
+
+class MessagebirdClient
+{
+    protected $client;
+
+    public function __construct(Client $client)
+    {
+        $this->client = $client;
+    }
+
+    public function send($message) {
+        if (empty($message->originator)) {
+            $message->setOriginator(config('services.messagebird.originator'));
+        }
+        if (empty($message->recipients)) {
+            $message->setRecipients(config('services.messagebird.recipients'));
+        }
+
+        try {
+            $this->client->messages->create($message);
+        } catch (AuthenticateException $exception) {
+            throw CouldNotSendNotification::couldNotAuthenticate();
+        } catch (BalanceException $exception) {
+            throw CouldNotSendNotification::notEnoughCredits();
+        } catch (Exception $exception) {
+            throw CouldNotSendNotification::serviceRespondedWithAnError($exception);
+        }
+    }
+}

src/MessagebirdServiceProvider.php

@@ -14,17 +14,17 @@ class MessagebirdServiceProvider extends ServiceProvider
     public function boot()
     {
         $this->app->when(MessagebirdChannel::class)
-            ->needs(Client::class)
+            ->needs(MessagebirdClient::class)
             ->give(function () {
                 $config = config('services.messagebird');
 
                 if (is_null($config)) {
                     throw InvalidConfiguration::configurationNotSet();
                 }
 
-                return new Client(
+                return new MessagebirdClient(new Client(
                     $config['access_key']
-                );
+                ));
             });
     }
 }

tests/MessagebirdChannelTest.php

@@ -0,0 +1,55 @@
+<?php
+
+namespace NotificationChannels\Messagebird\Test;
+
+use Illuminate\Notifications\Notifiable;
+use Illuminate\Notifications\Notification;
+use MessageBird\Client;
+use Mockery;
+use NotificationChannels\Messagebird\MessagebirdChannel;
+use NotificationChannels\Messagebird\MessagebirdClient;
+use NotificationChannels\Messagebird\MessagebirdMessage;
+use PHPUnit_Framework_TestCase;
+
+class MessagebirdChannelTest extends PHPUnit_Framework_TestCase
+{
+    public function setUp()
+    {
+        $this->notification = new TestNotification;
+        $this->notifiable = new TestNotifiable;
+        $this->messagebirdClient = Mockery::mock(new Client('test_1234567890'));
+        $this->client = Mockery::mock(new MessagebirdClient($this->messagebirdClient));
+        $this->channel = new MessagebirdChannel($this->client);
+    }
+
+    public function tearDown()
+    {
+        Mockery::close();
+        parent::tearDown();
+    }
+
+    /** @test */
+    public function it_can_be_instantiated()
+    {
+        $this->assertInstanceOf(MessagebirdClient::class, $this->client);
+        $this->assertInstanceOf(MessagebirdChannel::class, $this->channel);
+    }
+}
+
+class TestNotifiable
+{
+    use Notifiable;
+
+    public function routeNotificationForMessagebird()
+    {
+        return '0031650520659';
+    }
+}
+
+class TestNotification extends Notification
+{
+    public function toMessagebird($notifiable)
+    {
+        return (new MessagebirdMessage("Message content"))->setOriginator('APPNAME')->setRecipients('0031650520659');
+    }
+}

tests/MessagebirdClientTest.php

@@ -0,0 +1,29 @@
+<?php
+
+namespace NotificationChannels\Messagebird\Test;
+
+use MessageBird\Client;
+use Mockery;
+use NotificationChannels\Messagebird\MessagebirdClient;
+use PHPUnit_Framework_TestCase;
+
+class MessagebirdClientTest extends PHPUnit_Framework_TestCase
+{
+    public function setUp()
+    {
+        $this->messagebirdClient = Mockery::mock(new Client('test_1234567890'));
+        $this->client = Mockery::mock(new MessagebirdClient($this->messagebirdClient));
+    }
+
+    public function tearDown()
+    {
+        Mockery::close();
+        parent::tearDown();
+    }
+
+    /** @test */
+    public function it_can_be_instantiated()
+    {
+        $this->assertInstanceOf(MessagebirdClient::class, $this->client);
+    }
+}