Add ability to remove a feature from rollout

CHANGELOG.md

@@ -0,0 +1,11 @@
+2.0.0
+-----
+
+(BC Break) The `StorageInterface` interface had a `remove` function added to its definition.  If you have your own implementation of this interface, you'll need to update your implementation to include this functionality.
+
+- Added support for removing a feature [PR #10](https://github.com/opensoft/rollout/pull/10)
+
+1.0.4
+-----
+
+- Added redis support [PR #9](https://github.com/opensoft/rollout/pull/9)

README.md

@@ -130,6 +130,17 @@ $rollout->deactivate('chat');
 
 You may wish to disable features programmatically if monitoring tools detect unusually high error rates for example.
 
+Remove a Feature (added in 2.0.0)
+---------------------------------
+
+After a feature becomes mainstream or a failed experiment, you may want to remove the feature definition from rollout.
+
+```php
+$rollout->remove('chat');
+```
+
+Note: If there is still code referencing the feature, it will be recreated with default settings.
+
 Symfony2 Bundle
 ---------------
 

composer.json

@@ -13,7 +13,8 @@
         "php": ">=5.3.3"
     },
     "suggest": {
-        "doctrine/cache": "For use with the DoctrineCacheStorageAdapter"
+        "doctrine/cache": "For use with the DoctrineCacheStorageAdapter",
+        "predis/predis": "For use with the RedisStorageAdapter"
     },
     "require-dev": {
         "phpunit/phpunit": "*",

src/Rollout.php

@@ -45,7 +45,6 @@ public function activate($feature)
         }
     }
 
-
     /**
      * @param string $feature
      */
@@ -191,6 +190,22 @@ public function get($feature)
         return $f;
     }
 
+    /**
+     * Remove a feature definition from rollout
+     *
+     * @param string $feature
+     */
+    public function remove($feature)
+    {
+        $this->storage->remove($this->key($feature));
+
+        $features = $this->features();
+        if (in_array($feature, $features)) {
+            $features = array_diff($features, [$feature]);
+        }
+        $this->storage->set($this->featuresKey(), implode(',', $features));
+    }
+
     /**
      * @return array
      */

src/Storage/ArrayStorage.php

@@ -33,4 +33,13 @@ public function set($key, $value)
         $this->storage[$key] = $value;
     }
 
+    /**
+     * @param string $key
+     */
+    public function remove($key)
+    {
+        if (isset($this->storage[$key])) {
+            unset($this->storage[$key]);
+        }
+    }
 } 

src/Storage/DoctrineCacheStorageAdapter.php

@@ -44,4 +44,12 @@ public function set($key, $value)
     {
         $this->cache->save($key, $value);
     }
+
+    /**
+     * @param string $key
+     */
+    public function remove($key)
+    {
+        $this->cache->delete($key);
+    }
 } 

src/Storage/PDOStorageAdapter.php

@@ -12,6 +12,7 @@ class PDOStorageAdapter implements StorageInterface
     const STMT_SELECT = 'SELECT settings FROM :table WHERE name = :key';
     const STMT_INSERT = 'INSERT INTO :table (name, settings) VALUES (:key, :value)';
     const STMT_UPDATE = 'UPDATE :table SET settings = :value WHERE name = :key';
+    const STMT_DELETE = 'DELETE FROM :table WHERE name = :key';
 
     /**
      * @var \PDO
@@ -69,6 +70,17 @@ public function set($key, $value)
         $statement->execute();
     }
 
+    /**
+     * @param string $key
+     */
+    public function remove($key)
+    {
+        $statement = $this->pdoConnection->prepare($this->getSQLStatement(self::STMT_DELETE));
+
+        $statement->bindParam('key', $key);
+        $statement->execute();
+    }
+
     /**
      * @param string $sql
      *

src/Storage/RedisStorageAdapter.php

@@ -60,4 +60,12 @@ public function set($key, $value)
     {
         $this->redis->hset($this->group, $key, json_encode($value));
     }
+
+    /**
+     * @inheritdoc
+     */
+    public function remove($key)
+    {
+        $this->redis->hdel($this->group, $key);
+    }
 }

src/Storage/StorageInterface.php

@@ -22,4 +22,10 @@ public function get($key);
      * @return void
      */
     public function set($key, $value);
+
+    /**
+     * @param string $key
+     * @return void
+     */
+    public function remove($key);
 } 

tests/RolloutTest.php

@@ -246,6 +246,16 @@ public function testGet()
         $this->assertEmpty($feature->getUsers());
         $this->assertEquals(100, $feature->getPercentage());
     }
+
+    public function testRemove()
+    {
+        $this->rollout->activate('signup');
+        $feature = $this->rollout->get('signup');
+        $this->assertEquals('signup', $feature->getName());
+
+        $this->rollout->remove('signup');
+        $this->assertNotContains('signup', $this->rollout->features());
+    }
 }
 
 

tests/Storage/PDOStorageAdapterTest.php

@@ -29,6 +29,23 @@ public function testGet()
         $this->assertEquals('success', $result);
     }
 
+    public function testRemove()
+    {
+        $statement = $this->mockPDOStatement();
+
+        $statement->expects($this->once())
+            ->method('bindParam')
+            ->with('key', 'test');
+
+        $statement->expects($this->once())
+            ->method('execute');
+
+        $pdo = $this->mockPDO($this->prepareSQL(PDOStorageAdapter::STMT_DELETE), $statement);
+
+        $adapter = new PDOStorageAdapter($pdo);
+        $adapter->remove('test');
+    }
+
     public function testTableName()
     {
         $statement = $this->mockPDOStatement();

tests/Storage/RedisStorageAdapterTest.php

@@ -76,6 +76,17 @@ public function testSet()
         $adapter->set('key', 'value');
     }
 
+    public function testRemove()
+    {
+        $this->redis->expects($this->once())
+            ->method('hdel')
+            ->with(RedisStorageAdapter::DEFAULT_GROUP, 'key');
+
+        $adapter = new RedisStorageAdapter($this->redis);
+
+        $adapter->remove('key');
+    }
+
     public function testSetWithCustomGroup()
     {
         $this->redis->expects($this->once())
@@ -92,4 +103,5 @@ interface mockRedis
 {
     public function hget($key, $field);
     public function hset($key, $field, $value);
+    public function hdel($key, $field);
 }