First stage of working JS code

Author: hp197

composer.json

@@ -17,7 +17,8 @@
     "require": {
 		"php": ">=5.4.0",
 		"illuminate/support": "5.*",
-		"illuminate/view": "5.*"
+		"illuminate/view": "5.*",
+		"nesbot/carbon": "~1.0"
     },
     "require-dev": {
         "phpunit/phpunit": "~4.0"

src/Combiner.php

@@ -4,7 +4,18 @@
 use Illuminate\Http\Request;
 use Illuminate\Http\Response;
 use Illuminate\Foundation\Application;
-
+use Carbon\Carbon;
+
+/**
+ * Main Combiner class
+ * 
+ * @todo functionize the view class
+ * @todo better function naming
+ * @todo output complete html tags on (JS/Css)URL
+ * @todo write documentation
+ * @todo move import in css files to top of document (RFC)
+ *
+ */
 class Combiner
 {
 	protected static $_initialised = false;
@@ -45,9 +56,10 @@ public function viewJS(Route $route, Request $request, Response $response)
 			return $response;
 		}
 
+		$count = $route->parameter('count', 0);
 		$files = explode(',', $route->parameter('files', ''));
 
-		if ($route->parameter('count', 0) <> count($files))
+		if ($count <> count($files))
 		{
 			$this->app->abort(422, 'Length option incorrect');
 		}
@@ -56,13 +68,28 @@ public function viewJS(Route $route, Request $request, Response $response)
 		$files = $this->sanitize_files($files);
 		$filesstr = implode('_', $files);
 
-		$etag = implode('-', $request->getETags());
+		$etag = preg_replace('#^"(.*)"$#i', '\1', implode('-', $request->getETags()));
 
 		if (\Cache::has(sprintf('%s_%s_%d', $etag, $filesstr, $count)))
 		{
+			$response->setEtag($etag);
+
+			if ($response->isNotModified($request))
+			{
+				return $response->send();
+			}
+
 			$data = \Cache::get(sprintf('%s_%s_%d', $etag, $filesstr, $count));
 
-			return $this->output($response, $data);
+			$response->setPublic();
+			$response->setContent($data);
+			$response->setVary('etag', true);
+			$response->header('Content-Type', 'text/javascript', true);
+			$response->setExpires(Carbon::now()->addSeconds(
+				$this->app->config->get('combiner.javascript.expires')
+			));
+
+			return $response->send();
 		}
 
 		$basedir = $this->app->basePath() . DIRECTORY_SEPARATOR . $this->app->config->get('combiner.javascript.path');
@@ -76,14 +103,23 @@ public function viewJS(Route $route, Request $request, Response $response)
 				continue;
 			}
 
-			$data .= file_get_contents($fullfile) . PHP_EOL;
+			$data .= @file_get_contents($fullfile) . PHP_EOL;
 		}
 
-		$this->output($response, $data);
+		$etag = md5($data);
 
-		\Cache::put(sprintf('%s_%s_%d', $response->getEtag(), $filesstr, $count), $data, \Carbin::Carbon()->addMinutes(60));
+		$response->setPublic();
+		$response->setEtag($etag);
+		$response->setContent($data);
+		$response->setVary('etag', true);
+		$response->header('Content-Type', 'text/javascript', true);
+		$response->setExpires(Carbon::now()->addSeconds(
+			$this->app->config->get('combiner.javascript.expires')
+		));
 
-		return $response;
+		\Cache::put(sprintf('%s_%s_%d', $etag, $filesstr, $count), $data, Carbon::now()->addMinutes(60));
+
+		return $response->send();
 	}
 
 	/**
@@ -267,21 +303,6 @@ protected function arrayPush(&$array, $value)
 		return (in_array($value, $array) || array_push($array, $value));
 	}
 
-	protected function output(Response &$response, $data='')
-	{
-		$etag = \Crypt::hash('js', $data);
-
-		$response->setPublic();
-		$response->setEtag($etag);
-		$response->setExpires(\Carbon::Carbon()->addSeconds(
-			$this->app->config->get('combiner.javascript.expires')
-		));
-
-		$response->setContent($data);
-		
-		return $response;
-	}
-
 	protected function sanitize_files($arr)
 	{
 		foreach (array_keys($arr) as $idx)

src/CombinerServiceProvider.php

@@ -84,7 +84,7 @@ protected function enableJSCombiner()
 
 		$this->app->router->get($uri, 
 			function (Route $route, Request $request, Response $response) {
-				$this->app->combiner->viewJS($route, $request, $response);
+				return $this->app->combiner->viewJS($route, $request, $response);
 			}
 		);
 	}
@@ -95,7 +95,7 @@ protected function enableCssCombiner()
 
 		$this->app->router->get($uri, 
 			function (Route $route, Request $request, Response $response) {
-				$this->app->combiner->viewCss($route, $request, $response);
+				return $this->app->combiner->viewCss($route, $request, $response);
 			}
 		);
 	}