feat: Working on the new version

composer.json

@@ -27,7 +27,8 @@
     "twig/twig": "^3.0",
     "matthiasmullie/minify": "^1.3.50",
     "ext-json": "*",
-    "ext-intl": "*"
+    "ext-intl": "*",
+    "ext-fileinfo": "*"
   },
   "require-dev": {
     "phpunit/phpunit": "^8.0",

config/routes.php

@@ -13,5 +13,6 @@
 use Cake\Routing\Router;
 
 Router::plugin('DataTables', ['path' => '/data-tables'], function (RouteBuilder $builder) {
+	$builder->connect('/images/*', ['controller' => 'Assets', 'action' => 'images']);
 	$builder->fallbacks(DashedRoute::class);
 });

src/Command/DataTablesCommand.php

@@ -106,6 +106,7 @@ public function execute(Arguments $args, ConsoleIo $io): ?int {
 
 				return static::CODE_SUCCESS;
 			}
+			$this->bakeAppConfig($args, $io);
 			$this->bakeConfig($args, $io);
 			$this->bakeConfigTest($args, $io);
 		} else {
@@ -154,6 +155,31 @@ public function bakeConfig(Arguments $args, ConsoleIo $io) {
 		$this->deleteEmptyFile($emptyFile, $io);
 	}
 
+	/**
+	 * Bake a config class.
+	 *
+	 * @param \Cake\Console\Arguments $args
+	 * @param \Cake\Console\ConsoleIo $io
+	 * @return void
+	 */
+	public function bakeAppConfig(Arguments $args, ConsoleIo $io) {
+		$filename = $this->getPath($args) . $this->fileName('App');
+	    if (!file_exists($filename)) {
+			$this->_template = 'DataTables.app_config';
+			$renderer = new TemplateRenderer();
+			$renderer->set('name', 'App');
+			$templateData = $this->templateData($args);
+			$renderer->set($templateData);
+			$contents = $renderer->generate($this->template());
+			$io->createFile($filename, $contents, (bool)$args->getOption('force'));
+
+			$emptyFile = $this->getPath($args) . '.gitkeep';
+			$this->deleteEmptyFile($emptyFile, $io);
+		} else {
+	        $io->info(sprintf('"%s" will not baked because it already exists.', $this->fileName('App')));
+		}
+	}
+
 	/**
 	 * Bake a config class test.
 	 *

src/Controller/AssetsController.php

@@ -3,6 +3,8 @@
 
 namespace DataTables\Controller;
 
+use Cake\Http\Exception\NotFoundException;
+
 /**
  * Class AssetsController
  * Created by allancarvalho in june 26, 2020
@@ -30,7 +32,10 @@ public function css() {
 		$query = $this->getRequest()->getQuery();
 		$body = $this->Css->getFilesBody($query, 'css');
 
-		return $this->getResponse()->withType('text/css;charset=UTF-8')->withStringBody($body);
+		return $this->getResponse()
+					->withCache('-1 minute', '+30 days')
+					->withType('text/css;charset=UTF-8')
+					->withStringBody($body);
 	}
 
 	/**
@@ -42,7 +47,28 @@ public function script() {
 		$query = $this->getRequest()->getQuery();
 		$body = $this->Js->getFilesBody($query, 'js');
 
-		return $this->getResponse()->withType('application/javascript')->withStringBody($body);
+		return $this->getResponse()
+			->withCache('-1 minute', '+30 days')
+			->withType('application/javascript')
+			->withStringBody($body);
+	}
+
+	/**
+	 * Get the assets images
+	 *
+	 * @param string $filename Name of file.
+	 * @return \Cake\Http\Response
+	 */
+	public function images($filename) {
+	    $fullFilePath = DATA_TABLES_WWW_ROOT . 'images' . DS . $filename;
+		if (!file_exists($fullFilePath)) {
+			throw new NotFoundException(sprintf('Image "%s" not found!', $filename));
+		}
+
+		return $this->getResponse()
+			->withCache('-1 minute', '+30 days')
+			->withType(mime_content_type($fullFilePath))
+			->withStringBody(file_get_contents($fullFilePath));
 	}
 
 }

src/Controller/Component/AssetsTrait.php

@@ -83,7 +83,11 @@ protected function getBodies(array $files, string $type, string $version): strin
 		$body = '';
 		$basePath = DATA_TABLES_WWW_ROOT . $type . DS . $version . DS;
 		foreach ($files as $file) {
-			$body .= file_get_contents($basePath . $file) . "\n";
+			$body .= file_get_contents($basePath . $file);
+			if ($type === 'js') {
+			    $body .= ';';
+			}
+			$body .= "\n";
 		}
 
 		return $body;

src/StorageEngine/CacheStorageEngine.php

