Merge branch 'master' of https://github.com/abr4xas/utils

abr4xas · Jul 20, 2017 · ea1463d · ea1463d
2 parents 830be4e + 0d75b50
commit ea1463d
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 26 deletions.
diff --git a/README.md b/README.md
@@ -45,10 +45,11 @@ Debug::dieDump($var);
 
 use Abr4xas\Utils\Money;
 
-Money::generaFormato(200, 'USD$');
-Money::generaFormato(200, 'USD$', 5); // 5 decimals
+Money::generaFormato(200, ['s' => 'USD$']); // USD$ 200.00
+Money::generaFormato(200, ['s' => 'USD$', 'd' => 4]); // USD$ 200.0000
 
-Money::quitarFormato('USD$ 200', 'USD$');
+Money::quitarFormato('USD$ 200',  ['s' => 'USD$']); // 200.00
+Money::quitarFormato('USD$ 200',  ['s' => 'USD$', 'd' => 4]); // 200.0000
 
 use Abr4xas\Utils\Gravatar;
 
@@ -58,4 +59,4 @@ use Abr4xas\Utils\TimeFormat;
 
 TimeFormat::timeAgo('2017-07-11'); 
 
-```
+```
diff --git a/src/Gravatar.php b/src/Gravatar.php
@@ -34,11 +34,11 @@ class Gravatar
     const HTTPS_URL = 'https://secure.gravatar.com/avatar/';
 
     /**
-    * Returns the user's gravatar url.
-    * @param string $email The email address
-    * @param array $options Optional, additional key/value attributes to include
-    * @return string Link to the user's gravatar image.
-    */
+     * Returns the user's gravatar url.
+     * @param string $email The email address
+     * @param array $options Optional, additional key/value attributes to include
+     * @return string Link to the user's gravatar image.
+     */
     public static function getAvatarUrl($email, $options = [])
     {
         $size       = isset($options['s']) ? $options['s'] : 80;

diff --git a/src/Money.php b/src/Money.php
@@ -35,30 +35,36 @@ class Money
      * Genera el formato de moneda
      *
      * @param  float $valor monto a transformar
-     * @param  string $simbolo símbolo a mostrar por defecto BsF
-     * @param  int $decimal cantidad de decimales a mostrar por defecto dos
+     * @param array $options additional key/value attributes to include
      * @return string valor formateado según $simbolo y $decimal
      * @throws Exception
      */
 
-    public static function generaFormato($valor = 0, $simbolo = 'BsF', $decimal = 2)
+    public static function generaFormato($valor = 0,  $options = [])
     {
+
+        $simbolo  = isset($options['s']) ? $options['s'] : 'BsF';
+        $decimal  = isset($options['d']) ? $options['d'] : 2;  
+
         if (!is_numeric($valor))
             throw new Exception("{$valor} debe indicar un número que sea válido");
         if (!is_int($decimal))
-            throw new Exception("El valor {$decimal} no es válido");
+            throw new Exception("El valor {$decimal} no es válido");          
 
         return $simbolo . ' ' . number_format($valor, $decimal, '.', '');
     }
     /**
      * Retira el formato generado de moneda
      *
      * @param  string $str monto a transformar
-     * @param  string $simbolo
+     * @param array $options additional key/value attributes to include
      * @return float
      */
-    public static function quitarFormato($str, $simbolo = 'BsF')
+    public static function quitarFormato($str, $options = [])
     {
-        return floatval(str_replace('.', '', str_replace($simbolo, '', $str)));
+        $simbolo  = isset($options['s']) ? $options['s'] : 'BsF';
+        $decimal  = isset($options['d']) ? $options['d'] : 2;
+
+        return number_format(str_replace($simbolo, '', $str), $decimal, '.', '');
     }
 }
diff --git a/src/SeoUrl.php b/src/SeoUrl.php
@@ -31,11 +31,11 @@
 class SeoUrl
 {
     /**
-    * Remove Accent
-    * 
-    * @param string $str
-    * @return string
-    */
+     * Remove Accent
+     * 
+     * @param string $str
+     * @return string
+     */
     public static function removeAccent($str)
     {
         $first = [
@@ -48,11 +48,11 @@ public static function removeAccent($str)
     }
 
     /**
-    * Generate Slug
-    * 
-    * @param string $str
-    * @return string
-    */
+     * Generate Slug
+     * 
+     * @param string $str
+     * @return string
+     */
     public static function generateSlug($str)
     {
         return strtolower(preg_replace(