Merge pull request #24 from mpchadwick/release/v0.5.0

Release v0.5.0 -> Master

Author: mpchadwick

app/code/community/Mpchadwick/PageCacheHitRate/Model/Observer.php

@@ -35,7 +35,6 @@ public function handleControllerFrontSendResponseBefore(Varien_Event_Observer $o
             // Track any container misses for a partial cache response
             $trackContainerMisses = (string)$config->get('track_container_misses');
             if ($type === 'partial' && $trackContainerMisses) {
-                unset($params['type']);
                 $tracker->trackContainerMisses($params);
             }
         }

app/code/community/Mpchadwick/PageCacheHitRate/Model/Tracker/Abstract.php

@@ -29,6 +29,7 @@ public function track($type, array $args, $alias)
 
     public function trackContainerMisses($params)
     {
+        unset($params['type']);
         $containers = Mage::registry('cached_page_containers');
 
         foreach ($containers as $container) {

app/code/community/Mpchadwick/PageCacheHitRate/Model/Tracker/ParamProvider.php

@@ -2,13 +2,34 @@
 
 class Mpchadwick_PageCacheHitRate_Model_Tracker_ParamProvider
 {
+    // Taken from Cm_RedisSession_Model_Session
+    const BOT_REGEX = '/^alexa|^blitz\.io|bot|^browsermob|crawl|^curl|^facebookexternalhit|feed|google web preview|^ia_archiver|^java|jakarta|^load impact|^magespeedtest|monitor|nagios|^pinterest|postrank|slurp|spider|uptime|yandex/i';
+
+    protected $userAgent;
+
+    protected $isBot;
+
+    public function __construct()
+    {
+        $this->userAgent = empty($_SERVER['HTTP_USER_AGENT']) ? '' : $_SERVER['HTTP_USER_AGENT'];
+        if ($this->userAgent) {
+            $this->isBot = preg_match(self::BOT_REGEX, $this->userAgent);
+        } else {
+            // Can't be sure, but let's say it's not a bot...
+            $this->isBot = 0;
+        }
+
+    }
+
     public function baseParams($originalRequest = false)
     {
         return array(
             'url' => $this->getUrl($originalRequest),
             'ip' => Mage::app()->getRequest()->getClientIp(),
             'hostname' => gethostname(),
             'customerGroup' => $this->getCustomerGroup(),
+            'userAgent' => $this->userAgent,
+            'isBot' => $this->isBot,
         );
     }
 

app/code/community/Mpchadwick/PageCacheHitRate/Model/Tracker/Redis.php

@@ -9,9 +9,9 @@ class Mpchadwick_PageCacheHitRate_Model_Tracker_Redis
     /** @var Credis_Client */
     protected $redis;
 
-    public function connection()
+    public function connection($alias)
     {
-        $this->setupConnection();
+        $this->setupConnection($alias);
         return $this->redis;
     }
 

app/code/community/Mpchadwick/PageCacheHitRate/etc/config.xml

@@ -2,7 +2,7 @@
 <config>
     <modules>
         <Mpchadwick_PageCacheHitRate>
-            <version>0.4.0</version>
+            <version>0.5.0</version>
         </Mpchadwick_PageCacheHitRate>
     </modules>
     <global>