PrividerPass gets Elasticsearch manager name from its repository name…

… dynamically - Test updated - Docs updated
ongr-io · Feb 25, 2015 · 4850af7 · 4850af7
1 parent 284796e
commit 4850af7
Show file tree

Hide file tree

Showing 13 changed files with 59 additions and 55 deletions.
diff --git a/DependencyInjection/Compiler/ProviderPass.php b/DependencyInjection/Compiler/ProviderPass.php
@@ -89,13 +89,28 @@ protected function generateProvider(ContainerBuilder $container, $profile)
     {
         $id = "ongr_settings.dynamic_provider.{$profile}";
 
-        $manager = $container->getParameter('ongr_settings.connection.manager');
+        $managerName = $this->getElasticManagerFromRepository($container);
 
         $provider = new Definition($container->getParameter('ongr_settings.settings_provider.class'), [$profile]);
-        $provider->addMethodCall('setManager', [new Reference($manager)]);
+        $provider->addMethodCall('setManager', [new Reference($managerName)]);
         $provider->addTag('ongr_settings.settings_provider', ['profile' => $profile]);
         $container->setDefinition($id, $provider);
 
         return $id;
     }
+
+    /**
+     * Gets Elasticsearch manager name from repository name.
+     *
+     * @param ContainerBuilder $container
+     *
+     * @return string
+     */
+    private function getElasticManagerFromRepository(ContainerBuilder $container)
+    {
+        $repositoryName = $container->getParameter('ongr_settings.connection.repository');
+        $managerName = substr($repositoryName, 0, strrpos($repositoryName, '.'));
+
+        return $managerName;
+    }
 }
diff --git a/DependencyInjection/Configuration.php b/DependencyInjection/Configuration.php
@@ -47,10 +47,6 @@ public function getConfigTreeBuilder()
                                 ->defaultValue('ongr-settings')
                                 ->info('Index name for settings')
                             ->end()
-                            ->scalarNode('manager')
-                                ->defaultValue('es.manager.settings')
-                                ->info('Elasticsearch manager for settings')
-                            ->end()
                             ->scalarNode('repository')
                                 ->defaultValue('es.manager.settings.setting')
                                 ->info('Elasticsearch repository for settings')

diff --git a/DependencyInjection/ONGRSettingsExtension.php b/DependencyInjection/ONGRSettingsExtension.php
@@ -35,7 +35,6 @@ public function load(array $configs, ContainerBuilder $container)
         $container->setParameter('ongr_settings.connection.index_name', $config['connection']['index_name']);
         $container->setParameter('ongr_settings.connection.port', $config['connection']['port']);
         $container->setParameter('ongr_settings.connection.host', $config['connection']['host']);
-        $container->setParameter('ongr_settings.connection.manager', $config['connection']['manager']);
         $container->setParameter('ongr_settings.connection.repository', $config['connection']['repository']);
 
         // Set profiles.
@@ -94,7 +93,7 @@ protected function setFiltersManager(ContainerBuilder $container)
             'ONGR\FilterManagerBundle\Search\FiltersManager',
             [
                 new Reference('ongr_settings.filters_container'),
-                new Reference( $container->getParameter('ongr_settings.connection.repository') ),
+                new Reference($container->getParameter('ongr_settings.connection.repository')),
             ]
         );
         $container->setDefinition('ongr_settings.filters_manager', $definition);

diff --git a/README.rst b/README.rst
@@ -41,7 +41,7 @@ In your shell enter the following:
 
 .. code-block:: bash
 
-    composer require ongr/SettingsBundle "~0.1"
+    composer require ongr/settings-bundle "~0.1"
 
 ..
 
@@ -62,6 +62,7 @@ Then register SettingsBundle and it dependant bundles in ``AppKernel.php``:
                 new Tedivm\StashBundle\TedivmStashBundle(),
                 new ONGR\CookiesBundle\ONGRCookiesBundle(),
                 new ONGR\ElasticsearchBundle\ONGRElasticsearchBundle(),
+                new ONGR\FilterManagerBundle\ONGRFilterManagerBundle(),
                 new ONGR\SettingsBundle\ONGRSettingsBundle(),
             ];
         }
