Changeset 137
- Timestamp:
- Jun 3, 2006 8:15:06 PM (18 years ago)
- Location:
- trunk
- Files:
-
- 8 edited
- 6 moved
Legend:
- Unmodified
- Added
- Removed
-
trunk/bin/module_maker/skel/admin.php
r136 r137 19 19 require_once 'codebase/lib/TemplateGlue.inc.php'; 20 20 require_once 'codebase/lib/Prefs.inc.php'; 21 require_once 'codebase/lib/ RecordLock.inc.php';22 require_once 'codebase/lib/ RecordVersion.inc.php';21 require_once 'codebase/lib/Lock.inc.php'; 22 require_once 'codebase/lib/Version.inc.php'; 23 23 %ADMIN_UPLOAD_INCLUDE% 24 24 … … 294 294 295 295 // Create version. 296 $version = RecordVersion::getInstance($GLOBALS['auth']);296 $version = Version::getInstance($GLOBALS['auth']); 297 297 $version->create('%DB_TBL%', '%PRIMARY_KEY%', $last_insert_id, $frm['<##>']); 298 298 … … 319 319 320 320 // Create version. 321 $version = RecordVersion::getInstance($GLOBALS['auth']);321 $version = Version::getInstance($GLOBALS['auth']); 322 322 $version->create('%DB_TBL%', '%PRIMARY_KEY%', $frm['%PRIMARY_KEY%'], $frm['<##>']); 323 323 -
trunk/docs/file_layout.txt
r136 r137 52 52 PEdit.inc.php (page-by-page file-based content management system) 53 53 Prefs.inc.php (class for semi-permenent storage of values) 54 RecordLock.inc.php (db record locking system)55 RecordVersion.inc.php (db record versioning system)54 Lock.inc.php (db record locking system) 55 Version.inc.php (db record versioning system) 56 56 ScriptTimer.inc.php (timer for scripts) 57 57 Cache.inc.php (class for accessing a cache in a users session, stores any variables for quick retreival) -
trunk/docs/revision_history.txt
r136 r137 29 29 - DB 30 30 - DBSessionHandler 31 - RecordLock32 - RecordVersion31 - Lock 32 - Version 33 33 - Cache 34 34 - Upload … … 72 72 Full test suite for all codebase libraries. Run from the command line: "codebase/tests/run_tests.sh;" 73 73 74 Classes that access database tables have a function initDB() that will setup the basic schema necessary to run. This includes Auth_SQL, RecordVersion, RecordLock, and DBSessionHandler.74 Classes that access database tables have a function initDB() that will setup the basic schema necessary to run. This includes Auth_SQL, Version, Lock, and DBSessionHandler. 75 75 76 76 And much much more still to document... -
trunk/lib/Version.inc.php
r136 r137 1 1 <?php 2 2 /** 3 * RecordVersion.inc.php3 * Version.inc.php 4 4 * code by strangecode :: www.strangecode.com :: this document contains copyrighted information 5 5 * 6 * The RecordVersion class provides a system for saving, reviewing, and6 * The Version class provides a system for saving, reviewing, and 7 7 * restoring versions of a record of any DB table. All the data in the record is 8 8 * serialized, compressed, and saved in a blob in the version_tbl. Restoring a … … 17 17 * @version 2.1 18 18 */ 19 class RecordVersion {19 class Version { 20 20 21 21 // Configuration of this object. … … 44 44 45 45 if ($instance === null) { 46 $instance = new RecordVersion($auth_object);46 $instance = new Version($auth_object); 47 47 } 48 48 … … 55 55 * @param mixed $auth_object An Auth_SQL object. 56 56 */ 57 function RecordVersion($auth_object)57 function Version($auth_object) 58 58 { 59 59 $app =& App::getInstance(); -
trunk/services/admins.php
r136 r137 16 16 require_once 'codebase/lib/TemplateGlue.inc.php'; 17 17 require_once 'codebase/lib/Prefs.inc.php'; 18 require_once 'codebase/lib/ RecordLock.inc.php';19 require_once 'codebase/lib/ RecordVersion.inc.php';18 require_once 'codebase/lib/Lock.inc.php'; 19 require_once 'codebase/lib/Version.inc.php'; 20 20 21 21 … … 398 398 399 399 // Create version. 400 $version = RecordVersion::getInstance($GLOBALS['auth']);400 $version = Version::getInstance($GLOBALS['auth']); 401 401 $version->create('admin_tbl', 'admin_id', $last_insert_id, $frm['username']); 402 402 … … 441 441 442 442 // Create version. 443 $version = RecordVersion::getInstance($GLOBALS['auth']);443 $version = Version::getInstance($GLOBALS['auth']); 444 444 $version->create('admin_tbl', 'admin_id', $frm['admin_id'], $frm['username']); 445 445 -
trunk/services/lock.php
r136 r137 6 6 7 7 // require_once dirname(__FILE__) . '/_config.inc.php'; 8 require_once 'codebase/lib/ RecordLock.inc.php';8 require_once 'codebase/lib/Lock.inc.php'; 9 9 10 10 $auth->requireLogin(); … … 20 20 } 21 21 22 if (!isset($lock) || !is_a($lock, ' RecordLock')) {23 $lock =& RecordLock::getInstance($auth);22 if (!isset($lock) || !is_a($lock, 'Lock')) { 23 $lock =& Lock::getInstance($auth); 24 24 } 25 25 $lock->select(getFormData('lock_id')); -
trunk/services/logout.php
r136 r137 7 7 if (isset($auth) && method_exists($auth, 'getVal')) { 8 8 // Delete the current user's record locks. 9 require_once 'codebase/lib/ RecordLock.inc.php';10 $lock =& RecordLock::getInstance($auth);9 require_once 'codebase/lib/Lock.inc.php'; 10 $lock =& Lock::getInstance($auth); 11 11 $lock->removeAll($auth->getVal('user_id')); 12 12 } -
trunk/services/templates/lock.ihtml
r136 r137 1 1 <?php 2 if (!is_a($lock, ' RecordLock')) {2 if (!is_a($lock, 'Lock')) { 3 3 return null; 4 4 } -
trunk/services/versions.php
r136 r137 10 10 $app->sslOn(); 11 11 12 require_once 'codebase/lib/ RecordVersion.inc.php';13 require_once 'codebase/lib/ RecordLock.inc.php';12 require_once 'codebase/lib/Version.inc.php'; 13 require_once 'codebase/lib/Lock.inc.php'; 14 14 15 15 /****************************************************************************** … … 17 17 *****************************************************************************/ 18 18 19 $version = RecordVersion::getInstance($GLOBALS['auth']);19 $version = Version::getInstance($GLOBALS['auth']); 20 20 21 21 // Query arguments to retain their values between page requests. … … 75 75 76 76 case 'restore' : 77 if (!isset($lock) || !is_a($lock, ' RecordLock')) {78 $lock =& RecordLock::getInstance($auth);77 if (!isset($lock) || !is_a($lock, 'Lock')) { 78 $lock =& Lock::getInstance($auth); 79 79 } 80 80 $lock->select($record_table, $record_key, $record_val); -
trunk/tests/LockTest.php
r136 r137 1 1 <?php 2 2 /** 3 * PHPUnit test case for RecordLock3 * PHPUnit test case for Lock 4 4 * 5 5 * The method skeletons below need to be filled in with … … 10 10 */ 11 11 require_once 'PHPUnit.php'; 12 class RecordLockTest extends PHPUnit_TestCase {12 class LockTest extends PHPUnit_TestCase { 13 13 14 var $ RecordLock;14 var $Lock; 15 15 var $Auth_SQL; 16 16 17 function RecordLockTest($name)17 function LockTest($name) 18 18 { 19 19 $this->PHPUnit_TestCase($name); … … 23 23 { 24 24 require dirname(__FILE__) . '/_config.inc.php'; 25 require_once '../lib/ RecordLock.inc.php';25 require_once '../lib/Lock.inc.php'; 26 26 require_once '../lib/Auth_SQL.inc.php'; 27 27 … … 63 63 } 64 64 65 $this-> RecordLock =& RecordLock::getInstance($this->Auth_SQL);66 $this-> RecordLock->setParam(array('db_table' => 'test_lock_tbl'));65 $this->Lock =& Lock::getInstance($this->Auth_SQL); 66 $this->Lock->setParam(array('db_table' => 'test_lock_tbl')); 67 67 68 68 // Use fresh lock table. 69 $this-> RecordLock->initDB(true);69 $this->Lock->initDB(true); 70 70 } 71 71 … … 74 74 $db =& DB::getInstance(); 75 75 76 unset($this-> RecordLock);76 unset($this->Lock); 77 77 unset($this->Auth_SQL); 78 78 $db->query("DROP TABLE IF EXISTS test_user_tbl"); … … 83 83 function test_getinstance() 84 84 { 85 $result = RecordLock::getinstance($this->Auth_SQL);86 $this->assertTrue($result && is_a($result, ' RecordLock'));85 $result = Lock::getinstance($this->Auth_SQL); 86 $this->assertTrue($result && is_a($result, 'Lock')); 87 87 } 88 88 89 89 function test_setparam() 90 90 { 91 $this-> RecordLock->setparam(array('var'=>'val'));91 $this->Lock->setparam(array('var'=>'val')); 92 92 } 93 93 94 94 function test_getparam() 95 95 { 96 $this-> RecordLock->getparam('var');96 $this->Lock->getparam('var'); 97 97 } 98 98 99 99 function test_select() 100 100 { 101 $this-> RecordLock->set('test_user_tbl', 'user_id', '1');102 $result = $this-> RecordLock->select('test_user_tbl', 'user_id', '1');101 $this->Lock->set('test_user_tbl', 'user_id', '1'); 102 $result = $this->Lock->select('test_user_tbl', 'user_id', '1'); 103 103 $this->assertTrue($result); 104 104 } … … 106 106 function test_islocked() 107 107 { 108 $this-> RecordLock->select('test_user_tbl', 'user_id', '1');108 $this->Lock->select('test_user_tbl', 'user_id', '1'); 109 109 110 $this-> RecordLock->set('test_user_tbl', 'user_id', '1');111 $result = $this-> RecordLock->islocked();110 $this->Lock->set('test_user_tbl', 'user_id', '1'); 111 $result = $this->Lock->islocked(); 112 112 $this->assertTrue($result, 'Lock was not set.'); 113 113 114 $this-> RecordLock->remove();115 $this-> RecordLock->select('test_user_tbl', 'user_id', '1');116 $result = $this-> RecordLock->islocked();114 $this->Lock->remove(); 115 $this->Lock->select('test_user_tbl', 'user_id', '1'); 116 $result = $this->Lock->islocked(); 117 117 $this->assertFalse($result, 'Lock was not removed.'); 118 118 } … … 120 120 function test_ismine() 121 121 { 122 $this-> RecordLock->set('test_user_tbl', 'user_id', '1');123 $this-> RecordLock->select('test_user_tbl', 'user_id', '1');124 $result = $this-> RecordLock->ismine();122 $this->Lock->set('test_user_tbl', 'user_id', '1'); 123 $this->Lock->select('test_user_tbl', 'user_id', '1'); 124 $result = $this->Lock->ismine(); 125 125 $this->assertTrue($result); 126 126 } … … 128 128 function test_set() 129 129 { 130 $this-> RecordLock->select('test_user_tbl', 'user_id', '1');131 $this-> RecordLock->remove();132 $this-> RecordLock->set('test_user_tbl', 'user_id', '1');133 $this-> RecordLock->select('test_user_tbl', 'user_id', '1');134 $result = $this-> RecordLock->islocked();130 $this->Lock->select('test_user_tbl', 'user_id', '1'); 131 $this->Lock->remove(); 132 $this->Lock->set('test_user_tbl', 'user_id', '1'); 133 $this->Lock->select('test_user_tbl', 'user_id', '1'); 134 $result = $this->Lock->islocked(); 135 135 $this->assertTrue($result); 136 136 } … … 138 138 function test_remove() 139 139 { 140 $this-> RecordLock->select('test_user_tbl', 'user_id', '1');141 $this-> RecordLock->set('test_user_tbl', 'user_id', '1');142 $this-> RecordLock->remove();143 $this-> RecordLock->select('test_user_tbl', 'user_id', '1');144 $result = $this-> RecordLock->islocked();140 $this->Lock->select('test_user_tbl', 'user_id', '1'); 141 $this->Lock->set('test_user_tbl', 'user_id', '1'); 142 $this->Lock->remove(); 143 $this->Lock->select('test_user_tbl', 'user_id', '1'); 144 $result = $this->Lock->islocked(); 145 145 $this->assertFalse($result); 146 146 } … … 148 148 function test_removeall() 149 149 { 150 $this-> RecordLock->select('test_user_tbl', 'user_id', '1');151 $this-> RecordLock->set('test_user_tbl', 'user_id', '1');152 $this-> RecordLock->removeall();153 $this-> RecordLock->select('test_user_tbl', 'user_id', '1');154 $result = $this-> RecordLock->islocked();150 $this->Lock->select('test_user_tbl', 'user_id', '1'); 151 $this->Lock->set('test_user_tbl', 'user_id', '1'); 152 $this->Lock->removeall(); 153 $this->Lock->select('test_user_tbl', 'user_id', '1'); 154 $result = $this->Lock->islocked(); 155 155 $this->assertFalse($result); 156 156 } … … 158 158 function test__auto_timeout() 159 159 { 160 $this-> RecordLock->_auto_timeout();160 $this->Lock->_auto_timeout(); 161 161 } 162 162 163 163 function test_getid() 164 164 { 165 $this-> RecordLock->select('test_user_tbl', 'user_id', '1');166 $this-> RecordLock->set('test_user_tbl', 'user_id', '1');167 $result = $this-> RecordLock->getid();165 $this->Lock->select('test_user_tbl', 'user_id', '1'); 166 $this->Lock->set('test_user_tbl', 'user_id', '1'); 167 $result = $this->Lock->getid(); 168 168 $this->assertTrue('' != $result); 169 169 $this->assertTrue(is_numeric($result)); … … 172 172 function test_gettitle() 173 173 { 174 $this-> RecordLock->select('test_user_tbl', 'user_id', '1');175 $this-> RecordLock->set('test_user_tbl', 'user_id', '1', 'userlock');176 $result = $this-> RecordLock->gettitle();174 $this->Lock->select('test_user_tbl', 'user_id', '1'); 175 $this->Lock->set('test_user_tbl', 'user_id', '1', 'userlock'); 176 $result = $this->Lock->gettitle(); 177 177 $this->assertEquals('userlock', $result); 178 178 } … … 180 180 function test_geteditor() 181 181 { 182 $this-> RecordLock->select('test_user_tbl', 'user_id', '1');183 $this-> RecordLock->set('test_user_tbl', 'user_id', '1', 'userlock');184 $result = $this-> RecordLock->geteditor();182 $this->Lock->select('test_user_tbl', 'user_id', '1'); 183 $this->Lock->set('test_user_tbl', 'user_id', '1', 'userlock'); 184 $result = $this->Lock->geteditor(); 185 185 $this->assertEquals('testuser', $result); 186 186 } … … 188 188 function test_getsecondselapsed() 189 189 { 190 $result = $this-> RecordLock->getsecondselapsed();190 $result = $this->Lock->getsecondselapsed(); 191 191 $this->assertType('integer', $result); 192 192 } … … 194 194 } 195 195 // Running the test. 196 $suite = new PHPUnit_TestSuite(' RecordLockTest');196 $suite = new PHPUnit_TestSuite('LockTest'); 197 197 $result = PHPUnit::run($suite); 198 198 echo $result->toString(); -
trunk/tests/VersionTest.php
r136 r137 1 1 <?php 2 2 /** 3 * PHPUnit test case for RecordVersion3 * PHPUnit test case for Version 4 4 * 5 5 * The method skeletons below need to be filled in with … … 10 10 */ 11 11 require_once 'PHPUnit.php'; 12 class RecordVersionTest extends PHPUnit_TestCase {12 class VersionTest extends PHPUnit_TestCase { 13 13 14 var $ RecordVersion;14 var $Version; 15 15 var $Auth_SQL; 16 16 17 function RecordVersionTest($name)17 function VersionTest($name) 18 18 { 19 19 $this->PHPUnit_TestCase($name); … … 23 23 { 24 24 require dirname(__FILE__) . '/_config.inc.php'; 25 require_once '../lib/ RecordVersion.inc.php';25 require_once '../lib/Version.inc.php'; 26 26 27 27 require_once '../lib/Auth_SQL.inc.php'; … … 60 60 $this->Auth_SQL->login('testuser', 'testpass'); 61 61 62 $this-> RecordVersion =& RecordVersion::getInstance($this->Auth_SQL);63 $this-> RecordVersion->setParam(array('db_table' => 'test_version_tbl'));62 $this->Version =& Version::getInstance($this->Auth_SQL); 63 $this->Version->setParam(array('db_table' => 'test_version_tbl')); 64 64 65 65 // Use fresh version table. 66 $this-> RecordVersion->initDB(true);66 $this->Version->initDB(true); 67 67 } 68 68 … … 71 71 $db =& DB::getInstance(); 72 72 73 unset($this-> RecordVersion);73 unset($this->Version); 74 74 unset($this->Auth_SQL); 75 75 $db->query("DROP TABLE IF EXISTS test_user_tbl"); … … 80 80 function test_getinstance() 81 81 { 82 $result = RecordVersion::getinstance($this->Auth_SQL);83 $this->assertTrue($result && is_a($result, ' RecordVersion'));82 $result = Version::getinstance($this->Auth_SQL); 83 $this->assertTrue($result && is_a($result, 'Version')); 84 84 } 85 85 86 86 function test_setparam() 87 87 { 88 $this-> RecordVersion->setparam(array('var'=>'val'));88 $this->Version->setparam(array('var'=>'val')); 89 89 } 90 90 91 91 function test_getparam() 92 92 { 93 $this-> RecordVersion->getparam('var');93 $this->Version->getparam('var'); 94 94 } 95 95 96 96 function test_create() 97 97 { 98 $result = $this-> RecordVersion->create('test_user_tbl', 'user_id', '1', 'Test User', 'First version of user');98 $result = $this->Version->create('test_user_tbl', 'user_id', '1', 'Test User', 'First version of user'); 99 99 $this->assertTrue($result); 100 100 } … … 102 102 function test_restore() 103 103 { 104 $current = $this-> RecordVersion->getCurrent('test_user_tbl', 'user_id', '1');105 $version_id = $this-> RecordVersion->create('test_user_tbl', 'user_id', '1', 'Test User', 'First version of user');106 $versioned = $this-> RecordVersion->getData($version_id);107 $result = $this-> RecordVersion->restore($version_id);108 $restored = $this-> RecordVersion->getCurrent('test_user_tbl', 'user_id', '1');104 $current = $this->Version->getCurrent('test_user_tbl', 'user_id', '1'); 105 $version_id = $this->Version->create('test_user_tbl', 'user_id', '1', 'Test User', 'First version of user'); 106 $versioned = $this->Version->getData($version_id); 107 $result = $this->Version->restore($version_id); 108 $restored = $this->Version->getCurrent('test_user_tbl', 'user_id', '1'); 109 109 $this->assertTrue(is_array($result), 'Restore did not return array.'); 110 110 $this->assertTrue($current === $versioned && $versioned === $restored, 'Restored version does not match original.'); … … 114 114 { 115 115 // Creat 3 test versions. 116 $this-> RecordVersion->create('test_user_tbl', 'user_id', '1', 'Test 1', '1 version of user');117 $this-> RecordVersion->create('test_user_tbl', 'user_id', '1', 'Test 2', '2 version of user');118 $this-> RecordVersion->create('test_user_tbl', 'user_id', '1', 'Test 3', '3 version of user');116 $this->Version->create('test_user_tbl', 'user_id', '1', 'Test 1', '1 version of user'); 117 $this->Version->create('test_user_tbl', 'user_id', '1', 'Test 2', '2 version of user'); 118 $this->Version->create('test_user_tbl', 'user_id', '1', 'Test 3', '3 version of user'); 119 119 120 $a = $this-> RecordVersion->getList('test_user_tbl', 'user_id', '1');120 $a = $this->Version->getList('test_user_tbl', 'user_id', '1'); 121 121 122 $this-> RecordVersion->deleteold('test_user_tbl', 'user_id', '1');123 $b = $this-> RecordVersion->getList('test_user_tbl', 'user_id', '1');122 $this->Version->deleteold('test_user_tbl', 'user_id', '1'); 123 $b = $this->Version->getList('test_user_tbl', 'user_id', '1'); 124 124 125 $this-> RecordVersion->setparam(array('max_qty'=>2));126 $this-> RecordVersion->setparam(array('min_qty'=>1));127 $this-> RecordVersion->setparam(array('min_days'=>0));128 $this-> RecordVersion->deleteold('test_user_tbl', 'user_id', '1');129 $c = $this-> RecordVersion->getList('test_user_tbl', 'user_id', '1');125 $this->Version->setparam(array('max_qty'=>2)); 126 $this->Version->setparam(array('min_qty'=>1)); 127 $this->Version->setparam(array('min_days'=>0)); 128 $this->Version->deleteold('test_user_tbl', 'user_id', '1'); 129 $c = $this->Version->getList('test_user_tbl', 'user_id', '1'); 130 130 131 $this-> RecordVersion->setparam(array('max_qty'=>0));132 $this-> RecordVersion->setparam(array('min_qty'=>0));133 $this-> RecordVersion->setparam(array('min_days'=>0));134 $this-> RecordVersion->deleteold('test_user_tbl', 'user_id', '1');135 $d = $this-> RecordVersion->getList('test_user_tbl', 'user_id', '1');131 $this->Version->setparam(array('max_qty'=>0)); 132 $this->Version->setparam(array('min_qty'=>0)); 133 $this->Version->setparam(array('min_days'=>0)); 134 $this->Version->deleteold('test_user_tbl', 'user_id', '1'); 135 $d = $this->Version->getList('test_user_tbl', 'user_id', '1'); 136 136 137 137 $this->assertTrue(sizeof($a) == 3, 'A is wrong'); … … 143 143 function test_getlist() 144 144 { 145 $this-> RecordVersion->create('test_user_tbl', 'user_id', '1', 'Test 1', '1 version of user');146 $this-> RecordVersion->create('test_user_tbl', 'user_id', '1', 'Test 2', '2 version of user');147 $this-> RecordVersion->create('test_user_tbl', 'user_id', '1', 'Test 3', '3 version of user');148 $result = $this-> RecordVersion->getList('test_user_tbl', 'user_id', '1');145 $this->Version->create('test_user_tbl', 'user_id', '1', 'Test 1', '1 version of user'); 146 $this->Version->create('test_user_tbl', 'user_id', '1', 'Test 2', '2 version of user'); 147 $this->Version->create('test_user_tbl', 'user_id', '1', 'Test 3', '3 version of user'); 148 $result = $this->Version->getList('test_user_tbl', 'user_id', '1'); 149 149 $this->assertTrue(is_array($result) && !empty($result)); 150 150 } … … 152 152 function test_getverson() 153 153 { 154 $version_id = $this-> RecordVersion->create('test_user_tbl', 'user_id', '1', 'Test User', 'First version of user');155 $result = $this-> RecordVersion->getverson($version_id);154 $version_id = $this->Version->create('test_user_tbl', 'user_id', '1', 'Test User', 'First version of user'); 155 $result = $this->Version->getverson($version_id); 156 156 $this->assertTrue(is_array($result) && !empty($result)); 157 157 } … … 159 159 function test_getdata() 160 160 { 161 $version_id = $this-> RecordVersion->create('test_user_tbl', 'user_id', '1', 'Test User', 'First version of user');162 $result = $this-> RecordVersion->getdata($version_id);161 $version_id = $this->Version->create('test_user_tbl', 'user_id', '1', 'Test User', 'First version of user'); 162 $result = $this->Version->getdata($version_id); 163 163 $this->assertTrue(is_array($result) && !empty($result)); 164 164 } … … 166 166 function test_getcurrent() 167 167 { 168 $result = $this-> RecordVersion->getCurrent('test_user_tbl', 'user_id', '1');168 $result = $this->Version->getCurrent('test_user_tbl', 'user_id', '1'); 169 169 $this->assertTrue(is_array($result) && !empty($result)); 170 170 } … … 172 172 } 173 173 // Running the test. 174 $suite = new PHPUnit_TestSuite(' RecordVersionTest');174 $suite = new PHPUnit_TestSuite('VersionTest'); 175 175 $result = PHPUnit::run($suite); 176 176 echo $result->toString();
Note: See TracChangeset
for help on using the changeset viewer.