use renderer to return output instead of displaying

Author: MGatner

README.md

@@ -5,12 +5,13 @@ Lightweight asset loader for CodeIgniter 4
 
 1. Run: `> composer require tatter/assets`
 2. Put CSS & JS files in: public/assets
-3. Add in head tag: `helper("tatter\assets"); css();`
-4. Add to footer: `js();`
+3. Load the helper: `helper("tatter\assets");`
+3. Add in head tag: `echo css();`
+4. Add to footer: `echo js();`
 
 ## Features
 
-Provides out-of-the-box asset loading for CSS and JavaScript files
+Provides out-of-the-box asset loading for CSS and JavaScript files for CodeIgniter 4
 
 ## Installation
 
@@ -33,7 +34,7 @@ If installed correctly CodeIgniter 4 will detect and autoload the library, helpe
 (optional) config. Initialize the helper before using its functions:
 `helper("tatter\assets");`
 
-Then call the helper functions `css()` and `js()` to output the appropriate assets.
+Then call the helper functions `css()` and `js()` to retrieve the appropriate assets.
 
 ## Structure
 

src/Helpers/assets_helper.php

@@ -18,9 +18,9 @@ function css(string $file = null) {
 
 		// intercept requests for a single file
 		if (is_string($file))
-			$assets->displayFile($file);
+			return $assets->displayFile($file);
 		else
-			$assets->display("css");	
+			return $assets->display("css");	
 	}
 }
 
@@ -33,8 +33,8 @@ function js(string $file = null) {
 
 		// intercept requests for a single file
 		if (is_string($file))
-			$assets->displayFile($file);
+			return $assets->displayFile($file);
 		else
-			$assets->display("js");	
+			return $assets->display("js");	
 	}
 }

src/Libraries/Assets.php

@@ -29,45 +29,46 @@
 /*** CLASS ***/
 class Assets
 {
-
-	private $fsbase;
-	private $webbase;
-	private $routes;
+	protected $fsbase;
+	protected $webbase;
+	protected $routes;
 
 	// initiate library, check for existing session
-	public function __construct()
+	public function __construct($config = null)
 	{
 		// load required helpers
 		helper("filesystem");
 		helper("url");
 
 		// load optional configuration
-		$config = config('Assets', false);
+		$config = $config ?? config('Assets', false);
 
-		// set parameters by config override or default
+		// set parameters by config override or use default
 		$this->fsbase = $config->fsbase ?? FCPATH."assets/";
 		$this->webbase = $config->webbase ?? base_url()."assets/";
 		$this->routes = $config->routes ?? [ ];
 	}
 
-	// outputs route-relevant and preconfigured assets of a given extension
+	// returns route-relevant and preconfigured assets of a given extension
 	// accepts 'css' or 'js'
 	public function display(string $extension)
 	{
 		if (! in_array($extension, ['css', 'js']))
 			return false;
 
 		// output all matched files as tags
-		echo "<!-- Local ".strtoupper($extension)." files -->".PHP_EOL;
+		$buffer = "<!-- Local ".strtoupper($extension)." files -->".PHP_EOL;
 		foreach ($this->routed($extension) as $file)
-			echo $this->tag($file).PHP_EOL;
+			$buffer .= $this->tag($file).PHP_EOL;
+		return $buffer;
 	}
 
 	// outputs a formatted tag for a single file
-	public function displayFile(string $file) {
+	public function displayFile(string $file)
+	{
 		if (! file_exists($this->fsbase . $file))
 			return false;
-		echo $this->tag($file).PHP_EOL;		
+		return $this->tag($file).PHP_EOL;		
 	}
 
 	// given (an existing) file, formats it as a vlid tag