Changeset 1448

Timestamp:

01/01/07 19:42:27 (23 months ago)

Author:

david

Message:

work in progress: new execution flow, action stack is gone, decoration doesn't require special abilities of the renderer anymore, but still needs further abstraction. decorators in decorators (for slots) should work now, and slots are available in the main content template. also, caching for execution filter is in place, albeit not enabled/complete yet. refs #373, #377, #287 and #290

Location:

branches/david-execution_flow

Files:

• docs/docbook/manual.xml (modified) (2 diffs)
• samples/app/config/rendering_filters.xml (deleted)
• samples/app/lib/filter/AgaviSampleAppCookieLoginFilter.class.php (modified) (2 diffs)
• src/action/AgaviAction.class.php (modified) (4 diffs)
• src/buildtools/code_templates/config/rendering_filters.xml (deleted)
• src/config/defaults/autoload.xml (modified) (1 diff)
• src/config/defaults/compile.xml (modified) (1 diff)
• src/config/defaults/config_handlers.xml (modified) (2 diffs)
• src/controller/AgaviController.class.php (modified) (15 diffs)
• src/controller/AgaviExecutionContainer.class.php (added)
• src/filter/AgaviDispatchFilter.class.php (modified) (1 diff)
• src/filter/AgaviExecutionFilter.class.php (modified) (8 diffs)
• src/filter/AgaviExecutionTimeFilter.class.php (modified) (2 diffs)
• src/filter/AgaviFilter.class.php (modified) (2 diffs)
• src/filter/AgaviFilterChain.class.php (modified) (4 diffs)
• src/filter/AgaviFormPopulationFilter.class.php (modified) (1 diff)
• src/filter/AgaviIFilter.interface.php (modified) (2 diffs)
• src/filter/AgaviIRenderingFilter.interface.php (deleted)
• src/filter/AgaviSecurityFilter.class.php (modified) (4 diffs)
• src/renderer/AgaviPhpRenderer.class.php (modified) (2 diffs)
• src/renderer/AgaviPhptalRenderer.class.php (modified) (1 diff)
• src/renderer/AgaviRenderer.class.php (modified) (5 diffs)
• src/renderer/AgaviSmartyRenderer.class.php (modified) (1 diff)
• src/renderer/AgaviXslRenderer.class.php (modified) (1 diff)
• src/view/AgaviView.class.php (modified) (5 diffs)

branches/david-execution_flow/docs/docbook/manual.xml

@@ -1635 +1635 @@
 
   <handlers>
-   <handler pattern="%core.module_dir%/*/config/rendering_filters.xml" validate="%core.agavi_dir%/config/xsd/filters.xsd" class="AgaviFilterConfigHandler" />
+   <handler pattern="%core.module_dir%/*/config/action_filters.xml" validate="%core.agavi_dir%/config/xsd/filters.xsd" class="AgaviFilterConfigHandler" />
    <handler pattern="%core.module_dir%/*/config/module.xml" validate="%core.agavi_dir%/config/xsd/module.xsd" class="AgaviModuleConfigHandler" />
    <handler pattern="%core.module_dir%/*/validate/*.xml" class="AgaviValidatorConfigHandler" />
@@ -1902 +1902 @@
       <title>FilterConfigHandler Tags (*_filters.xml)</title>
 
-      <para>You may use <filename>action_filters.xml</filename>,
-      <filename>global_filters.xml</filename> and
-      <filename>rendering_filters.xml</filename> to configure Action, global
-      or rendering filters. Action and rendering filters may also be specified
-      on a per-module basis by putting them into the
+      <para>You may use <filename>action_filters.xml</filename> and
+      <filename>global_filters.xml</filename> to configure filters that wrap
+      either the global execution flow or individual actions. Action filters
+      may also be specified on a per-module basis by putting them into the
       <filename>app/modules/ModuleName/config/</filename> folder.</para>
 

branches/david-execution_flow/samples/app/lib/filter/AgaviSampleAppCookieLoginFilter.class.php

@@ -27 +27 @@
    * @since      0.11.0
    */
