From 0b4839e718fae23b7056d67745aca3af69a6a9c0 Mon Sep 17 00:00:00 2001
From: ornicar <thibault.duplessis@gmail.com>
Date: Sun, 10 Apr 2011 14:08:51 -0700
Subject: [PATCH] Introduce the Index manager and setup dependency injection

---
 Command/CreateIndexesCommand.php              | 33 +++++++
 DependencyInjection/Configuration.php         | 62 ++++++++++--
 DependencyInjection/FOQElasticaExtension.php  | 95 +++++++++++++++++++
 .../FOQElasticsearchExtension.php             | 23 -----
 FOQElasticaBundle.php                         |  9 ++
 FOQElasticsearchBundle.php                    |  9 --
 IndexManager.php                              | 35 +++++++
 README.md                                     |  2 +-
 Resources/config/config.xml                   | 14 +++
 9 files changed, 241 insertions(+), 41 deletions(-)
 create mode 100644 Command/CreateIndexesCommand.php
 create mode 100644 DependencyInjection/FOQElasticaExtension.php
 delete mode 100644 DependencyInjection/FOQElasticsearchExtension.php
 create mode 100644 FOQElasticaBundle.php
 delete mode 100644 FOQElasticsearchBundle.php
 create mode 100644 IndexManager.php
 create mode 100644 Resources/config/config.xml

diff --git a/Command/CreateIndexesCommand.php b/Command/CreateIndexesCommand.php
new file mode 100644
index 0000000..6614266
--- /dev/null
+++ b/Command/CreateIndexesCommand.php
@@ -0,0 +1,33 @@
+<?php
+
+namespace FOQ\ElasticaBundle\Command;
+
+use Symfony\Bundle\FrameworkBundle\Command\Command as BaseCommand;
+use Symfony\Component\Console\Input\InputArgument;
+use Symfony\Component\Console\Input\InputOption;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Output\OutputInterface;
+use Symfony\Component\Console\Output\Output;
+
+class CreateIndexesCommand extends BaseCommand
+{
+    /**
+     * @see Command
+     */
+    protected function configure()
+    {
+        $this
+            ->setName('foq:elastica:reset')
+            ->setDescription('Recreates all indexes');
+    }
+
+    /**
+     * @see Command
+     */
+    protected function execute(InputInterface $input, OutputInterface $output)
+    {
+        foreach ($this->container->get('foq_elastica.index_manager')->getAllIndexes() as $index) {
+
+        }
+    }
+}
diff --git a/DependencyInjection/Configuration.php b/DependencyInjection/Configuration.php
index 645890e..ce6919a 100644
--- a/DependencyInjection/Configuration.php
+++ b/DependencyInjection/Configuration.php
@@ -1,16 +1,10 @@
 <?php
 
-namespace FOQ\ElasticsearchBundle\DependencyInjection;
+namespace FOQ\ElasticaBundle\DependencyInjection;
 
 use Symfony\Component\Config\Definition\Builder\ArrayNodeDefinition;
 use Symfony\Component\Config\Definition\Builder\TreeBuilder;
 
-/**
- * This class contains the configuration information for the bundle
- *
- * This information is solely responsible for how the different configuration
- * sections are normalized, and merged.
- */
 class Configuration
 {
     /**
@@ -21,8 +15,60 @@ class Configuration
     public function getConfigTree()
     {
         $treeBuilder = new TreeBuilder();
-        $treeBuilder->root('foq_elasticsearch', 'array');
+        $rootNode = $treeBuilder->root('foq_elastica', 'array');
+
+        $this->addClientsSection($rootNode);
+        $this->addIndexesSection($rootNode);
+
+        $rootNode
+            ->children()
+                ->scalarNode('default_client')->end()
+            ->end()
+        ;
 
         return $treeBuilder->buildTree();
     }
+
+    /**
+     * Adds the configuration for the "clients" key
+     */
+    private function addClientsSection(ArrayNodeDefinition $rootNode)
+    {
+        $rootNode
+            ->fixXmlConfig('client')
+            ->children()
+                ->arrayNode('clients')
+                    ->useAttributeAsKey('id')
+                    ->prototype('array')
+                        ->performNoDeepMerging()
+                        ->children()
+                            ->scalarNode('host')->defaultValue('localhost')->end()
+                            ->scalarNode('port')->defaultValue('9000')->end()
+                        ->end()
+                    ->end()
+                ->end()
+            ->end()
+        ;
+    }
+
+    /**
+     * Adds the configuration for the "indexes" key
+     */
+    private function addIndexesSection(ArrayNodeDefinition $rootNode)
+    {
+        $rootNode
+            ->fixXmlConfig('index')
+            ->children()
+                ->arrayNode('indexes')
+                    ->useAttributeAsKey('id')
+                    ->prototype('array')
+                        ->performNoDeepMerging()
+                        ->children()
+                            ->scalarNode('client')->end()
+                        ->end()
+                    ->end()
+                ->end()
+            ->end()
+        ;
+    }
 }
