summaryrefslogtreecommitdiff
path: root/core
diff options
context:
space:
mode:
authorBharat Mediratta <bharat@menalto.com>2008-11-02 23:55:09 +0000
committerBharat Mediratta <bharat@menalto.com>2008-11-02 23:55:09 +0000
commite173f36bcb50451c49e5708de29fcb41267b41f4 (patch)
tree8731a44fea798548426ffbbc24421c87091fe147 /core
parentaff7048b1f94dfcc98924bf9a0904dbba13709f7 (diff)
Create some basic infrastructure:
* item model (contains basic item info, similar to the gx version) * module model (has info about each module and which version of it is installed) * added a very basic unit test to verify that we can create an instance of item * Updated our test controller to require a unit_test db config and call core::install if it hasn't been done already. New pattern: * core/helpers/core_installer.php creates core_installer helper. When we install a new module you call xxx_installer::install(), and when you want it to go away, you do xxx_installer::uninstall() Create
Diffstat (limited to 'core')
-rw-r--r--core/controllers/welcome.php4
-rw-r--r--core/helpers/core_installer.php67
-rw-r--r--core/models/item.php21
-rw-r--r--core/models/module.php21
-rw-r--r--core/tests/Item_Test.php24
5 files changed, 135 insertions, 2 deletions
diff --git a/core/controllers/welcome.php b/core/controllers/welcome.php
index 672252eb..061a4176 100644
--- a/core/controllers/welcome.php
+++ b/core/controllers/welcome.php
@@ -20,7 +20,7 @@
class Welcome_Controller extends Template_Controller {
public $template = 'welcome.html';
- function Index() {
+ function index() {
$this->template->syscheck = new View('welcome_syscheck.html');
$this->template->syscheck->errors = $this->_get_config_errors();
$this->_create_directories();
@@ -77,7 +77,7 @@ class Welcome_Controller extends Template_Controller {
return $errors;
}
- function _error_handler() {
+ function _error_handler($x) {
}
function _create_directories() {
diff --git a/core/helpers/core_installer.php b/core/helpers/core_installer.php
new file mode 100644
index 00000000..ef4dddd9
--- /dev/null
+++ b/core/helpers/core_installer.php
@@ -0,0 +1,67 @@
+<?php defined("SYSPATH") or die("No direct script access.");
+/**
+ * Gallery - a web based photo album viewer and editor
+ * Copyright (C) 2000-2008 Bharat Mediratta
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or (at
+ * your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+class core_installer {
+ public function install() {
+ $db = Database::instance();
+ try {
+ $base_version = ORM::factory('module')->where('name', 'core')->find()->version;
+ } catch (Exception $e) {
+ if ($e->getMessage() == "Table modules does not exist in your database.") {
+ $base_version = 0;
+ } else {
+ throw $e;
+ }
+ }
+
+ if ($base_version == 0) {
+ $db->query("CREATE TABLE `modules` (
+ `id` int(9) NOT NULL auto_increment,
+ `name` char(255) default NULL,
+ `version` int(9) default NULL,
+ PRIMARY KEY (`id`),
+ UNIQUE KEY(`name`))
+ ENGINE=InnoDB DEFAULT CHARSET=utf8;");
+
+ $db->query("CREATE TABLE `items` (
+ `id` int(9) NOT NULL auto_increment,
+ `type` char(32) default NULL,
+ `title` char(255) default NULL,
+ `path` char(255) default NULL,
+ `parent_id` int(9) default NULL,
+ `level` int(9) default NULL,
+ `left` int(9) default NULL,
+ `right` int(9) default NULL,
+ PRIMARY KEY (`id`),
+ KEY `parent_id` (`parent_id`),
+ KEY `type` (`type`))
+ ENGINE=InnoDB DEFAULT CHARSET=utf8;");
+ $core = ORM::factory('module')->where('name', 'core')->find();
+ $core->name = "core";
+ $core->version = 1;
+ $core->save();
+ }
+ }
+
+ public function uninstall() {
+ $db = Database::instance();
+ $db->query("DROP TABLE IF EXISTS `items`;");
+ $db->query("DROP TABLE IF EXISTS `modules`;");
+ }
+}
diff --git a/core/models/item.php b/core/models/item.php
new file mode 100644
index 00000000..f402a567
--- /dev/null
+++ b/core/models/item.php
@@ -0,0 +1,21 @@
+<?php defined("SYSPATH") or die("No direct script access.");
+/**
+ * Gallery - a web based photo album viewer and editor
+ * Copyright (C) 2000-2008 Bharat Mediratta
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or (at
+ * your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+class Item_Model extends MPTT {
+}
diff --git a/core/models/module.php b/core/models/module.php
new file mode 100644
index 00000000..de4cc43d
--- /dev/null
+++ b/core/models/module.php
@@ -0,0 +1,21 @@
+<?php defined("SYSPATH") or die("No direct script access.");
+/**
+ * Gallery - a web based photo album viewer and editor
+ * Copyright (C) 2000-2008 Bharat Mediratta
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or (at
+ * your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+class Module_Model extends ORM {
+}
diff --git a/core/tests/Item_Test.php b/core/tests/Item_Test.php
new file mode 100644
index 00000000..f83c60f1
--- /dev/null
+++ b/core/tests/Item_Test.php
@@ -0,0 +1,24 @@
+<?php defined("SYSPATH") or die("No direct script access.");
+/**
+ * Gallery - a web based photo album viewer and editor
+ * Copyright (C) 2000-2008 Bharat Mediratta
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or (at
+ * your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+class Item_Test extends Unit_Test_Case {
+ public function create_item_test() {
+ ORM::factory('item');
+ }
+}