-  public function execute(AgaviFilterChain $filterChain, AgaviResponse $response)
+  public function execute(AgaviFilterChain $filterChain, AgaviExecutionContainer $container)
   {
     $req = $this->getContext()->getRequest();
@@ -43 +43 @@
     }
     
-    $filterChain->execute($filterChain, $response);
+    $filterChain->execute($container);
   }
 }

branches/david-execution_flow/src/action/AgaviAction.class.php

@@ -29 +29 @@
  * @version    $Id$
  */
-abstract class AgaviAction extends AgaviAttributeHolder
+abstract class AgaviAction
 {
   /**
    * @var        AgaviContext An AgaviContext instance.
    */
+  private $container = null;
+
+  /**
+   * @var        AgaviContext An AgaviContext instance.
+   */
   private $context = null;
 
@@ -47 +52 @@
   {
     return $this->context;
+  }
+
+  public final function getContainer()
+  {
+    return $this->container;
   }
 
@@ -91 +101 @@
    * @since      0.9.0
    */
-  public function initialize(AgaviContext $context)
-  {
-    $this->context = $context;
+  public function initialize(AgaviExecutionContainer $container)
+  {
+    $this->container = $container;
+    
+    $this->context = $container->getContext();
   }
 
@@ -148 +160 @@
     return 'Input';
   }
+
+  /**
+   * @see        AgaviAttributeHolder::setAttributesByRef()
+   *
+   * @author     David Zuelke <dz@bitxtender.com>
+   * @since      0.9.0
+   */
+  public function clearAttributes()
+  {
+    $this->container->clearAttributes();
+  }
+
+  /**
+   * @see        AgaviAttributeHolder::setAttributesByRef()
+   *
+   * @author     David Zuelke <dz@bitxtender.com>
+   * @since      0.9.0
+   */
+  public function & getAttribute($name, $default = null)
+  {
+    return $this->container->getAttribute($name, null, $default);
+  }
+
+  /**
+   * @see        AgaviAttributeHolder::setAttributesByRef()
+   *
+   * @author     David Zuelke <dz@bitxtender.com>
+   * @since      0.9.0
+   */
+  public function getAttributeNames()
+  {
+    return $this->container->getAttributeNames();
+  }
+
+  /**
+   * @see        AgaviAttributeHolder::setAttributesByRef()
+   *
+   * @author     David Zuelke <dz@bitxtender.com>
+   * @since      0.11.0
+   */
+  public function & getAttributes()
+  {
+    return $this->container->getAttributes();
+  }
+
+  /**
+   * @see        AgaviAttributeHolder::setAttributesByRef()
+   *
+   * @author     David Zuelke <dz@bitxtender.com>
+   * @since      0.9.0
+   */
+  public function hasAttribute($name)
+  {
+    return $this->container->hasAttribute($name);
+  }
+
+  /**
+   * @see        AgaviAttributeHolder::setAttributesByRef()
+   *
+   * @author     David Zuelke <dz@bitxtender.com>
+   * @since      0.9.0
+   */
+  public function & removeAttribute($name)
+  {
+    return $this->container->removeAttribute($name);
+  }
+  
+  /**
+   * @see        AgaviAttributeHolder::setAttributesByRef()
+   *
+   * @author     David Zuelke <dz@bitxtender.com>
+   * @since      0.9.0
+   */
+  public function setAttribute($name, $value)
+  {
+    $this->container->setAttribute($name, $value);
+  }
+
+  /**
+   * @see        AgaviAttributeHolder::setAttributesByRef()
+   *
+   * @author     David Zuelke <dz@bitxtender.com>
+   * @since      0.10.0
+   */
+  public function appendAttribute($name, $value)
+  {
+    $this->container->appendAttribute($name, $value);
+  }
+
+  /**
+   * @see        AgaviAttributeHolder::setAttributesByRef()
+   *
+   * @author     David Zuelke <dz@bitxtender.com>
+   * @since      0.9.0
+   */
+  public function setAttributeByRef($name, &$value)
+  {
+    $this->container->setAttributeByRef($name, $value);
+  }
+
+  /**
+   * @see        AgaviAttributeHolder::setAttributesByRef()
+   *
+   * @author     David Zuelke <dz@bitxtender.com>
+   * @since      0.10.0
+   */
+  public function appendAttributeByRef($name, &$value)
+  {
+    $this->container->appendAttributeByRef($name, $value);
+  }
+
+  /**
+   * @see        AgaviAttributeHolder::setAttributesByRef()
+   *
+   * @author     David Zuelke <dz@bitxtender.com>
+   * @since      0.9.0
+   */
+  public function setAttributes(array $attributes)
+  {
+    $this->container->setAttributes($attributes);
+  }
+
+  /**
+   * @see        AgaviAttributeHolder::setAttributesByRef()
+   *
+   * @author     David Zuelke <dz@bitxtender.com>
+   * @since      0.9.0
+   */
+  public function setAttributesByRef(array &$attributes)
+  {
+    $this->container->setAttributesByRef($attributes);
+  }
 }
 

