Changeset 1638

Timestamp:

02/04/07 17:23:30 (2 years ago)

Author:

david

Message:

support for lightweight actions. these don't run through action filters, don't call execute() on the action (and thus don't pass validation) and don't get any data from the actual request, only the arguments set on their containers. good for slots. make an action 'simple' by returning true from isSimple() in the action. closes #407

Location:

branches/0.11

Files:

• samples/app/modules/Default/actions/MenuAction.class.php (modified) (1 diff)
• src/action/AgaviAction.class.php (modified) (1 diff)
• src/controller/AgaviExecutionContainer.class.php (modified) (3 diffs)
• src/filter/AgaviExecutionFilter.class.php (modified) (6 diffs)

branches/0.11/samples/app/modules/Default/actions/MenuAction.class.php

@@ -71 +71 @@
     return 'Success';
   }
+  
+  public function isSimple()
+  {
+    return true;
+  }
 }
 

branches/0.11/src/action/AgaviAction.class.php

@@ -130 +130 @@
 
   /**
+   * Whether or not this action is "simple", i.e. doesn't use validation etc.
+   *
+   * @return     bool true, if this action should act in simple mode, or false.
+   *
+   * @author     David Zuelke <dz@bitxtender.com>
+   * @since      0.11.0
+   */
+  public function isSimple()
+  {
+    return false;
+  }
+
+  /**
    * Manually register validators for this action.
    *

branches/0.11/src/controller/AgaviExecutionContainer.class.php

@@ -187 +187 @@
     $request = $this->context->getRequest();
     
-    $this->requestData = clone $request->getRequestData();
-    
-    if($this->arguments !== null) {
-      $this->requestData->merge($this->arguments);
-    }
-    
     $controller->countExecution();
     
@@ -280 +274 @@
       $this->actionInstance->initialize($this);
       
-      // create a new filter chain
-      $fcfi = $this->context->getFactoryInfo('filter_chain');
-      $filterChain = new $fcfi['class']();
-      $filterChain->initialize($this->context, $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) && $this->actionInstance->isSecure()) {
-          // register security filter
-          $filterChain->register($controller->getFilter('security'));
+      if($this->actionInstance->isSimple()) {
+        if($this->arguments !== null) {
+          $this->requestData = $this->arguments;
+        } else {
+          $this->requestData = new AgaviRequestDataHolder();
         }
-
-        // load filters
-        $controller->loadFilters($filterChain, 'action');
-        $controller->loadFilters($filterChain, 'action', $moduleName);
+        var_dump('foo');
+        // run the execution filter, without a proper chain
+        $controller->getFilter('execution')->execute(new AgaviFilterChain(), $this);
+      } else {
+        $this->requestData = clone $request->getRequestData();
+        
+        if($this->arguments !== null) {
+          $this->requestData->merge($this->arguments);
+        }
+      
+        // create a new filter chain
+        $fcfi = $this->context->getFactoryInfo('filter_chain');
+        $filterChain = new $fcfi['class']();
+        $filterChain->initialize($this->context, $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) && $this->actionInstance->isSecure()) {
+            // register security filter
+            $filterChain->register($controller->getFilter('security'));
+          }
+
+          // load filters
+          $controller->loadFilters($filterChain, 'action');
+          $controller->loadFilters($filterChain, 'action', $moduleName);
+        }
+
+        // register the execution filter
+        $filterChain->register($controller->getFilter('execution'));
+
+        // process the filter chain
+        $filterChain->execute($this);
       }
-
-      // register the execution filter
-      $filterChain->register($controller->getFilter('execution'));
-
-      // process the filter chain
-      $filterChain->execute($this);
       
       // restore autoloads
@@ -327 +338 @@
       }
       
-      // TODO. this will be pretty difficult, I guess...
       $this->setNext($controller->createExecutionContainer($moduleName, $actionName));
     }

branches/0.11/src/filter/AgaviExecutionFilter.class.php

@@ -206 +206 @@
   public function execute(AgaviFilterChain $filterChain, AgaviExecutionContainer $container)
   {
-    $lm = $this->context->getLoggerManager();
+    // $lm = $this->context->getLoggerManager();
+    
     // get the context, controller and validator manager
     $controller = $this->context->getController();
@@ -472 +473 @@
     // get the (already formatted) request method
     $method = $request->getMethod();
+    
+    $requestData = $container->getRequestData();
 
     $useGenericMethods = false;
@@ -480 +483 @@
     }
 
-    if($useGenericMethods && !method_exists($actionInstance, $executeMethod) ) {
+    if($actionInstance->isSimple() || ($useGenericMethods && !method_exists($actionInstance, $executeMethod))) {
       // this action will skip validation/execution for this method
       // get the default view
@@ -487 +490 @@
       // set default validated status
       $validated = true;
-
+      
       // get the current action validation configuration
       $validationConfig = AgaviConfig::get('core.module_dir') . '/' . $moduleName . '/validate/' . $actionName . '.xml';
@@ -505 +508 @@
 
       // process validators
-      $validated = $validationManager->execute($container->getRequestData());
-
+      $validated = $validationManager->execute($requestData);
+      
       $validateMethod = 'validate' . $method;
       if(!method_exists($actionInstance, $validateMethod)) {
         $validateMethod = 'validate';
       }
-
+      
       // prevent access to Request::getParameters()
       // process manual validation
-      if($actionInstance->$validateMethod($container->getRequestData()) && $validated) {
+      if($actionInstance->$validateMethod($requestData) && $validated) {
         // execute the action
         $key = $request->toggleLock();
-        $viewName = $actionInstance->$executeMethod($container->getRequestData());
+        $viewName = $actionInstance->$executeMethod($requestData);
         $request->toggleLock($key);
       } else {
@@ -526 +529 @@
         }
         $key = $request->toggleLock();
-        $viewName = $actionInstance->$handleErrorMethod($container->getRequestData());
+        $viewName = $actionInstance->$handleErrorMethod($requestData);
         $request->toggleLock($key);
       }