Merge branch 'pr/732' into 3.0.x

Author: merk

CHANGELOG-3.0.md

@@ -15,6 +15,7 @@ To generate a changelog summary since the last version, run
 * 3.0.8 (Unreleased)
 
  * Fixed handling of empty indexes #760
+ * Added support for `connectionStrategy` Elastica configuration #732
 
 * 3.0.7 (2015-01-21)
 

DependencyInjection/Configuration.php

@@ -84,6 +84,16 @@ private function addClientsSection(ArrayNodeDefinition $rootNode)
                             return $v;
                         })
                         ->end()
+                        // Elastica names its properties with camel case, support both
+                        ->beforeNormalization()
+                        ->ifTrue(function ($v) { return isset($v['connection_strategy']); })
+                        ->then(function ($v) {
+                            $v['connectionStrategy'] = $v['connection_strategy'];
+                            unset($v['connection_strategy']);
+
+                            return $v;
+                        })
+                        ->end()
                         // If there is no connections array key defined, assume a single connection.
                         ->beforeNormalization()
                         ->ifTrue(function ($v) { return is_array($v) && !array_key_exists('connections', $v); })
@@ -124,6 +134,7 @@ private function addClientsSection(ArrayNodeDefinition $rootNode)
                             ->end()
                             ->scalarNode('timeout')->end()
                             ->scalarNode('headers')->end()
+                            ->scalarNode('connectionStrategy')->defaultValue('Simple')->end()
                         ->end()
                     ->end()
                 ->end()

Resources/doc/cookbook/multiple-connections.md

@@ -11,6 +11,11 @@ fos_elastica:
             connections:
                 - url: http://es1.example.net:9200
                 - url: http://es2.example.net:9200
+            connection_strategy: RoundRobin
 ```
 
+Elastica allows for definition of different connection strategies and by default
+supports `RoundRobin` and `Simple`. You can see definitions for these strategies
+in the `Elastica\Connection\Strategy` namespace.
+
 For more information on Elastica clustering see http://elastica.io/getting-started/installation.html#section-connect-cluster

Tests/Functional/ClientTest.php

@@ -0,0 +1,48 @@
+<?php
+
+/**
+ * This file is part of the FOSElasticaBundle project.
+ *
+ * (c) Tim Nagel <[email protected]>
+ *
+ * This source file is subject to the MIT license that is bundled
+ * with this source code in the file LICENSE.
+ */
+
+namespace FOS\ElasticaBundle\Tests\Functional;
+
+use Symfony\Bundle\FrameworkBundle\Client;
+
+/**
+ * @group functional
+ */
+class ClientTest extends WebTestCase
+{
+    public function testContainerSource()
+    {
+        $client = $this->createClient(array('test_case' => 'Basic'));
+
+        $es = $client->getContainer()->get('fos_elastica.client.default');
+        $this->assertInstanceOf('Elastica\\Connection\\Strategy\\RoundRobin', $es->getConnectionStrategy());
+
+        $es = $client->getContainer()->get('fos_elastica.client.second_server');
+        $this->assertInstanceOf('Elastica\\Connection\\Strategy\\RoundRobin', $es->getConnectionStrategy());
+
+        $es = $client->getContainer()->get('fos_elastica.client.third');
+        $this->assertInstanceOf('Elastica\\Connection\\Strategy\\Simple', $es->getConnectionStrategy());
+    }
+
+    protected function setUp()
+    {
+        parent::setUp();
+
+        $this->deleteTmpDir('Basic');
+    }
+
+    protected function tearDown()
+    {
+        parent::tearDown();
+
+        $this->deleteTmpDir('Basic');
+    }
+}

Tests/Functional/app/Basic/config.yml

@@ -15,7 +15,12 @@ fos_elastica:
                 - url: http://localhost:9200
                 - host: localhost
                   port: 9200
+            connectionStrategy: RoundRobin
         second_server:
+            connections:
+                - url: http://localhost:9200
+            connection_strategy: RoundRobin
+        third:
             url: http://localhost:9200
     indexes:
         index: