From 3000c789986d93b3911a3217d7153b0de041c887 Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Sat, 27 Jun 2009 23:30:02 -0700
Subject: Update the version number and upgrade method for gallery to reflect
 the addition of the cache table.

---
 modules/gallery/helpers/gallery_installer.php | 25 ++++++++++++++++++++++++-
 1 file changed, 24 insertions(+), 1 deletion(-)

(limited to 'modules/gallery/helpers/gallery_installer.php')

diff --git a/modules/gallery/helpers/gallery_installer.php b/modules/gallery/helpers/gallery_installer.php
index df555d52..92fc662d 100644
--- a/modules/gallery/helpers/gallery_installer.php
+++ b/modules/gallery/helpers/gallery_installer.php
@@ -181,6 +181,15 @@ class gallery_installer {
                 UNIQUE KEY(`module_name`, `name`))
                ENGINE=InnoDB DEFAULT CHARSET=utf8;");
 
+    $db->query("CREATE TABLE {caches} (
+                `id` varchar(255) NOT NULL,
+                `tags` varchar(255),
+                `expiration` int(9) NOT NULL,
+                `cache` text,
+                PRIMARY KEY (`id`),
+                KEY (`tags`))
+                ENGINE=InnoDB DEFAULT CHARSET=utf8;");
+
     foreach (array("albums", "logs", "modules", "resizes", "thumbs", "tmp", "uploads") as $dir) {
       @mkdir(VARPATH . $dir);
     }
