From 1cf2285a42bad0b768b38223ab372f4cdc69e538 Mon Sep 17 00:00:00 2001 From: Tiago Garcia Date: Mon, 1 Aug 2016 18:33:19 +0200 Subject: [PATCH] Rename CartoDB to Carto --- .gitignore | 2 +- {CartoDB => Carto}/ConnectionFactory.php | 2 +- {CartoDB => Carto}/SymfonySessionStorage.php | 2 +- .../CartoLinkListener.php | 4 ++-- .../Mapping/CartoDBColumn.php | 4 ++-- .../Mapping/CartoDBLink.php | 4 ++-- .../Mapping/Driver/Annotation.php | 10 ++++---- DependencyInjection/Configuration.php | 6 ++--- ...nsion.php => SimbioticaCartoExtension.php} | 14 +++++------ README.md | 4 ++-- Resources/config/services.xml | 24 +++++++++---------- Resources/doc/annotations.rst | 2 +- Resources/doc/configuration.rst | 2 +- Resources/doc/index.rst | 4 ++-- SimbioticaCartoBundle.php | 9 +++++++ SimbioticaCartoDBBundle.php | 9 ------- .../CartoDBTest.php => Carto/CartoTest.php} | 8 +++---- Tests/Functional/app/AppKernel.php | 6 ++--- Tests/Functional/app/config/.gitignore | 1 - ..._config.yml.dist => carto_config.yml.dist} | 4 ++-- Tests/Functional/app/config/config_test.yml | 2 +- composer.json | 6 ++--- phpunit.xml.dist | 2 +- 23 files changed, 65 insertions(+), 66 deletions(-) rename {CartoDB => Carto}/ConnectionFactory.php (96%) rename {CartoDB => Carto}/SymfonySessionStorage.php (95%) rename CartoDBLink/CartoDBLinkListener.php => CartoLink/CartoLinkListener.php (99%) rename {CartoDBLink => CartoLink}/Mapping/CartoDBColumn.php (78%) rename {CartoDBLink => CartoLink}/Mapping/CartoDBLink.php (76%) rename {CartoDBLink => CartoLink}/Mapping/Driver/Annotation.php (90%) rename DependencyInjection/{SimbioticaCartoDBExtension.php => SimbioticaCartoExtension.php} (86%) create mode 100644 SimbioticaCartoBundle.php delete mode 100644 SimbioticaCartoDBBundle.php rename Tests/{CartoDB/CartoDBTest.php => Carto/CartoTest.php} (96%) delete mode 100644 Tests/Functional/app/config/.gitignore rename Tests/Functional/app/config/{cartodb_config.yml.dist => carto_config.yml.dist} (81%) diff --git a/.gitignore b/.gitignore index e41b579..c67fdc8 100644 --- a/.gitignore +++ b/.gitignore @@ -1,7 +1,7 @@ build phpunit.xml Resources/doc/_build/* -Tests/Functional/app/config/cartodb_config.yml +Tests/Functional/app/config/carto_config.yml composer.lock vendor composer.phar diff --git a/CartoDB/ConnectionFactory.php b/Carto/ConnectionFactory.php similarity index 96% rename from CartoDB/ConnectionFactory.php rename to Carto/ConnectionFactory.php index 9066d6e..3387508 100644 --- a/CartoDB/ConnectionFactory.php +++ b/Carto/ConnectionFactory.php @@ -4,7 +4,7 @@ * @author tiagojsag */ -namespace Simbiotica\CartoDBBundle\CartoDB; +namespace Simbiotica\CartoBundle\Carto; use Simbiotica\CartoDBClient\PublicConnection; use Simbiotica\CartoDBClient\PrivateConnection; diff --git a/CartoDB/SymfonySessionStorage.php b/Carto/SymfonySessionStorage.php similarity index 95% rename from CartoDB/SymfonySessionStorage.php rename to Carto/SymfonySessionStorage.php index bc25fe1..02f273a 100644 --- a/CartoDB/SymfonySessionStorage.php +++ b/Carto/SymfonySessionStorage.php @@ -1,6 +1,6 @@ getMetaReflectionClass($meta); // class annotations - if ($annotation = $this->reader->getClassAnnotation($class, self::CARTODBLINK)) { + if ($annotation = $this->reader->getClassAnnotation($class, self::CARTOLINK)) { if (!$annotation->connection || !$annotation->table) { throw new InvalidMappingException( "CartoDBLink requires \"connection\" and \"table\" configurations, found ".$annotation @@ -49,7 +49,7 @@ public function readExtendedMetadata($meta, array &$config) continue; } // linked property - if ($column = $this->reader->getPropertyAnnotation($property, self::CARTODBCOLUMN)) { + if ($column = $this->reader->getPropertyAnnotation($property, self::CARTOCOLUMN)) { $field = $property->getName(); if (!$column->column) { throw new InvalidMappingException( diff --git a/DependencyInjection/Configuration.php b/DependencyInjection/Configuration.php index d536a82..1d27756 100644 --- a/DependencyInjection/Configuration.php +++ b/DependencyInjection/Configuration.php @@ -1,6 +1,6 @@ root('simbiotica_carto_db'); + $rootNode = $treeBuilder->root('simbiotica_carto'); $rootNode ->append($this->getAnnotationNode('orm')) @@ -58,7 +58,7 @@ private function getAnnotationNode($name) ->prototype('array') ->performNoDeepMerging() ->children() - ->booleanNode('cartodblink')->defaultFalse()->end() + ->booleanNode('cartolink')->defaultFalse()->end() ->end() ->end(); diff --git a/DependencyInjection/SimbioticaCartoDBExtension.php b/DependencyInjection/SimbioticaCartoExtension.php similarity index 86% rename from DependencyInjection/SimbioticaCartoDBExtension.php rename to DependencyInjection/SimbioticaCartoExtension.php index 1c4abbf..5d589c1 100644 --- a/DependencyInjection/SimbioticaCartoDBExtension.php +++ b/DependencyInjection/SimbioticaCartoExtension.php @@ -1,6 +1,6 @@ $listeners) { foreach ($listeners as $ext => $enabled) { - $listener = sprintf('cartodb.listener.%s', $ext); + $listener = sprintf('carto.listener.%s', $ext); if ($enabled && $container->hasDefinition($listener)) { $attributes = array('connection' => $name); $definition = $container->getDefinition($listener); @@ -59,8 +59,8 @@ protected function loadConnection($name, array $connection, ContainerBuilder $co { if ($connection['private']) { $container->setDefinition( - sprintf('simbiotica.cartodb_connection.%s', $name), - new DefinitionDecorator('cartodb_connection_private') + sprintf('simbiotica.carto_connection.%s', $name), + new DefinitionDecorator('carto_connection_private') ) ->setArguments( array( @@ -74,8 +74,8 @@ protected function loadConnection($name, array $connection, ContainerBuilder $co ); } else { $container->setDefinition( - sprintf('simbiotica.cartodb_connection.%s', $name), - new DefinitionDecorator('cartodb_connection_public') + sprintf('simbiotica.carto_connection.%s', $name), + new DefinitionDecorator('carto_connection_public') ) ->setArguments( array( diff --git a/README.md b/README.md index e054d0b..fbd20f1 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ -SimbioticaCartoDBBundle +SimbioticaCartoBundle ======================= -CartoDB SQL API integration for Symfony2 +Carto SQL API integration for Symfony2 You can find documentation in Resources/docs folder diff --git a/Resources/config/services.xml b/Resources/config/services.xml index a980df6..8629d76 100644 --- a/Resources/config/services.xml +++ b/Resources/config/services.xml @@ -5,31 +5,31 @@ xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd"> - Simbiotica\CartoDBBundle\CartoDB\PrivateConnection - Simbiotica\CartoDBBundle\CartoDB\PublicConnection - Simbiotica\CartoDBBundle\CartoDB\ConnectionFactory - Simbiotica\CartoDBBundle\CartoDBLink\CartoDBLinkListener + Simbiotica\CartoBundle\Carto\PrivateConnection + Simbiotica\CartoBundle\Carto\PublicConnection + Simbiotica\CartoBundle\Carto\ConnectionFactory + Simbiotica\CartoBundle\CartoLink\CartoLinkListener - + - - - + diff --git a/Resources/doc/annotations.rst b/Resources/doc/annotations.rst index ec29baf..d904b75 100644 --- a/Resources/doc/annotations.rst +++ b/Resources/doc/annotations.rst @@ -31,7 +31,7 @@ in your classes: namespace Simbiotica\AcmeBundle\Entity; use Doctrine\ORM\Mapping as ORM; - use Simbiotica\CartoDBBundle\CartoDBLink\Mapping as CartoDB; + use Simbiotica\CartoBundle\CartoDBLink\Mapping as CartoDB; /** * @ORM\Entity diff --git a/Resources/doc/configuration.rst b/Resources/doc/configuration.rst index d34c8d6..f0fb21a 100644 --- a/Resources/doc/configuration.rst +++ b/Resources/doc/configuration.rst @@ -1,7 +1,7 @@ Configuration ============= -SimbioticaCartoDBBundle supports multiple connections to CartoDB, for both public and private tables +SimbioticaCartoBundle supports multiple connections to CartoDB, for both public and private tables .. code-block:: yaml diff --git a/Resources/doc/index.rst b/Resources/doc/index.rst index 8d3ea3d..64df524 100644 --- a/Resources/doc/index.rst +++ b/Resources/doc/index.rst @@ -1,4 +1,4 @@ -SimbioticaCartoDBBundle +SimbioticaCartoBundle ======================= CartoDB SQL API integration for Symfony2 @@ -49,7 +49,7 @@ Next, enable it in you app/AppKernel.php { $bundles = array( // ... - new Simbiotica\CartoDBBundle\SimbioticaCartoDBBundle(), + new Simbiotica\CartoBundle\SimbioticaCartoBundle(), ); } diff --git a/SimbioticaCartoBundle.php b/SimbioticaCartoBundle.php new file mode 100644 index 0000000..6ed685c --- /dev/null +++ b/SimbioticaCartoBundle.php @@ -0,0 +1,9 @@ +getContainer(); //wrong config fails auth - $privateFailClient = $container->get('simbiotica.cartodb_connection.private_fail'); + $privateFailClient = $container->get('simbiotica.carto_connection.private_fail'); $this->assertFalse($privateFailClient->authorized, 'Wrong credentials should make auth fail'); //correct config passes auth - $privateClient = $container->get('simbiotica.cartodb_connection.private'); + $privateClient = $container->get('simbiotica.carto_connection.private'); $this->assertTrue($privateClient->authorized, 'Correct credentials should make auth succeed'); /** @@ -206,7 +206,7 @@ public function testPublicConnection() $client = static::createClient(); $container = $client->getContainer(); - $publicClient = $container->get('simbiotica.cartodb_connection.public'); + $publicClient = $container->get('simbiotica.carto_connection.public'); $this->assertTrue( $publicClient->authorized, 'Connection to public tables should succeed if parameters are correct' diff --git a/Tests/Functional/app/AppKernel.php b/Tests/Functional/app/AppKernel.php index d43e43c..03a8b39 100644 --- a/Tests/Functional/app/AppKernel.php +++ b/Tests/Functional/app/AppKernel.php @@ -12,7 +12,7 @@ public function registerBundles() { return array( new Symfony\Bundle\FrameworkBundle\FrameworkBundle(), - new Simbiotica\CartoDBBundle\SimbioticaCartoDBBundle(), + new Simbiotica\CartoBundle\SimbioticaCartoBundle(), ); } @@ -29,7 +29,7 @@ public function registerContainerConfiguration(LoaderInterface $loader) */ public function getCacheDir() { - return sys_get_temp_dir().'/SimbioticaCartoDBBundle/cache'; + return sys_get_temp_dir().'/SimbioticaCartoBundle/cache'; } /** @@ -37,7 +37,7 @@ public function getCacheDir() */ public function getLogDir() { - return sys_get_temp_dir().'/SimbioticaCartoDBBundle/logs'; + return sys_get_temp_dir().'/SimbioticaCartoBundle/logs'; } } diff --git a/Tests/Functional/app/config/.gitignore b/Tests/Functional/app/config/.gitignore deleted file mode 100644 index a49496e..0000000 --- a/Tests/Functional/app/config/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/cartodb_config.yml diff --git a/Tests/Functional/app/config/cartodb_config.yml.dist b/Tests/Functional/app/config/carto_config.yml.dist similarity index 81% rename from Tests/Functional/app/config/cartodb_config.yml.dist rename to Tests/Functional/app/config/carto_config.yml.dist index d6086da..1f675d9 100644 --- a/Tests/Functional/app/config/cartodb_config.yml.dist +++ b/Tests/Functional/app/config/carto_config.yml.dist @@ -1,6 +1,6 @@ -# Copy this file as cartodb_config.yml and fill in the parameters +# Copy this file as carto_config.yml and fill in the parameters -simbiotica_carto_db: +simbiotica_carto: connections: private: private: true diff --git a/Tests/Functional/app/config/config_test.yml b/Tests/Functional/app/config/config_test.yml index 2d8155f..7950ee2 100644 --- a/Tests/Functional/app/config/config_test.yml +++ b/Tests/Functional/app/config/config_test.yml @@ -1,5 +1,5 @@ imports: - - { resource: cartodb_config.yml } + - { resource: carto_config.yml } framework: secret: $3cr3t diff --git a/composer.json b/composer.json index a73b679..dba9eca 100644 --- a/composer.json +++ b/composer.json @@ -1,11 +1,11 @@ { "name": "simbiotica/cartodb-bundle", "type": "symfony-bundle", - "description": "CartoDB SQL API integration for Symfony2", + "description": "Carto SQL API integration for Symfony2", "keywords": [ "cartodb" ], - "homepage": "http://github.com/simbiotica/SimbioticaCartoDBBundle", + "homepage": "http://github.com/simbiotica/SimbioticaCartoBundle", "license": "MIT", "authors": [ { @@ -27,7 +27,7 @@ }, "autoload": { "psr-4": { - "Simbiotica\\CartoDBBundle\\": "" + "Simbiotica\\CartoBundle\\": "" } } } diff --git a/phpunit.xml.dist b/phpunit.xml.dist index 1bebe4e..1cfed1c 100644 --- a/phpunit.xml.dist +++ b/phpunit.xml.dist @@ -13,7 +13,7 @@ > - + ./Tests