Changeset 8983

Timestamp:

05/15/08 18:46:55 (5 months ago)

Author:

fabien

Message:

added a view.cache.filter_content event to decouple the sfViewCacheManager and the sfWebDebug class (closes #3218)

Files:

• branches/1.1/lib/config/config/factories.yml (modified) (1 diff)
• branches/1.1/lib/debug/sfWebDebug.class.php (modified) (3 diffs)
• branches/1.1/lib/log/sfWebDebugLogger.class.php (modified) (1 diff)
• branches/1.1/lib/view/sfViewCacheManager.class.php (modified) (6 diffs)

branches/1.1/lib/config/config/factories.yml

@@ -82 +82 @@
-          class: sfWebDebugLogger
-          param:
-
-
+
+
+
-        sf_file_debug:
-          class: sfFileLogger

branches/1.1/lib/debug/sfWebDebug.class.php

@@ -20 +20 @@
-{
-  protected
+    $dispatcher  = null,
-    $log         = array(),
-    $maxPriority = 1000,
-    $types       = array(),
-    $lastTimeLog = -1;
+
+  public function __construct(sfEventDispatcher $dispatcher)
+  {
+    $this->dispatcher = $dispatcher;
+
+    $this->dispatcher->connect('view.cache.filter_content', array($this, 'decorateContentWithDebug'));
+  }
-
-  /**
@@ -354 +362 @@
-
-  /**
-Decorates
-
-tring  The internalUri representing the content
+Listens to the 'view.cache.filter_content' event to decorate
+
+fEvent A sfEvent instance
-   * @param string  The HTML content
-   * @param boolean true if the content is new in the cache, false otherwise
-   *
-   * @return string The decorated HTML string
-   */
-
-
-
-
+
+
-    // don't decorate if not html or if content is null
-context->getResponse()
+event['response']
-    {
-      return $content;
-    }
-
-cache = $context->getViewCacheManager
+viewCacheManager = $event->getSubject
-    sfLoader::loadHelpers(array('Helper', 'Url', 'Asset', 'Tag'));
-
-new
-cache->getLastModified($internalUri
-internalUri
+event['new']
+viewCacheManager->getLastModified($event['uri']
+event['uri']
-
-    return '
@@ -384 +389 @@
-      <div style="height: 16px; padding: 2px"><a href="#" onclick="sfWebDebugToggle(\'sub_main_info_'.$id.'\'); return false;"><strong>cache information</strong></a>&nbsp;<a href="#" onclick="sfWebDebugToggle(\'sub_main_'.$id.'\'); document.getElementById(\'main_'.$id.'\').style.border = \'none\'; return false;">'.image_tag(sfConfig::get('sf_web_debug_web_dir').'/images/close.png').'</a>&nbsp;</div>
-        <div style="padding: 2px; display: none" id="sub_main_info_'.$id.'">
-internalUri
-cache->getLifeTime($internalUri
+event['uri']
+viewCacheManager->getLifeTime($event['uri']
-        [last&nbsp;modified]&nbsp;'.(time() - $lastModified).'&nbsp;seconds<br />
-        &nbsp;<br />&nbsp;

branches/1.1/lib/log/sfWebDebugLogger.class.php

@@ -38 +38 @@
-    $this->dispatcher = $dispatcher;
-
+    $class = isset($options['web_debug_class']) ? $options['web_debug_class'] : 'sfWebDebug';
+    $this->webDebug = new $class($dispatcher);
+
-    $dispatcher->connect('response.filter_content', array($this, 'filterResponseContent'));
-
-    if(is_null($this->webDebug))
-    {
-      $this->webDebug = $this->context->has('sf_web_debug') ? $this->context->get('sf_web_debug') : new sfWebDebug();
-    }
-
-    $this->context->set('sf_web_debug', $this->webDebug);
-
-    if (isset($options['xdebug_logging']))

branches/1.1/lib/view/sfViewCacheManager.class.php

@@ -669 +669 @@
-    if (sfConfig::get('sf_web_debug'))
-    {
-sfWebDebug::decorateContentWithDebug($uri, $content, false
+$this->dispatcher->filter(new sfEvent($this, 'view.cache.filter_content', array('response' => $this->context->getResponse(), 'uri' => $uri, 'new' => false)), $content)->getReturnValue(
-    }
-
@@ -697 +697 @@
-    if ($saved && sfConfig::get('sf_web_debug'))
-    {
-sfWebDebug::decorateContentWithDebug($uri, $content, true
+$this->dispatcher->filter(new sfEvent($this, 'view.cache.filter_content', array('response' => $this->context->getResponse(), 'uri' => $uri, 'new' => true)), $content)->getReturnValue(
-    }
-
@@ -744 +744 @@
-    if (sfConfig::get('sf_web_debug'))
-    {
-sfWebDebug::decorateContentWithDebug($uri, $content, false
+$this->dispatcher->filter(new sfEvent($this, 'view.cache.filter_content', array('response' => $this->context->getResponse(), 'uri' => $uri, 'new' => false)), $content)->getReturnValue(
-    }
-
@@ -770 +770 @@
-    if ($saved && sfConfig::get('sf_web_debug'))
-    {
-sfWebDebug::decorateContentWithDebug($uri, $content, true
+$this->dispatcher->filter(new sfEvent($this, 'view.cache.filter_content', array('response' => $this->context->getResponse(), 'uri' => $uri, 'new' => true)), $content)->getReturnValue(
-    }
-
@@ -793 +793 @@
-    if ($saved && sfConfig::get('sf_web_debug'))
-    {
-
+
+
-      $this->context->getResponse()->setContent($content);
-    }
@@ -828 +829 @@
-      if (sfConfig::get('sf_web_debug'))
-      {
-
+
+
-        $this->context->getResponse()->setContent($content);
-      }