Changeset 7725

Timestamp:

03/03/08 15:00:44 (1 year ago)

Author:

fabien

Message:

fixed caching of partial and components (now with css, js, and slots support) (closes #2685)

Files:

• branches/1.1/lib/plugins/sfCompat10Plugin/lib/helper/PartialHelper.php (modified) (5 diffs)
• branches/1.1/test/functional/cacheTest.php (modified) (1 diff)
• branches/1.1/test/functional/fixtures/project/apps/cache/modules/cache/actions/actions.class.php (modified) (1 diff)
• branches/1.1/test/functional/fixtures/project/apps/cache/modules/cache/templates/_anotherCacheablePartial.php (added)
• branches/1.1/test/functional/fixtures/project/apps/cache/modules/cache/templates/_cacheableComponent.php (modified) (1 diff)
• branches/1.1/test/functional/fixtures/project/apps/cache/modules/cache/templates/_cacheablePartial.php (modified) (1 diff)
• branches/1.1/test/functional/fixtures/project/apps/cache/modules/cache/templates/anotherPartialSuccess.php (added)
• branches/1.1/test/functional/fixtures/project/apps/cache/modules/cache/templates/componentSuccess.php (added)
• branches/1.1/test/functional/fixtures/project/apps/cache/modules/cache/templates/multiBisSuccess.php (modified) (1 diff)
• branches/1.1/test/functional/fixtures/project/apps/cache/modules/cache/templates/partialSuccess.php (added)

branches/1.1/lib/plugins/sfCompat10Plugin/lib/helper/PartialHelper.php

@@ -118 +118 @@
-      return $retval;
-    }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-  {
-    // render
-    $view = new sfPartialView($context, $moduleName, $actionName, '');
-componentInstance->getVarHolder()->getAll()
+allVars
-
-    $retval = $view->render();
@@ -178 +139 @@
-    {
-      $retval = $cacheManager->setPartialCache($moduleName, $actionName, $cacheManager->computeCacheKey($vars), $retval);
+
+      $context->setResponse($mainResponse);
+      $mainResponse->merge($response);
-    }
-
@@ -241 +205 @@
-  {
-    $cacheManager->registerConfiguration($moduleName);
-
-
+
+
+
-    {
-      return $retval;
+    }
+    else
+    {
+      $mainResponse = $context->getResponse();
+      $responseClass = get_class($mainResponse);
+      $context->setResponse($response = new $responseClass($context->getEventDispatcher(), $mainResponse->getOptions()));
-    }
-  }
@@ -255 +226 @@
-  if ($cacheManager)
-  {
-
+
+
+
-  }
-
@@ -385 +358 @@
-  return isset($slots[$name]) ? $slots[$name] : '';
-}
+
+function _call_component($moduleName, $componentName, $vars)
+{
+  $context = sfContext::getInstance();
+
+  $controller = $context->getController();
+
+  if (!$controller->componentExists($moduleName, $componentName))
+  {
+    // cannot find component
+    throw new sfConfigurationException(sprintf('The component does not exist: "%s", "%s".', $moduleName, $componentName));
+  }
+
+  // create an instance of the action
+  $componentInstance = $controller->getComponent($moduleName, $componentName);
+
+  // load component's module config file
+  require($context->getConfigCache()->checkConfig('modules/'.$moduleName.'/config/module.yml'));
+
+  $componentInstance->getVarHolder()->add($vars);
+
+  // dispatch component
+  $componentToRun = 'execute'.ucfirst($componentName);
+  if (!method_exists($componentInstance, $componentToRun))
+  {
+    if (!method_exists($componentInstance, 'execute'))
+    {
+      // component not found
+      throw new sfInitializationException(sprintf('sfComponent initialization failed for module "%s", component "%s".', $moduleName, $componentName));
+    }
+
+    $componentToRun = 'execute';
+  }
+
+  if (sfConfig::get('sf_logging_enabled'))
+  {
+    $context->getEventDispatcher()->notify(new sfEvent(null, 'application.log', array(sprintf('Call "%s->%s()'.'"', $moduleName, $componentToRun))));
+  }
+
+  // run component
+  if (sfConfig::get('sf_debug') && sfConfig::get('sf_logging_enabled'))
+  {
+    $timer = sfTimerManager::getTimer(sprintf('Component "%s/%s"', $moduleName, $componentName));
+  }
+
+  $retval = $componentInstance->$componentToRun($context->getRequest());
+
+  if (sfConfig::get('sf_debug') && sfConfig::get('sf_logging_enabled'))
+  {
+    $timer->addTime();
+  }
+
+  return sfView::NONE == $retval ? null : $componentInstance->getVarHolder()->getAll();
+}

branches/1.1/test/functional/cacheTest.php

