Merge pull request #10 from hexadog/develop

Develop

Author: gaetan-hexadog

config/config.php

@@ -16,7 +16,7 @@
     | Symbolic path
     |--------------------------------------------------------------------------
     |
-    | you can change the public themes path used for assets
+    | you can change the public themes path used for assets.
     |
     */
     'symlink_path' => 'themes',
@@ -31,4 +31,18 @@
 	|
 	*/
 	'fallback_theme' => null,
+
+	/*
+    |--------------------------------------------------------------------------
+    | Caching
+    |--------------------------------------------------------------------------
+    |
+    | Config for caching feature.
+    |
+    */
+    'cache' => [
+        'enabled' => false,
+        'key' => 'themes-manager',
+        'lifetime' => 86400,
+	],
 ];

src/Console/Commands/Cache.php

@@ -0,0 +1,46 @@
+<?php
+
+namespace Hexadog\ThemesManager\Console\Commands;
+
+use Hexadog\ThemesManager\Facades\ThemesManager;
+use Hexadog\ThemesManager\Console\Commands\AbstractCommand;
+
+class Cache extends AbstractCommand
+{
+    /**
+     * The console command name.
+     *
+     * @var string
+     */
+    protected $name = 'theme:cache';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'Create themes cache';
+
+    /**
+     * Create a new command instance.
+     *
+     * @return void
+     */
+    public function __construct()
+    {
+        parent::__construct();
+    }
+
+    /**
+     * Prompt for module's alias name
+     *
+     */
+    public function handle()
+    {
+        if (ThemesManager::buildCache()) {
+            $this->sectionMessage('Themes Manager', 'Themes cache created succefully');
+        } else {
+            $this->error("An error occured while creating themes cache");
+        }
+    }
+}

src/Console/Commands/ClearCache.php

@@ -0,0 +1,46 @@
+<?php
+
+namespace Hexadog\ThemesManager\Console\Commands;
+
+use Hexadog\ThemesManager\Facades\ThemesManager;
+use Hexadog\ThemesManager\Console\Commands\AbstractCommand;
+
+class ClearCache extends AbstractCommand
+{
+    /**
+     * The console command name.
+     *
+     * @var string
+     */
+    protected $name = 'theme:cache:clear';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'Clear themes cache';
+
+    /**
+     * Create a new command instance.
+     *
+     * @return void
+     */
+    public function __construct()
+    {
+        parent::__construct();
+    }
+
+    /**
+     * Prompt for module's alias name
+     *
+     */
+    public function handle()
+    {
+        if (ThemesManager::clearCache()) {
+            $this->sectionMessage('Themes Manager', 'Themes cache cleared succefully');
+        } else {
+            $this->error("An error occured while clearing themes cache");
+        }
+    }
+}

src/Helpers/Json.php

@@ -115,7 +115,7 @@ public function getContents(): string
 
     /**
      * Get file contents as array
-     * 
+     *
      * @return array
      * @throws InvalidJsonException
      */

src/Providers/PackageServiceProvider.php

@@ -6,6 +6,7 @@
 use ReflectionClass;
 use Illuminate\Support\Str;
 use Illuminate\Routing\Router;
+use Illuminate\Cache\CacheManager;
 use Illuminate\Filesystem\Filesystem;
 use Illuminate\Contracts\View\Factory;
 use Illuminate\Foundation\AliasLoader;
@@ -99,7 +100,8 @@ public function register(): void
         $this->app->singleton('themes-manager', function () {
             return new ThemesManager(
                 app(Factory::class),
-                app(Translator::class)
+                app(Translator::class),
+                app(CacheManager::class)
             );
         });
 
@@ -127,6 +129,8 @@ protected function strapCommands()
         if ($this->app->runningInConsole() || config('app.env') == 'testing') {
             $this->commands([
                 Commands\ActivateTheme::class,
+                Commands\Cache::class,
+                Commands\ClearCache::class,
                 Commands\DeactivateTheme::class,
                 Commands\ListThemes::class,
                 Generators\MakeTheme::class,

src/Theme.php

@@ -13,6 +13,7 @@
 use Hexadog\ThemesManager\Events\ThemeEnabling;
 use Hexadog\ThemesManager\Traits\ComposerTrait;
 use Hexadog\ThemesManager\Events\ThemeDisabling;
+use Illuminate\Support\Facades\Log;
 
 class Theme
 {
@@ -25,13 +26,6 @@ class Theme
      */
     protected $path;
 
-    /**
-     * The theme assets path (within public storage).
-     *
-     * @var string
-     */
-    protected $assetsPath;
-
     /**
      * The Parent theme.
      *
@@ -112,9 +106,10 @@ public function getAssetsPath(string $path = null): string
      * Get theme views paths
      *
      * @param string $path
-     * @return void
+     *
+     * @return array
      */
-    public function getViewPaths($path = '')
+    public function getViewPaths($path = ''): array
     {
         // Build Paths array.
         // All paths are relative to Config::get('themes-manager.directory')
@@ -317,7 +312,7 @@ public function url($url, $absolutePath = false): ?string
             }
         }
 
-        \Log::warning("Asset [{$url}] not found for Theme [{$this->getName()}]");
+        Log::warning("Asset [{$url}] not found for Theme [{$this->getName()}]");
 
         return ltrim(str_replace('\\', '/', $url));
     }