Author: mgiagnoni
Date: 2010-09-19 15:59:34 +0200 (Sun, 19 Sep 2010)
New Revision: 30927
Modified:
plugins/lyMediaManagerPlugin/trunk/lib/form/doctrine/base/BaselyMediaUploadForm.class.php
plugins/lyMediaManagerPlugin/trunk/lib/helper/lyMediaHelper.php
plugins/lyMediaManagerPlugin/trunk/lib/lyMediaFileSystem.class.php
plugins/lyMediaManagerPlugin/trunk/lib/lyMediaTools.class.php
plugins/lyMediaManagerPlugin/trunk/lib/model/doctrine/PluginlyMediaFolder.class.php
plugins/lyMediaManagerPlugin/trunk/lib/test/lyMediaTestFunctional.class.php
plugins/lyMediaManagerPlugin/trunk/modules/lyMediaAsset/templates/_asset_icon.php
plugins/lyMediaManagerPlugin/trunk/test/bootstrap/functional.php
plugins/lyMediaManagerPlugin/trunk/test/bootstrap/unit.php
plugins/lyMediaManagerPlugin/trunk/test/unit/lyMediaFolderTableTest.php
plugins/lyMediaManagerPlugin/trunk/test/unit/lyMediaFolderTest.php
Log:
Removed other functions from 'tools' class.
Modified:
plugins/lyMediaManagerPlugin/trunk/lib/form/doctrine/base/BaselyMediaUploadForm.class.php
===================================================================
---
plugins/lyMediaManagerPlugin/trunk/lib/form/doctrine/base/BaselyMediaUploadForm.class.php
2010-09-19 11:27:13 UTC (rev 30926)
+++
plugins/lyMediaManagerPlugin/trunk/lib/form/doctrine/base/BaselyMediaUploadForm.class.php
2010-09-19 13:59:34 UTC (rev 30927)
@@ -35,7 +35,7 @@
$this->widgetSchema['filename'] = new sfWidgetFormInputFile();
$this->validatorSchema['filename'] = new lyMediaValidatorFile(array(
'required' => 'true',
- 'path' => lyMediaTools::getBasePath() .
$this->getOption('folder')->getRelativePath(),
+ 'path' => $this->getOption('folder')->getRelativePath(),
'mime_types' => lyMediaTools::getAllowedMimeTypes(),
'allowed_extensions' => lyMediaTools::getAllowedExtensions()
));
Modified: plugins/lyMediaManagerPlugin/trunk/lib/helper/lyMediaHelper.php
===================================================================
--- plugins/lyMediaManagerPlugin/trunk/lib/helper/lyMediaHelper.php
2010-09-19 11:27:13 UTC (rev 30926)
+++ plugins/lyMediaManagerPlugin/trunk/lib/helper/lyMediaHelper.php
2010-09-19 13:59:34 UTC (rev 30927)
@@ -53,4 +53,8 @@
}
return $uri;
+}
+function format_asset_caption($asset)
+{
+
return(nl2br(wordwrap($asset->getFilename(),sfConfig::get('app_lyMediaManager_caption_row_max_chars',20),
"\n", true)));
}
\ No newline at end of file
Modified: plugins/lyMediaManagerPlugin/trunk/lib/lyMediaFileSystem.class.php
===================================================================
--- plugins/lyMediaManagerPlugin/trunk/lib/lyMediaFileSystem.class.php
2010-09-19 11:27:13 UTC (rev 30926)
+++ plugins/lyMediaManagerPlugin/trunk/lib/lyMediaFileSystem.class.php
2010-09-19 13:59:34 UTC (rev 30927)
@@ -63,6 +63,30 @@
}
/**
+ * Checks if a path is a regular directory.
+ *
+ * @param string $path (can be relative to web dir)
+ * @return bool
+ */
+ public function is_dir($path)
+ {
+ $path = $this->makePathAbsolute($path);
+ return is_dir($path);
+ }
+
+ /**
+ * Checks if a path is a regular file.
+ *
+ * @param string $path (can be relative to web dir)
+ * @return bool
+ */
+ public function is_file($path)
+ {
+ $path = $this->makePathAbsolute($path);
+ return is_file($path);
+ }
+
+ /**
* Transforms a path relative to web dir (for example the value of
relativePath
* property of lyMediaFolder class) in absolute path.
*
Modified: plugins/lyMediaManagerPlugin/trunk/lib/lyMediaTools.class.php
===================================================================
--- plugins/lyMediaManagerPlugin/trunk/lib/lyMediaTools.class.php
2010-09-19 11:27:13 UTC (rev 30926)
+++ plugins/lyMediaManagerPlugin/trunk/lib/lyMediaTools.class.php
2010-09-19 13:59:34 UTC (rev 30927)
@@ -19,11 +19,6 @@
*/
class lyMediaTools
{
- public static function formatAssetCaption($asset)
- {
-
return(nl2br(wordwrap($asset->getFilename(),sfConfig::get('app_lyMediaManager_caption_row_max_chars',20),
"\n", true)));
- }
-
public static function getAllowedExtensions()
{
return sfConfig::get('app_lyMediaManager_allowed_extensions',
@@ -42,11 +37,6 @@
));
}
- public static function getBasePath()
- {
- return sfConfig::get('sf_web_dir') . DIRECTORY_SEPARATOR;
- }
-
public static function log($message, $color = '')
{
switch ($color)
Modified:
plugins/lyMediaManagerPlugin/trunk/lib/model/doctrine/PluginlyMediaFolder.class.php
===================================================================
---
plugins/lyMediaManagerPlugin/trunk/lib/model/doctrine/PluginlyMediaFolder.class.php
2010-09-19 11:27:13 UTC (rev 30926)
+++
plugins/lyMediaManagerPlugin/trunk/lib/model/doctrine/PluginlyMediaFolder.class.php
2010-09-19 13:59:34 UTC (rev 30927)
@@ -248,7 +248,7 @@
}
}
- $dirs =
sfFinder::type('dir')->maxdepth(0)->discard(lyMediaTools::getThumbnailFolder())->ignore_version_control()->in($baseFolder);
+ $dirs =
sfFinder::type('dir')->maxdepth(0)->discard(lyMediaThumbnails::getThumbnailFolder())->ignore_version_control()->in($baseFolder);
$folders = $this->getSubfoldersWithFolderNames();
foreach ($dirs as $dir)
{
Modified:
plugins/lyMediaManagerPlugin/trunk/lib/test/lyMediaTestFunctional.class.php
===================================================================
--- plugins/lyMediaManagerPlugin/trunk/lib/test/lyMediaTestFunctional.class.php
2010-09-19 11:27:13 UTC (rev 30926)
+++ plugins/lyMediaManagerPlugin/trunk/lib/test/lyMediaTestFunctional.class.php
2010-09-19 13:59:34 UTC (rev 30927)
@@ -71,16 +71,15 @@
*/
protected function checkFile($folder, $file, $check_thumbs = true, $exist =
true)
{
- $file_path = lyMediaTools::getBasePath() . $folder . $file;
+ $fs = new lyMediaFileSystem();
+ $this->test()->is($fs->is_file($folder . $file), $exist, 'File ' . $folder
. $file . ($exist ? ' has ' : ' has not ') . 'been found');
- $this->test()->is(is_file($file_path), $exist, 'File ' . $folder . $file .
($exist ? ' has ' : ' has not ') . 'been found');
-
if($check_thumbs)
{
$tn = new lyMediaThumbnails($folder, $file);
foreach($tn->getThumbnailPaths() as $file_path)
{
- $this->test()->is(is_file($file_path), $exist, 'Thumbnail ' .
basename($file_path) . ($exist ? ' has ' : ' has not ') . 'been found');
+ $this->test()->is($fs->is_file($file_path), $exist, 'Thumbnail ' .
basename($file_path) . ($exist ? ' has ' : ' has not ') . 'been found');
}
}
return $this;
Modified:
plugins/lyMediaManagerPlugin/trunk/modules/lyMediaAsset/templates/_asset_icon.php
===================================================================
---
plugins/lyMediaManagerPlugin/trunk/modules/lyMediaAsset/templates/_asset_icon.php
2010-09-19 11:27:13 UTC (rev 30926)
+++
plugins/lyMediaManagerPlugin/trunk/modules/lyMediaAsset/templates/_asset_icon.php
2010-09-19 13:59:34 UTC (rev 30927)
@@ -15,7 +15,7 @@
<?php echo thumbnail_image_tag($asset, $folder->getRelativePath(),
'small', 'alt=asset title=' . $asset->getTitle()); ?>
</div>
<div class="lymedia_caption">
- <?php echo lyMediaTools::formatAssetCaption($asset); ?>
+ <?php echo format_asset_caption($asset); ?>
</div>
<div class="lymedia_iconbar">
<ul class="lymedia_actions_icons">
Modified: plugins/lyMediaManagerPlugin/trunk/test/bootstrap/functional.php
===================================================================
--- plugins/lyMediaManagerPlugin/trunk/test/bootstrap/functional.php
2010-09-19 11:27:13 UTC (rev 30926)
+++ plugins/lyMediaManagerPlugin/trunk/test/bootstrap/functional.php
2010-09-19 13:59:34 UTC (rev 30927)
@@ -25,7 +25,7 @@
sfContext::createInstance($configuration);
//Remove test dirs
-$rootdir = lyMediaTools::getBasePath() .
sfConfig::get('app_lyMediaManager_media_root', 'media');
+$rootdir = sfConfig::get('sf_web_dir') . DIRECTORY_SEPARATOR .
sfConfig::get('app_lyMediaManager_media_root', 'media');
$test_dirs = array($rootdir . '/testsub1', $rootdir . '/testsub2');
$files = sfFinder::type('any')->maxdepth(4)->in($test_dirs);
Modified: plugins/lyMediaManagerPlugin/trunk/test/bootstrap/unit.php
===================================================================
--- plugins/lyMediaManagerPlugin/trunk/test/bootstrap/unit.php 2010-09-19
11:27:13 UTC (rev 30926)
+++ plugins/lyMediaManagerPlugin/trunk/test/bootstrap/unit.php 2010-09-19
13:59:34 UTC (rev 30927)
@@ -19,7 +19,7 @@
$configuration = ProjectConfiguration::getApplicationConfiguration(
'frontend', 'test', true);
//Remove test dirs
-$rootdir = lyMediaTools::getBasePath() . 'test_root';
+$rootdir = sfConfig::get('sf_web_dir') . DIRECTORY_SEPARATOR . 'test_root';
if(is_dir($rootdir))
{
$files = sfFinder::type('any')->maxdepth(4)->in($rootdir);
Modified:
plugins/lyMediaManagerPlugin/trunk/test/unit/lyMediaFolderTableTest.php
===================================================================
--- plugins/lyMediaManagerPlugin/trunk/test/unit/lyMediaFolderTableTest.php
2010-09-19 11:27:13 UTC (rev 30926)
+++ plugins/lyMediaManagerPlugin/trunk/test/unit/lyMediaFolderTableTest.php
2010-09-19 13:59:34 UTC (rev 30927)
@@ -2,6 +2,7 @@
include(dirname(__FILE__).'/../bootstrap/unit.php');
+$fs = new lyMediaFileSystem();
$t = new lime_test(5, new lime_output_color());
$t->info('->createRoot()');
@@ -11,6 +12,6 @@
$t->is($root->getRelativePath(), 'test_root/', '->getRelativePath()');
$t->ok($root->getNode()->isValidNode(), 'Folder is valid node');
$t->ok($root->getNode()->isRoot(), 'Folder is root');
-$t->ok(is_dir(lyMediaTools::getBasePath() . $root->getRelativePath()), 'Root
dir created in filesystem');
+$t->ok($fs->is_dir($root->getRelativePath()), 'Root dir created in
filesystem');
$t->info('->getRoot()');
$t->is_deeply($root->toArray(),
Doctrine::getTable('lyMediaFolder')->getRoot()->toArray(), '->getRoot()');
Modified: plugins/lyMediaManagerPlugin/trunk/test/unit/lyMediaFolderTest.php
===================================================================
--- plugins/lyMediaManagerPlugin/trunk/test/unit/lyMediaFolderTest.php
2010-09-19 11:27:13 UTC (rev 30926)
+++ plugins/lyMediaManagerPlugin/trunk/test/unit/lyMediaFolderTest.php
2010-09-19 13:59:34 UTC (rev 30927)
@@ -7,6 +7,8 @@
$root = Doctrine::getTable('lyMediaFolder')
->createRoot('test_root');
+$fs = new lyMediaFileSystem();
+
$t = new lime_test(15, new lime_output_color());
$t->info('Create first level folder');
@@ -19,7 +21,7 @@
$t->is($folder->getRelativePath(), 'test_root/test/', '->getRelativePath()');
$t->ok($folder->getNode()->isValidNode(), 'Folder is a valid node');
$t->is($folder->getNode()->getPath('/', true), 'test_root/test', 'Folder has
right path');
-$t->ok(is_dir(lyMediaTools::getBasePath() . $folder->getRelativePath()),
'Folder exists in filesystem');
+$t->ok($fs->is_dir($folder->getRelativePath()), 'Folder exists in filesystem');
$t->info('Create sub-folder');
$sub = new lyMediaFolder();
@@ -30,7 +32,7 @@
$t->is($sub->getRelativePath(), 'test_root/test/test-sub/',
'->getRelativePath()');
$t->ok($sub->getNode()->isValidNode(), 'Folder is a valid node');
$t->is($sub->getNode()->getPath('/', true), 'test_root/test/test-sub',
'Subfolder has right path');
-$t->ok(is_dir(lyMediaTools::getBasePath() . $sub->getRelativePath()), 'Folder
exists in filesystem');
+$t->ok($fs->is_dir($sub->getRelativePath()), 'Folder exists in filesystem');
$folder2 = new lyMediaFolder();
$folder2->setName('test2');
@@ -43,7 +45,7 @@
$t->is($folder2->getRelativePath(), 'test_root/test/test2/',
'->getRelativePath()');
$t->is($folder2->getNode()->getPath('/', true), 'test_root/test/test2',
'Folder has right path');
-$t->ok(is_dir(lyMediaTools::getBasePath() . $folder2->getRelativePath()),
'Folder exists in filesystem');
+$t->ok($fs->is_dir($folder2->getRelativePath()), 'Folder exists in
filesystem');
$t->info('Move folder deeper');
$folder2->move($sub);
@@ -51,4 +53,4 @@
$t->is($folder2->getRelativePath(), 'test_root/test/test-sub/test2/',
'->getRelativePath()');
$t->is($folder2->getNode()->getPath('/', true),
'test_root/test/test-sub/test2', 'Folder has right path');
-$t->ok(is_dir(lyMediaTools::getBasePath() . $folder2->getRelativePath()),
'Folder exists in filesystem');
+$t->ok($fs->is_dir($folder2->getRelativePath()), 'Folder exists in
filesystem');
--
You received this message because you are subscribed to the Google Groups
"symfony SVN" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/symfony-svn?hl=en.