@@ -121,6 +122,19 @@ You should add an entry to your ``config.yml`` you should add an entry:
     Using this config, console command below will create an Elasticsearch index called ``settings``
     with 2 shards and 0 replicas, after running the console command mentioned above.
 
+In case if you wish to use different Elasticsearch connection options, you can configure manager used in SettingsBundle
+with following ``config.yml`` entry:
+
+.. code-block:: yaml
+
+    ongr_settings:
+        connection:
+            repository: es.manager.default.setting
+
+..
+
+This example shows how you can configure settings repository, that is access in manager called ``default``.
+
 Second - new index in Elasticsearch should be created.
 This can be done by running a command in console:
 

diff --git a/Resources/doc/index.rst b/Resources/doc/index.rst
@@ -41,7 +41,7 @@ In your shell enter the following:
 
 .. code-block:: bash
 
-    composer require ongr/SettingsBundle "~0.1"
+    composer require ongr/settings-bundle "~0.1"
 
 ..
 
@@ -62,6 +62,7 @@ Then register SettingsBundle and it dependant bundles in ``AppKernel.php``:
                 new Tedivm\StashBundle\TedivmStashBundle(),
                 new ONGR\CookiesBundle\ONGRCookiesBundle(),
                 new ONGR\ElasticsearchBundle\ONGRElasticsearchBundle(),
+                new ONGR\FilterManagerBundle\ONGRFilterManagerBundle(),
                 new ONGR\SettingsBundle\ONGRSettingsBundle(),
             ];
         }
@@ -121,6 +122,19 @@ You should add an entry to your ``config.yml`` you should add an entry:
     Using this config, console command below will create an Elasticsearch index called ``settings``
     with 2 shards and 0 replicas, after running the console command mentioned above.
 
+In case if you wish to use different Elasticsearch connection options, you can configure manager used in SettingsBundle
+with following ``config.yml`` entry:
+
+.. code-block:: yaml
+
+    ongr_settings:
+        connection:
+            repository: es.manager.default.setting
+
+..
+
+This example shows how you can configure settings repository, that is access in manager called ``default``.
+
 Second - new index in Elasticsearch should be created.
 This can be done by running a command in console:
 

diff --git a/Tests/Functional/DependencyInjection/Compiler/ProviderPassTest.php b/Tests/Functional/DependencyInjection/Compiler/ProviderPassTest.php
@@ -25,11 +25,11 @@ public function testProcess()
         $container = new ContainerBuilder();
         $container->setDefinition('ongr_settings.settings_container', new Definition());
         $container->setParameter('ongr_settings.settings_container.profiles', ['default', 'custom']);
-        $container->setParameter('ongr_settings.connection.manager', 'es.manager');
         $container->setParameter(
             'ongr_settings.settings_provider.class',
             'ONGR\\SettingsBundle\\Settings\\Personal\\Provider\\ManagerAwareSettingProvider.php'
         );
+        $container->setParameter('ongr_settings.connection.repository', 'es.manager.setting');
 
         $definition = new Definition();
         $definition->addTag('ongr_settings.ongr_settings', ['profile' => 'custom']);

diff --git a/Tests/Unit/DependencyInjection/Compiler/ProviderPassTest.php b/Tests/Unit/DependencyInjection/Compiler/ProviderPassTest.php
@@ -29,7 +29,7 @@ public function testProcess()
             'ongr_settings.settings_provider.class',
             'ONGR\\SettingsBundle\\Settings\\Personal\\Provider\\ManagerAwareSettingProvider'
         );
-        $container->setParameter('ongr_settings.connection.manager', 'es.manager');
+        $container->setParameter('ongr_settings.connection.repository', 'es.manager.default.setting');
 
         $definition = new Definition();
         $definition->addTag('ongr_settings.settings_provider', ['profile' => 'custom', 'priority' => 9]);

diff --git a/Tests/Unit/DependencyInjection/ConfigurationTest.php b/Tests/Unit/DependencyInjection/ConfigurationTest.php
@@ -27,7 +27,6 @@ public function configurationData()
             'index_name' => 'ongr-settings',
             'host' => '127.0.0.1',
             'port' => 9200,
-            'manager' => 'es.manager.settings',
             'repository' => 'es.manager.settings.setting',
         ];
 
