More work on deferreds and promises

ircmaxell · ircmaxell · commit e8c92ef23b6c · 2013-07-03T13:19:24.000-04:00
diff --git a/lib/MonadPHP/Deferred.php b/lib/MonadPHP/Deferred.php
@@ -0,0 +1,25 @@
+<?php
+
+namespace MonadPHP;
+
+class Deferred extends Promise {
+
+    protected $isResolved = false;
+    protected $succeed = null;
+
+    protected $children = array();
+    protected $success;
+    protected $failure;
+
+    public function __construct() {
+    }
+
+    public function succeed($value) {
+        $this->resolve(true, $value);
+    }
+
+    public function fail($value) {
+        $this->resolve(false, $value);
+    }
+
+}
diff --git a/lib/MonadPHP/Promise.php b/lib/MonadPHP/Promise.php
@@ -17,31 +17,19 @@ public function __construct($success = null, $failure = null) {
     }
 
     public function unit($success = null, $failure = null) {
-        return new static($success, $failure); 
+        return new Promise($success, $failure); 
     }
 
     public function bind($success, $failure) {
         $obj = $this->unit($success, $failure);
         if ($this->isResolved) {
-            if ($this->succeed) {
-                $obj->succeed($this->value);
-            } else {
-                $obj->fail($this->value);
-            }
+            $obj->resolve($this->succeed, $this->value);
         } else {
             $this->children[] = $obj;
         }
         return $obj;
     }
 
-    public function succeed($value) {
-        $this->resolve(true, $value);
-    }
-
-    public function fail($value) {
-        $this->resolve(false, $value);
-    }
-
     protected function resolve($status, $value) {
         if ($this->isResolved) {
             throw new \BadMethodCallException('Promise already resolved');
@@ -53,9 +41,8 @@ protected function resolve($status, $value) {
         if ($callback) {
             call_user_func($callback, $value);
         }
-        $method = $status ? 'succeed' : 'fail';
         foreach ($this->children as $child) {
-            $child->$method($value);
+            $child->resolve($status, $value);
         }
     }
 
diff --git a/test/MonadPHP/PromiseTest.php b/test/MonadPHP/PromiseTest.php
@@ -4,8 +4,8 @@
 
 class PromiseTest extends \PHPUnit_Framework_TestCase {
 
-    public function testBind() {
-        $promise = new Promise;
+    public function testFail() {
+        $promise = new Deferred;
         $calledSuccess = false;
         $calledFailure = false;
         $promise->when(function() use (&$calledSuccess) {
@@ -16,16 +16,56 @@ public function testBind() {
         $this->assertFalse($calledSuccess);
         $this->assertFalse($calledFailure);
 
-        $promise->succeed(true);
-        $this->assertTrue($calledSuccess);
+        $promise->fail(true);
+        $this->assertFalse($calledSuccess, 'Not successful');
+        $this->assertTrue($calledFailure, 'Failed!');
+
+        try {
+            $promise->succeed(true);
+            $this->fail('No exception raised');
+        } catch (\BadMethodCallException $e) {
+            $this->assertFalse($calledSuccess);
+        }
+    }
+
+
+    public function testSucceed() {
+        $promise = new Deferred;
+        $calledSuccess = false;
+        $calledFailure = false;
+        $promise->when(function() use (&$calledSuccess) {
+            $calledSuccess = true;
+        }, function() use (&$calledFailure) {
+            $calledFailure = true;
+        });
+        $this->assertFalse($calledSuccess);
         $this->assertFalse($calledFailure);
 
+        $promise->succeed(true);
+        $this->assertTrue($calledSuccess, 'Success was not called');
+        $this->assertFalse($calledFailure, 'Fail was called');
+
         try {
             $promise->fail(true);
             $this->fail('No exception raised');
         } catch (\BadMethodCallException $e) {
-            $this->assertFalse($calledFailure);
+            $this->assertFalse($calledFailure, 'Fail is true!');
         }
     }
 
+    public function testAlreadyResolvedPromise() {
+        $promise = new Deferred();
+        $promise->succeed(true);
+        $calledSuccess = false;
+        $calledFailure = false;
+        $promise->when(function() use (&$calledSuccess) {
+            $calledSuccess = true;
+        }, function() use (&$calledFailure) {
+            $calledFailure = true;
+        });
+        $this->assertTrue($calledSuccess);
+        $this->assertFalse($calledFailure);
+       
+    }
+
 }
