From 5e3a8d5e8dc83e391e9a754149721b980fdc0c45 Mon Sep 17 00:00:00 2001 From: gloas <gloas@afi-sa.fr> Date: Tue, 30 Oct 2018 15:46:34 +0100 Subject: [PATCH] dev #78660 rename to Numel --- .../Batch.php | 2 +- .../Config.php | 12 ++++---- .../ModuleMenu.php | 2 +- .../Service.php | 2 +- .../Service/Album.php | 6 ++-- .../Service/Parser.php | 2 +- .../View/Helper/Album.php | 2 +- .../controllers/IndexController.php | 2 +- .../images/icon.png | Bin .../tests/NumelTest.php} | 26 +++++++++--------- .../tests/oai_page1.xml | 0 .../tests/oai_page2.xml | 0 12 files changed, 28 insertions(+), 28 deletions(-) rename library/digital_resources/{EntrepotNumeriqueMelun => Numel}/Batch.php (92%) rename library/digital_resources/{EntrepotNumeriqueMelun => Numel}/Config.php (87%) rename library/digital_resources/{EntrepotNumeriqueMelun => Numel}/ModuleMenu.php (91%) rename library/digital_resources/{EntrepotNumeriqueMelun => Numel}/Service.php (91%) rename library/digital_resources/{EntrepotNumeriqueMelun => Numel}/Service/Album.php (85%) rename library/digital_resources/{EntrepotNumeriqueMelun => Numel}/Service/Parser.php (98%) rename library/digital_resources/{EntrepotNumeriqueMelun => Numel}/View/Helper/Album.php (94%) rename library/digital_resources/{EntrepotNumeriqueMelun => Numel}/controllers/IndexController.php (90%) rename library/digital_resources/{EntrepotNumeriqueMelun => Numel}/images/icon.png (100%) rename library/digital_resources/{EntrepotNumeriqueMelun/tests/EntrepotNumeriqueMelunTest.php => Numel/tests/NumelTest.php} (85%) rename library/digital_resources/{EntrepotNumeriqueMelun => Numel}/tests/oai_page1.xml (100%) rename library/digital_resources/{EntrepotNumeriqueMelun => Numel}/tests/oai_page2.xml (100%) diff --git a/library/digital_resources/EntrepotNumeriqueMelun/Batch.php b/library/digital_resources/Numel/Batch.php similarity index 92% rename from library/digital_resources/EntrepotNumeriqueMelun/Batch.php rename to library/digital_resources/Numel/Batch.php index 993c8507e75..77f7e45151e 100644 --- a/library/digital_resources/EntrepotNumeriqueMelun/Batch.php +++ b/library/digital_resources/Numel/Batch.php @@ -20,4 +20,4 @@ */ -class EntrepotNumeriqueMelun_Batch extends Class_DigitalResource_Batch {} \ No newline at end of file +class Numel_Batch extends Class_DigitalResource_Batch {} \ No newline at end of file diff --git a/library/digital_resources/EntrepotNumeriqueMelun/Config.php b/library/digital_resources/Numel/Config.php similarity index 87% rename from library/digital_resources/EntrepotNumeriqueMelun/Config.php rename to library/digital_resources/Numel/Config.php index 4a962482015..27dc476788e 100644 --- a/library/digital_resources/EntrepotNumeriqueMelun/Config.php +++ b/library/digital_resources/Numel/Config.php @@ -20,26 +20,26 @@ */ -class EntrepotNumeriqueMelun_Config extends Class_DigitalResource_Config { +class Numel_Config extends Class_DigitalResource_Config { protected function _getConfig() { - return ['Introduction' => $this->_('EntrepotNumeriqueMelun'), - 'HelpLink' => 'http://wiki.bokeh-library-portal.org/index.php/EntrepotNumeriqueMelun', + return ['Introduction' => $this->_('Numel'), + 'HelpLink' => 'http://wiki.bokeh-library-portal.org/index.php/Numel', 'Url' => '', 'Icon' => 'http://melun.preprod-osiros.decalog.net/img/logo-melun.png', - 'PermissionLabel' => $this->_('Bibliothèque numérique: accéder à la ressource EntrepotNumeriqueMelun'), + 'PermissionLabel' => $this->_('Bibliothèque numérique: accéder à Numel'), 'NotAllowedMessage' => $this->_('Votre compte n\'est pas autorisé à accéder à cette ressource.'), 'SsoAction' => true, - 'MenuLabel' => $this->_('Lien vers EntrepotNumeriqueMelun'), + 'MenuLabel' => $this->_('Lien vers NuMel'), 'ModuleMenu' => $this->withNameSpace('ModuleMenu'), 'Service' => $this->withNameSpace('Service'), 'Batch' => $this->withNameSpace('Batch'), - 'DocTypeLabel' => $this->_('ressource EntrepotNumeriqueMelun'), + 'DocTypeLabel' => $this->_('NuMel'), 'AdminVars' => ['Harvest_Url' => Class_AdminVar_Meta::newDefault($this->_('URL du service OAI de l\'entrepôt numérique de Melun'), ['value' => 'http://melun.preprod-osiros.decalog.net/oai/'])->bePrivate(), diff --git a/library/digital_resources/EntrepotNumeriqueMelun/ModuleMenu.php b/library/digital_resources/Numel/ModuleMenu.php similarity index 91% rename from library/digital_resources/EntrepotNumeriqueMelun/ModuleMenu.php rename to library/digital_resources/Numel/ModuleMenu.php index 5a0dd82c48b..4deaafabb63 100644 --- a/library/digital_resources/EntrepotNumeriqueMelun/ModuleMenu.php +++ b/library/digital_resources/Numel/ModuleMenu.php @@ -20,4 +20,4 @@ */ -class EntrepotNumeriqueMelun_ModuleMenu extends Class_DigitalResource_ModuleMenu {} \ No newline at end of file +class Numel_ModuleMenu extends Class_DigitalResource_ModuleMenu {} \ No newline at end of file diff --git a/library/digital_resources/EntrepotNumeriqueMelun/Service.php b/library/digital_resources/Numel/Service.php similarity index 91% rename from library/digital_resources/EntrepotNumeriqueMelun/Service.php rename to library/digital_resources/Numel/Service.php index 7f3f4aebf3e..c190705fbed 100644 --- a/library/digital_resources/EntrepotNumeriqueMelun/Service.php +++ b/library/digital_resources/Numel/Service.php @@ -20,4 +20,4 @@ */ -class EntrepotNumeriqueMelun_Service extends Class_DigitalResource_ServiceOAI {} \ No newline at end of file +class Numel_Service extends Class_DigitalResource_ServiceOAI {} \ No newline at end of file diff --git a/library/digital_resources/EntrepotNumeriqueMelun/Service/Album.php b/library/digital_resources/Numel/Service/Album.php similarity index 85% rename from library/digital_resources/EntrepotNumeriqueMelun/Service/Album.php rename to library/digital_resources/Numel/Service/Album.php index bd416dade84..caa049c5279 100644 --- a/library/digital_resources/EntrepotNumeriqueMelun/Service/Album.php +++ b/library/digital_resources/Numel/Service/Album.php @@ -20,7 +20,7 @@ */ -class EntrepotNumeriqueMelun_Service_Album extends Class_WebService_BibNumerique_RessourceNumerique { +class Numel_Service_Album extends Class_WebService_BibNumerique_RessourceNumerique { protected $_origine_doc_type; @@ -31,7 +31,7 @@ class EntrepotNumeriqueMelun_Service_Album extends Class_WebService_BibNumerique protected function getTypeDoc() { - return EntrepotNumeriqueMelun_Config::getInstance()->getDocType(); + return Numel_Config::getInstance()->getDocType(); } public function fillAlbum($album) { @@ -52,6 +52,6 @@ class EntrepotNumeriqueMelun_Service_Album extends Class_WebService_BibNumerique public function getRessourceCategorieLibelle() { - return EntrepotNumeriqueMelun_Config::getInstance()->getDocTypeLabel(); + return Numel_Config::getInstance()->getDocTypeLabel(); } } \ No newline at end of file diff --git a/library/digital_resources/EntrepotNumeriqueMelun/Service/Parser.php b/library/digital_resources/Numel/Service/Parser.php similarity index 98% rename from library/digital_resources/EntrepotNumeriqueMelun/Service/Parser.php rename to library/digital_resources/Numel/Service/Parser.php index a96e0aa0973..770bae0cae7 100644 --- a/library/digital_resources/EntrepotNumeriqueMelun/Service/Parser.php +++ b/library/digital_resources/Numel/Service/Parser.php @@ -20,7 +20,7 @@ */ -class EntrepotNumeriqueMelun_Service_Parser +class Numel_Service_Parser extends Class_WebService_OAI_DublinCoreParser_ForRessourceNumerique { public function endIdentifier($data) { diff --git a/library/digital_resources/EntrepotNumeriqueMelun/View/Helper/Album.php b/library/digital_resources/Numel/View/Helper/Album.php similarity index 94% rename from library/digital_resources/EntrepotNumeriqueMelun/View/Helper/Album.php rename to library/digital_resources/Numel/View/Helper/Album.php index 7a408d68a4a..37b04a240ba 100644 --- a/library/digital_resources/EntrepotNumeriqueMelun/View/Helper/Album.php +++ b/library/digital_resources/Numel/View/Helper/Album.php @@ -20,7 +20,7 @@ */ -class EntrepotNumeriqueMelun_View_Helper_Album extends Class_DigitalResource_AlbumViewHelper { +class Numel_View_Helper_Album extends Class_DigitalResource_AlbumViewHelper { public function album($album) { if (!$album) return ''; diff --git a/library/digital_resources/EntrepotNumeriqueMelun/controllers/IndexController.php b/library/digital_resources/Numel/controllers/IndexController.php similarity index 90% rename from library/digital_resources/EntrepotNumeriqueMelun/controllers/IndexController.php rename to library/digital_resources/Numel/controllers/IndexController.php index 3d3f3b7acb9..c1396572c06 100644 --- a/library/digital_resources/EntrepotNumeriqueMelun/controllers/IndexController.php +++ b/library/digital_resources/Numel/controllers/IndexController.php @@ -20,4 +20,4 @@ */ -class EntrepotNumeriqueMelun_Plugin_IndexController extends Class_DigitalResource_Controller {} \ No newline at end of file +class Numel_Plugin_IndexController extends Class_DigitalResource_Controller {} \ No newline at end of file diff --git a/library/digital_resources/EntrepotNumeriqueMelun/images/icon.png b/library/digital_resources/Numel/images/icon.png similarity index 100% rename from library/digital_resources/EntrepotNumeriqueMelun/images/icon.png rename to library/digital_resources/Numel/images/icon.png diff --git a/library/digital_resources/EntrepotNumeriqueMelun/tests/EntrepotNumeriqueMelunTest.php b/library/digital_resources/Numel/tests/NumelTest.php similarity index 85% rename from library/digital_resources/EntrepotNumeriqueMelun/tests/EntrepotNumeriqueMelunTest.php rename to library/digital_resources/Numel/tests/NumelTest.php index 3eaa695d21a..c60464694c0 100644 --- a/library/digital_resources/EntrepotNumeriqueMelun/tests/EntrepotNumeriqueMelunTest.php +++ b/library/digital_resources/Numel/tests/NumelTest.php @@ -20,7 +20,7 @@ */ -abstract class EntrepotNumeriqueMelunActivatedTestCase extends AbstractControllerTestCase { +abstract class NumelActivatedTestCase extends AbstractControllerTestCase { protected $_storm_default_to_volatile = true, $_user; @@ -28,8 +28,8 @@ abstract class EntrepotNumeriqueMelunActivatedTestCase extends AbstractControlle public function setUp() { parent::setUp(); - Class_AdminVar::set('EntrepotNumeriqueMelun_SSO_URL', 'https://test.org/api/bokeh/login'); - Class_AdminVar::set('EntrepotNumeriqueMelun_EntrepotNumeriqueMelun', '1'); + Class_AdminVar::set('Numel_SSO_URL', 'https://test.org/api/bokeh/login'); + Class_AdminVar::set('Numel_Numel', '1'); $group = $this->fixture('Class_UserGroup', ['id' => 1, @@ -43,7 +43,7 @@ abstract class EntrepotNumeriqueMelunActivatedTestCase extends AbstractControlle $this->fixture('Class_Permission', ['id' => 1, - 'code' => 'EntrepotNumeriqueMelun']) + 'code' => 'Numel']) ->permitTo($group, new Class_Entity()); } } @@ -51,13 +51,13 @@ abstract class EntrepotNumeriqueMelunActivatedTestCase extends AbstractControlle -class EntrepotNumeriqueMelunDashboardUnactivatedTest extends Admin_AbstractControllerTestCase { +class NumelDashboardUnactivatedTest extends Admin_AbstractControllerTestCase { protected $_storm_default_to_volatile = true; public function setUp() { parent::setUp(); - $this->dispatch('/EntrepotNumeriqueMelun_Plugin', true); + $this->dispatch('/Numel_Plugin', true); } @@ -70,7 +70,7 @@ class EntrepotNumeriqueMelunDashboardUnactivatedTest extends Admin_AbstractContr -class EntrepotNumeriqueMelunDashboardActivatedTest extends EntrepotNumeriqueMelunActivatedTestCase { +class NumelDashboardActivatedTest extends NumelActivatedTestCase { protected $_storm_default_to_volatile = true; @@ -80,7 +80,7 @@ class EntrepotNumeriqueMelunDashboardActivatedTest extends EntrepotNumeriqueMelu $album = $this->fixture('Class_Album', ['id' => 20, 'titre' => '10 moutons', - 'type_doc_id' => 'EntrepotNumeriqueMelun', + 'type_doc_id' => 'Numel', ]) ->addThumbnailURI('userfiles/album/20/thumb_20_large_10Moutons.jpeg') ->addPosterURI('userfiles/album/20/thumb_20_large_10Moutons.jpeg'); @@ -91,7 +91,7 @@ class EntrepotNumeriqueMelunDashboardActivatedTest extends EntrepotNumeriqueMelu 'password' => 'admin', 'role_level' => ZendAfi_Acl_AdminControllerRoles::SUPER_ADMIN])); Class_Album::getLoader()->setMemoryCleaner(function() {}); - $this->dispatch('/EntrepotNumeriqueMelun_Plugin', true); + $this->dispatch('/Numel_Plugin', true); } @@ -121,14 +121,14 @@ class EntrepotNumeriqueMelunDashboardActivatedTest extends EntrepotNumeriqueMelu /** @test */ public function doctypeImageUrlShouldBePresent() { - $this->assertXPath('//h4/img[contains(@src, "/digital-resource/typedoc-icon/id/EntrepotNumeriqueMelun")]'); + $this->assertXPath('//h4/img[contains(@src, "/digital-resource/typedoc-icon/id/Numel")]'); } } -class EntrepotNumeriqueMelunHarvestTests extends EntrepotNumeriqueMelunActivatedTestCase { +class NumelHarvestTests extends NumelActivatedTestCase { protected $_storm_default_to_volatile = true, @@ -149,7 +149,7 @@ class EntrepotNumeriqueMelunHarvestTests extends EntrepotNumeriqueMelunActivated ->answers(file_get_contents(__DIR__ . '/oai_page2.xml')) ; - $this->_service = EntrepotNumeriqueMelun_Service::getInstance(); + $this->_service = Numel_Service::getInstance(); $this->_service->setDefaultHttpClient($http_client); $this->_service->harvest(); @@ -159,7 +159,7 @@ class EntrepotNumeriqueMelunHarvestTests extends EntrepotNumeriqueMelunActivated /** @test */ public function harvestingShouldHaveCreate39Albums() { - $this->assertEquals(39, EntrepotNumeriqueMelun_Config::getInstance()->countAlbums()); + $this->assertEquals(39, Numel_Config::getInstance()->countAlbums()); } diff --git a/library/digital_resources/EntrepotNumeriqueMelun/tests/oai_page1.xml b/library/digital_resources/Numel/tests/oai_page1.xml similarity index 100% rename from library/digital_resources/EntrepotNumeriqueMelun/tests/oai_page1.xml rename to library/digital_resources/Numel/tests/oai_page1.xml diff --git a/library/digital_resources/EntrepotNumeriqueMelun/tests/oai_page2.xml b/library/digital_resources/Numel/tests/oai_page2.xml similarity index 100% rename from library/digital_resources/EntrepotNumeriqueMelun/tests/oai_page2.xml rename to library/digital_resources/Numel/tests/oai_page2.xml -- GitLab