0
@@ -1,6 +1,7 @@
0
 <?php
0
 
0
 require_once 'SpecHelper.php';
0
+require_once 'PHPSpec.php';
0
 
0
 $options = new stdClass;
0
 $options->recursive = true;

0
@@ -2,6 +2,8 @@
0
 
0
 require_once 'SpecHelper.php';
0
 
0
+require_once dirname(__FILE__) . '/_zend/application/Bootstrap.php';
0
+
0
 class DescribeContextZend extends PHPSpec_Context
0
 {
0
 
0
@@ -14,7 +16,8 @@ class DescribeContextZend extends PHPSpec_Context
0
     public function itShouldCreateFrontControllerWhenInstantiated()
0
     {
0
         $context = new DescribeFooController;
0
-        $this->spec($context->getFrontController())->should->beAnInstanceOf('Zend_Controller_Front');
0
+        $this->spec($context->getFrontController())->should
0
+            ->beAnInstanceOf('Zend_Controller_Front');
0
     }
0
 
0
     public function itShouldAllowSettingControllerManually()
0
@@ -24,14 +27,168 @@ class DescribeContextZend extends PHPSpec_Context
0
         $this->spec($context->getController())->should->be('Bar');
0
     }
0
 
0
-    public function itShouldCreateRequestBeforeEachExample()
0
+    public function itShouldAllowSettingModuleDirs()
0
+    {
0
+        PHPSpec_Context_Zend::addModuleDirectory('/path/to/module');
0
+        $this->spec(PHPSpec_Context_Zend::getModuleDirectories())->should
0
+            ->be(array('/path/to/module'));
0
+    }
0
+
0
+    public function itShouldAllowSettingSetupCallbackFunction()
0
+    {
0
+        PHPSpec_Context_Zend::setFrontControllerSetupCallback(array('Bootstrap','prepare'));
0
+        $context = new DescribeFooController;
0
+        $context->beforeEach();
0
+        $this->spec(
0
+                Zend_Controller_Front::getInstance()->getControllerDirectory()
0
+            )->should->be(array('default'=>'./application/controllers'));
0
+    }
0
+
0
+    public function itShouldClearFrontControllerBeforeEachExample()
0
+    {
0
+        PHPSpec_Context_Zend::addModuleDirectory(
0
+            dirname(__FILE__) . DIRECTORY_SEPARATOR . '_modules'
0
+        );
0
+        $context = new DescribeFooController;
0
+        $context->beforeEach();
0
+        $this->spec(
0
+            Zend_Controller_Front::getInstance()->getControllerDirectory()
0
+            )->should->be(
0
+                array('Default'=>dirname(__FILE__) . DIRECTORY_SEPARATOR
0
+                . '_modules' . DIRECTORY_SEPARATOR
0
+                . 'Default' . DIRECTORY_SEPARATOR
0
+                . 'controllers')
0
+        );
0
+    }
0
+
0
+    public function itShouldFormulateAndDispatchGetRequest()
0
+    {
0
+        $this->setControllerDirectory();
0
+        $context = new DescribeFooController;
0
+        $context->beforeEach();
0
+        $context->setController('index');
0
+        $response = $context->get('index');
0
+        $this->spec($response)->should->match("/This is Index/");
0
+    }
0
+
0
+    public function itShouldFormulateAndDispatchPostRequest()
0
+    {
0
+        $this->setControllerDirectory();
0
+        $context = new DescribeFooController;
0
+        $context->beforeEach();
0
+        $context->setController('index');
0
+        $response = $context->post('index');
0
+        $this->spec($response)->should->match("/This is Index/");
0
+    }
0
+
0
+    public function itShouldPreserveInstanceOfPhpspecRequest()
0
+    {
0
+        $this->setControllerDirectory();
0
+        $context = new DescribeFooController;
0
+        $context->beforeEach();
0
+        $context->setController('index');
0
+        $response = $context->get('index');
0
+        $this->spec($context->request())->should->beAnInstanceOf('Zend_Controller_Request_Http');
0
+    }
0
+
0
+    public function itShouldReturnInstanceOfPhpspecResponseFromRequest()
0
+    {
0
+        $this->setControllerDirectory();
0
+        $context = new DescribeFooController;
0
+        $context->beforeEach();
0
+        $context->setController('index');
0
+        $response = $context->get('index');
0
+        $this->spec($response)->should->beAnInstanceOf('PHPSpec_Context_Zend_Response');
0
+    }
0
+
0
+    public function itShouldPreserveInstanceOfPhpspecResponse()
0
     {
0
+        $this->setControllerDirectory();
0
         $context = new DescribeFooController;
0
         $context->beforeEach();
0
-        $this->spec($context->request())->should->beAnInstanceOf('Zend_Controller_Request_http');
0
+        $context->setController('index');
0
+        $context->get('index');
0
+        $this->spec($context->response())
0
+            ->should->beAnInstanceOf('PHPSpec_Context_Zend_Response');
0
+    }
0
+
0
+    public function itShouldFormulateAndDispatchRequestWithUserParams()
0
+    {
0
+        $this->setControllerDirectory();
0
+        $context = new DescribeFooController;
0
+        $context->beforeEach();
0
+        $context->setController('index');
0
+        $response = $context->get('userparam', array(), array('text'=>'This is User Param'));
0
+        $this->spec($response)->should->match("/This is User Param/");
0
+    }
0
+
0
+    public function itShouldDispatchARelativeUriPath()
0
+    {
0
+        $this->setControllerDirectory();
0
+        $context = new DescribeFooController;
0
+        $context->beforeEach();
0
+        $response = $context->post('/index/userparam/text/userparampage');
0
+        $this->spec($response)->should->match("/userparampage/");
0
+    }
0
+
0
+    public function itShouldDispatchRelativePathWithoutOpeningSlash()
0
+    {
0
+        $this->setControllerDirectory();
0
+        $context = new DescribeFooController;
0
+        $context->beforeEach();
0
+        $response = $context->post('index/userparam/text/userparampage');
0
+        $this->spec($response)->should->match("/userparampage/");
0
+    }
0
+
0
+    public function itShouldAttachBesuccessMatcherToResponse()
0
+    {
0
+        $context = new DescribeFooController;
0
+        $response = new PHPSpec_Context_Zend_Response;
0
+        $response->setContext($context);
0
+        $response->setHttpResponseCode(200);
0
+        $response->should->beSuccess();
0
+    }
0
+
0
+    public function itShouldAttachBesuccessMatcherToResponseAndFailIfNo200ResponseCode()
0
+    {
0
+        $context = new DescribeFooController;
0
+        $response = new PHPSpec_Context_Zend_Response;
0
+        $response->setContext($context);
0
+        $response->setHttpResponseCode(300);
0
+        $response->shouldNot->beSuccess();
0
+    }
0
+
0
+    public function itShouldAttachHavetextMatcherToResponse()
0
+    {
0
+        $context = new DescribeFooController;
0
+        $response = new PHPSpec_Context_Zend_Response;
0
+        $response->setContext($context);
0
+        $response->setBody('I Am Text');
0
+        $response->should->haveText('I Am Text');
0
+    }
0
+
0
+    public function after()
0
+    {
0
+        PHPSpec_Context_Zend::clearModuleDirectories();
0
+        PHPSpec_Context_Zend::clearControllerDirectories();
0
+        PHPSpec_Context_Zend::clearFrontControllerSetupCallback();
0
+    }
0
+
0
+    public function setControllerDirectory()
0
+    {
0
+        PHPSpec_Context_Zend::addControllerDirectory(
0
+            dirname(__FILE__)
0
+            . DIRECTORY_SEPARATOR . '_zend'
0
+            . DIRECTORY_SEPARATOR . 'application'
0
+            . DIRECTORY_SEPARATOR . 'controllers'
0
+        );
0
     }
