From 43eda480c591839787107355f464330684abf9d1 Mon Sep 17 00:00:00 2001
From: Jeremy Mikola <jmikola@gmail.com>
Date: Fri, 2 Mar 2012 00:28:38 -0500
Subject: [PATCH] Rename "reseter" to "Resetter" (BC break)

---
 Command/PopulateCommand.php                  |  4 ++--
 DependencyInjection/FOQElasticaExtension.php | 10 +++++-----
 Reseter.php => Resetter.php                  |  4 +---
 Resources/config/config.xml                  |  2 +-
 Tests/{ReseterTest.php => ResetterTest.php}  | 10 +++++-----
 5 files changed, 14 insertions(+), 16 deletions(-)
 rename Reseter.php => Resetter.php (91%)
 rename Tests/{ReseterTest.php => ResetterTest.php} (87%)

diff --git a/Command/PopulateCommand.php b/Command/PopulateCommand.php
index 287fa7e..d9b082d 100644
--- a/Command/PopulateCommand.php
+++ b/Command/PopulateCommand.php
@@ -29,8 +29,8 @@ class PopulateCommand extends ContainerAwareCommand
      */
     protected function execute(InputInterface $input, OutputInterface $output)
     {
-        $output->writeln('Reseting indexes');
-        $this->getContainer()->get('foq_elastica.reseter')->reset();
+        $output->writeln('Resetting indexes');
+        $this->getContainer()->get('foq_elastica.resetter')->reset();
 
         $output->writeln('Populating indexes');
         $this->getContainer()->get('foq_elastica.populator')->populate(function($text) use ($output) {
diff --git a/DependencyInjection/FOQElasticaExtension.php b/DependencyInjection/FOQElasticaExtension.php
index 251e01d..c4e26df 100644
--- a/DependencyInjection/FOQElasticaExtension.php
+++ b/DependencyInjection/FOQElasticaExtension.php
@@ -48,7 +48,7 @@ class FOQElasticaExtension extends Extension
         }, $indexIdsByName);
 
         $this->loadIndexManager($indexRefsByName, $container);
-        $this->loadReseter($this->indexConfigs, $container);
+        $this->loadResetter($this->indexConfigs, $container);
 
         $container->setAlias('foq_elastica.client', sprintf('foq_elastica.client.%s', $config['default_client']));
         $container->setAlias('foq_elastica.index', sprintf('foq_elastica.index.%s', $config['default_index']));
@@ -382,14 +382,14 @@ class FOQElasticaExtension extends Extension
     }
 
     /**
-     * Loads the reseter
+     * Loads the resetter
      *
      * @return null
      **/
-    protected function loadReseter(array $indexConfigs, ContainerBuilder $container)
+    protected function loadResetter(array $indexConfigs, ContainerBuilder $container)
     {
-        $reseterDef = $container->getDefinition('foq_elastica.reseter');
-        $reseterDef->replaceArgument(0, $indexConfigs);
+        $resetterDef = $container->getDefinition('foq_elastica.resetter');
+        $resetterDef->replaceArgument(0, $indexConfigs);
     }
 
     protected function loadDriver(ContainerBuilder $container, $driver)
diff --git a/Reseter.php b/Resetter.php
similarity index 91%
rename from Reseter.php
rename to Resetter.php
index 98a7ee0..0e1425d 100644
--- a/Reseter.php
+++ b/Resetter.php
@@ -2,12 +2,10 @@
 
 namespace FOQ\ElasticaBundle;
 
-use Elastica_Exception_Response;
-
 /**
  * Deletes and recreates indexes
  **/
-class Reseter
+class Resetter
 {
 	/**
 	 * Index settings and mappings
diff --git a/Resources/config/config.xml b/Resources/config/config.xml
index 2549d59..b324f95 100644
--- a/Resources/config/config.xml
+++ b/Resources/config/config.xml
@@ -41,7 +41,7 @@
             <argument /> <!-- providers -->
         </service>
 
-        <service id="foq_elastica.reseter" class="FOQ\ElasticaBundle\Reseter">
+        <service id="foq_elastica.resetter" class="FOQ\ElasticaBundle\Resetter">
             <argument /> <!-- index configs -->
         </service>
 
diff --git a/Tests/ReseterTest.php b/Tests/ResetterTest.php
similarity index 87%
rename from Tests/ReseterTest.php
rename to Tests/ResetterTest.php
index 598ae08..81449f2 100644
--- a/Tests/ReseterTest.php
+++ b/Tests/ResetterTest.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace FOQ\ElasticaBundle\Tests\Reseter;
+namespace FOQ\ElasticaBundle\Tests\Resetter;
 
-use FOQ\ElasticaBundle\Reseter;
+use FOQ\ElasticaBundle\Resetter;
 use FOQ\ElasticaBundle\IndexManager;
 use Elastica_Exception_Response;
 use Elastica_Response;
@@ -41,7 +41,7 @@ class NewIndex
     }
 }
 
-class ReseterTest extends \PHPUnit_Framework_TestCase
+class ResetterTest extends \PHPUnit_Framework_TestCase
 {
     public function setUp()
     {
@@ -61,8 +61,8 @@ class ReseterTest extends \PHPUnit_Framework_TestCase
         $indexConfig['index_2']['config'] = array();
 
 
-        $reseter = new Reseter($indexConfig);
-        $reseter->reset();
+        $resetter = new Resetter($indexConfig);
+        $resetter->reset();
 
         $this->assertTrue($indexConfig['index_1']['index']->created);
         $this->assertTrue($indexConfig['index_2']['index']->created);