branches/david-execution_flow/src/config/defaults/autoload.xml

@@ -98 +98 @@
       <autoload name="AgaviIFilter">%core.agavi_dir%/filter/AgaviIFilter.interface.php</autoload>
       <autoload name="AgaviIGlobalFilter">%core.agavi_dir%/filter/AgaviIGlobalFilter.interface.php</autoload>
-      <autoload name="AgaviIRenderingFilter">%core.agavi_dir%/filter/AgaviIRenderingFilter.interface.php</autoload>
       <autoload name="AgaviISecurityFilter">%core.agavi_dir%/filter/AgaviISecurityFilter.interface.php</autoload>
       <autoload name="AgaviSecurityFilter">%core.agavi_dir%/filter/AgaviSecurityFilter.class.php</autoload>

branches/david-execution_flow/src/config/defaults/compile.xml

@@ -45 +45 @@
       <compile>%core.agavi_dir%/core/AgaviContext.class.php</compile>
       <compile>%core.agavi_dir%/controller/AgaviController.class.php</compile>
+      <compile>%core.agavi_dir%/controller/AgaviExecutionContainer.class.php</compile>
       <compile>%core.agavi_dir%/filter/AgaviFilter.class.php</compile>
       <compile>%core.agavi_dir%/filter/AgaviDispatchFilter.class.php</compile>

branches/david-execution_flow/src/config/defaults/config_handlers.xml

@@ -103 +103 @@
       <handler pattern="%core.config_dir%/global_filters.xml" validate="%core.agavi_dir%/config/xsd/filters.xsd" class="AgaviFilterConfigHandler" />
 
-      <handler pattern="%core.config_dir%/rendering_filters.xml" validate="%core.agavi_dir%/config/xsd/filters.xsd" class="AgaviFilterConfigHandler" />
-
       <handler pattern="%core.config_dir%/output_types.xml" validate="%core.agavi_dir%/config/xsd/output_types.xsd" class="AgaviOutputTypeConfigHandler" />
 
@@ -134 +132 @@
       <handler pattern="%core.module_dir%/*/config/action_filters.xml" validate="%core.agavi_dir%/config/xsd/filters.xsd" class="AgaviFilterConfigHandler" />
 
-      <handler pattern="%core.module_dir%/*/config/rendering_filters.xml" validate="%core.agavi_dir%/config/xsd/filters.xsd" class="AgaviFilterConfigHandler" />
-
       <handler pattern="%core.module_dir%/*/config/module.xml" validate="%core.agavi_dir%/config/xsd/module.xsd" class="AgaviModuleConfigHandler" />
 

branches/david-execution_flow/src/controller/AgaviController.class.php

