From e18a7498a6a08ce68b5f2e115989ab371e54e076 Mon Sep 17 00:00:00 2001 From: Nigel Banks Date: Tue, 12 Feb 2013 09:39:51 +0100 Subject: [PATCH] Filename conventions. --- .../{islandora_authtokens.inc => authtokens.inc} | 0 ...y_controller.inc => object.entity_controller.inc} | 0 includes/{islandora_tuque.inc => tuque.inc} | 0 ...islandora_tuque_wrapper.inc => tuque_wrapper.inc} | 0 islandora.info | 12 ++++++------ islandora.module | 8 ++++---- tests/{islandora_authtokens.test => authtokens.test} | 6 +++--- tests/{islandora_hooks.test => hooks.test} | 0 ...islandora_hooks_test.info => islandora_test.info} | 3 +-- ...ndora_hooks_test.module => islandora_test.module} | 0 ...islandora_web_test_case.inc => web_test_case.inc} | 0 theme/{islandora.theme.inc => theme.inc} | 0 12 files changed, 14 insertions(+), 15 deletions(-) rename includes/{islandora_authtokens.inc => authtokens.inc} (100%) rename includes/{islandora_object.entity_controller.inc => object.entity_controller.inc} (100%) rename includes/{islandora_tuque.inc => tuque.inc} (100%) rename includes/{islandora_tuque_wrapper.inc => tuque_wrapper.inc} (100%) rename tests/{islandora_authtokens.test => authtokens.test} (94%) rename tests/{islandora_hooks.test => hooks.test} (100%) rename tests/{islandora_hooks_test.info => islandora_test.info} (62%) rename tests/{islandora_hooks_test.module => islandora_test.module} (100%) rename tests/{islandora_web_test_case.inc => web_test_case.inc} (100%) rename theme/{islandora.theme.inc => theme.inc} (100%) diff --git a/includes/islandora_authtokens.inc b/includes/authtokens.inc similarity index 100% rename from includes/islandora_authtokens.inc rename to includes/authtokens.inc diff --git a/includes/islandora_object.entity_controller.inc b/includes/object.entity_controller.inc similarity index 100% rename from includes/islandora_object.entity_controller.inc rename to includes/object.entity_controller.inc diff --git a/includes/islandora_tuque.inc b/includes/tuque.inc similarity index 100% rename from includes/islandora_tuque.inc rename to includes/tuque.inc diff --git a/includes/islandora_tuque_wrapper.inc b/includes/tuque_wrapper.inc similarity index 100% rename from includes/islandora_tuque_wrapper.inc rename to includes/tuque_wrapper.inc diff --git a/islandora.info b/islandora.info index c17ba661..9763819b 100644 --- a/islandora.info +++ b/islandora.info @@ -8,10 +8,10 @@ stylesheets[all][] = css/islandora.base.css stylesheets[all][] = css/islandora.theme.css files[] = includes/mime_detect.inc files[] = includes/dublin_core.inc -files[] = includes/islandora_tuque.inc -files[] = includes/islandora_tuque_wrapper.inc -files[] = includes/islandora_object.entity_controller.inc -files[] = tests/islandora_web_test_case.inc -files[] = tests/islandora_authtokens.test -files[] = tests/islandora_hooks.test +files[] = includes/tuque.inc +files[] = includes/tuque_wrapper.inc +files[] = includes/object.entity_controller.inc +files[] = tests/web_test_case.inc +files[] = tests/authtokens.test +files[] = tests/hooks.test php = 5.3 diff --git a/islandora.module b/islandora.module index bddb2967..e85a4156 100644 --- a/islandora.module +++ b/islandora.module @@ -227,13 +227,13 @@ function islandora_theme() { return array( // default object template 'islandora_default' => array( - 'file' => 'theme/islandora.theme.inc', + 'file' => 'theme/theme.inc', 'template' => 'theme/islandora-object', 'variables' => array('islandora_object' => NULL), ), // default edit page 'islandora_default_edit' => array( - 'file' => 'theme/islandora.theme.inc', + 'file' => 'theme/theme.inc', 'template' => 'theme/islandora-object-edit', 'variables' => array('islandora_object' => NULL), ), @@ -615,7 +615,7 @@ function islandora_tokened_object_load($object_id, $map) { if (array_key_exists('token', $_GET)) { $token = filter_input(INPUT_GET, 'token', FILTER_SANITIZE_STRING); if ($token) { - module_load_include('inc', 'islandora', 'includes/islandora_authtokens'); + module_load_include('inc', 'islandora', 'includes/authtokens'); $token_user = islandora_validate_object_token($object_id, $map[4], $token); $token_user = $token_user ? user_load($token_user->uid) : NULL; islandora_get_tuque_connection($token_user); @@ -794,7 +794,7 @@ function islandora_delete_datastream(FedoraDatastream &$datastream) { * Removes expired authentication tokens. */ function islandora_cron() { - module_load_include('inc', 'islandora', 'includes/islandora_authtokens'); + module_load_include('inc', 'islandora', 'includes/authtokens'); islandora_remove_expired_tokens(); } diff --git a/tests/islandora_authtokens.test b/tests/authtokens.test similarity index 94% rename from tests/islandora_authtokens.test rename to tests/authtokens.test index 326225f2..ccd3088a 100644 --- a/tests/islandora_authtokens.test +++ b/tests/authtokens.test @@ -29,7 +29,7 @@ class IslandoraAuthtokensTestCase extends IslandoraWebTestCase { * Test redeeming invalid tokens. */ public function testRedeemInvalidToken() { - module_load_include('inc', 'islandora', 'includes/islandora_authtokens'); + module_load_include('inc', 'islandora', 'includes/authtokens'); $token = islandora_get_object_token('test:pid', 'woot', 1); $this->assertTrue($token, 'Token was generated correctly.', 'Unit Tests'); // Redeem a token that doesn't exist with real pid and dsid. @@ -41,7 +41,7 @@ class IslandoraAuthtokensTestCase extends IslandoraWebTestCase { * Test redeeming valid tokens. */ public function testRedeemValidToken() { - module_load_include('inc', 'islandora', 'includes/islandora_authtokens'); + module_load_include('inc', 'islandora', 'includes/authtokens'); // Change the current user. global $user; $user_backup = $user; @@ -82,7 +82,7 @@ class IslandoraAuthtokensTestCase extends IslandoraWebTestCase { // Do some voodoo to get a token as the user we are connecting as // to do this we need to change the user we are logged in as. - module_load_include('inc', 'islandora', 'includes/islandora_authtokens'); + module_load_include('inc', 'islandora', 'includes/authtokens'); global $user; $backup = $user; $user = $account; diff --git a/tests/islandora_hooks.test b/tests/hooks.test similarity index 100% rename from tests/islandora_hooks.test rename to tests/hooks.test diff --git a/tests/islandora_hooks_test.info b/tests/islandora_test.info similarity index 62% rename from tests/islandora_hooks_test.info rename to tests/islandora_test.info index 9d211978..c6cb57ad 100644 --- a/tests/islandora_hooks_test.info +++ b/tests/islandora_test.info @@ -1,7 +1,6 @@ -name = Islandora Hook testing +name = Islandora Test Module description = Tests Hooks. Do not enable. core = 7.x package = Testing hidden = TRUE dependencies[] = islandora -files[] = islandora_hooks_test.module diff --git a/tests/islandora_hooks_test.module b/tests/islandora_test.module similarity index 100% rename from tests/islandora_hooks_test.module rename to tests/islandora_test.module diff --git a/tests/islandora_web_test_case.inc b/tests/web_test_case.inc similarity index 100% rename from tests/islandora_web_test_case.inc rename to tests/web_test_case.inc diff --git a/theme/islandora.theme.inc b/theme/theme.inc similarity index 100% rename from theme/islandora.theme.inc rename to theme/theme.inc