When dispatching assets, urls that cannot be dispatched, should be le…

…ft intact

Closes #5

src/Assets/AbstractDispatchableAsset.php

@@ -93,8 +93,14 @@ protected function _dispatchNestedUrl($uri)
     }
 
     $path = ltrim($path, '/');
+    $url  = $this->_assetManager->getResourceUri(
+      build_path_unix($prefix, $path)
+    );
 
-    $url = $this->_assetManager->getResourceUri(build_path_unix($prefix, $path));
+    if(empty($url))
+    {
+      return $uri[0];
+    }
 
     if(!empty($append))
     {

src/Assets/JavascriptAsset.php

@@ -36,6 +36,13 @@ public function getContent()
       return $data;
     }
 
-    return Minifier::minify($data);
+    try
+    {
+      return Minifier::minify($data);
+    }
+    catch(\Exception $e)
+    {
+      return $data;
+    }
   }
 }

tests/DispatchTest.php

@@ -110,20 +110,6 @@ public function urlProvider()
 {alert("Hello\nHow are you?");}'
     ];
 
-    /**
-     * Do not minify .min.ext files
-     * @link https://github.com/packaged/dispatch/issues/1
-     * */
-    $tests[] = [
-      array_merge($baseConfig, []),
-      'res/p/domain/b/filehash/test.min.js',
-      'www.packaged.in',
-      'function myFunction()
-{
-  alert("Hello\nHow are you?");
-}'
-    ];
-
     $tests[] = [
       array_merge($baseConfig, []),
       'res/p/domain/b/filehash/test.css',
@@ -271,6 +257,33 @@ public function urlProvider()
       'body { background: yellow url(x.jpg); }'
     ];
 
+    /**
+     * Do not minify .min.ext files
+     * @link https://github.com/packaged/dispatch/issues/1
+     * */
+    $tests[] = [
+      array_merge($baseConfig, []),
+      'res/p/domain/b/filehash/test.min.js',
+      'www.packaged.in',
+      'function myFunction()
+{
+  alert("Hello\nHow are you?");
+}'
+    ];
+
+    /**
+     * Invalid dispatch links should remain as the default
+     * @link https://github.com/packaged/dispatch/issues/5
+     * */
+    $tests[] = [
+      array_merge($baseConfig, []),
+      'res/p/domain/b/filehash/dispatch.test.js',
+      'www.packaged.in',
+      'function f(){setCss(\'background:url(https://),url(https://),'
+      . 'red url(https://)\');return(/(url\s*\(.*?){3}/).'
+      . 'test(mStyle.background);}'
+    ];
+
     return $tests;
   }
 

tests/asset/dispatch.test.js

@@ -0,0 +1,12 @@
+function f() {
+  // Setting multiple images AND a color on the background shorthand property
+  //  and then querying the style.background property value for the number of
+  //  occurrences of "url(" is a reliable method for detecting ACTUAL support for this!
+
+  setCss('background:url(https://),url(https://),red url(https://)');
+
+  // If the UA supports multiple backgrounds, there should be three occurrences
+  //   of the string "url(" in the return value for elemStyle.background
+
+  return (/(url\s*\(.*?){3}/).test(mStyle.background);
+}