@@ -30 +30 @@
 {
   /**
+   * @var        int The number of forward() calls done so far.
+   */
+  protected $numForwards = 0;
+  
+  /**
    * @var        int The maximum number of times this Controller will forward().
    */
   protected $maxForwards  = 20;
   
-  /**
-   * @var        int The render mode, see AgaviView RENDER_* constants.
-   */
-  protected $renderMode   = AgaviView::RENDER_CLIENT;
-
-  /**
-   * @var        AgaviActionStack An ActionStack instance.
-   */
-  protected $actionStack = null;
-
   /**
    * @var        AgaviContext An AgaviContext instance.
@@ -55 +50 @@
     'global' => array(),
     'action' => array(
-      '*' => null
-    ),
-    'rendering' => array(
       '*' => null
     ),
@@ -76 +68 @@
   
   /**
-   * @var        AgaviResponse The Response instance for this Controller.
-   */
-  protected $response = null;
-  
-  /**
-   * @var        AgaviResponse The Response to be used after redirects are set.
-   */
-  protected $redirectResponse = null;
-
-  /**
-   * Retrieve the ActionStack.
-   *
-   * @return     AgaviActionStack the ActionStack instance
-   *
-   * @author     David Zuelke <dz@bitxtender.com>
-   * @since      0.11.0
-   */
-  public function getActionStack()
-  {
-    return $this->actionStack;
-  }
-
-  /**
    * Indicates whether or not a module has a specific action.
    *
@@ -104 +73 @@
    * @param      string An action name.
    *
-   * @return     mixed  The actual name of the action (might be auto-resolved),
-   *                    or false if no Action related to that name was found.
-   *
-   * @author     Sean Kerr <skerr@mojavi.org>
-   * @author     David Zuelke <dz@bitxtender.com>
-   * @since      0.9.0
-   */
-  public function actionExists($moduleName, $actionName = null)
+   * @return     mixed  The actual name of the action (might be auto-resolved).
+   *
+   * @throws     AgaviControllerException if the action could not be found.
+   * @author     Sean Kerr <skerr@mojavi.org>
+   * @author     David Zuelke <dz@bitxtender.com>
+   * @since      0.9.0
+   */
+  public function resolveAction($moduleName, $actionName = null)
   {
     $actionName = str_replace('.', '/', $actionName);
@@ -123 +92 @@
       if(is_readable($file)) {
         return $actionName;
-      } else {
-        return false;
-      }
-    }
+      }
+    }
+    throw new AgaviControllerException(sprintf('Action "%s" in Module "%s" could not be found.', $actionName, $moduleName));
+  }
+  
+  public function incNumForwards()
+  {
+    if(++$this->numForwards > $this->maxForwards) {
+      throw new AgaviForwardException('Too many forwards have been detected for this request.');
+    }
+  }
+  
+  /**
+   * Create and initialize new execution container instance.
+   *
+   * @param      string The name of the module.
+   * @param      string The name of the action.
+   * @param      array  Optional additional parameters.
+   *
+   * @return     AgaviExecutionContainer A new execution container instance,
+   *                                     fully initialized.
+   *
+   * @author     David Zuelke <dz@bitxtender.com>
+   * @since      0.11.0
+   */
+  public function createExecutionContainer($moduleName, $actionName, array $parameters = array())
+  {
+    $container = new AgaviExecutionContainer();
+    $container->initialize($this->context, $moduleName, $actionName, $parameters);
+    return $container;
   }
   
@@ -146 +141 @@
       $request->setAttribute('matchedRoutes', $this->context->getRouting()->execute(), 'org.agavi.routing');
     
-      if($parameters != null) {
-        $request->setParametersByRef($parameters);
-      }
+      $request->setParameters($parameters);
     
       // determine our module and action
@@ -171 +164 @@
       }
       
+      $container = $this->createExecutionContainer($moduleName, $actionName);
+      
       // create a new filter chain
       $fcfi = $this->context->getFactoryInfo('filter_chain');
       $filterChain = new $fcfi['class']();
-      $filterChain->initialize($this->response, $fcfi['parameters']);
+      $filterChain->initialize($this->context, $fcfi['parameters']);
       
       $this->loadFilters($filterChain, 'global');
@@ -182 +177 @@
     
       // go, go, go!