@@ -47,7 +46,6 @@ public function configurationData()
             'index_name' => 'ongr-test',
             'host' => '127.5.0.1',
             'port' => 9205,
-            'manager' => 'es.manager.settings',
             'repository' => 'es.manager.settings.setting',
         ];
         $out[] = [

diff --git a/Tests/app/AppKernel.php b/Tests/app/AppKernel.php
@@ -35,7 +35,6 @@ public function registerBundles()
             new ONGR\ElasticsearchBundle\ONGRElasticsearchBundle(),
             new Tedivm\StashBundle\TedivmStashBundle(),
 
-            new ONGR\PagerBundle\ONGRPagerBundle(),
             new ONGR\CookiesBundle\ONGRCookiesBundle(),
             new ONGR\SettingsBundle\Tests\Fixtures\Acme\TestBundle\AcmeTestBundle(),
             new ONGR\SettingsBundle\ONGRSettingsBundle(),

diff --git a/Tests/app/config/config_test.yml b/Tests/app/config/config_test.yml
@@ -54,40 +54,7 @@ ongr_elasticsearch:
                 number_of_replicas: 0
                 index:
                     refresh_interval: -1
-                analysis:
-                    tokenizer:
-                        pathTokenizer:
-                            type : path_hierarchy
-                            buffer_size: 2024
-                            skip: 0
-                            delimiter: /
-                    filter:
-                        incremental_filter:
-                            type: edge_ngram
-                            min_gram: 1
-                            max_gram: 20
-                    analyzer:
-                        indexAnalyzer:
-                            type: snowball
-                            language: German2
-                            stopwords: "der,die,das,mit,und,für"
-                        searchAnalyzer:
-                            type: snowball
-                            language: German2
-                            stopwords: "der,die,das,mit,und,für"
-                        pathAnalyzer:
-                            type: custom
-                            tokenizer: pathTokenizer
-                        urlAnalyzer:
-                            type: custom
-                            tokenizer: keyword
-                            filter: [lowercase]
-                        incrementalAnalyzer:
-                            type: custom
-                            tokenizer: standard
-                            filter:
-                                - lowercase
-                                - incremental_filter
+
     managers:
         default:
             connection: default
@@ -163,6 +130,8 @@ services:
 
 ongr_settings:
     profiles: [ test1, test2, default, meh ]
+    connection:
+        repository: es.manager.default.setting
     admin_user:
         categories:
             category_1:

diff --git a/Tests/app/config/config_test_container_creation.yml b/Tests/app/config/config_test_container_creation.yml
@@ -94,6 +94,10 @@ ongr_elasticsearch:
             mappings:
               - ONGRSettingsBundle
 
+ongr_settings:
+    connection:
+        repository: es.manager.default.setting
+
 services:
     ongr_settings.settings_manager:
         class: %ongr_settings.settings_manager.class%
@@ -124,4 +128,5 @@ services:
     ongr_settings.pair_storage:
         class: %ongr_settings.pair_storage.class%
         arguments:
-            - @es.manager
+            - @es.manager
+
diff --git a/Tests/app/config/parameters_test.yml b/Tests/app/config/parameters_test.yml
@@ -16,6 +16,3 @@ parameters:
     cdn_url_ssl: 'https:%cdn_base_url%'
 
     ongr_settings.environment_variables_pass_test_param: unchanged_param
-
-    ongr_settings.connection.manager: es.manager
-    ongr_settings.connection.repository: es.manager.setting
diff --git a/Tests/app/config/parameters_test_container_creation.yml b/Tests/app/config/parameters_test_container_creation.yml
@@ -23,5 +23,3 @@ parameters:
 
     ongr_settings.authentication.secret: O0EKwvq8Sv30O3ImKdXT7aT
 
-    ongr_settings.connection.manager: es.manager
-    ongr_settings.connection.repository: es.manager.setting
Original file line number	Diff line number	Diff line change
Expand Up		@@ -23,5 +23,3 @@ parameters:

		ongr_settings.authentication.secret: O0EKwvq8Sv30O3ImKdXT7aT

		ongr_settings.connection.manager: es.manager
		ongr_settings.connection.repository: es.manager.setting