version update

Author: Fredrick Peter

Asset.php

@@ -20,7 +20,7 @@ class Asset{
      * 
      * @return string
      */
-    static public function asset(?string $asset = null, ?bool $cache = true)
+    static public function asset(?string $asset = null, ?bool $cache = false)
     {
         // if coniguration has not been used in the global space
         // then we call to define paths for us
@@ -70,21 +70,27 @@ static public function config(?string $base_path = null, ?bool $cache = true)
         // severs
         $server = self::getServers();
 
-        // set default
+        // set default directory
         if(empty($base_path)){
-            $base_path = "assets";
+            $base_path = "public";
         }
 
         // if not defined
         if(!defined('ASSET_BASE_DIRECTORY')){
             // - Trim forward slash from left and right
             $base_path = trim($base_path, '/');
+            
+            // old url getter helper
+            $urlFromServer = self::cleanServerPath("{$server['domain']}{$base_path}");
+
+            // url helper class
+            $urlFromhelper = UrlHelper::url();
 
             define('ASSET_BASE_DIRECTORY', [
                 'cache'     => $cache,
                 'server'    => self::formatWithBaseDirectory($base_path),
                 'domain'    => rtrim(
-                    self::cleanServerPath("{$server['domain']}{$base_path}"), 
+                    self::cleanServerPath("{$urlFromhelper}{$base_path}"), 
                     '/'
                 ),
             ]);

Capsule/Manager.php

@@ -6,6 +6,7 @@
 
 use Tamedevelopers\Support\Env;
 use Tamedevelopers\Support\Str;
+use Tamedevelopers\Support\Tame;
 
 class Manager{
 
@@ -149,16 +150,16 @@ static public function isEnvSet($key)
      * Set headers with response code
      *
      * @param  mixed $status
-     * @param  callable $function
+     * @param  Closure|null $closure
      * @return void
      */
-    static public function setHeaders($status = 404, callable $function = null)
+    static public function setHeaders($status = 404, $closure = null)
     {
         // Set HTTP response status code to 404
         @http_response_code($status);
 
-        if(is_callable($function)){
-            $function();
+        if(Tame::isClosure($closure)){
+            $closure();
         }
 
         // Exit with response 404

Laravel.php

@@ -26,22 +26,35 @@ static public function svgDirective()
 
             // Register a Blade directive
             Blade::directive('svg', function ($expression) {
-                // Parse the expression to get the path and classes
-                list($path, $classes) = explode(',', $expression, 2);
 
-                // path
-
-                // Load the SVG file contents
-                $svgContent = file_get_contents(public_path(trim($path, '"')));
-
-                // Add classes to SVG
-                $svg = simplexml_load_string($svgContent);
-                if (!empty($classes)) {
-                    $svg->addAttribute('class', trim($classes, '"'));
-                }
-
-                // Return the modified SVG
-                return $svg->asXML();
+                list($path, $class) = array_pad(explode(',', $expression, 2), 2, '');
+
+                $path = str_replace(['"', "'"], '', $path);
+                $class = str_replace(['"', "'"], '', $class);
+                
+                // fullpath
+                $fullPath = public_path($path);
+
+                // if file exists
+                if(Tame::exists($fullPath)){
+                    // Load the SVG file contents
+                    $svgContent = file_get_contents($fullPath);
+
+                    // Parse the SVG content into a SimpleXMLElement
+                    $svg = simplexml_load_string($svgContent);
+
+                    // If a class is provided, add it to the SVG element
+                    if (!empty($class)) {
+                        if (isset($svg['class'])) {
+                            $svg['class'] .= ' ' . $class;
+                        } else {
+                            $svg->addAttribute('class', $class);
+                        }
+                    }
+
+                    // Return the modified SVG
+                    return $svg->asXML();
+                };
             });
         });
     }

README.md

@@ -37,7 +37,7 @@ composer require tamedevelopers/support
 
 ## Asset
 - Takes a param as `string` path to asset file
-    - Default [dir] is set to `assets`
+    - Default [dir] is set to `public`
 
 ```
 use Tamedevelopers\Support\Asset;
@@ -175,15 +175,15 @@ Server::config('tests.lang.email', [], 'Tests');
  * @param  mixed $key
  * @return mixed
  */
-function __($key){
+function __lang($key){
 
     // since the config only takes the filename follow by dot(.) and keyname
     // then we can manually include additional folder-name followed by / to indicate that it's a folder
     // then message.key_name
     // To make this Laravel kind of language, we can add the default value to be returned as the key
     // Do not forget that it starts from your root base directory, as the Package already has your root path
 
-    return config("en/message.{$key}", "message.{$key}", 'Lang');
+    return config("en/message.{$key}", "message.{$key}", 'lang');
 }
 
 

Tame.php

@@ -13,7 +13,7 @@
  * @see \Tamedevelopers\Support\Server
  * @see \Tamedevelopers\Support\Time
  */
-class Tame{
+class Tame {
 
     use TameTrait;
 
@@ -64,14 +64,14 @@ static public function echoJson(int $response = 0, $message = null)
      * Check if Class Exists
      *
      * @param  string $class
-     * @param  callable|null $function
-     * @return mixed
+     * @param  Closure|null $closure
+     * @return void
      */
-    static public function class_exists($class, callable $function = null)
+    static public function class_exists($class, $closure = null)
     {
         if(class_exists($class)){
-            if(is_callable($function)){
-                $function();
+            if(self::isClosure($closure)){
+                $closure();
             }
         }
     }
@@ -746,9 +746,6 @@ static public function formatNumberToNearestThousand(float|int $number = 0)
      */
     static public function unlinkFile(string $fileToUnlink, $checkFile = null)
     {
-        $fileToUnlink = self::getBasePath($fileToUnlink);
-        $checkFile = self::getBasePath($checkFile);
-
         if(self::exists($fileToUnlink)){
             if(basename($fileToUnlink) != basename($checkFile)){
                 @unlink($fileToUnlink);
@@ -836,20 +833,18 @@ static public function saveFileFromURL($url = null, $destination = null)
     static public function readPDFToBrowser($path = null)
     {
         if(!empty($path) && self::exists($path)){
-            // Header content type
-            header("Content-type: application/pdf");
-            
-            header("Content-Length: " . filesize($path));
-            
-            // Send the file to the browser.
+            @header("Content-type: application/pdf");
+            @header("Content-Length: " . filesize($path));
             readfile($path);
         }
     }
 
     /**
      * Convert image to base64
      *
-     * @param  string|null $path_to_image
+     * @param  string|null $path
+     * 
+     * 
      * @return null|string
      */
     static public function imageToBase64($path = null) 

Tests/test.php

@@ -19,7 +19,7 @@
 //     'output' => 'download'
 // ]);
 
-// Tame::unlinkFile('welcome.png', 'upload/avatar/default.png')
+// Tame::unlinkFile(base_path('welcome.png'), 'default.png')
 
 // Tame::platformIcon('windows')
 

Tests/translate.php

@@ -8,13 +8,14 @@
 /**
  * Custom Language Handler
  *
- * @param  string $key
+ * @param string $key
+ * @param string|null  $locale
+ * 
  * @return mixed
  */
-function __lang($key){
+function __lang($key, $locale = null){
     return Translator::trans(
-        "message.{$key}", 
-        Translator::getLocale()
+        "message.{$key}", $locale
     );
 }
 
@@ -35,14 +36,15 @@ function configuration($key, $default = null){
     return config("configuration/{$key}", $default, 'tests');
 }
 
-
 dd(
+    
     __('message.name'),
 
+    __('error.forgot'),
 
     __('message.forgot_password'),
 
-    __lang('confirm_password'),
+    __lang('confirm_password', 'cn'),
 
     // configuration('banners'),
 

Tests/url.php

@@ -8,7 +8,6 @@
 // URL Helpers
 
 
-
 dd(
     domain(),