@@ -249,10 +258,11 @@ class gallery_installer {
     module::set_var("gallery", "show_credits", 1);
     // @todo this string needs to be picked up by l10n_scanner
     module::set_var("gallery", "credits", "Powered by <a href=\"%url\">Gallery %version</a>");
-    module::set_version("gallery", 3);
+    module::set_version("gallery", 4);
   }
 
   static function upgrade($version) {
+    $db = Database::instance();
     if ($version == 1) {
       module::set_var("gallery", "date_format", "Y-M-d");
       module::set_var("gallery", "date_time_format", "Y-M-d H:i:s");
@@ -265,6 +275,18 @@ class gallery_installer {
       module::set_var("gallery", "show_credits", 1);
       module::set_version("gallery", $version = 3);
     }
+
+    if ($version == 3) {
+      $db->query("CREATE TABLE {caches} (
+                `id` varchar(255) NOT NULL,
+                `tags` varchar(255),
+                `expiration` int(9) NOT NULL,
+                `cache` text,
+                PRIMARY KEY (`id`),
+                KEY (`tags`))
+                ENGINE=InnoDB DEFAULT CHARSET=utf8;");
+      module::set_version("gallery", $version = 4);
+    }
   }
 
   static function uninstall() {
@@ -282,6 +304,7 @@ class gallery_installer {
     $db->query("DROP TABLE IF EXISTS {tasks}");
     $db->query("DROP TABLE IF EXISTS {themes}");
     $db->query("DROP TABLE IF EXISTS {vars}");
+    $db->query("DROP TABLE IF EXISTS {caches}");
     foreach (array("albums", "resizes", "thumbs", "uploads",
                    "modules", "logs", "database.php") as $entry) {
       system("/bin/rm -rf " . VARPATH . $entry);
-- 
cgit v1.2.3


From 7a3310e91b50f37b09a1c9d10173409244015653 Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Sun, 28 Jun 2009 13:14:47 -0700
Subject: Change the cache column of the caches table to a large blob.  This
 fixes ticket #485 and gives us the extra adavantage of not having to
 serialize the data (as the database driver handles that for us)

---
 modules/gallery/helpers/gallery_installer.php        | 9 +++++++--
 modules/gallery/libraries/drivers/Cache/Database.php | 5 ++---
 modules/gallery/module.info                          | 2 +-
 3 files changed, 10 insertions(+), 6 deletions(-)

(limited to 'modules/gallery/helpers/gallery_installer.php')

diff --git a/modules/gallery/helpers/gallery_installer.php b/modules/gallery/helpers/gallery_installer.php
index 92fc662d..8ccbd51b 100644
--- a/modules/gallery/helpers/gallery_installer.php
+++ b/modules/gallery/helpers/gallery_installer.php
@@ -185,7 +185,7 @@ class gallery_installer {
                 `id` varchar(255) NOT NULL,
                 `tags` varchar(255),
                 `expiration` int(9) NOT NULL,
-                `cache` text,
+                `cache` longblob,
                 PRIMARY KEY (`id`),
                 KEY (`tags`))
                 ENGINE=InnoDB DEFAULT CHARSET=utf8;");
@@ -258,7 +258,7 @@ class gallery_installer {
     module::set_var("gallery", "show_credits", 1);
     // @todo this string needs to be picked up by l10n_scanner
     module::set_var("gallery", "credits", "Powered by <a href=\"%url\">Gallery %version</a>");
-    module::set_version("gallery", 4);
+    module::set_version("gallery", 5);
   }
 
   static function upgrade($version) {
@@ -287,6 +287,11 @@ class gallery_installer {
                 ENGINE=InnoDB DEFAULT CHARSET=utf8;");
       module::set_version("gallery", $version = 4);
     }
+    if ($version == 4) {
+      Cache::instance()->delete_all();
+      $db->query("ALTER TABLE {caches} modify column cache LONGBLOB");
+      module::set_version("gallery", $version = 5);
+    }
   }
 
   static function uninstall() {
diff --git a/modules/gallery/libraries/drivers/Cache/Database.php b/modules/gallery/libraries/drivers/Cache/Database.php
index 70235e05..158f7b3a 100644
--- a/modules/gallery/libraries/drivers/Cache/Database.php
+++ b/modules/gallery/libraries/drivers/Cache/Database.php
@@ -68,7 +68,6 @@ class Cache_Database_Driver implements Cache_Driver {
       $lifetime += time();
     }
 
-    $data = serialize($data);
     if ($this->exists($id)) {
       $status = $this->db->update("caches",
         array("tags" => $tags, "expiration" => $lifetime, "cache" => $data), array("id" => $id));
@@ -101,7 +100,7 @@ class Cache_Database_Driver implements Cache_Driver {
 
       foreach ($db_result as $row) {
         // Add each cache to the array
-        $result[$row->id] = unserialize($row->cache);
+        $result[$row->id] = $row->cache;
       }
 
       // Turn notices back on
@@ -133,7 +132,7 @@ class Cache_Database_Driver implements Cache_Driver {
         $ER = error_reporting(~E_NOTICE);
 
         // Return the valid cache data
-        $data = unserialize($cache->cache);
+        $data = $cache->cache;
 
         // Turn notices back on
         error_reporting($ER);
diff --git a/modules/gallery/module.info b/modules/gallery/module.info
index 1a44ce51..817fdddd 100644
--- a/modules/gallery/module.info
+++ b/modules/gallery/module.info
@@ -1,3 +1,3 @@
 name = Gallery 3
 description = Gallery core application
-version = 4
+version = 5
-- 
cgit v1.2.3


From aa31e1f0090522c3cfb3a44b947ad8c33a275979 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Sun, 28 Jun 2009 16:24:51 -0700
Subject: Tweak the cache implementation 1) Drop the *_modified key, we don't
 really need it.  The modification date is not    relevant to our browser
 caching strategy. 2) Fix multiple issues with the Expires header and just
 hardcode it to the biggest    possibly value for code clarity. 3) print the
 $content out directly instead of using fwrite 4) Minor cleanups in the
 installer.

---
 modules/gallery/controllers/javascript.php    | 21 ++++++------------
 modules/gallery/helpers/gallery_installer.php | 32 +++++++++++++--------------
 modules/gallery/libraries/Theme_View.php      | 16 +++++++++-----
 3 files changed, 33 insertions(+), 36 deletions(-)

(limited to 'modules/gallery/helpers/gallery_installer.php')

diff --git a/modules/gallery/controllers/javascript.php b/modules/gallery/controllers/javascript.php
index bc231e0a..ba5cbf4b 100644
--- a/modules/gallery/controllers/javascript.php
+++ b/modules/gallery/controllers/javascript.php
@@ -27,16 +27,13 @@ class Javascript_Controller extends Controller {
     // We don't need to save the session for this request
     Session::abort_save();
 
-    // Dump out the javascript file
-    $cache = Cache::instance();
-
-    $modified = $cache->get("{$key}_modified");
-    if (!empty($_SERVER["HTTP_IF_MODIFIED_SINCE"]) && !empty($modified)) {
+    // Our data is immutable, so if they already have a copy then it needs no updating.
+    if (!empty($_SERVER["HTTP_IF_MODIFIED_SINCE"])) {
       header('HTTP/1.0 304 Not Modified');
       return;
     }
 
-    $content = "";
+    $cache = Cache::instance();
     if (strpos($_SERVER["HTTP_ACCEPT_ENCODING"], "gzip") !== false ) {
       $content = $cache->get("{$key}_gz");
     }
@@ -51,19 +48,15 @@ class Javascript_Controller extends Controller {
 
     if (strpos($_SERVER["HTTP_ACCEPT_ENCODING"], "gzip") !== false) {
       header("Content-Encoding: gzip");
-      header("Cache-Control: private, x-gzip-ok=\"public\"");
+      header("Cache-Control: public");
     }
 
     header("Content-Type: text/javascript; charset=UTF-8");
-
-    header("Expires: " . gmdate(21474383647));
-    header("Last-Modified: " . $modified);
+    header("Expires: Tue, 19 Jan 2038 00:00:00 GMT");
+    header("Last-Modified: " . gmdate("D, d M Y H:i:s T", time()));
 
     Kohana::close_buffers(false);
-
-    $handle = fopen("php://output", "wb");
-    fwrite($handle, $content);
-    fclose($handle);
+    print $content;
   }
 }
 
diff --git a/modules/gallery/helpers/gallery_installer.php b/modules/gallery/helpers/gallery_installer.php
index 8ccbd51b..d0bfa629 100644
--- a/modules/gallery/helpers/gallery_installer.php
+++ b/modules/gallery/helpers/gallery_installer.php
@@ -32,6 +32,15 @@ class gallery_installer {
                  PRIMARY KEY (`id`))
                ENGINE=InnoDB DEFAULT CHARSET=utf8;");
 
+    $db->query("CREATE TABLE {caches} (
+                `id` varchar(255) NOT NULL,
+                `tags` varchar(255),
+                `expiration` int(9) NOT NULL,
+                `cache` longblob,
+                PRIMARY KEY (`id`),
+                KEY (`tags`))
+                ENGINE=InnoDB DEFAULT CHARSET=utf8;");
+
     $db->query("CREATE TABLE {graphics_rules} (
                  `id` int(9) NOT NULL auto_increment,
                  `active` BOOLEAN default 0,
@@ -181,15 +190,6 @@ class gallery_installer {
                 UNIQUE KEY(`module_name`, `name`))
                ENGINE=InnoDB DEFAULT CHARSET=utf8;");
 
-    $db->query("CREATE TABLE {caches} (
-                `id` varchar(255) NOT NULL,
-                `tags` varchar(255),
-                `expiration` int(9) NOT NULL,
-                `cache` longblob,
-                PRIMARY KEY (`id`),
-                KEY (`tags`))
-                ENGINE=InnoDB DEFAULT CHARSET=utf8;");
-
     foreach (array("albums", "logs", "modules", "resizes", "thumbs", "tmp", "uploads") as $dir) {
       @mkdir(VARPATH . $dir);
     }
@@ -278,13 +278,13 @@ class gallery_installer {
 
     if ($version == 3) {
       $db->query("CREATE TABLE {caches} (
-                `id` varchar(255) NOT NULL,
-                `tags` varchar(255),
-                `expiration` int(9) NOT NULL,
-                `cache` text,
-                PRIMARY KEY (`id`),
-                KEY (`tags`))
-                ENGINE=InnoDB DEFAULT CHARSET=utf8;");
+                 `id` varchar(255) NOT NULL,
+                 `tags` varchar(255),
+                 `expiration` int(9) NOT NULL,
+                 `cache` text,
+                 PRIMARY KEY (`id`),
+                 KEY (`tags`))
+                 ENGINE=InnoDB DEFAULT CHARSET=utf8;");
       module::set_version("gallery", $version = 4);
     }
     if ($version == 4) {
diff --git a/modules/gallery/libraries/Theme_View.php b/modules/gallery/libraries/Theme_View.php
index f55cb55a..c3acfeb3 100644
--- a/modules/gallery/libraries/Theme_View.php
+++ b/modules/gallery/libraries/Theme_View.php
@@ -172,6 +172,10 @@ class Theme_View_Core extends View {
     $this->scripts[$file] = 1;
   }
 
+  /**
+   * Combine a series of Javascript files into a single one and cache it in the database, then
+   * return a single <script> element to refer to it.
+   */
   private function _combine_script() {
     $links = array();
     $key = "";
@@ -188,18 +192,18 @@ class Theme_View_Core extends View {
     }
 
     $key = md5($key);
-    $contents = Cache::instance()->get($key);
+    $cache = Cache::instance();
+    $contents = $cache->get($key);
     if (empty($contents)) {
-      $contents = '';
+      $contents = "";
       foreach ($links as $link) {
         $contents .= file_get_contents($link);
       }
-      Cache::instance()->set($key, $contents, array("javascript"), 84600);
+      $cache->set($key, $contents, array("javascript"), 30 * 84600);
       if (function_exists("gzencode")) {
-        Cache::instance()->set("{$key}_gz", gzencode($contents, 9, FORCE_GZIP),
-                               array("javascript", "gzip"), 84600);
+        $cache->set("{$key}_gz", gzencode($contents, 9, FORCE_GZIP),
+                    array("javascript", "gzip"), 30 * 84600);
       }
-      Cache::instance()->set("{$key}_modified", time(), array("javascript", "modified"), 84600);
     }
 
     // Handcraft the script link because html::script will add a .js extenstion
-- 
cgit v1.2.3


From fcc57a418245b6cac410f70506f6f4b687c8a98a Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Sun, 28 Jun 2009 16:48:29 -0700
Subject: Modify the cache table to make id the primary key for consistency
 with other gallery 3 tables.  Update the driver to match, add more upgrader
 code, update the installer block and change the gallery module version to 6.

---
 modules/gallery/helpers/gallery_installer.php        | 14 ++++++++++++--
 modules/gallery/libraries/drivers/Cache/Database.php | 13 ++++++-------
 modules/gallery/module.info                          |  2 +-
 3 files changed, 19 insertions(+), 10 deletions(-)

(limited to 'modules/gallery/helpers/gallery_installer.php')

diff --git a/modules/gallery/helpers/gallery_installer.php b/modules/gallery/helpers/gallery_installer.php
index d0bfa629..c3c3543c 100644
--- a/modules/gallery/helpers/gallery_installer.php
+++ b/modules/gallery/helpers/gallery_installer.php
@@ -33,7 +33,8 @@ class gallery_installer {
                ENGINE=InnoDB DEFAULT CHARSET=utf8;");
 
     $db->query("CREATE TABLE {caches} (
-                `id` varchar(255) NOT NULL,
+                `id` int(9) NOT NULL auto_increment,
+                `key` varchar(255) NOT NULL,
                 `tags` varchar(255),
                 `expiration` int(9) NOT NULL,
                 `cache` longblob,
@@ -287,11 +288,20 @@ class gallery_installer {
                  ENGINE=InnoDB DEFAULT CHARSET=utf8;");
       module::set_version("gallery", $version = 4);
     }
+
     if ($version == 4) {
       Cache::instance()->delete_all();
-      $db->query("ALTER TABLE {caches} modify column cache LONGBLOB");
+      $db->query("ALTER TABLE {caches} MODIFY COLUMN `cache` LONGBLOB");
       module::set_version("gallery", $version = 5);
     }
+
+    if ($version == 5) {
+      Cache::instance()->delete_all();
+      $db->query("ALTER TABLE {caches} DROP COLUMN `id`");
+      $db->query("ALTER TABLE {caches} ADD COLUMN `key` varchar(255) NOT NULL");
+      $db->query("ALTER TABLE {caches} ADD COLUMN `id` int(9) NOT NULL auto_increment PRIMARY KEY");
+      module::set_version("gallery", $version = 6);
+    }
   }
 
   static function uninstall() {
diff --git a/modules/gallery/libraries/drivers/Cache/Database.php b/modules/gallery/libraries/drivers/Cache/Database.php
index 158f7b3a..f3a1eb02 100644
--- a/modules/gallery/libraries/drivers/Cache/Database.php
+++ b/modules/gallery/libraries/drivers/Cache/Database.php
@@ -32,9 +32,8 @@ class Cache_Database_Driver implements Cache_Driver {
     $this->db = Database::instance();
 
     if (!$this->db->table_exists("caches")) {
-      throw new Kohana_Exception("cache.driver_error", "Cache table is not defined");
+      throw new Exception("@todo Cache table is not defined");
     }
-    Kohana::log("debug", "Cache Database Driver Initialized");
   }
 
   /**
@@ -44,7 +43,7 @@ class Cache_Database_Driver implements Cache_Driver {
    * @return boolean
    */
   public function exists($id) {
-    $count = $this->db->count_records("caches", array("id" => $id, "expiration >=" => time()));
+    $count = $this->db->count_records("caches", array("key" => $id, "expiration >=" => time()));
     return $count > 0;
   }
 
@@ -70,10 +69,10 @@ class Cache_Database_Driver implements Cache_Driver {
 
     if ($this->exists($id)) {
       $status = $this->db->update("caches",
-        array("tags" => $tags, "expiration" => $lifetime, "cache" => $data), array("id" => $id));
+        array("tags" => $tags, "expiration" => $lifetime, "cache" => $data), array("key" => $id));
     } else {
       $status = $this->db->insert("caches",
-        array("id" => $id, "tags" => $tags, "expiration" => $lifetime, "cache" => $data));
+        array("key" => $id, "tags" => $tags, "expiration" => $lifetime, "cache" => $data));
     }
 
     return count($status) > 0;
@@ -119,7 +118,7 @@ class Cache_Database_Driver implements Cache_Driver {
    */
   public function get($id) {
     $data = null;
-    $result = $this->db->getwhere("caches", array("id" => $id));
+    $result = $this->db->getwhere("caches", array("key" => $id));
 
     if (count($result) > 0) {
       $cache = $result->current();
@@ -157,7 +156,7 @@ class Cache_Database_Driver implements Cache_Driver {
     } else if ($tag === true) {
       $this->db->like("tags", "<$id>");
     } else {
-      $this->db->where("id", $id);
+      $this->db->where("key", $id);
     }
 
     $status = $this->db->delete();
diff --git a/modules/gallery/module.info b/modules/gallery/module.info
index 817fdddd..c184aba7 100644
--- a/modules/gallery/module.info
+++ b/modules/gallery/module.info
@@ -1,3 +1,3 @@
 name = Gallery 3
 description = Gallery core application
-version = 5
+version = 6
-- 
cgit v1.2.3