Changeset 357

Timestamp:

09/14/07 16:24:40 (1 year ago)

Author:

bermiferrer

Message:

MAJOR CHANGE. The way Akelos dispatches requests has changed completely. You are encouraged to update your existing applications public/index.php and config/boot.php to benefit from this changes.
Now Akelos uses a generic Dispatcher that will serve as the base Akelos bootstrapping for executing Akelos in share-nothing environments (the default PHP workflow) and as an Application Server (Like Mongrel cubes using SCGI and http://code.google.com/p/appserver-in-php/).

Files:

• trunk/app/controllers/framework_setup_controller.php (modified) (1 diff)
• trunk/app/models/framework_setup.php (modified) (3 diffs)
• trunk/config/boot.php (modified) (1 diff)
• trunk/lib/AkActionController.php (modified) (18 diffs)
• trunk/lib/AkActionController/AkWebRequest.php (modified) (1 diff)
• trunk/lib/AkActionView/helpers/asset_tag_helper.php (modified) (1 diff)
• trunk/lib/AkActionView/helpers/pagination_helper.php (modified) (1 diff)
• trunk/lib/AkActiveRecord.php (modified) (2 diffs)
• trunk/lib/AkDispatcher.php (added)
• trunk/lib/AkLocaleManager.php (modified) (2 diffs)
• trunk/lib/AkObject.php (modified) (3 diffs)
• trunk/lib/AkRequest.php (modified) (10 diffs)
• trunk/lib/AkResponse.php (modified) (6 diffs)
• trunk/lib/AkRouter.php (modified) (2 diffs)
• trunk/lib/constants.php (modified) (1 diff)
• trunk/public/index.php (modified) (2 diffs)
• trunk/test/fixtures/public/index.php (modified) (1 diff)
• trunk/test/unit/lib/AkActionView/helpers/asset_tag_helper.php (modified) (5 diffs)

trunk/app/controllers/framework_setup_controller.php

@@ -24 +24 @@
-
-include_once(AK_CONFIG_DIR.DS.'boot.php');
+require_once(AK_LIB_DIR.DS.'AkObject.php');
+require_once(AK_LIB_DIR.DS.'AkInflector.php');
+require_once(AK_LIB_DIR.DS.'Ak.php');
+require_once(AK_LIB_DIR.DS.'AkActionController.php');
-
-$_GET['controller'] = 'framework_setup';

trunk/app/models/framework_setup.php

@@ -241 +241 @@
-    function runFrameworkInstaller()
-    {
+        static $unique_dsn = array();
-        require_once(AK_LIB_DIR.DS.'AkInstaller.php');
-        require_once(AK_APP_DIR.DS.'installers'.DS.'framework_installer.php');
-
-        foreach (array('production', 'development') as $mode){
-
-
-
+
+
+
+
+
+
+
-        }
-
@@ -360 +365 @@
-
-            $settings['%locales'] = $this->getLocales();
-
+
-            $settings['%AK_URL_REWRITING'] = $this->isUrlRewriteEnabled() ? '' : "// The web configuration wizard could not detect if you have mod_rewrite enabled. \n// If that is the case, you should uncomment the next line line for better performance. \n// ";
-            $settings['%AK_FRAMEWORK_DIR'] = defined('AK_FRAMEWORK_DIR') ?
@@ -562 +567 @@
-        'ftp_host' => $this->getFtpHost(),
-        'ftp_path' => $this->getFtpPath(),
-
+
-        'random' => Ak::randomString(),
-        );

trunk/config/boot.php

@@ -22 +22 @@
-
-require_once(AK_LIB_DIR.DS.'constants.php');
-require_once(AK_LIB_DIR.DS.'Ak.php');
-require_once(AK_LIB_DIR.DS.'AkActionController.php');
-
-?>

trunk/lib/AkActionController.php

@@ -8 +8 @@
-// | Released under the GNU Lesser General Public License, see LICENSE.txt|
-// +----------------------------------------------------------------------+
+
+if(!class_exists('AkActionController')){
+
+require_once(AK_LIB_DIR.DS.'AkObject.php');
+
+defined('AK_HIGH_LOAD_MODE') ? null : define('AK_HIGH_LOAD_MODE', false);
-
-/**
@@ -16 +22 @@
- * @license GNU Lesser General Public License <http://www.gnu.org/copyleft/lesser.html>
- */
-
-
-
-
-
+
-class AkActionController extends AkObject
-{
-_database_connection_available = false
-_session_handler = AK_SESSION_HANDLER
-_session_available = fals
-__internationalization_support_enabled
-
+high_load_mode = AK_HIGH_LOAD_MODE
+enable_plugins = true
+auto_instantiate_models = tru
+validate_output
+
-    var $_ssl_requirement = false;
-
@@ -39 +41 @@
-    * Protected instance variable cache
-    */
-
+ = array()
-
-    /**
@@ -48 +50 @@
-    *  $this->_asset_host = 'http://assets.example.com';
-    */
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
-
-    /**
@@ -141 +114 @@
-    var $cookies;
-
-    var $_autoIncludePaginator = true;
-
-    var $helpers = 'default';
-
@@ -153 +124 @@
-    var $web_service_apis = array();
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-            }
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-    /**
@@ -287 +331 @@
-    }
-
-$models = null
+
-    {
-        require_once(AK_LIB_DIR.DS.'AkActiveRecord.php');
-        require_once(AK_APP_DIR.DS.'shared_model.php');
-
-
+
+
+
+
-        Ak::import($this->model),
- : $models
+
-
-        foreach ($models as $model){
@@ -466 +513 @@
-    function render($options = null, $status = 200)
-    {
-        Ak::profile('Entering into '.__CLASS__.'::'.__FUNCTION__.' '.__FILE__.' on line '.__LINE__);
-
-        if(empty($options['partial']) && $this->_hasPerformed()){
-            $this->_doubleRenderError(Ak::t("Can only render or redirect once per action"));
@@ -477 +522 @@
-        // Ror Backwards compatibility
-        if(!is_array($options)){
-            Ak::profile('Enterind on render file '.__CLASS__.'::'.__FUNCTION__.' '.__FILE__.' on line '.__LINE__);
-            return $this->renderFile(empty($options) ? $this->getDefaultTemplateName() : $options, $status, true);
-        }
@@ -544 +588 @@
-            $this->_assertExistanceOfTemplateFile($template_path);
-        }
-
-
-
-
+
+
+
-        return $this->renderText($this->Template->renderFile($template_path, $use_full_path, $locals), $status);
-    }
@@ -602 +645 @@
-    }
-
-
+ = null
-    {
-        $template_name = empty($template_name) ? $this->getDefaultTemplateName() : $template_name;
@@ -628 +671 @@
-    function _addInstanceVariablesToAssigns()
-    {
-
-
-
-
+
+
+
-            if($attribute[0] != '_'){
-                $this->_assigns[$attribute] =& $this->$attribute;
@@ -686 +728 @@
-                    $this->_doubleRenderError();
-                }
-
-
-
+
-                $this->_handleFlashAttribute();
-                $this->Response->redirect($options);
@@ -1832 +1872 @@
-    }
-
+    
-    function _callFilters(&$filters, $method = '')
-    {
@@ -1845 +1886 @@
-                    $filter_result = $filter->filter($this);
-                }else{
-Filters need to be a method name, or class implementing a static filter method'
+Invalid filter %filter. Filters need to be a method name or a class implementing a static filter method', array('%filter'=>$filter)
-                }
-
@@ -1955 +1996 @@
-    }
-
-
-
-    /**
-     * This methods are used before triggering an Application Controller
-     */
-    function __connectToDatabase()
-    {
-        global $dsn;
-        if(!empty($dsn)){
-            Ak::db($dsn);
-            $this->__database_connection_available = AK_DATABASE_CONNECTION_AVAILABLE;
-        }
-    }
-
-    function __startSession()
-    {
-        if($this->__session_available === false){
-            if($this->__session_handler == 1 && $this->__database_connection_available){
-                require_once(AK_LIB_DIR.DS.'AkDbSession.php');
-
-                $AkDbSession = new AkDbSession();
-                $AkDbSession->session_life = AK_SESSION_EXPIRE;
-                session_set_save_handler (
-                array(&$AkDbSession, '_open'),
-                array(&$AkDbSession, '_close'),
-                array(&$AkDbSession, '_read'),
-                array(&$AkDbSession, '_write'),
-                array(&$AkDbSession, '_destroy'),
-                array(&$AkDbSession, '_gc')
-                );
-            }
-            @session_start();
-        }
-        $this->__session_available = isset($_SESSION);
-
-        if($this->__session_available){
-            $this->session =& $_SESSION;
-        }
-    }
-
-    function __enableInternationalizationSupport()
-    {
-        require_once(AK_LIB_DIR.DS.'AkLocaleManager.php');
-
-        $LocaleManager = new AkLocaleManager();
-
-        $LocaleManager->init();
-        $LocaleManager->initApplicationInternationalization($this->Request);
-
-        $this->__internationalization_support_enabled = true;
-    }
-
-    function __mapRoutes()
-    {
-        require_once(AK_LIB_DIR.DS.'AkRouter.php');
-        if(is_file(AK_ROUTES_MAPPING_FILE)){
-            $Map =& AkRouter();
-            include(AK_ROUTES_MAPPING_FILE);
-            // Set this routes for being used via Ak::toUrl
-            Ak::toUrl($Map,true);
-            $this->Request->checkForRoutedRequests($Map);
-        }
-    }
-
-
@@ -2505 +2483 @@
-    function redirectToLocale($locale)
-    {
-
+Request->
-            $lang = isset($this->params['lang']) ? $this->params['lang'] : $locale;
-
@@ -2550 +2528 @@
-}
-
+}
+
-?>

trunk/lib/AkActionController/AkWebRequest.php

@@ -15 +15 @@
- * @copyright Copyright (c) 2002-2006, Akelos Media, S.L. http://www.akelos.org
- * @license GNU Lesser General Public License <http://www.gnu.org/copyleft/lesser.html>
+ * @deprecated Please use AkDispatcher on your public/index.php instead
- */
-

trunk/lib/AkActionView/helpers/asset_tag_helper.php

@@ -223 +223 @@
-        $source = !strstr($source,'.') ? "$source.$ext" : $source;
-        $source = !preg_match('/^[-a-z]+:\/\//',$source) ? AK_ASSET_URL_PREFIX.$source : $source;
-AK_ASSET_HOST
+$this->_controller->asset_host
-        $source = substr($source,0,2) == '//' ? substr($source,1) : $source;
-        

trunk/lib/AkActionView/helpers/pagination_helper.php

@@ -19 +19 @@
-
-require_once(AK_LIB_DIR.DS.'AkActionView'.DS.'AkActionViewHelper.php');
-
+
+
-class PaginationHelper extends AkActionViewHelper
-{

trunk/lib/AkActiveRecord.php

@@ -4569 +4569 @@
-    {
-        $class_name = AkInflector::camelize($behaviour);
-!file_exists(AK_APP_BEHAVIOURS_DIR.DS.'
+file_exists(AK_LIB_DIR.DS.'AkActiveRecord'.DS.'Ak
-        'AkActsAs'.$class_name : 'ActsAs'.$class_name;
-    }
@@ -4582 +4582 @@
-                include_once(AK_LIB_DIR.DS.'AkActiveRecord'.DS.$class_name.'.php');
-            }else{
-BEHAVIOURS_DIR
+PLUGINS_DIR.DS.AkInflector::underscore($class_name).DS.'lib'
-            }
-        }

trunk/lib/AkLocaleManager.php

@@ -43 +43 @@
-    {
-        static $available_locales;
-        Ak::profile(__CLASS__.'::'.__FUNCTION__);
-
-        if(empty($available_locales)){
@@ -62 +61 @@
-    function _parseLocaleConfigString($locale_settings)
-    {
-        Ak::profile(__CLASS__.'::'.__FUNCTION__);
-        $locale_settings = trim(str_replace(' ','',$locale_settings));
-        $locale_settings = str_replace(array(';','(',')'), array(',','~','',''),$locale_settings);

trunk/lib/AkObject.php

@@ -17 +17 @@
- */
-
-defined('AK_OBJECT_CLASS_INCLUDED')){ define('AK_OBJECT_CLASS_INCLUDED',true); // Class overriding trick
+class_exists('AkObject')){ 
-
-/**
@@ -148 +148 @@
-}
-
-}// End of if(!defined('AK_OBJECT_CLASS_INCLUDED')){
-
-
-function ____ak_shutdown_function($details = false)
@@ -167 +165 @@
-}
-
+}
-
-?>

trunk/lib/AkRequest.php

@@ -8 +8 @@
-// | Released under the GNU Lesser General Public License, see LICENSE.txt|
-// +----------------------------------------------------------------------+
+
+if(!class_exists('AkResponse')){
-
-/**
@@ -17 +19 @@
- */
-
-if(!defined('AK_REQUEST_CLASS_INCLUDED')){ define('AK_REQUEST_CLASS_INCLUDED',true); // Class overriding trick
-
-require_once(AK_LIB_DIR.DS.'AkObject.php');
-
-if(!defined('AK_DEFAULT_CONTROLLER')){
-    define('AK_DEFAULT_CONTROLLER', 'page');
@@ -27 +25 @@
-    define('AK_DEFAULT_ACTION', 'index');
-}
+
+defined('AK_HIGH_LOAD_MODE') ? null : define('AK_HIGH_LOAD_MODE', false);
+defined('AK_AUTOMATIC_DB_CONNECTION') ? null : define('AK_AUTOMATIC_DB_CONNECTION', !AK_HIGH_LOAD_MODE);
+defined('AK_AUTOMATIC_SESSION_START') ? null : define('AK_AUTOMATIC_SESSION_START', !AK_HIGH_LOAD_MODE);
-
-// IIS does not provide a valid REQUEST_URI so we need to guess it from the script name + query string
@@ -64 +66 @@
-
-    var $_init_check = false;
+    var $__internationalization_support_enabled = false;
-
-    var $action = AK_DEFAULT_ACTION;
-    var $controller = AK_DEFAULT_CONTROLLER;
-    var $view;
-
-
- 
- 
- 
- 
+
+
+
+
+
+
-    var $env = array();
-    // }}}
@@ -138 +141 @@
-    * @return void 
-    */
-
-    function init()
-    {
@@ -586 +588 @@
-        if(!empty($params) && is_array($params)){
-            foreach ($params as $name=>$details){
-
+
-                if(is_array($details) && !empty($details['name']) &&  !empty($details['tmp_name']) &&  !empty($details['size'])){
-
- 
-    
-        count($details['tmp_name']) == 1 && 
-        
-    
+
+
+
+count($details['tmp_name']) == 1 &&
+
+
-
-                        foreach (array_keys($details['tmp_name']) as $k){
@@ -634 +636 @@
-            }
-        }
-
+
-        return $result;
-    }
@@ -679 +681 @@
-                array_walk($_POST, array('AkRequest', '_fixGpc'));
-                array_walk($_COOKIE, array('AkRequest', '_fixGpc'));
-                //array_walk($_REQUEST, array('AkRequest', '_fixGpc'));
-                //!empty($_FILES) ? array_walk($_FILES, array('AkRequest', '_fixGpc')) : null;
-            }
-            define('AK_GPC_MAGIC_FIXED',true);
@@ -710 +710 @@
-        }else {
-            $item = urldecode($item);
+        }
+    }
+
+
+    // {{{ recognize()
+
+    /**
+    * Recognizes a Request and returns the responsible controller instance
+    * 
+    * @return AkActionController
+    */
+    function &recognize($Map = null)
+    {
+        $this->_connectToDatabase();
+        $this->_startSession();
+        $this->_enableInternationalizationSupport();
+        $this->_mapRoutes($Map);
+        
+        $params =& $this->getParams();
+        $controller_file_name = AkInflector::underscore($params['controller']).'_controller.php';
+        $controller_class_name = AkInflector::camelize($params['controller']).'Controller';
+        $controller_path = AK_CONTROLLERS_DIR.DS.$controller_file_name;
+        include_once(AK_APP_DIR.DS.'application_controller.php');
+        if(@!include_once($controller_path)){
+            trigger_error(Ak::t('Could not find the file /app/controllers/<i>%controller_file_name</i> for '.
+            'the controller %controller_class_name',
+            array('%controller_file_name'=> $controller_file_name,
+            '%controller_class_name' => $controller_class_name)), E_USER_ERROR);
+        }
+        if(!class_exists($controller_class_name)){
+            trigger_error(Ak::t('Controller <i>%controller_name</i> does not exist',
+            array('%controller_name' => $controller_class_name)), E_USER_ERROR);
+        }
+        $Controller =& new $controller_class_name(array('controller'=>true));
+        isset($_SESSION) ? $Controller->session = $_SESSION : null;
+        return $Controller;
+
+    }
+
+    // }}}
+
+    function _enableInternationalizationSupport()
+    {
+        if(AK_AVAILABLE_LOCALES != 'en'){
+            require_once(AK_LIB_DIR.DS.'AkLocaleManager.php');
+
+            $LocaleManager = new AkLocaleManager();
+            $LocaleManager->init();
+            $LocaleManager->initApplicationInternationalization($this);
+            $this->__internationalization_support_enabled = true;
+        }
+    }
+
+    function _mapRoutes($Map = null)
+    {
+        require_once(AK_LIB_DIR.DS.'AkRouter.php');
+        if(is_file(AK_ROUTES_MAPPING_FILE)){
+            if(empty($Map)){
+                $Map =& AkRouter();
+            }
+            include(AK_ROUTES_MAPPING_FILE);
+            // Set this routes for being used via Ak::toUrl
+            Ak::toUrl($Map,true);
+            $this->checkForRoutedRequests($Map);
+        }
+    }
+    
+
+    function _connectToDatabase()
+    {
+        global $dsn;
+        if(AK_AUTOMATIC_DB_CONNECTION){
+            if(!empty($dsn)){
+                Ak::db($dsn);
+            }
+        }
+    }
+    
+    function _startSession()
+    {
+        if(AK_AUTOMATIC_SESSION_START){
+            if(!isset($_SESSION)){
+                if(AK_SESSION_HANDLER == 1 && defined('AK_DATABASE_CONNECTION_AVAILABLE') && AK_DATABASE_CONNECTION_AVAILABLE){
+                    require_once(AK_LIB_DIR.DS.'AkDbSession.php');
+                
+                    $AkDbSession = new AkDbSession();
+                    $AkDbSession->session_life = AK_SESSION_EXPIRE;
+                    session_set_save_handler (
+                    array(&$AkDbSession, '_open'),
+                    array(&$AkDbSession, '_close'),
+                    array(&$AkDbSession, '_read'),
+                    array(&$AkDbSession, '_write'),
+                    array(&$AkDbSession, '_destroy'),
+                    array(&$AkDbSession, '_gc')
+                    );
+                }
+                @session_start();
+            }
-        }
-    }
@@ -722 +820 @@
-}
-
-
-
+
+
-
-?>

trunk/lib/AkResponse.php

@@ -9 +9 @@
-// +----------------------------------------------------------------------+
-
-
+
-
-/**
@@ -24 +24 @@
-    var $_headers_sent = array();
-    var $body = '';
-
+
+
-    function set($data, $id = null)
-    {
@@ -61 +62 @@
-    function outputResults()
-    {
-         Ak::profile('Started sending response'.__CLASS__.'::'.__FUNCTION__.' '.__FILE__.' on line '.__LINE__);
-        $this->sendHeaders();
-        if(is_object($this->body) && method_exists($this->body,'stream')){
+            AK_LOG_EVENTS && !empty($this->_Logger) ? $this->_Logger->message("Sending response as stream") : null;
-            $this->body->stream();
-        }else{
+            AK_LOG_EVENTS && !empty($this->_Logger) ? $this->_Logger->message("Sending response") : null;
-            echo $this->body;
-        }
@@ -90 +92 @@
-        
-        if(!empty($this->_headers) && is_array($this->_headers)){
+            $this->addHeader('Connection: close');
-            foreach ($this->_headers as $k=>$v){
-                $header = trim((!is_numeric($k) ? $k.': ' : '').$v);
@@ -103 +106 @@
-                    $_has_content_type = true;
-                }
+                AK_LOG_EVENTS && !empty($this->_Logger) ? $this->_Logger->message("Sending header:  $header") : null;
-                header($header);
-            }
@@ -192 +196 @@
-    $null = null;
-    $AkResponse =& Ak::singleton('AkResponse', $null);
+    AK_LOG_EVENTS && empty($AkResponse->_Logger) ? ($AkResponse->_Logger =& Ak::getLogger()) : null;
-    return $AkResponse;
-}
-
+}
+
-?>

trunk/lib/AkRouter.php

@@ -9 +9 @@
-// +----------------------------------------------------------------------+
-
-
-
-
+
+
+
+
+
- * Native PHP URL rewriting for the Akelos Framework.
- * 
@@ -22 +24 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-    /**
-Routes setting container
+Native PHP URL rewriting for the Akelos Framework
-    *
-
-
-
+
+
+
+
+
+
+
+
+
-    */
-
-
-
-
-
-
-
-
-
-
-
+
-    {
+        // {{{ properties
+
+
+        // --- Private properties --- //
+
+
-        /**
+        * Routes setting container
+        *
+        * @see getRoutes
+        * @access private
+        * @var array $_loaded_routes
+        */
+        var $_loaded_routes = array();
+
+        // }}}
+
+
+        // ------ CLASS METHODS ------ //
+
+
+        // ---- Constructor ---- //
+
+        function __construct()
+        {
+            /**
-        * We will try to guess if mod_rewrite is enabled.
-        * Set AK_ENABLE_URL_REWRITE in your config 
-        * to avoid the overhead this function causes
-        */
-
-
+
+
+
-        }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+