Fixed a bug where caching would clear the cache

Author: chewett

src/Chewett/CacheNCrunch/CacheNCrunch.php

@@ -47,6 +47,10 @@ public static function register($scriptName, $publicPath, $physicalPath) {
         self::$jsFiles[$scriptName] = new CachingFile($scriptName, $publicPath, $physicalPath);
     }
 
+    public static function removeScript($scriptName) {
+        unset(self::$jsFiles[$scriptName]);
+    }
+
     public static function setDebug($debug) {
         self::$debugMode = $debug;
     }
@@ -99,6 +103,9 @@ public static function crunch() {
 
         $data = [];
         require self::$cacheDirectory . self::$JS_LOADING_FILES . self::$JS_FILE_CACHE_DETAILS;
+        if(isset($JS_FILES)) {
+            $data = $JS_FILES;
+        }
 
         foreach(self::$jsFiles as $scriptName => $file) {
             $fileContents = file_get_contents($file->getPhysicalPath());

tests/Chewett/CacheNCrunch/CacheNCrunchTest.php

@@ -11,15 +11,15 @@
  */
 class CacheNCrunchTest extends \PHPUnit_Framework_TestCase {
 
-    public function setUp() {
-        $cacheDir = __DIR__ . "/../../../build/output/cache/";
+    private static $CACHE_DIR = __DIR__ . "/../../../build/output/cache/";
 
-        if(is_dir($cacheDir)) {
+    public function setUp() {
+        if(is_dir(self::$CACHE_DIR)) {
             $fs = new Filesystem();
-            $fs->remove($cacheDir);
+            $fs->remove(self::$CACHE_DIR);
         }
 
-        CacheNCrunch::setUpCacheDirectory($cacheDir, '/build/output/cache/');
+        CacheNCrunch::setUpCacheDirectory(self::$CACHE_DIR, '/build/output/cache/');
         CacheNCrunch::setDebug(false);
     }
 
@@ -62,5 +62,34 @@ public function testCachePresentOutput() {
         );
     }
 
+    public function testMultiCachePresentOutput() {
+        CacheNCrunch::register("testJs", "/static/testJs.js", __DIR__ . "/../../../static/testJs.js");
+        CacheNCrunch::register("testA", "/static/testA.js", __DIR__ . "/../../../static/testA.js");
+
+        $this->assertEquals(
+            "<script src='/static/testJs.js'></script><script src='/static/testA.js'></script>",
+            CacheNCrunch::getScriptImports()
+        );
+
+        CacheNCrunch::crunch();
+        $this->assertEquals(
+            "<script src='/build/output/cache/static/js/6ffaf172520927af80aaca83b0e74e48.js'></script><script src='/build/output/cache/static/js/76082198a45cb1943e8855d258ebb4d0.js'></script>",
+            CacheNCrunch::getScriptImports()
+        );
+    }
+
+    public function testMultiCachePresentOutputTwoCrunches() {
+        CacheNCrunch::register("testJs", "/static/testJs.js", __DIR__ . "/../../../static/testJs.js");
+        CacheNCrunch::crunch();
+        CacheNCrunch::removeScript("testJs");
+        CacheNCrunch::register("testA", "/static/testA.js", __DIR__ . "/../../../static/testA.js");
+        CacheNCrunch::crunch();
+
+        require self::$CACHE_DIR . CacheNCrunch::$JS_LOADING_FILES . CacheNCrunch::$JS_FILE_CACHE_DETAILS;
+        $this->assertTrue(isset($JS_FILES));
+        $this->assertCount(2, $JS_FILES);
+
+    }
+
 
 }