add uppercase option

README.md

@@ -85,6 +85,9 @@ return [
     // font size
     'fontSize' => 48,
 
+    // convert initial letter to uppercase
+    'uppercase' => false,
+
     // Fonts used to render text.
     // If contains more than one fonts, randomly selected based on name supplied
     // You can provide absolute path, path relative to folder resources/laravolt/avatar/fonts/, or mixed.    

config/config.php

@@ -36,6 +36,9 @@
     // font size
     'fontSize' => 48,
 
+    // convert initial letter in uppercase
+    'uppercase' => false,
+
     // Fonts used to render text.
     // If contains more than one fonts, randomly selected based on name supplied
     // You can provide absolute path, path relative to folder resources/laravolt/avatar/fonts/, or mixed.

src/Avatar.php

@@ -59,9 +59,18 @@ public function __construct(array $config, CacheManager $cache, InitialGenerator
         $this->borderColor = Arr::get($config, 'border.color');
 
         $this->cache = $cache;
-        $this->initialGenerator = $initialGenerator;
+        $this->initialGenerator = $initialGenerator->setUppercase(Arr::get($config, 'uppercase'));
     }
 
+    /**
+     * @return String
+     */
+    function __toString()
+    {
+        return (string) $this->toBase64();
+    }
+
+
     public function create($name)
     {
         $this->name = $name;
@@ -272,6 +281,7 @@ protected function cacheKey()
         $keys = [];
         $attributes = [
             'name',
+            'initials',
             'shape',
             'chars',
             'font',

src/InitialGenerator.php

@@ -13,6 +13,8 @@ class InitialGenerator
 
     protected $ascii = false;
 
+    protected $uppercase = false;
+
     /**
      * Identifier constructor.
      *
@@ -71,25 +73,41 @@ public function setAscii($ascii)
         return $this;
     }
 
+    public function setUppercase($uppercase)
+    {
+        $this->uppercase = $uppercase;
+
+        return $this;
+    }
+
     public function getInitial()
     {
         $words = new Collection(explode(' ', $this->name));
 
         // if name contains single word, use first N character
         if ($words->count() === 1) {
+
+            $initial = (string)$words->first();
+
             if ($this->name->length() >= $this->length) {
-                return (string) $this->name->substr(0, $this->length);
+                $initial = (string)$this->name->substr(0, $this->length);
             }
 
-            return (string) $words->first();
+        } else {
+            // otherwise, use initial char from each word
+            $initials = new Collection();
+            $words->each(function ($word) use ($initials) {
+                $initials->push(Stringy::create($word)->substr(0, 1));
+            });
+
+            $initial = $initials->slice(0, $this->length)->implode('');
+
         }
 
-        // otherwise, use initial char from each word
-        $initials = new Collection();
-        $words->each(function ($word) use ($initials) {
-            $initials->push(Stringy::create($word)->substr(0, 1));
-        });
+        if ($this->uppercase) {
+            $initial = strtoupper($initial);
+        }
 
-        return $initials->slice(0, $this->length)->implode('');
+        return $initial;
     }
 }

tests/AvatarTest.php

@@ -12,6 +12,7 @@ public function it_can_instantiated()
 
         $generator = Mockery::mock('Laravolt\Avatar\InitialGenerator');
         $generator->shouldReceive('getInitial')->andReturn('AB');
+        $generator->shouldReceive('setUppercase')->andReturnSelf();
 
         new \Laravolt\Avatar\Avatar([], $cache, $generator);
     }
@@ -38,6 +39,7 @@ public function it_can_override_attributes_when_instantiated()
 
         $generator = Mockery::mock('Laravolt\Avatar\InitialGenerator');
         $generator->shouldReceive('getInitial')->andReturn('AB');
+        $generator->shouldReceive('setUppercase');
 
         $avatar = new \Laravolt\Avatar\Avatar($config, $cache, $generator);
 
@@ -64,6 +66,7 @@ public function it_can_override_attributes_after_set_name()
         $generator->shouldReceive('setName')->andReturnSelf();
         $generator->shouldReceive('setLength');
         $generator->shouldReceive('getInitial')->andReturn('A');
+        $generator->shouldReceive('setUppercase')->andReturnSelf();
         $generator->shouldReceive('base_path');
         $config = ['backgrounds' => ['#000000', '#111111'], 'foregrounds' => ['#EEEEEE', '#FFFFFF']];
 
@@ -77,7 +80,7 @@ public function it_can_override_attributes_after_set_name()
     /**
      * @test
      */
-    public function it_has_corrent_random_background()
+    public function it_has_correct_random_background()
     {
         $config = [
             'foregrounds' => ['#000000', '#111111'],
@@ -87,6 +90,7 @@ public function it_has_corrent_random_background()
         $cache = Mockery::mock('Illuminate\Cache\CacheManager');
 
         $generator = Mockery::mock('Laravolt\Avatar\InitialGenerator');
+        $generator->shouldReceive('setUppercase')->andReturnSelf();
 
         $avatar = new \Laravolt\Avatar\Avatar($config, $cache, $generator);
         $avatar->setFontFolder(['fonts/']);
@@ -95,6 +99,7 @@ public function it_has_corrent_random_background()
 
         $generator->shouldReceive('setLength')->andReturn(1);
         $generator->shouldReceive('setName')->andReturn($name);
+        $generator->shouldReceive('setUppercase')->andReturnSelf();
         $generator->shouldReceive('getInitial')->andReturn('A');
         $avatar->create($name);
 
@@ -114,6 +119,7 @@ public function it_has_different_random_background()
         $cache = Mockery::mock('Illuminate\Cache\CacheManager');
 
         $generator = Mockery::mock('Laravolt\Avatar\InitialGenerator');
+        $generator->shouldReceive('setUppercase')->andReturnSelf();
 
         $name1 = 'AA';
         $name2 = 'AAA';