From 0aa39b11e18622f0d77bdcbe1923192f2d266b46 Mon Sep 17 00:00:00 2001
From: Jeffrey Way <jeffrey@jeffrey-way.com>
Date: Thu, 25 Sep 2014 17:35:58 -0400
Subject: [PATCH] Make dispatchable trait more testable

---
 .../Commander/Events/DispatchableSpec.php     | 37 +++++++++++++++++++
 .../Commander/Events/Contracts/Dispatcher.php | 12 ++++++
 .../Commander/Events/DispatchableTrait.php    | 25 +++++++++++--
 .../Commander/Events/EventDispatcher.php      | 16 +++++---
 4 files changed, 82 insertions(+), 8 deletions(-)
 create mode 100644 spec/Laracasts/Commander/Events/DispatchableSpec.php
 create mode 100644 src/Laracasts/Commander/Events/Contracts/Dispatcher.php

diff --git a/spec/Laracasts/Commander/Events/DispatchableSpec.php b/spec/Laracasts/Commander/Events/DispatchableSpec.php
new file mode 100644
index 0000000..3a3fe31
--- /dev/null
+++ b/spec/Laracasts/Commander/Events/DispatchableSpec.php
@@ -0,0 +1,37 @@
+<?php namespace spec\Laracasts\Commander\Events;
+
+use PhpSpec\ObjectBehavior;
+use Prophecy\Argument;
+use Laracasts\Commander\Events\Contracts\Dispatcher;
+
+class DispatchableSpec extends ObjectBehavior {
+
+    function let()
+    {
+        $this->beAnInstanceOf(HandlerStub::class);
+    }
+
+    function it_dispatches_stuff(Dispatcher $dispatcher)
+    {
+        $this->setDispatcher($dispatcher);
+
+        $this->dispatchEventsFor(new EntityStub);
+
+        $dispatcher->dispatch([])->shouldBeCalled();
+    }
+
+}
+
+
+class HandlerStub {
+    use \Laracasts\Commander\Events\DispatchableTrait;
+}
+
+class EntityStub {
+
+    public function releaseEvents()
+    {
+        return [];
+    }
+
+}
\ No newline at end of file
diff --git a/src/Laracasts/Commander/Events/Contracts/Dispatcher.php b/src/Laracasts/Commander/Events/Contracts/Dispatcher.php
new file mode 100644
index 0000000..329079e
--- /dev/null
+++ b/src/Laracasts/Commander/Events/Contracts/Dispatcher.php
@@ -0,0 +1,12 @@
+<?php namespace Laracasts\Commander\Events\Contracts;
+
+interface Dispatcher {
+
+    /**
+     * Dispatch all raised events.
+     *
+     * @param array $events
+     */
+    public function dispatch(array $events);
+
+}
diff --git a/src/Laracasts/Commander/Events/DispatchableTrait.php b/src/Laracasts/Commander/Events/DispatchableTrait.php
index 5ce380e..26651bc 100644
--- a/src/Laracasts/Commander/Events/DispatchableTrait.php
+++ b/src/Laracasts/Commander/Events/DispatchableTrait.php
@@ -1,9 +1,17 @@
 <?php  namespace Laracasts\Commander\Events;
 
- use App;
+use Laracasts\Commander\Events\Contracts\Dispatcher;
+use App;
 
  trait DispatchableTrait {
 
+     /**
+      * The Dispatcher instance.
+      *
+      * @var Dispatcher
+      */
+     protected $dispatcher;
+
      /**
       * Dispatch all events for an entity.
       *
@@ -14,13 +22,24 @@ public function dispatchEventsFor($entity)
          return $this->getDispatcher()->dispatch($entity->releaseEvents());
      }
 
+     /**
+      * Set the dispatcher instance.
+      *
+      * @param mixed $dispatcher
+      */
+     public function setDispatcher(Dispatcher $dispatcher)
+     {
+         $this->dispatcher = $dispatcher;
+     }
+
      /**
       * Get the event dispatcher.
       *
-      * @return \Laracasts\Commander\Events\EventDispatcher
+      * @return Dispatcher
       */
      public function getDispatcher()
      {
-         return App::make('Laracasts\Commander\Events\EventDispatcher');
+         return $this->dispatcher ?: App::make('Laracasts\Commander\Events\EventDispatcher');
      }
+
  }
\ No newline at end of file
diff --git a/src/Laracasts/Commander/Events/EventDispatcher.php b/src/Laracasts/Commander/Events/EventDispatcher.php
index 369069f..95d2cae 100644
--- a/src/Laracasts/Commander/Events/EventDispatcher.php
+++ b/src/Laracasts/Commander/Events/EventDispatcher.php
@@ -1,21 +1,28 @@
 <?php namespace Laracasts\Commander\Events;
 
+use Laracasts\Commander\Events\Contracts\Dispatcher as DispatcherInterface;
 use Illuminate\Events\Dispatcher;
 use Illuminate\Log\Writer;
 
-class EventDispatcher {
+class EventDispatcher implements DispatcherInterface {
 
     /**
+     * The Dispatcher instance.
+     *
      * @var Dispatcher
      */
     protected $event;
 
     /**
+     * The writer instance.
+     *
      * @var Writer
      */
     protected $log;
 
     /**
+     * Create a new EventDispatcher instance.
+     *
      * @param Dispatcher $event
      * @param Writer $log
      */
@@ -26,7 +33,7 @@ function __construct(Dispatcher $event, Writer $log)
     }
 
     /**
-     * Dispatch all events
+     * Dispatch all raised events.
      *
      * @param array $events
      */
@@ -43,11 +50,10 @@ public function dispatch(array $events)
     }
 
     /**
-     * We'll make the fired event name look
-     * just a bit more object-oriented.
+     * Make the fired event name look more object-oriented.
      *
      * @param $event
-     * @return mixed
+     * @return string
      */
     protected function getEventName($event)
     {