-      $filterChain->execute();
-      
-      if($this->redirectResponse instanceof AgaviResponse) {
-        $this->redirectResponse->append($this->response->export());
-        $this->redirectResponse->send();
+      $filterChain->execute($container);
+      
+      $container->getResponse()->send();
+      
+    } catch(Exception $e) {
+      if(isset($container) && $container instanceof AgaviExecutionContainer && $container->getResponse() instanceof AgaviResponse) {
+        AgaviException::printStackTrace($e, $this->context, $response);
       } else {
-        $this->response->send();
-      }
-      
-    } catch(Exception $e) {
-      AgaviException::printStackTrace($e, $this->context, $this->getResponse());
-    }
-  }
-
-  /**
-   * Forward the request to another action.
-   *
-   * @param      string A module name.
-   * @param      string An action name.
-   * @param      array|AgaviParameterHolder Additional parameters which will be
-   *                                        passed to the action.
-   *
-   * @throws     <b>AgaviConfigurationException</b> If an invalid configuration 
-   *                                                setting has been found.
-   * @throws     <b>AgaviForwardException</b> If an error occurs while 
-   *                                          forwarding the request.
-   * @throws     <b>AgaviInitializationException</b> If the action could not be
-   *                                                 initialized.
-   * @throws     <b>AgaviSecurityException</b> If the action requires security 
-   *                                           but the user implementation is 
-   *                                           not of type SecurityUser.
-   *
-   * @author     Sean Kerr <skerr@mojavi.org>
-   * @since      0.9.0
-   */
-  public function forward($moduleName, $actionName = 'Index', $additionalParams = array())
-  {
-    $request = $this->context->getRequest();
-
-    $actionName = str_replace('.', '/', $actionName);
-    $actionName = preg_replace('/[^a-z0-9\-_\/]+/i', '', $actionName);
-    $moduleName = preg_replace('/[^a-z0-9\-_]+/i', '', $moduleName);
-
-    if($this->actionStack->getSize() >= $this->maxForwards) {
-      throw new AgaviForwardException('Too many forwards have been detected for this request');
-    }
-
-    if(!AgaviConfig::get('core.available', false)) {
-      // application is unavailable
-      $request->setAttributes(array(
-        'requested_module' => $moduleName,
-        'requested_action' => $actionName
-      ), 'org.agavi.controller.forwards.unavailable');
-      $moduleName = AgaviConfig::get('actions.unavailable_module');
-      $actionName = AgaviConfig::get('actions.unavailable_action');
-
-      if(!$this->actionExists($moduleName, $actionName)) {
-        // cannot find unavailable module/action
-        $error = 'Invalid configuration settings: actions.unavailable_module "%s", actions.unavailable_action "%s"';
-        $error = sprintf($error, $moduleName, $actionName);
-
-        throw new AgaviConfigurationException($error);
-      }
-
-    } elseif(!$this->actionExists($moduleName, $actionName)) {
-      // the requested action doesn't exist
-
-      // track the requested module so we have access to the data
-      // in the error 404 page
-      $request->setAttributes(array(
-        'requested_module' => $moduleName,
-        'requested_action' => $actionName
-      ), 'org.agavi.controller.forwards.error_404');
-
-      // switch to error 404 action
-      $moduleName = AgaviConfig::get('actions.error_404_module');
-      $actionName = AgaviConfig::get('actions.error_404_action');
-
-      if(!$this->actionExists($moduleName, $actionName)) {
-        // cannot find unavailable module/action
-        $error = 'Invalid configuration settings: actions.error_404_module "%s", actions.error_404_action "%s"';
-        $error = sprintf($error, $moduleName, $actionName);
-
-        throw new AgaviConfigurationException($error);
-      }
-    }
-    
-    // get the "real" action name, i.e. allow auto-resolving of sub-action IndexActions
-    $actionName = $this->actionExists($moduleName, $actionName);
-
-    // create an instance of the action
-    $actionInstance = $this->getAction($moduleName, $actionName);
-
-    // add a new action stack entry
-    $actionEntry = $this->actionStack->addEntry($moduleName, $actionName, $actionInstance, new AgaviParameterHolder(array_merge($request->getParameters(), $additionalParams instanceof AgaviParameterHolder ? $additionalParams->getParameters() : (array) $additionalParams)));
-
-    // include the module configuration
-    // laoded only once due to the way import() works
-    if(is_readable(AgaviConfig::get('core.module_dir') . '/' . $moduleName . '/config/module.xml')) {
-      AgaviConfigCache::import(AgaviConfig::get('core.module_dir') . '/' . $moduleName . '/config/module.xml', $this->context->getName());
-    } else {
-      AgaviConfig::set('modules.' . strtolower($moduleName) . '.enabled', true);
-    }
-
-    // save autoloads so we can restore them later
-    $oldAutoloads = Agavi::$autoloads;
-    
-    static $moduleAutoloads = array();
-    if(!isset($moduleAutoloads[$moduleName])) {
-      $moduleAutoloads[$moduleName] = array();
-      $moduleAutoload = AgaviConfig::get('core.module_dir') . '/' . $moduleName . '/config/autoload.xml';
-      if(is_readable($moduleAutoload)) {
-        include(AgaviConfigCache::checkConfig($moduleAutoload));
-        $moduleAutoloads[$moduleName] = Agavi::$autoloads;
-      }
-    } else {
-      Agavi::$autoloads = array_merge($moduleAutoloads[$moduleName], Agavi::$autoloads);
-    }
-    
-    if(AgaviConfig::get('modules.' . strtolower($moduleName) . '.enabled')) {
-      // check for a module config.php
-      $moduleConfig = AgaviConfig::get('core.module_dir') . '/' . $moduleName . '/config.php';
-      if(is_readable($moduleConfig)) {
-        require_once($moduleConfig);
-      }
-
-      // initialize the action
-      $actionInstance->initialize($this->context);
-      
-      // create a new response instance for this action
-      $rfi = $this->context->getFactoryInfo('response');
-      $response = new $rfi['class'];
-      $response->initialize($this->context, $rfi['parameters']);
-
-      // create a new filter chain
-      $fcfi = $this->context->getFactoryInfo('filter_chain');
-      $filterChain = new $fcfi['class']();
-      $filterChain->initialize($response, $fcfi['parameters']);
-
-      if(AgaviConfig::get('core.available', false)) {
-        // the application is available so we'll register
-        // global and module filters, otherwise skip them
-
-        // does this action require security?
-        if(AgaviConfig::get('core.use_security', false) && $actionInstance->isSecure()) {
-          // register security filter
-          $filterChain->register($this->filters['security']);
-        }
-
-        // load filters
-        $this->loadFilters($filterChain, 'action');
-        $this->loadFilters($filterChain, 'action', $moduleName);
-      }
-
-      // register the execution filter
-      $filterChain->register($this->filters['execution']);
-
-      // process the filter chain
-      $filterChain->execute();
-      
-      // clear the global request attribute namespace containing attributes for the View
-      $request->removeAttributeNamespace($request->getDefaultNamespace());
-      
-      if($this->renderMode == AgaviView::RENDER_CLIENT && !$actionEntry->hasNext()) {
-        // add the output for this action to the global one
-        $this->getResponse()->append($response->export());
-      }
-      
-      // restore autoloads
-      Agavi::$autoloads = $oldAutoloads;
-
-    } else {
-      // module is disabled
-      $request->setAttributes(array(
-        'requested_module' => $moduleName,
-        'requested_action' => $actionName
-      ), 'org.agavi.controller.forwards.disabled');
-      $moduleName = AgaviConfig::get('actions.module_disabled_module');
-      $actionName = AgaviConfig::get('actions.module_disabled_action');
-
-      if(!$this->actionExists($moduleName, $actionName)) {
-        // cannot find mod disabled module/action
-        $error = 'Invalid configuration settings: actions.module_disabled_module "%s", actions.module_disabled_action "%s"';
-        $error = sprintf($error, $moduleName, $actionName);
-        throw new AgaviConfigurationException($error);
-      }
-
-      $this->forward($moduleName, $actionName);
-    }
-    
-    if($actionEntry->hasNext()) {
-      $next = $actionEntry->getNext();
-      $request->setParameters($next['parameters'] instanceof AgaviParameterHolder ? $next['parameters']->getParameters() : $next['parameters']);
-      $this->forward($next['moduleName'], $next['actionName']);
+        AgaviException::printStackTrace($e, $this->context);
+      }
     }
   }
@@ -391 +202 @@
    */
   abstract public function redirect($to);
-
-  /**
-   * Retrieve the currently executing Action's name.
-   *
-   * @return     string The currently executing action name, if one is set,
-   *                    otherwise null.