Merge pull request #195 from GordonLesti/develop

GordonLesti · GordonLesti · commit ab71aacad300 · 2016-03-30T15:43:10.000+02:00
Cache the response content-type header
diff --git a/.travis.yml b/.travis.yml
@@ -14,8 +14,7 @@ env:
   - MAGE=magento-1-5-1-0
 
 install:
-  - cp -f .travis/composer.json composer.json
-  - composer install --dev --prefer-dist
+  - composer install --dev --prefer-dist --no-scripts
   - curl https://gordonlesti.com/"$MAGE".tar.gz | tar xz
   - mv $MAGE magento
   - cd magento
diff --git a/.travis/composer.json b/.travis/composer.json
diff --git a/app/code/community/Lesti/Fpc/Helper/Data.php b/app/code/community/Lesti/Fpc/Helper/Data.php
@@ -243,4 +243,19 @@ public function getFullActionName()
         $request->getRequestedControllerName() . $delimiter .
         $request->getRequestedActionName();
     }
+
+    /**
+     * @param Mage_Core_Controller_Response_Http $response
+     * @return string
+     */
+    public function getContentType(\Mage_Core_Controller_Response_Http $response)
+    {
+        foreach ($response->getHeaders() as $header) {
+            if (isset($header['name']) && $header['name'] === 'Content-Type' && isset($header['value'])) {
+                return $header['value'];
+            }
+        }
+
+        return 'text/html; charset=UTF-8';
+    }
 }
diff --git a/app/code/community/Lesti/Fpc/Model/Fpc.php b/app/code/community/Lesti/Fpc/Model/Fpc.php
@@ -63,20 +63,25 @@ public function __construct()
     /**
      * Save data
      *
-     * @param string $data
+     * @param \Lesti_Fpc_Model_Fpc_CacheItem $item
      * @param string $id
      * @param array $tags
      * @param int $lifeTime
      * @return bool
      */
-    public function save($data, $id, $tags=array(), $lifeTime=null)
+    public function save(Lesti_Fpc_Model_Fpc_CacheItem $item, $id, $tags=array(), $lifeTime=null)
     {
         if (!in_array(self::CACHE_TAG, $tags)) {
             $tags[] = self::CACHE_TAG;
         }
         if (is_null($lifeTime)) {
             $lifeTime = (int) $this->getFrontend()->getOption('lifetime');
         }
+        $data = array(
+            $item->getContent(),
+            $item->getTime(),
+            $item->getContentType(),
+        );
         // edit cached object
         $cacheData = new Varien_Object();
         $cacheData->setCachedata($data);
@@ -93,6 +98,7 @@ public function save($data, $id, $tags=array(), $lifeTime=null)
         $lifeTime = $cacheData->getLifeTime();
 
         $compressLevel = Mage::getStoreConfig(self::GZCOMPRESS_LEVEL_XML_PATH);
+        $data = serialize($data);
         if ($compressLevel != -2) {
             $data = gzcompress($data, $compressLevel);
         }
@@ -107,17 +113,22 @@ public function save($data, $id, $tags=array(), $lifeTime=null)
 
     /**
      * @param string $id
-     * @return string
+     * @return boolean|\Lesti_Fpc_Model_Fpc_CacheItem
      */
     public function load($id)
     {
         $data = parent::load($id);
+        if ($data === false) {
+            return false;
+        }
         $compressLevel = Mage::getStoreConfig(self::GZCOMPRESS_LEVEL_XML_PATH);
         if ($data !== false && $compressLevel != -2) {
             $data = gzuncompress($data);
         }
 
-        return $data;
+        $data = unserialize($data);
+
+        return new Lesti_Fpc_Model_Fpc_CacheItem($data[0], $data[1], $data[2]);
     }
 
     /**
diff --git a/app/code/community/Lesti/Fpc/Model/Fpc/CacheItem.php b/app/code/community/Lesti/Fpc/Model/Fpc/CacheItem.php
@@ -0,0 +1,58 @@
+<?php
+
+/**
+ * Class Lesti_Fpc_Model_Fpc_CacheItem
+ */
+class Lesti_Fpc_Model_Fpc_CacheItem
+{
+    /**
+     * @var string
+     */
+    private $_content;
+
+    /**
+     * @var int
+     */
+    private $_time;
+
+    /**
+     * @var string
+     */
+    private $_contentType;
+
+    /**
+     * @param string $content
+     * @param int    $time
+     * @param string $contentType
+     */
+    public function __construct($content, $time, $contentType)
+    {
+        $this->_content = $content;
+        $this->_time = $time;
+        $this->_contentType = $contentType;
+    }
+
+    /**
+     * @return string
+     */
+    public function getContent()
+    {
+        return $this->_content;
+    }
+
+    /**
+     * @return int
+     */
+    public function getTime()
+    {
+        return $this->_time;
+    }
+
+    /**
+     * @return string
+     */
+    public function getContentType()
+    {
+        return $this->_contentType;
+    }
+}
diff --git a/app/code/community/Lesti/Fpc/Model/Observer.php b/app/code/community/Lesti/Fpc/Model/Observer.php
@@ -37,8 +37,8 @@ public function controllerActionLayoutGenerateBlocksBefore($observer)
             Mage::helper('fpc')->canCacheRequest()) {
             $key = Mage::helper('fpc')->getKey();
             if ($object = $this->_getFpc()->load($key)) {
-                $time = (int)substr($object, 0, 10);
-                $body = substr($object, 10);
+                $time = $object->getTime();
+                $body = $object->getContent();
                 $this->_cached = true;
                 $session = Mage::getSingleton('customer/session');
                 $lazyBlocks = Mage::helper('fpc/block')->getLazyBlocks();
@@ -71,9 +71,9 @@ public function controllerActionLayoutGenerateBlocksBefore($observer)
                 $this->_replaceFormKey();
                 $body = str_replace($this->_placeholder, $this->_html, $body);
                 if (Mage::getStoreConfig(self::SHOW_AGE_XML_PATH)) {
-                    Mage::app()->getResponse()
-                        ->setHeader('Age', time() - $time);
+                    Mage::app()->getResponse()->setHeader('Age', time() - $time);
                 }
+                Mage::app()->getResponse()->setHeader('Content-Type', $object->getContentType());
                 $response = Mage::app()->getResponse();
                 $response->setBody($body);
                 Mage::dispatchEvent(
@@ -133,7 +133,11 @@ public function httpResponseSendBefore($observer)
                     array('cache_tags' => $cacheTags)
                 );
                 $this->_cacheTags = $cacheTags->getValue();
-                $this->_getFpc()->save(time() . $body, $key, $this->_cacheTags);
+                $this->_getFpc()->save(
+                    new Lesti_Fpc_Model_Fpc_CacheItem($body, time(), Mage::helper('fpc')->getContentType($response)),
+                    $key,
+                    $this->_cacheTags
+                );
                 $this->_cached = true;
                 $body = str_replace($this->_placeholder, $this->_html, $body);
                 $observer->getEvent()->getResponse()->setBody($body);
@@ -269,4 +273,4 @@ protected function _insertDynamicBlocks(
             }
         }
     }
