Changeset 303

Timestamp:

08/02/07 12:49:01 (1 year ago)

Author:

bermiferrer

Message:

This is a big patch provided by salavert that fixes the issues that prevented the unit tests from passing on Windows environments.
It closes #27 and #28.

• Fixing non-standard mime type detection under windows.
  
• Improving DB connection identifier for handling multiple database connections simultaneously.
  
• Improving the migrations versioning scheme. Now versions belong to an specific environment and are stored at app/installers/versions, so you might need to change your existing app/installers/*_version.txt files to app/installers/versions/ENVIRONMENT_*_version.txt
  
• Fixed some setup issues on directory recursion where it made the setup script to fail silently.
  
• Added rewrite base for testing environments.
  

Files:

• trunk/app/installers/versions (added)
• trunk/app/models/framework_setup.php (modified) (3 diffs)
• trunk/lib/Ak.php (modified) (2 diffs)
• trunk/lib/AkInstaller.php (modified) (10 diffs)
• trunk/script/setup (modified) (1 diff)
• trunk/test/fixtures/config/config.php (modified) (2 diffs)
• trunk/test/unit/lib/AkActiveRecord/_AkActiveRecord_3.php (modified) (1 diff)
• trunk/test/unit/lib/utils/_Ak_file_functions.php (modified) (1 diff)

trunk/app/models/framework_setup.php

@@ -244 +244 @@
-        require_once(AK_APP_DIR.DS.'installers'.DS.'framework_installer.php');
-
-development', 'production', 'testing
+production', 'development
-            $db_conn = Ak::db($this->_getDsn($mode));
-            $installer = new FrameworkInstaller($db_conn);
-
+null, array('mode' => $mode)
-        }
-
@@ -329 +329 @@
-%AK_FRAMEWORK_DIR
-
-%AK_ASSET_URL_PREFIX
-
-include_once(dirname(__FILE__).DIRECTORY_SEPARATOR.'boot.php');
-
@@ -362 +360 @@
-            $settings['%AK_FRAMEWORK_DIR'] = defined('AK_FRAMEWORK_DIR') ?
-            "defined('AK_FRAMEWORK_DIR') ? null : define('AK_FRAMEWORK_DIR', '".AK_FRAMEWORK_DIR."');" : '';
-
-
-            $asset_path = $this->_getAssetBasePath();
-            if(!empty($asset_path)){
-                $settings['%AK_ASSET_URL_PREFIX'] = "define('AK_ASSET_URL_PREFIX','/".trim($this->getUrlSuffix(),'/').'/'.$asset_path."');";
-            }else{
-                $settings['%AK_ASSET_URL_PREFIX'] = '';
-            }
-
-        }
-

trunk/lib/Ak.php

@@ -64 +64 @@
-    function &db($dsn = null, $connection_id = null)
-    {
-
+, $default_connection_id
-
-        // In order to retrieve a database connection we just need to provide its identifier
-
-
-
-
+
+
+
+
+
-        if(empty($db[$connection_id])){
-            require_once(AK_CONTRIB_DIR.DS.'adodb'.DS.'adodb.inc.php');
@@ -1649 +1650 @@
-        ak_compat('mime_content_type');
-
-
+@
-
-        if(empty($mime)){
-            empty($mime_types) ? require(AK_LIB_DIR.DS.'utils'.DS.'mime_types.php') : null;
-
-
+
-            $mime = !empty($mime_types[$file_extension]) ? $mime_types[$file_extension] : false;
-        }

trunk/lib/AkInstaller.php

@@ -49 +49 @@
-    function install($version = null, $options = array())
-    {
+        $version = (is_null($version)) ? max($this->getAvailableVersions()) : $version;
+        return $this->_upgradeOrDowngrade('up',  $version , $options);
+    }
+
+    function up($version = null, $options = array())
+    {
-        return $this->_upgradeOrDowngrade('up', $version, $options);
-    }
-
-    function up($version = null, $options = array())
-    {
-        return $this->_upgradeOrDowngrade('up', $version, $options);
-    }
-
-
-    function uninstall($version = null, $options = array())
-    {
+        $version = (is_null($version)) ? 0 : $version;
-        return $this->_upgradeOrDowngrade('down', $version, $options);
-    }
@@ -77 +79 @@
-        }
-
-
+$options
-        $available_versions = $this->getAvailableVersions();
-
@@ -86 +88 @@
-            $version = isset($version[0]) && is_numeric($version[0]) ? $version[0] : $newest_version;
-            $versions = range($current_version+1,$version);
-
+
-            if($current_version > $version){
-                echo Ak::t("You can't upgrade to version %version, when you are currently on version %current_version", array('%version'=>$version,'%current_version'=>$current_version));
@@ -95 +97 @@
-            $versions = range($current_version, empty($version) ? 1 : $version+1);
-
-
+
+
+
-                echo Ak::t("You can't downgrade to version %version, when you just have installed version %current_version", array('%version'=>$version,'%current_version'=>$current_version));
-                return false;
@@ -153 +157 @@
-        $this->transactionComplete();
-        if($success){
-
+, $options
-        }
-        return $success;
@@ -164 +168 @@
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-        if(!is_file($version_file)){
-
-
-
-
-
-
-
-
-
+, $options
+
+$options
+
+
+
+, $options = array()
+
+$options
-    }
-
@@ -317 +323 @@
-        $index_name = ($index_name == '') ? 'idx_'.$table_name.'_'.$columns : $index_name;
-        $index_options = array();
- (preg_match('/(UNIQUE|FULLTEXT|HASH)/',$columns,$match)) 
+(preg_match('/(UNIQUE|FULLTEXT|HASH)/',$columns,$match))
-            $columns = trim(str_replace($match[1],'',$columns),' ');
-            $index_options[] = $match[1];
@@ -326 +332 @@
-    function removeIndex($table_name, $columns_or_index_name)
-    {
- 
+
-        $available_indexes =& $this->db->MetaIndexes($table_name);
-        $index_name = isset($available_indexes[$columns_or_index_name]) ? $columns_or_index_name : 'idx_'.$table_name.'_'.$columns_or_index_name;
- (!isset($available_indexes[$index_name])) 
+(!isset($available_indexes[$index_name]))
-            trigger_error(Ak::t('Index %index_name does not exist.', array('%index_name'=>$index_name)), E_USER_NOTICE);
-            return false;
@@ -408 +414 @@
-            if(strstr($columns,"\n")){
-                $columns = explode("\n",$columns);
- 
+
-                $columns = explode(',',$columns);
-            }
@@ -437 +443 @@
-            if(is_string($replacement)){
-                $column = preg_replace($regex,$replacement,$column);
- 
+
-                $column = call_user_func_array($replacement,$match);
-            }

trunk/script/setup

@@ -126 +126 @@
-    {
-        foreach($this->source_tree as $k=>$node){
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-    }
-

trunk/test/fixtures/config/config.php

@@ -20 +20 @@
-(array)@explode('/',@$_SERVER['REQUEST_URI']))),DIRECTORY_SEPARATOR),array('','/'),AK_TEST_DIR));
-
- 
+
-//define('AK_SKIP_DB_CONNECTION',isset($db) && $db === false);
-
@@ -30 +30 @@
-
-defined('AK_TESTING_URL') ? null : define('AK_TESTING_URL', rtrim(AK_URL,'/').'/test/fixtures/public');
+defined('AK_TESTING_REWRITE_BASE') ? null : define('AK_TESTING_REWRITE_BASE', false);
-
-defined('AK_LIB_TESTS_DIRECTORY') ? null : define('AK_LIB_TESTS_DIRECTORY', AK_TEST_DIR.DS.'unit'.DS.'lib');
+
+if(AK_TESTING_REWRITE_BASE){
+    Ak::file_put_contents(AK_BASE_DIR.'/test/fixtures/public/.htaccess', str_replace('# RewriteBase /test/fixtures/public','RewriteBase '.AK_TESTING_REWRITE_BASE, Ak::file_get_contents(AK_BASE_DIR.'/test/fixtures/public/.htaccess')));
+}
-
-if(defined('AK_TEST_DATABASE_ON')){

trunk/test/unit/lib/AkActiveRecord/_AkActiveRecord_3.php

@@ -284 +284 @@
-    function Test_of_binary_data_on_database()
-    {
-Ak::
+
-
-        $_tmp_file = fopen(AK_LIB_DIR.DS.'AkActiveRecord.php', "rb");

trunk/test/unit/lib/utils/_Ak_file_functions.php

@@ -103 +103 @@
-    function test_mime_type_detection()
-    {
-
+
+
-        $this->assertEqual(Ak::mime_content_type('C:\Folder\image.png'),'image/png');
+    }
+
+    function test_should_read_files_using_scoped_file_get_contents_function()
+    {
+        $this->assertEqual(Ak::file_get_contents(AK_LIB_DIR.DS.'AkActiveRecord.php'), file_get_contents(AK_LIB_DIR.DS.'AkActiveRecord.php'));
-    }
-