0
 }
0
 
0
+/**
0
+ * DescribeFooController is just an entry point. The actual controller
0
+ * is manually set so we don't need subclass bloat for specs
0
+ */
0
 class DescribeFooController extends PHPSpec_Context_Zend
0
 {
0
 }
0
\ No newline at end of file

0
@@ -14,14 +14,14 @@
0
  *
0
  * @category   PHPSpec
0
  * @package    PHPSpec
0
- * @copyright  Copyright (c) 2007 P�draic Brady, Travis Swicegood
0
+ * @copyright  Copyright (c) 2007 Pádraic Brady, Travis Swicegood
0
  * @license    http://www.gnu.org/licenses/lgpl-3.0.txt GNU Lesser General Public Licence Version 3
0
  */
0
 
0
 /**
0
  * @category   PHPSpec
0
  * @package    PHPSpec
0
- * @copyright  Copyright (c) 2007 P�draic Brady, Travis Swicegood
0
+ * @copyright  Copyright (c) 2007 Pádraic Brady, Travis Swicegood
0
  * @license    http://www.gnu.org/licenses/lgpl-3.0.txt GNU Lesser General Public Licence Version 3
0
  */
0
 class PHPSpec_Context implements Countable

0
@@ -1,142 +1,232 @@
0
-<?php
0
-/**
0
- * PHPSpec
0
- *
0
- * LICENSE
0
- *
0
- * This file is subject to the GNU Lesser General Public License Version 3
0
- * that is bundled with this package in the file LICENSE.
0
- * It is also available through the world-wide-web at this URL:
0
- * http://www.gnu.org/licenses/lgpl-3.0.txt
0
- * If you did not receive a copy of the license and are unable to
0
- * obtain it through the world-wide-web, please send an email
0
- * to license@phpspec.org so we can send you a copy immediately.
0
- *
0
- * @category   PHPSpec
0
- * @package    PHPSpec
0
- * @copyright  Copyright (c) 2007 Pádraic Brady, Travis Swicegood
0
- * @license    http://www.gnu.org/licenses/lgpl-3.0.txt GNU Lesser General Public Licence Version 3
0
- */
0
-
0
-require_once 'Zend/Controller/Front.php';
0
-require_once 'Zend/Controller/Request/Http.php';
0
-
0
-/**
0
- * @category   PHPSpec
0
- * @package    PHPSpec
0
- * @copyright  Copyright (c) 2007 Pádraic Brady, Travis Swicegood
0
- * @license    http://www.gnu.org/licenses/lgpl-3.0.txt GNU Lesser General Public Licence Version 3
0
- */
0
-class PHPSpec_Context_Zend extends PHPSpec_Context
0
-{
0
-    
0
-    protected static $_moduleDirectories = array();
0
-    
0
-    protected $_controller = '';
0
-    
0
-    /**
0
-     * Zend Framework; instance of Front Controller
0
-     *
0
-     * @var Zend_Controller_Front
0
-     */
0
-    protected $_frontController = null;
0
-    
0
-    /**
0
-     * Zend Framework; instance of HTTP Request
0
-     *
0
-     * @var Zend_Controller_Request_Http
0
-     */
0
-    protected $_request = null;
0
-    
0
-    /**
0
-     * Zend Framework; instance of HTTP Response
0
-     *
0
-     * @var Zend_Controller_Response_Http
0
-     */
0
-    protected $_response = null;
0
-    
0
-    public function __construct()
0
-    {
0
-        parent::__construct();
0
-        $this->_setController();
0
-        $this->_frontController = Zend_Controller_Front::getInstance();
0
-    }
0
-    
0
-    public static function addModuleDirectory($path)
0
-    {
0
-        self::$_moduleDirectories[] = $path;
0
-    }
0
-    
0
-    public static function getModuleDirectories()
0
-    {
0
-        return self::$_moduleDirectories;
0
-    }
0
-    
0
-    public function beforeEach()
0
-    {
0
-        $this->_request = new Zend_Controller_Request_Http;
0
-        $this->_clearFrontController();
0
-    }
0
-    
0
-    public function get($actionName, array $getArray = null, array $paramArray = null)
0
-    {
0
-        $this->request()->setControllerName($this->getController());
0
-        $this->request()->setActionName($actionName);
0
+<?php
0
+/**
0
+ * PHPSpec
0
+ *
0
+ * LICENSE
0
+ *
0
+ * This file is subject to the GNU Lesser General Public License Version 3
0
+ * that is bundled with this package in the file LICENSE.
0
+ * It is also available through the world-wide-web at this URL:
0
+ * http://www.gnu.org/licenses/lgpl-3.0.txt
0
+ * If you did not receive a copy of the license and are unable to
0
+ * obtain it through the world-wide-web, please send an email
0
+ * to license@phpspec.org so we can send you a copy immediately.
0
+ *
0
+ * @category   PHPSpec
0
+ * @package    PHPSpec
0
+ * @copyright  Copyright (c) 2007 Pádraic Brady, Travis Swicegood
0
+ * @license    http://www.gnu.org/licenses/lgpl-3.0.txt GNU Lesser General Public Licence Version 3
0
+ */
0
+
0
+require_once 'Zend/Controller/Front.php';
0
+
0
+require_once 'Zend/Controller/Request/Http.php';
0
+
0
+/**
0
+ * @category   PHPSpec
0
+ * @package    PHPSpec
0
+ * @copyright  Copyright (c) 2007 Pádraic Brady, Travis Swicegood
0
+ * @license    http://www.gnu.org/licenses/lgpl-3.0.txt GNU Lesser General Public Licence Version 3
0
+ */
0
+class PHPSpec_Context_Zend extends PHPSpec_Context
0
+{
0
+
0
+    const BASE_URL = 'http://www.example.com';
0
+
0
+    protected static $_moduleDirectories = array();
0
+
0
+    protected static $_controllerDirectories = array();
0
+
0
+    protected static $_frontControllerSetupCallback = null;
0
+
0
+    /**
0
+     * Name of the Controller being specified; captured usually
0
+     * from the Context classname.
0
+     *
0
+     * @var string
0
+     */
0
+    protected $_controller = '';
0
+
0
+    /**
0
+     * Zend Framework; instance of Front Controller
0
+     *
0
+     * @var Zend_Controller_Front
0
+     */
0
+    protected $_frontController = null;
0
+
0
+    /**
0
+     * Zend Framework; instance of HTTP Request
0
+     *
0
+     * @var Zend_Controller_Request_Http
0
+     */
0
+    protected $_request = null;
0
+
0
+    /**
0
+     * Zend Framework; instance of HTTP Response
0
+     *
0
+     * @var Zend_Controller_Response_Http
0
+     */
0
+    protected $_response = null;
0
+
0
+    public function __construct()
0
+    {
0
+        parent::__construct();
0
+        $this->_setController();
0
+        $this->_frontController = Zend_Controller_Front::getInstance();
0
+    }
0
+
0
+    public static function setFrontControllerSetupCallback($callback)
0
+    {
0
+        self::$_frontControllerSetupCallback = $callback;
0
+    }
0
+
0
+    public static function clearFrontControllerSetupCallback()
0
+    {
0
+        self::$_frontControllerSetupCallback = null;
0
+    }
0
+
0
+    public static function addModuleDirectory($path)
0
+    {
0
+        self::$_moduleDirectories[] = $path;
0
+    }
0
+
0
+    public static function getModuleDirectories()
0
+    {
0
+        return self::$_moduleDirectories;
0
+    }
0
+
0
+    public static function clearModuleDirectories()
0
+    {
0
+        self::$_moduleDirectories = array();
0
+    }
0
+
0
+    public static function addControllerDirectory($path, $module = null)
0
+    {
0
+        if (!isset($module)) {
0
+        	$module = 'NULL';
0
+        }
0
+
0
+        self::$_controllerDirectories[$module] = $path;
0
+    }
0
+
0
+    public static function getControllerDirectories()
0
+    {
0
+        return self::$_controllerDirectories;
0
+    }
0
+
0
+    public static function clearControllerDirectories()
0
+    {
0
+        self::$_controllerDirectories = array();
0
+    }
0
+
0
+    public function beforeEach()
0
+    {
0
+        $_GET = array();
0
+        $_POST = array();
0
+        $_COOKIE = array();
0
+        $this->_clearFrontController();
0
+    }
0
+
0
+    public function get($actionName, array $getArray = null, array $paramArray = null)
0
+    {
0
         if (!empty($getArray)) {
0
-        	$this->request()->setParams($getArray); // override later with subclass!
0
-        }
0
-        if (!empty($paramArray)) {
0
-            $this->request()->setParams($paramArray);
0
-        }
0
-        $this->_response = $this->_frontController->dispatch($this->request());
0
-        return $this->response();
0
-    }
0
-    
0
-    /**
0
-     * Returns current Request_Http object
0
-     *
0
-     * @return Zend_Controller_Request_Http
0
-     */
0
-    public function request()
0
-    {
0
-        return $this->_request;
0
-    }
0
-    
0
-    public function response()
0
-    {
0
+        	$_GET = $getArray;
0
+        }
0
+        $this->_response = $this->_makeRequest($actionName, $paramArray);
0
+        return $this->response();
0
+    }
0
+
0
+    public function post($actionName, array $postArray = null, array $paramArray = null)
0
+    {
0
+        if (!empty($postArray)) {
0
+            $_POST = $postArray;
0
+        }
0
+        $this->_response = $this->_makeRequest($actionName, $paramArray);
0
+        return $this->response();
0
+    }
0
+
0
+    /**
0
+     * Returns current Request_Http object
0
+     *
0
+     * @return Zend_Controller_Request_Http
0
+     */
0
+    public function request()
0
+    {
0
+        return $this->_request;
0
+    }
0
+
0
+    public function response()
0
+    {
0
         if (!isset($this->_response)) {
0
-        	throw new PHPSpec_Exception('No response has been retrieved yet;
0
+        	throw new PHPSpec_Exception('No response has been retrieved yet;
0
           make a get or post request first');
0
-        }
0
-        return $this->_response;
0
-    }
0
-    
0
-    public function setController($controllerName)
0
-    {
0
-        $this->_controller = $controllerName;
0
-    }
0
-    
0
-    public function getController()
0
-    {
0
-        return $this->_controller;
0
-    }
0
-    
0
-    public function getFrontController()
0
-    {
0
-        return $this->_frontController;
0
-    }
0
-    
0
-    protected function _clearFrontController() {
0
-        $this->_frontController->resetInstance();
0
-        $this->_frontController->returnResponse(true);
0
-        foreach (self::getModuleDirectories() as $path) {
0
-        	$this->_frontController->addModuleDirectory($path);
0
-        }
0
-    }
0
-    
0
-    protected function _setController()
0
-    {
0
-        $this->_controller = substr(get_class($this), 8, strlen(substr(get_class($this), 8))-10);
0
-    }
0
-    
0
+        }
0
+        return $this->_response;
0
+    }
0
+
0
+    public function setController($controllerName)
0
+    {
0
+        $this->_controller = $controllerName;
0
+    }
0
+
0
+    public function getController()
0
+    {
0
+        return $this->_controller;
0
+    }
0
+
0
+    public function getFrontController()
0
+    {
0
+        return $this->_frontController;
0
+    }
0
+
0
+    protected function _makeRequest($actionName, array $paramArray = null)
0
+    {
0
+        if (preg_match("%/%", $actionName)) {
0
+            $uri = self::BASE_URL
0
+                . (substr($actionName, 0, 1) == '/' ? $actionName : '/' . $actionName);
0
+        } else {
0
+            $uri = self::BASE_URL . '/' . $this->getController()
0
+            . (!empty($actionName) ? '/' . $actionName : '');
0
+        }
0
+        $this->_request = new Zend_Controller_Request_Http($uri);
0
+        if (!empty($paramArray)) {
0
+        	$this->request()->setParams($paramArray);
0
+        }
0
+        $response = $this->_frontController->dispatch(
0
+            $this->request(),
0
+            new PHPSpec_Context_Zend_Response
0
+        );
0
+        $response->setContext($this);
0
+        return $response;
0
+    }
0
+
0
+    protected function _clearFrontController() {
0
+        $this->_frontController->resetInstance();
0
+        if (count(self::$_frontControllerSetupCallback) > 0) {
0
+            call_user_func(array(
0
+                self::$_frontControllerSetupCallback[0],
0
+                self::$_frontControllerSetupCallback[1]
0
+            ));
0
+        } else {
0
+            $this->_frontController->returnResponse(true);
0
+            $this->_frontController->throwExceptions(true);
0
+            foreach (self::getControllerDirectories() as $module=>$path) {
0
+                if ($module == 'NULL') {
0
+                    $module = null;
0
+                }
0
+                $this->_frontController->addControllerDirectory($path, $module);
0
+            }
0
+            foreach (self::getModuleDirectories() as $path) {
0
+                $this->_frontController->addModuleDirectory($path);
0
+            }
0
+        }
0
+
0
+    }
0
+
0
+    protected function _setController()
0
+    {
0
+        $controllerClassName = substr(get_class($this), 8);
0
+        $this->_controller = substr($controllerClassName, 0, strlen($controllerClassName)-10);
0
+    }
0
+
0
 }
0
\ No newline at end of file

0
@@ -38,7 +38,12 @@ class PHPSpec_Framework
0
             return false;
0
         }