-}
+}
diff --git a/app/code/community/Lesti/Fpc/Test/Model/Fpc.php b/app/code/community/Lesti/Fpc/Test/Model/Fpc.php
@@ -33,7 +33,7 @@ protected function setUp()
      */
     public function saveLoadClean()
     {
-        $data = 'fpc_data';
+        $data = new \Lesti_Fpc_Model_Fpc_CacheItem('fpc_data', time(), 'text/html');
         $id = 'fpc_id';
         $tag = 'tag1';
 
@@ -61,4 +61,4 @@ public function saveLoadClean()
         sleep(3);
         $this->assertFalse($this->_fpc->load($id));
     }
-}
+}
diff --git a/app/code/community/Lesti/Fpc/Test/Model/Observer/Clean.php b/app/code/community/Lesti/Fpc/Test/Model/Observer/Clean.php
@@ -38,7 +38,8 @@ protected function tearDown()
      */
     public function testCoreCleanCache()
     {
-        $this->_fpc->save('fpc_old_data', 'fpc_old_id', array('fpc'), 1);
+        $data = new \Lesti_Fpc_Model_Fpc_CacheItem('fpc_old_data', time(), 'text/html');
+        $this->_fpc->save($data, 'fpc_old_id', array('fpc'), 1);
         sleep(2);
         $this->_cleanObserver->coreCleanCache();
         $this->assertFalse($this->_fpc->remove('fpc_old_id'));
@@ -49,14 +50,15 @@ public function testCoreCleanCache()
      */
     public function testControllerActionPredispatchAdminhtmlCacheMassRefresh()
     {
-        $this->_fpc->save('test_data', 'test_id');
+        $data = new \Lesti_Fpc_Model_Fpc_CacheItem('test_data', time(), 'text/html');
+        $this->_fpc->save($data, 'test_id');
         Mage::app()->getRequest()->setParam('types', array('core'));
         $this->_cleanObserver->
             controllerActionPredispatchAdminhtmlCacheMassRefresh();
-        $this->assertEquals('test_data', $this->_fpc->load('test_id'));
+        $this->assertEquals($data, $this->_fpc->load('test_id'));
 
         $this->_fpc->clean();
-        $this->_fpc->save('test_data', 'test_id');
+        $this->_fpc->save($data, 'test_id');
         Mage::app()->getRequest()->setParam(
             'types',
             array('core', Lesti_Fpc_Model_Observer_Clean::CACHE_TYPE)
@@ -66,14 +68,14 @@ public function testControllerActionPredispatchAdminhtmlCacheMassRefresh()
         $this->assertFalse($this->_fpc->load('test_id'));
 
         $this->_fpc->clean();
-        $this->_fpc->save('test_data', 'test_id');
+        $this->_fpc->save($data, 'test_id');
         Mage::app()->getRequest()->setParam(
             'types',
             array('core', Lesti_Fpc_Model_Observer_Clean::CACHE_TYPE)
         );
         Mage::app()->getCacheInstance()->banUse('fpc');
         $this->_cleanObserver->
             controllerActionPredispatchAdminhtmlCacheMassRefresh();
-        $this->assertEquals('test_data', $this->_fpc->load('test_id'));
+        $this->assertEquals($data, $this->_fpc->load('test_id'));
     }
 }
diff --git a/app/code/community/Lesti/Fpc/Test/Model/Observer/Save.php b/app/code/community/Lesti/Fpc/Test/Model/Observer/Save.php
diff --git a/composer.json b/composer.json

Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ protected function setUp()`
`33`	`33`	`*/`
`34`	`34`	`public function saveLoadClean()`
`35`	`35`	`{`
`36`		`- $data = 'fpc_data';`
	`36`	`+ $data = new \Lesti_Fpc_Model_Fpc_CacheItem('fpc_data', time(), 'text/html');`
`37`	`37`	`$id = 'fpc_id';`
`38`	`38`	`$tag = 'tag1';`
`39`	`39`
`@@ -61,4 +61,4 @@ public function saveLoadClean()`
`61`	`61`	`sleep(3);`
`62`	`62`	`$this->assertFalse($this->_fpc->load($id));`
`63`	`63`	`}`
`64`		`-}`
	`64`	`+}`