@@ -303 +303 @@
-sfConfig::set('sf_web_debug', false);
-
+// check stylesheets, javascripts inclusions
+sfToolkit::clearDirectory(sfConfig::get('sf_app_cache_dir'));
+$b->
+  get('/cache/multiBis')->
+  isStatusCode(200)->
+  isRequestParameter('module', 'cache')->
+  isRequestParameter('action', 'multiBis')->
+
+  // the first time (no cache)
+  checkResponseElement('link[href*="/main_css"]')->
+  checkResponseElement('script[src*="/main_js"]')->
+  checkResponseElement('link[href*="/partial_css"]')->
+  checkResponseElement('script[src*="/partial_js"]')->
+  checkResponseElement('link[href*="/another_partial_css"]')->
+  checkResponseElement('script[src*="/another_partial_js"]')->
+  checkResponseElement('link[href*="/component_css"]')->
+  checkResponseElement('script[src*="/component_js"]')->
+
+  get('/cache/multiBis')->
+
+  // when in cache
+  checkResponseElement('link[href*="/main_css"]')->
+  checkResponseElement('script[src*="/main_js"]')->
+  checkResponseElement('link[href*="/partial_css"]')->
+  checkResponseElement('script[src*="/partial_js"]')->
+  checkResponseElement('link[href*="/another_partial_css"]')->
+  checkResponseElement('script[src*="/another_partial_js"]')->
+  checkResponseElement('link[href*="/component_css"]')->
+  checkResponseElement('script[src*="/component_js"]')
+;
+
+$b->
+  get('/cache/partial')->
+  isStatusCode(200)->
+  isRequestParameter('module', 'cache')->
+  isRequestParameter('action', 'partial')->
+
+  // only partial specific css and js are included
+  checkResponseElement('link[href*="/main_css"]', false)->
+  checkResponseElement('script[src*="/main_js"]', false)->
+  checkResponseElement('link[href*="/partial_css"]')->
+  checkResponseElement('script[src*="/partial_js"]')->
+  checkResponseElement('link[href*="/another_partial_css"]')->
+  checkResponseElement('script[src*="/another_partial_js"]')->
+  checkResponseElement('link[href*="/component_css"]', false)->
+  checkResponseElement('script[src*="/component_js"]', false)->
+
+  get('/cache/anotherPartial')->
+  isStatusCode(200)->
+  isRequestParameter('module', 'cache')->
+  isRequestParameter('action', 'anotherPartial')->
+
+  // only partial specific css and js are included
+  checkResponseElement('link[href*="/main_css"]', false)->
+  checkResponseElement('script[src*="/main_js"]', false)->
+  checkResponseElement('link[href*="/partial_css"]', false)->
+  checkResponseElement('script[src*="/partial_js"]', false)->
+  checkResponseElement('link[href*="/another_partial_css"]')->
+  checkResponseElement('script[src*="/another_partial_js"]')->
+  checkResponseElement('link[href*="/component_css"]', false)->
+  checkResponseElement('script[src*="/component_js"]', false)->
+
+  get('/cache/component')->
+  isStatusCode(200)->
+  isRequestParameter('module', 'cache')->
+  isRequestParameter('action', 'component')->
+
+  // only partial specific css and js are included
+  checkResponseElement('link[href*="/main_css"]', false)->
+  checkResponseElement('script[src*="/main_js"]', false)->
+  checkResponseElement('link[href*="/partial_css"]', false)->
+  checkResponseElement('script[src*="/partial_js"]', false)->
+  checkResponseElement('link[href*="/another_partial_css"]', false)->
+  checkResponseElement('script[src*="/another_partial_js"]', false)->
+  checkResponseElement('link[href*="/component_css"]')->
+  checkResponseElement('script[src*="/component_js"]')
+;
+
-// test with sfFileCache class (default)
-$b->launch();

branches/1.1/test/functional/fixtures/project/apps/cache/modules/cache/actions/actions.class.php

@@ -29 +29 @@
-
-  public function executeMultiBis()
+  {
+  }
+
+  public function executePartial()
+  {
+  }
+
+  public function executeAnotherPartial()
+  {
+  }
+
+  public function executeComponent()
-  {
-  }

branches/1.1/test/functional/fixtures/project/apps/cache/modules/cache/templates/_cacheableComponent.php

@@ +1 @@
+<?php use_stylesheet('component_css') ?>
+<?php use_javascript('component_js') ?>
+
-<div class="cacheableComponent_<?php echo isset($varParam) ? $varParam : '' ?>_<?php echo isset($componentParam) ? $componentParam : '' ?>_<?php echo isset($requestParam) ? $requestParam : '' ?>">OK</div>

branches/1.1/test/functional/fixtures/project/apps/cache/modules/cache/templates/_cacheablePartial.php

@@ +1 @@
+<?php use_stylesheet('partial_css') ?>
+<?php use_javascript('partial_js') ?>
+
-<div class="cacheablePartial_<?php echo isset($varParam) ? $varParam : '' ?>_<?php echo $sf_params->get('param') ?>">OK</div>
+
+<div id="anotherCacheablePartial"><?php include_partial('cache/anotherCacheablePartial') ?></div>

branches/1.1/test/functional/fixtures/project/apps/cache/modules/cache/templates/multiBisSuccess.php

@@ +1 @@
+<?php use_stylesheet('main_css') ?>
+<?php use_javascript('main_js') ?>
+
-<div id="cacheablePartial"><?php include_partial('cache/cacheablePartial') ?></div>
-