Rename CartoDB to Carto

.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

CartoDB/ConnectionFactory.php → 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;

CartoDB/SymfonySessionStorage.php → Carto/SymfonySessionStorage.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Simbiotica\CartoDBBundle\CartoDB;
+namespace Simbiotica\CartoBundle\Carto;
 
 use Simbiotica\CartoDBClient\TokenStorageInterface;
 use Eher\OAuth\Token;

CartoDBLink/CartoDBLinkListener.php → CartoLink/CartoLinkListener.php

@@ -1,13 +1,13 @@
 <?php
 
-namespace Simbiotica\CartoDBBundle\CartoDBLink;
+namespace Simbiotica\CartoBundle\CartoLink;
 
 use Gedmo\Tool\Wrapper\AbstractWrapper;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 use Doctrine\Common\EventArgs;
 use Gedmo\Mapping\MappedEventSubscriber;
 
-class CartoDBLinkListener extends MappedEventSubscriber
+class CartoLinkListener extends MappedEventSubscriber
 {
     protected $container;
 

CartoDBLink/Mapping/CartoDBColumn.php → CartoLink/Mapping/CartoDBColumn.php

@@ -1,14 +1,14 @@
 <?php
 
-namespace Simbiotica\CartoDBBundle\CartoDBLink\Mapping;
+namespace Simbiotica\CartoBundle\CartoLink\Mapping;
 
 use Doctrine\Common\Annotations\Annotation;
 
 /**
  * @Annotation
  * @Target("PROPERTY")
  */
-final class CartoDBColumn extends Annotation
+final class CartoColumn extends Annotation
 {
     public $column; //name of cartodb column
     public $strong = false; //if true, will override local value with cartodb's on load

CartoDBLink/Mapping/CartoDBLink.php → CartoLink/Mapping/CartoDBLink.php

@@ -1,14 +1,14 @@
 <?php
 
-namespace Simbiotica\CartoDBBundle\CartoDBLink\Mapping;
+namespace Simbiotica\CartoBundle\CartoLink\Mapping;
 
 use Doctrine\Common\Annotations\Annotation;
 
 /**
  * @Annotation
  * @Target("CLASS")
  */
-final class CartoDBLink extends Annotation
+final class CartoLink extends Annotation
 {
     public $connection; //name of the connection to use
     public $table; //name of the table it links to

CartoDBLink/Mapping/Driver/Annotation.php → CartoLink/Mapping/Driver/Annotation.php

@@ -1,20 +1,20 @@
 <?php
 
-namespace Simbiotica\CartoDBBundle\CartoDBLink\Mapping\Driver;
+namespace Simbiotica\CartoBundle\CartoLink\Mapping\Driver;
 
 use Gedmo\Exception\InvalidMappingException;
 use Gedmo\Mapping\Driver\AbstractAnnotationDriver;
 
 class Annotation extends AbstractAnnotationDriver
 {
-    const CARTODBLINK = 'Simbiotica\\CartoDBBundle\\CartoDBLink\\Mapping\\CartoDBLink';
-    const CARTODBCOLUMN = 'Simbiotica\\CartoDBBundle\\CartoDBLink\\Mapping\\CartoDBColumn';
+    const CARTOLINK = 'Simbiotica\\CartoBundle\\CartoLink\\Mapping\\CartoLink';
+    const CARTOCOLUMN = 'Simbiotica\\CartoBundle\\CartoLink\\Mapping\\CartoColumn';
 
     public function readExtendedMetadata($meta, array &$config)
     {
         $class = $this->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(

DependencyInjection/Configuration.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Simbiotica\CartoDBBundle\DependencyInjection;
+namespace Simbiotica\CartoBundle\DependencyInjection;
 
 use Symfony\Component\Config\Definition\Builder\ArrayNodeDefinition;
 use Symfony\Component\Config\Definition\Builder\TreeBuilder;
@@ -19,7 +19,7 @@ class Configuration implements ConfigurationInterface
     public function getConfigTreeBuilder()
     {
         $treeBuilder = new TreeBuilder();
-        $rootNode = $treeBuilder->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();
 

DependencyInjection/SimbioticaCartoDBExtension.php → DependencyInjection/SimbioticaCartoExtension.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Simbiotica\CartoDBBundle\DependencyInjection;
+namespace Simbiotica\CartoBundle\DependencyInjection;
 
 use Symfony\Component\DependencyInjection\DefinitionDecorator;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
@@ -13,7 +13,7 @@
  *
  * To learn more see {@link http://symfony.com/doc/current/cookbook/bundles/extension.html}
  */
-class SimbioticaCartoDBExtension extends Extension
+class SimbioticaCartoExtension extends Extension
 {
     /**
      * {@inheritDoc}
@@ -28,7 +28,7 @@ public function load(array $configs, ContainerBuilder $container)
 
         foreach ($config['orm'] as $name => $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(

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
 

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">
 
     <parameters>
-        <parameter key="cartodb_connection_private.class">Simbiotica\CartoDBBundle\CartoDB\PrivateConnection</parameter>
-        <parameter key="cartodb_connection_public.class">Simbiotica\CartoDBBundle\CartoDB\PublicConnection</parameter>
-        <parameter key="cartodb_connection_factory.class">Simbiotica\CartoDBBundle\CartoDB\ConnectionFactory</parameter>
-        <parameter key="cartodb.listener.cartodblink.class">Simbiotica\CartoDBBundle\CartoDBLink\CartoDBLinkListener
+        <parameter key="carto_connection_private.class">Simbiotica\CartoBundle\Carto\PrivateConnection</parameter>
+        <parameter key="carto_connection_public.class">Simbiotica\CartoBundle\Carto\PublicConnection</parameter>
+        <parameter key="carto_connection_factory.class">Simbiotica\CartoBundle\Carto\ConnectionFactory</parameter>
+        <parameter key="carto.listener.cartolink.class">Simbiotica\CartoBundle\CartoLink\CartoLinkListener
         </parameter>
     </parameters>
 
     <services>
-        <service id="cartodb_connection_factory" class="%cartodb_connection_factory.class%">
+        <service id="carto_connection_factory" class="%carto_connection_factory.class%">
             <argument type="service" id="session"/>
         </service>
 
-        <service id="cartodb_connection_private"
-                 class="%cartodb_connection_private.class%"
-                 factory-service="cartodb_connection_factory"
+        <service id="carto_connection_private"
+                 class="%carto_connection_private.class%"
+                 factory-service="carto_connection_factory"
                  factory-method="createPrivateConnection"
         />
 
-        <service id="cartodb_connection_public"
-                 class="%cartodb_connection_public.class%"
-                 factory-service="cartodb_connection_factory"
+        <service id="carto_connection_public"
+                 class="%carto_connection_public.class%"
+                 factory-service="carto_connection_factory"
                  factory-method="createPublicConnection"
         />
 
-        <service id="cartodb.listener.cartodblink" class="%cartodb.listener.cartodblink.class%" public="false">
+        <service id="carto.listener.cartolink" class="%carto.listener.cartolink.class%" public="false">
             <argument type="service" id="service_container"/>
             <call method="setAnnotationReader">
                 <argument type="service" id="annotation_reader"/>

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

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
 

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(),
       );
   }
 

SimbioticaCartoBundle.php

@@ -0,0 +1,9 @@
+<?php
+
+namespace Simbiotica\CartoBundle;
+
+use Symfony\Component\HttpKernel\Bundle\Bundle;
+
+class SimbioticaCartoBundle extends Bundle
+{
+}

Tests/CartoDB/CartoDBTest.php → Tests/Carto/CartoTest.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Simbiotica\CartoDBBundle\Tests\CartoDB;
+namespace Simbiotica\CartoBundle\Tests\Carto;
 
 use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
 
@@ -20,11 +20,11 @@ public function testPrivateConnection()
         $container = $client->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'

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,15 +29,15 @@ public function registerContainerConfiguration(LoaderInterface $loader)
      */
     public function getCacheDir()
     {
-        return sys_get_temp_dir().'/SimbioticaCartoDBBundle/cache';
+        return sys_get_temp_dir().'/SimbioticaCartoBundle/cache';
     }
 
     /**
      * @return string
      */
     public function getLogDir()
     {
-        return sys_get_temp_dir().'/SimbioticaCartoDBBundle/logs';
+        return sys_get_temp_dir().'/SimbioticaCartoBundle/logs';
     }
 }
 

Tests/Functional/app/config/cartodb_config.yml.dist → 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

Tests/Functional/app/config/config_test.yml

@@ -1,5 +1,5 @@
 imports:
-    - { resource: cartodb_config.yml }
+    - { resource: carto_config.yml }
 
 framework:
     secret:          $3cr3t

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\\": ""
     }
   }
 }

phpunit.xml.dist

@@ -13,7 +13,7 @@
 >
 
     <testsuites>
-        <testsuite name="CartoDBBundle Test Suite">
+        <testsuite name="CartoBundle Test Suite">
             <directory>./Tests</directory>
         </testsuite>
     </testsuites>