Merge 143ed56927 into dd50626677

includes/solution_packs.inc

@@ -318,6 +318,14 @@ function islandora_install_solution_pack($module, $op = 'install', $force = FALS
     return;
   }
 
+  // Login as user 1 if the installation is coming from the command line (e.g.
+  // drush).
+  if (drupal_is_cli()) {
+    global $user;
+    $user = user_load(1);
+    user_login_finalize();
+  }
+
   $t = get_t();
 
   // Some general replacements.
@@ -412,6 +420,14 @@ function islandora_install_solution_pack($module, $op = 'install', $force = FALS
  *    directly for each solution pack.
  */
 function islandora_uninstall_solution_pack($module, $force = FALSE) {
+  // Login as user 1 if the uninstall is coming from the command line (e.g.
+  // drush).
+  if (drupal_is_cli()) {
+    global $user;
+    $user = user_load(1);
+    user_login_finalize();
+  }
+
   $t = get_t();
   drupal_load('module', 'islandora');
   module_load_include('inc', 'islandora', 'includes/utilities');

includes/utilities.inc

@@ -912,3 +912,27 @@ function islandora_as_renderable_array(&$markup_array) {
   }
   unset($value);
 }
+
+/**
+ * Creates and returns a singleton of tuque if one does not already exist.
+ *
+ * @param object $user
+ *   User who created the request.
+ * @param object $url
+ *   URL to Fedora.
+ *
+ * @return IslandoraTuque
+ *   An IslandoraTuque instance.
+ */
+function islandora_make_tuque($user, $url) {
+  if (IslandoraTuque::exists()) {
+    try {
+      return new IslandoraTuque($user, $url);
+    }
+    catch (Exception $e) {
+      drupal_set_message(t('Unable to connect to the repository %e', array('%e' => $e)), 'error');
+    }
+  }
+
+  return NULL;
+}

islandora.info

@@ -20,4 +20,5 @@ files[] = tests/islandora_manage_permissions.test
 files[] = tests/datastream_versions.test
 files[] = tests/datastream_cache.test
 files[] = tests/derivatives.test
+files[] = tests/islandora_tuque.test
 php = 5.3

islandora.module

@@ -1012,7 +1012,7 @@ function islandora_default_islandora_printer_object($object, $alter) {
  *
  * Includes some very basic error logging.
  *
- * @param object $user
+ * @param object $new_user
  *   The user to connect as.
  * @param string $url
  *   The URL to connect to.
@@ -1020,19 +1020,30 @@ function islandora_default_islandora_printer_object($object, $alter) {
  * @return IslandoraTuque
  *   A IslandoraTuque instance
  */
-function islandora_get_tuque_connection($user = NULL, $url = NULL) {
+function islandora_get_tuque_connection($new_user = NULL, $url = NULL) {
+  module_load_include('inc', 'islandora', 'includes/utilities');
+
   $tuque = &drupal_static(__FUNCTION__);
+
+  if ($new_user === NULL) {
+    global $user;
+    $new_user = $user;
+  }
+
+  // If tuque is NULL.
   if (!$tuque) {
-    if (IslandoraTuque::exists()) {
-      try {
-        $tuque = new IslandoraTuque($user, $url);
-      }
-      catch (Exception $e) {
-        drupal_set_message(t('Unable to connect to the repository %e', array('%e' => $e)), 'error');
-      }
+    $tuque = islandora_make_tuque($new_user, $url);
+  }
+  // Else, tuque already exists.  So only make it if the users are different.
+  else {
+    // Get the name of the new user.  If it's '', then it's actually
+    // 'anonymous' as far as Tuque is concerned.
+    $new_user_name = $new_user->name;
+    if (empty($new_user_name)) {
+      $new_user_name = 'anonymous';
     }
-    else {
-      return NULL;
+    if ($new_user_name != $tuque->connection->username) {
+      $tuque = islandora_make_tuque($new_user, $url);
     }
   }
   return $tuque;

tests/islandora_tuque.test

@@ -0,0 +1,73 @@
+<?php
+
+/**
+ * @file
+ * Tests islandora tuque functionality.
+ */
+
+class IslandoraTuqueTestCase extends IslandoraWebTestCase {
+
+  /**
+   * Gets info to display to describe this test.
+   *
+   * @see IslandoraWebTestCase::getInfo()
+   */
+  public static function getInfo() {
+    return array(
+      'name' => 'Islandora Tuque User Cache',
+      'description' => 'Tests the tuque cache when a user changes.',
+      'group' => 'Islandora',
+    );
+  }
+
+  /**
+   * Prepares enviroment for testing.
+   *
+   * @see IslandoraWebTestCase::setUp()
+   */
+  public function setUp() {
+    parent::setUp(array('islandora'));
+  }
+
+  /**
+   * Tests that a new tuque instance is created when a new user is provided.
+   */
+  public function testTuqueUserChange() {
+    global $user;
+    $tuque = islandora_get_tuque_connection($user);
+    $old_user_name = $tuque->connection->username;
+    $new_user = user_load(0);
+    $tuque = islandora_get_tuque_connection($new_user);
+    $new_user_name = $tuque->connection->username;
+    $this->assertNotEqual($old_user_name, $new_user_name, "User in tuque's connection changes when a new user is provided to islandora_get_tuque_connection().");
+
+    $tuque = islandora_get_tuque_connection();
+    $new_user_name = $tuque->connection->username;
+
+    $this->assertEqual($old_user_name, $new_user_name, "User in tuque's connection changes back when no user is provided.");
+  }
+
+  /**
+   * Tests that tuque does not exist and the user is not null.
+   */
+  public function testTuqueDoesNotExistAndUserIsNotNull() {
+    drupal_static_reset('islandora_get_tuque_connection');
+    $user_to_provide = user_load(1);
+
+    $new_tuque = islandora_get_tuque_connection($user_to_provide);
+    $new_tuque_user_name = $new_tuque->connection->username;
+
+    $this->assertNotNull($new_tuque, 'Tuque is not NULL');
+    $this->assertEqual($user_to_provide->name, $new_tuque_user_name);
+  }
+
+  /**
+   * Tests that tuque does not exist and the user is null.
+   */
+  public function testTuqueDoesNotExistAndUserIsNull() {
+    $new_tuque = islandora_get_tuque_connection();
+    $new_tuque_user_name = $new_tuque->connection->username;
+    global $user;
+    $this->assertEqual($new_tuque_user_name, $user->name);
+  }
+}