Merge pull request #25 from robcaw/master

Generator created at point of calling generate()
vivait · Apr 22, 2015 · 3a9ab1a · 3a9ab1a
2 parents 1757768 + c6e4e6f
commit 3a9ab1a
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 18 deletions.
diff --git a/spec/Vivait/StringGeneratorBundle/Generator/SecureStringGeneratorSpec.php b/spec/Vivait/StringGeneratorBundle/Generator/SecureStringGeneratorSpec.php
@@ -11,12 +11,6 @@
 
 class SecureStringGeneratorSpec extends ObjectBehavior
 {
-
-    /**
-     * @var Factory
-     */
-    private $factory;
-
     function it_is_initializable()
     {
         $this->shouldHaveType('Vivait\StringGeneratorBundle\Generator\SecureStringGenerator');
@@ -37,11 +31,6 @@ function let(Factory $factory, Generator $low, Generator $medium)
         $this->setOptions($defaults);
     }
 
-    function it_chooses_medium_strength_gen_by_default(Generator $medium)
-    {
-        $this->getGenerator()->shouldReturn($medium);
-    }
-
     function it_chooses_a_specified_strength_gen(Generator $medium, Generator $low)
     {
         $this->getGenerator('medium')->shouldReturn($medium);

diff --git a/src/Vivait/StringGeneratorBundle/Generator/SecureStringGenerator.php b/src/Vivait/StringGeneratorBundle/Generator/SecureStringGenerator.php
@@ -11,17 +11,18 @@ class SecureStringGenerator implements ConfigurableGeneratorInterface
 {
 
     /**
-     * @var
+     * @var int
      */
     private $length = 32;
 
     /**
-     * @var Generator
+     * @var string
      */
-    private $generator;
-
     private $chars = '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ';
 
+    /**
+     * @var string
+     */
     private $strength = 'medium';
 
     /**
@@ -44,10 +45,10 @@ public function __construct(Factory $factory)
      */
     public function generate()
     {
-        return $this->generator->generateString($this->length, $this->chars);
+        return $this->getGenerator($this->strength)->generateString($this->length, $this->chars);
     }
 
-    public function getGenerator($strength = 'medium')
+    public function getGenerator($strength)
     {
         switch ($strength) {
             case 'low':
@@ -63,7 +64,7 @@ public function getGenerator($strength = 'medium')
 
     public function setOptions(array $options)
     {
-        $this->generator = $this->getGenerator($options['strength']);
+        $this->strength = $options['strength'];
         $this->length = $options['length'];
         $this->chars = $options['chars'];
     }