0
         $path = dirname(dirname(__FILE__));
0
-        include_once $path . '/' . str_replace('_', '/', $class) . '.php';
0
+        $file = $path . '/' . str_replace('_', '/', $class) . '.php';
0
+        if (!file_exists($file)) {
0
+            throw new PHPSpec_Exception('include_once("' . $file . '"): file does not exist');
0
+        } else {
0
+            include_once $file;
0
+        }
0
     }
0
 
0
 }

0
@@ -122,7 +122,9 @@ class PHPSpec_Specification
0
 
0
         // check for Matcher references
0
         $matchers = array(
0
-            'equal', 'be', 'beEqualTo', 'beAnInstanceOf', 'beGreaterThan', 'beTrue', 'beFalse', 'beEmpty', 'beLessThan', 'beGreaterThanOrEqualTo', 'beLessThanOrEqualTo', 'beSet', 'beNull', 'beOfType', 'beIdenticalTo', 'match', 'throw'
0
+            'equal', 'be', 'beEqualTo', 'beAnInstanceOf', 'beGreaterThan', 'beTrue', 'beFalse', 'beEmpty', 'beLessThan', 'beGreaterThanOrEqualTo', 'beLessThanOrEqualTo', 'beSet', 'beNull', 'beOfType', 'beIdenticalTo', 'match', 'throw',
0
+
0
+            'beSuccess', 'haveText'
0
         );
0
         if (in_array($method, $matchers)) {
0
             $this->setExpectedValue(array_shift($args));
0
@@ -338,11 +340,19 @@ class PHPSpec_Specification
0
      *
0
      * @param DSL method call which was found to be a Matcher reference
0
      * @return null
0
+     * @todo Refactor Matcher inclusion into a more extensible system
0
      */
0
     protected function _createMatcher($method)
0
     {
0
         $matcherClass = 'PHPSpec_Matcher_' . ucfirst($method);
0
-        $this->_matcher = new $matcherClass( $this->getExpectedValue() );
0
+        try {
0
+            if (class_exists($matcherClass, true)) {
0
+                $this->_matcher = new $matcherClass( $this->getExpectedValue() );
0
+            }
0
+        } catch (PHPSpec_Exception $e) {
0
+            $matcherClass = 'PHPSpec_Context_Zend_Matcher_' . ucfirst($method);
0
+            $this->_matcher = new $matcherClass( $this->getExpectedValue() );
0
+        }
0
     }
0
 
0
     /**