diff --git a/DependencyInjection/FOQElasticaExtension.php b/DependencyInjection/FOQElasticaExtension.php
new file mode 100644
index 0000000..95f4bdf
--- /dev/null
+++ b/DependencyInjection/FOQElasticaExtension.php
@@ -0,0 +1,95 @@
+<?php
+
+namespace FOQ\ElasticaBundle\DependencyInjection;
+
+use Symfony\Component\Config\Definition\Processor;
+use Symfony\Component\HttpKernel\DependencyInjection\Extension;
+use Symfony\Component\DependencyInjection\Loader\XmlFileLoader;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\Definition;
+use Symfony\Component\Config\FileLocator;
+
+class FOQElasticaExtension extends Extension
+{
+    public function load(array $configs, ContainerBuilder $container)
+    {
+        $loader = new XmlFileLoader($container, new FileLocator(__DIR__.'/../Resources/config'));
+        $loader->load('config.xml');
+
+        $configuration = new Configuration();
+        $processor = new Processor();
+
+        $config = $processor->process($configuration->getConfigTree(), $configs);
+
+        if (empty ($config['default_client'])) {
+            $keys = array_keys($config['clients']);
+            $config['default_client'] = reset($keys);
+        }
+
+        $clientsByName = $this->loadClients($config['clients'], $container);
+        $indexesByName = $this->loadIndexes($config['indexes'], $container, $clientsByName, $config['default_client']);
+        $this->loadIndexManager($indexesByName, $container);
+
+        $container->setAlias('foq_elastica.client', sprintf('foq_elastica.client.%s', $config['default_client']));
+    }
+
+    /**
+     * Loads the configured clients.
+     *
+     * @param array $config An array of clients configurations
+     * @param ContainerBuilder $container A ContainerBuilder instance
+     */
+    protected function loadClients(array $clients, ContainerBuilder $container)
+    {
+        $clientDefs = array();
+        foreach ($clients as $name => $client) {
+            $clientDefArgs = array(
+                isset($client['host']) ? $client['host'] : null,
+                isset($client['port']) ? $client['port'] : array(),
+            );
+            $clientDef = new Definition('%foq_elastica.client.class%', $clientDefArgs);
+            $container->setDefinition(sprintf('foq_elastica.client.%s', $name), $clientDef);
+            $clientDefs[$name] = $clientDef;
+        }
+
+        return $clientDefs;
+    }
+
+    /**
+     * Loads the configured indexes.
+     *
+     * @param array $config An array of indexes configurations
+     * @param ContainerBuilder $container A ContainerBuilder instance
+     */
+    protected function loadIndexes(array $indexes, ContainerBuilder $container, array $clientsByName, $defaultClientName)
+    {
+        $indexDefs = array();
+        foreach ($indexes as $name => $index) {
+            if (isset($index['client'])) {
+                $clientName = $index['client'];
+                if (!isset($clientsByName[$clientName])) {
+                    throw new InvalidArgumentException(sprintf('The elastica client with name "%s" is not defined', $clientName));
+                }
+            } else {
+                $clientName = $defaultClientName;
+            }
+            $indexDefArgs = array($clientsByName[$clientName], $name);
+            $indexDef = new Definition('%foq_elastica.index.class%', $indexDefArgs);
+            $container->setDefinition(sprintf('foq_elastica.index.%s', $name), $indexDef);
+            $indexDefs[$name] = $indexDef;
+        }
+
+        return $indexDefs;
+    }
+
+    /**
+     * Loads the index manager
+     *
+     * @return null
+     **/
+    public function loadIndexManager(array $indexDefs, ContainerBuilder $container)
+    {
+        $managerDef = new Definition('%foq_elastica.index_manager.class%', $indexDefs);
+        $container->setDefinition('fos_elastica.index_manager', $managerDef);
+    }
+}
diff --git a/DependencyInjection/FOQElasticsearchExtension.php b/DependencyInjection/FOQElasticsearchExtension.php
deleted file mode 100644
index 2e1ad73..0000000
--- a/DependencyInjection/FOQElasticsearchExtension.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-
-namespace FOQ\ElasticsearchBundle\DependencyInjection;
-
-use Symfony\Component\Config\Definition\Processor;
-use Symfony\Component\HttpKernel\DependencyInjection\Extension;
-use Symfony\Component\DependencyInjection\Loader\XmlFileLoader;
-use Symfony\Component\DependencyInjection\ContainerBuilder;
-use Symfony\Component\Config\FileLocator;
-
-class FOQElasticsearchExtension extends Extension
-{
-    public function load(array $configs, ContainerBuilder $container)
-    {
-        $loader = new XmlFileLoader($container, new FileLocator(__DIR__.'/../Resources/config'));
-        $loader->load('config.xml');
-
-        $configuration = new Configuration();
-        $processor = new Processor();
-
-        $config = $processor->process($configuration->getConfigTree(), $configs);
-    }
-}
diff --git a/FOQElasticaBundle.php b/FOQElasticaBundle.php
new file mode 100644
index 0000000..db9e926
--- /dev/null
+++ b/FOQElasticaBundle.php
@@ -0,0 +1,9 @@
+<?php
+
+namespace FOQ\ElasticaBundle;
+
+use Symfony\Component\HttpKernel\Bundle\Bundle;
+
+class FOQElasticaBundle extends Bundle
+{
+}
diff --git a/FOQElasticsearchBundle.php b/FOQElasticsearchBundle.php
deleted file mode 100644
index b4acc87..0000000
--- a/FOQElasticsearchBundle.php
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-
-namespace FOQ\ElasticsearchBundle;
-
-use Symfony\Component\HttpKernel\Bundle\Bundle;
-
-class FOQElasticsearchBundle extends Bundle
-{
-}
diff --git a/IndexManager.php b/IndexManager.php
new file mode 100644
index 0000000..62f2cbc
--- /dev/null
+++ b/IndexManager.php
@@ -0,0 +1,35 @@
+<?php
+
+namespace FOQ\ElasticaBundle;
+
+class IndexManager
+{
+    protected $indexes;
+
+    public function __construct(array $indexes)
+    {
+        $this->indexes = $indexes;
+    }
+
+    /**
+     * Gets all registered indexes
+     *
+     * @return array
+     */
+    public function getAllIndexes()
+    {
+        return $this->indexes;
+    }
+
+    /**
+     * Destroys and creates all registered indexes
+     *
+     * @return null
+     */
+    public function createAllIndexes()
+    {
+        foreach ($this->getAllIndexes() as $index) {
+            $index->create();
+        }
+    }
+}
diff --git a/README.md b/README.md
index 99916ca..c1b2c55 100644
--- a/README.md
+++ b/README.md
@@ -22,7 +22,7 @@ With clone:
 
     $loader->registerPrefixes(array(
         ...
-        'elastica' => __DIR__.'/../vendor/elastica/lib',
+        'Elastica' => __DIR__.'/../vendor/elastica/lib',
     ));
 
 ### Install ElasticaBundle
diff --git a/Resources/config/config.xml b/Resources/config/config.xml
new file mode 100644
index 0000000..db18f5c
--- /dev/null
+++ b/Resources/config/config.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+
+<container xmlns="http://symfony.com/schema/dic/services"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
+
+    <parameters>
+        <parameter key="foq_elastica.client.class">Elastica_Client</parameter>
+        <parameter key="foq_elastica.index.class">Elastica_Index</parameter>
+
+        <parameter key="foq_elastica.index_manager.class">FOQ\ElasticaBundle\IndexManager</parameter>
+    </parameters>
+
+</container>