tonyair
/
silverstripe-dms
mirror of https://github.com/silverstripe/silverstripe-dms
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

API-CHANGE: fixing up the DMS and tests

This commit is contained in:
Julian Seidenberg 2012-07-17 13:52:46 +12:00
parent 5bf381c87b
commit 27d666a08d
3 changed files with 47 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
code/DMS.php
View File

@ -45,14 +45,15 @@ class DMS implements DMSInterface {
$fromFilename = basename($fromPath);
$toFilename = $docID . '~' . $fromFilename; //add the docID to the start of the Filename
$toFolder = self::getStorageFolder($docID);
$toPath = $toFolder . DIRECTORY_SEPARATOR . $toFilename;
$this->createStorageFolder($toFolder);
$toPath = self::$dmsPath . DIRECTORY_SEPARATOR . $toFolder . DIRECTORY_SEPARATOR . $toFilename;
$this->createStorageFolder(self::$dmsPath . DIRECTORY_SEPARATOR . $toFolder);
//copy the file into place
copy($fromPath, self::$dmsPath . DIRECTORY_SEPARATOR . $toPath);
copy($fromPath, $toPath);
//write the filename of the stored document
$doc->Filename = $toPath;
$doc->Filename = $toFilename;
$doc->Folder = $toFolder;
$doc->write();
//set an initial title for the document from the filename
@ -110,6 +111,6 @@ class DMS implements DMSInterface {
*/
static function getStorageFolder($id) {
$folderName = intval($id / self::$dmsFolderSize);
return self::$dmsPath . DIRECTORY_SEPARATOR . $folderName;
return $folderName;
}
}

9
code/DMSDocument.php
View File

@ -3,6 +3,7 @@ class DMSDocument extends DataObject implements DMSDocumentInterface {
static $db = array(
"Filename" => "Text",
"Folder" => "Text"
);
/**
@ -184,4 +185,12 @@ class DMSDocument extends DataObject implements DMSDocumentInterface {
// TODO: Implement getVersions() method.
}
/**
* Returns the full filename of the document stored in this object
* @return string
*/
function getFullPath() {
return DMS::$dmsPath . DIRECTORY_SEPARATOR . $this->Folder . DIRECTORY_SEPARATOR . $this->Filename;
}
}

53
tests/DMSTest.php
View File

@ -1,7 +1,7 @@
<?php
class DMSTest extends SapphireTest {
static $testFile = 'dms/tests/DMS-test-lorum-file';
static $testFile = 'dms/tests/DMS-test-lorum-file.pdf';
//store values to reset back to after this test runs
static $dmsFolderOld;
@ -28,20 +28,22 @@ class DMSTest extends SapphireTest {
}
public function delete($path) {
$it = new RecursiveIteratorIterator(
new RecursiveDirectoryIterator($path),
RecursiveIteratorIterator::CHILD_FIRST
);
foreach ($it as $file) {
if (in_array($file->getBasename(), array('.', '..'))) {
continue;
} elseif ($file->isDir()) {
rmdir($file->getPathname());
} elseif ($file->isFile() || $file->isLink()) {
unlink($file->getPathname());
}
}
rmdir($path);
if (file_exists($path) || is_dir($path)) {
$it = new RecursiveIteratorIterator(
new RecursiveDirectoryIterator($path),
RecursiveIteratorIterator::CHILD_FIRST
);
foreach ($it as $file) {
if (in_array($file->getBasename(), array('.', '..'))) {
continue;
} elseif ($file->isDir()) {
rmdir($file->getPathname());
} elseif ($file->isFile() || $file->isLink()) {
unlink($file->getPathname());
}
}
rmdir($path);
}
}
@ -52,7 +54,7 @@ class DMSTest extends SapphireTest {
$document = $dms->storeDocument($file);
$this->assertNotNull($document, "Document object created");
$this->assertTrue(file_exists(DMS::$dmsPath . DIRECTORY_SEPARATOR . $document->Filename),"Document file copied into DMS folder");
$this->assertTrue(file_exists(DMS::$dmsPath . DIRECTORY_SEPARATOR . $document->Folder . DIRECTORY_SEPARATOR . $document->Filename),"Document file copied into DMS folder");
//$title = $document->getTag('title');
}
@ -63,17 +65,26 @@ class DMSTest extends SapphireTest {
$file = BASE_PATH . DIRECTORY_SEPARATOR . self::$testFile;
$documents = array();
for($i = 0; $i <= 16; $i++) {
$document = $dms->storeDocument($file);
$this->assertNotNull($document, "Document object created on run number: $i");
$this->assertTrue(file_exists($document->getFullPath()));
$documents[] = $document;
}
//test document objects have their folders set
$folders = array();
for($i = 0; $i <= 16; $i++) {
$folderName = $documents[$i]->Folder;
$this->assertTrue(strpos($documents[$i]->getFullPath(), DIRECTORY_SEPARATOR . $folderName . DIRECTORY_SEPARATOR) !== false, "Correct folder name for the documents. Document path contains reference to folder name '$folderName'");
$folders[] = $folderName;
}
//test we created 4 folder to contain the 17 files
$this->assertTrue(is_dir(DMS::$dmsPath . DIRECTORY_SEPARATOR . '1'));
$this->assertTrue(is_dir(DMS::$dmsPath . DIRECTORY_SEPARATOR . '2'));
$this->assertTrue(is_dir(DMS::$dmsPath . DIRECTORY_SEPARATOR . '3'));
$this->assertTrue(is_dir(DMS::$dmsPath . DIRECTORY_SEPARATOR . '4'));
$this->assertFalse(is_dir(DMS::$dmsPath . DIRECTORY_SEPARATOR . '5'));
foreach($folders as $f) {
$this->assertTrue(is_dir(DMS::$dmsPath . DIRECTORY_SEPARATOR . $f),"Document folder '$f' exists");
}
}