Minify javascript with JShrink

composer.json

@@ -1,26 +1,27 @@
 {
-  "name":              "packaged/dispatch",
-  "license":           "MIT",
-  "authors":           [
+  "name":        "packaged/dispatch",
+  "license":     "MIT",
+  "authors":     [
     {
       "name":  "Brooke Bryan",
       "email": "[email protected]"
     }
   ],
-  "bin":               [
+  "bin":         [
     "bin/dispatch"
   ],
-  "require":           {
+  "require":     {
     "php":                 ">=5.4.0",
     "packaged/helpers":    "0.*",
     "packaged/config":     "0.*",
     "symfony/http-kernel": "2.*",
-    "symfony/console":     "2.*"
+    "symfony/console":     "2.*",
+    "tedivm/jshrink":      "~1.0"
   },
-  "require-dev":       {
+  "require-dev": {
     "phpunit/phpunit": "*"
   },
-  "autoload":          {
+  "autoload":    {
     "psr-4": {
       "Packaged\\Dispatch\\": "src"
     }

src/Assets/JavascriptAsset.php

@@ -1,6 +1,7 @@
 <?php
 namespace Packaged\Dispatch\Assets;
 
+use JShrink\Minifier;
 use Packaged\Helpers\ValueAs;
 
 class JavascriptAsset extends AbstractDispatchableAsset
@@ -35,18 +36,6 @@ public function getContent()
       return $data;
     }
 
-    //Strip Comments
-    $data = preg_replace('!/\*[^*]*\*+([^/][^*]*\*+)*/!', '', $data);
-    $data = preg_replace('!^(?:[\t ]+)?\/\/(?:.*)?$!m', '', $data);
-
-    //remove tabs, spaces, newlines, etc.
-    $data = str_replace(array("\t"), ' ', $data);
-    $data = str_replace(
-      array("\r\n", "\r", "\n", '  ', '    ', '    '),
-      '',
-      $data
-    );
-
-    return $data;
+    return Minifier::minify($data);
   }
 }

tests/Assets/JavascriptAssetTest.php

@@ -4,14 +4,12 @@ class JavascriptAssetTest extends PHPUnit_Framework_TestCase
 {
   public function testMinify()
   {
-    $original = 'function myFunction()
-    {
+    $original = 'function myFunction(){
       alert("Hello\nHow are you?");
     }';
 
     $nominify = '@' . 'do-not-minify
-    function myFunction()
-    {
+    function myFunction(){
       alert("Hello\nHow are you?");
     }';
 
@@ -37,4 +35,29 @@ public function testAsset()
     $this->assertEquals('js', $asset->getExtension());
     $this->assertEquals('text/javascript', $asset->getContentType());
   }
+
+  /**
+   * @ref  Issue 2
+   * @link https://github.com/packaged/dispatch/issues/2
+   */
+  public function testSingleLineCommands()
+  {
+    $raw = '$(document).ready(function(){
+
+    $(window).scroll(function () {
+
+        var max_scroll = 273; //height to scroll before hitting nav-bar
+
+        var navbar = $(".main-nav");
+    });
+});';
+
+    $asset = new \Packaged\Dispatch\Assets\JavascriptAsset();
+    $asset->setContent($raw);
+    $this->assertEquals(
+      '$(document).ready(function(){$(window).scroll(function()'
+      . '{var max_scroll=273;var navbar=$(".main-nav");});});',
+      $asset->getContent()
+    );
+  }
 }