Merge pull request #14 from ARCANEDEV/patch-1

Updating the supported image types

Author: arcanedev-maroc

config/gravatar.php

@@ -9,7 +9,7 @@
      | -----------------------------------------------------------------
      |  The default avatar to display if we have no results.
      |
-     |  Supported: 'identicon', '404', 'mm', 'monsterid', 'wavatar', 'retro', false
+     |  Supported: 'identicon', '404', 'mp', 'monsterid', 'wavatar', 'retro', 'robohash', 'blank', false
      */
 
     'default' => 'identicon',

src/Exceptions/InvalidImageUrlException.php

@@ -10,10 +10,10 @@
  */
 class InvalidImageUrlException extends InvalidArgumentException
 {
-    public static function make()
+    public static function make($image)
     {
         return new static(
-            'The default image specified is not a recognized gravatar "default" and is not a valid URL'
+            "The default image specified is not a recognized gravatar `default` and is not a valid URL: `{$image}`"
         );
     }
 }

src/Gravatar.php

@@ -72,14 +72,18 @@ class Gravatar implements Contracts\Gravatar
      *
      * @var array
      */
-    private $supportedImages    = ['404', 'mm', 'identicon', 'monsterid', 'wavatar', 'retro'];
+    private $supportedImages    = [
+        '404', 'mp', 'identicon', 'monsterid', 'wavatar', 'retro', 'robohash', 'blank',
+    ];
 
     /**
      * Supported image ratings.
      *
      * @var array
      */
-    private $supportedRatings   = ['g', 'pg', 'r', 'x'];
+    private $supportedRatings   = [
+        'g', 'pg', 'r', 'x'
+    ];
 
     /* -----------------------------------------------------------------
      |  Constructor
@@ -93,7 +97,7 @@ class Gravatar implements Contracts\Gravatar
      * @param  int     $size
      * @param  string  $rating
      */
-    public function __construct($default = 'mm', $size = 80, $rating = 'g')
+    public function __construct($default = 'blank', $size = 80, $rating = 'g')
     {
         $this->setDefaultImage($default);
         $this->setSize($size);
@@ -360,7 +364,7 @@ public function exists($email)
     private function checkImageUrl($image)
     {
         if ( ! filter_var($image, FILTER_VALIDATE_URL)) {
-            throw Exceptions\InvalidImageUrlException::make();
+            throw Exceptions\InvalidImageUrlException::make($image);
         }
 
         return $image;

tests/GravatarTest.php

@@ -1,5 +1,6 @@
 <?php namespace Arcanedev\Gravatar\Tests;
 
+use Arcanedev\Gravatar\Exceptions\InvalidImageUrlException;
 use Arcanedev\Gravatar\Gravatar;
 
 /**
@@ -97,10 +98,10 @@ public function it_must_throw_an_invalid_rating_exception()
     }
 
     /** @test */
-    public function it_must_throw_invalid_image_url_on_setting_default_image()
+    public function it_must_throw_invalid_image_url_when_setting_default_image()
     {
         $this->expectException(\Arcanedev\Gravatar\Exceptions\InvalidImageUrlException::class);
-        $this->expectExceptionMessage('The default image specified is not a recognized gravatar "default" and is not a valid URL');
+        $this->expectExceptionMessage('The default image specified is not a recognized gravatar `default` and is not a valid URL: `hello.com/img.png`');
 
         new Gravatar('hello.com/img.png');
     }
@@ -283,6 +284,36 @@ public function it_get_profile()
         static::assertCount(1, $data['entry']);
     }
 
+    /** @test */
+    public function it_can_check_if_image_type_is_supported()
+    {
+        $types = [
+            '404',
+            'mp',
+            'identicon',
+            'monsterid',
+            'wavatar',
+            'retro',
+            'robohash',
+            'blank',
+        ];
+
+        foreach ($types as $type) {
+            $this->gravatar->setDefaultImage($type);
+
+            static::assertSame($type, $this->gravatar->getDefaultImage());
+        }
+    }
+
+    /** @test */
+    public function it_must_throw_exception_when_default_image_not_supported()
+    {
+        $this->expectException(InvalidImageUrlException::class);
+        $this->expectExceptionMessage('The default image specified is not a recognized gravatar `default` and is not a valid URL: `github`');
+
+        $this->gravatar->setDefaultImage('github');
+    }
+
     /* -----------------------------------------------------------------
      |  Other Methods
      | -----------------------------------------------------------------