@@ -40,21 +40,21 @@ public function __construct(?string $cacheConfigName = null) {
 	 * @inheritDoc
 	 */
 	public function save(string $key, ConfigBundle $configBundle): bool {
-		return Cache::write($key, $configBundle, '_data_tables_config_bundles_');
+		return Cache::write($key, $configBundle, $this->_cacheConfigName);
 	}
 
 	/**
 	 * @inheritDoc
 	 */
 	public function exists(string $key): bool {
-		return Cache::read($key, '_data_tables_config_bundles_') instanceof ConfigBundle;
+		return Cache::read($key, $this->_cacheConfigName) instanceof ConfigBundle;
 	}
 
 	/**
 	 * @inheritDoc
 	 */
 	public function read(string $key): ?ConfigBundle {
-		$configBundle = Cache::read($key, '_data_tables_config_bundles_');
+		$configBundle = Cache::read($key, $this->_cacheConfigName);
 
 		return ($configBundle instanceof ConfigBundle) ? $configBundle : null;
 	}
@@ -63,7 +63,7 @@ public function read(string $key): ?ConfigBundle {
 	 * @inheritDoc
 	 */
 	public function delete(string $key): bool {
-		return Cache::delete($key, '_data_tables_config_bundles_');
+		return Cache::delete($key, $this->_cacheConfigName);
 	}
 
 }

src/Table/Assets.php

@@ -199,6 +199,35 @@ public static function getInstance(bool $reset = false) {
 		return static::$_instance;
 	}
 
+	/**
+	 * Apply a assets instance to main instance.
+	 *
+	 * @param \DataTables\Table\Assets $assets
+	 * @return void
+	 */
+	public function applyConfig(Assets $assets): void {
+		$this->setEnabled($assets->isEnabled());
+		$this->setAutoload($assets->isAutoload());
+		$this->setCssBlock($assets->getCssBlock());
+		$this->setScriptBlock($assets->getScriptBlock());
+		$this->setDataTablesVersion($assets->getDataTablesVersion());
+		$this->setTheme($assets->getTheme());
+		$this->setLoadThemeLibrary($assets->isLoadThemeLibrary());
+		$this->setJquery($assets->getJquery());
+		$this->setLoadPluginAutoFill($assets->isLoadPluginAutoFill());
+		$this->setLoadPluginButtons($assets->isLoadPluginButtons());
+		$this->setLoadPluginColReorder($assets->isLoadPluginColReorder());
+		$this->setLoadPluginFixedColumns($assets->isLoadPluginFixedColumns());
+		$this->setLoadPluginFixedHeader($assets->isLoadPluginFixedHeader());
+		$this->setLoadPluginKeyTable($assets->isLoadPluginKeyTable());
+		$this->setLoadPluginResponsive($assets->isLoadPluginResponsive());
+		$this->setLoadPluginRowGroup($assets->isLoadPluginRowGroup());
+		$this->setLoadPluginRowReorder($assets->isLoadPluginRowReorder());
+		$this->setLoadPluginScroller($assets->isLoadPluginScroller());
+		$this->setLoadPluginSearchPanes($assets->isLoadPluginSearchPanes());
+		$this->setLoadPluginSelect($assets->isLoadPluginSelect());
+	}
+
 	/**
 	 * Return the assets to default state.
 	 *

src/Table/Builder.php

@@ -74,6 +74,7 @@ public function getConfigBundle(string $dataTables, bool $cache = true): ConfigB
 		if ($cache === true && $storageEngine->exists($cacheKey)) {
 			/** @var \DataTables\Table\ConfigBundle $configBundle */
 			$configBundle = $storageEngine->read($cacheKey);
+			Assets::getInstance()->applyConfig($configBundle->Assets);
 		}
 		if (empty($configBundle) || $configBundle->getCheckMd5() !== $md5) {
 			$configBundle = new ConfigBundle($md5, $dataTablesFQN);

src/Table/ConfigBundle.php

@@ -10,6 +10,7 @@
 
 namespace DataTables\Table;
 
+use Cake\Core\Configure;
 use Cake\Error\FatalErrorException;
 use Cake\Routing\Router;
 use Cake\Utility\Inflector;
@@ -80,8 +81,15 @@ public function __construct(
 		$this->Options = new MainOption($this, $this->getUrl());
 		$this->Query = new QueryBaseState();
 		$this->Assets = Assets::getInstance();
-		$this->_dataTables->config($this);
 		$this->Options->setColumns($this->Columns);
+		$this->_dataTables->config($this);
+		if (file_exists(APP . 'DataTables' . DS . 'AppDataTables.php')) {
+			$class = Configure::read('App.namespace') . '\\DataTables\\AppDataTables';
+			$appDataTables = new $class();
+			if (method_exists($appDataTables, 'mainConfig')) {
+				$appDataTables->mainConfig($this->Options, $this->Assets);
+			}
+		}
 	}
 
 	/**

src/Tools/Functions.php

@@ -11,6 +11,7 @@
 
 namespace DataTables\Tools;
 
+use Cake\Core\Configure;
 use Cake\Routing\Router;
 use Cake\Utility\Inflector;
 use DataTables\Table\ConfigBundle;
@@ -77,10 +78,14 @@ public function arrayKeyLast(array $array) {
 	 * @return string
 	 */
 	public function getClassAndVersionMd5(string $classWithNameSpace): string {
+		$appClassMd5 = '';
+		if (file_exists(APP . 'DataTables' . DS . 'AppDataTables.php')) {
+			$appClassMd5 = $this->getClassMd5(Configure::read('App.namespace') . '\\DataTables\\AppDataTables');
+		}
 		$classMd5 = $this->getClassMd5($classWithNameSpace);
 		$pluginCurrentHash = $this->getPluginCurrentCommit();
 
-		return md5($classMd5 . $pluginCurrentHash);
+		return md5($appClassMd5 . $classMd5 . $pluginCurrentHash);
 	}
 
 	/**

templates/bake/app_config.twig

@@ -0,0 +1,24 @@
+<?php
+declare(strict_types=1);
+
+namespace {{ namespace }}\DataTables;
+
+use DataTables\Table\Option\MainOption;
+use DataTables\Table\Assets;
+
+/**
+ * Class {{ name }}DataTables
+ */
+class {{ name }}DataTables {
+
+	/**
+	 * This will be applied to all DataTables tables.
+	 *
+	 * @param \DataTables\Table\Option\MainOption $options Options of DataTable library.
+	 * @param \DataTables\Table\Assets $assets Options for asset load.
+	 */
+    public function mainConfig(MainOption $options, Assets $assets): void
+    {
+        // TODO: Configure here the rules that will be applied to all tables.
+    }
+}