Merge pull request jazzband#531 from theatlantic/pr/compiler-compressor-unit-tests

Add unit tests for the bundled compiler and compressor classes

Author: davidt

.gitignore

@@ -13,6 +13,7 @@ docs/_build/
 coverage/
 tests/static/
 tests/assets/js/dummy.js
+tests/node_modules/
 .tox/
 .DS_Store
 .idea
@@ -21,3 +22,6 @@ tests/assets/js/dummy.js
 .pydevproject
 .ropeproject
 __pycache__
+npm-debug.log
+tests/npm-cache
+django-pipeline-*/

MANIFEST.in

@@ -3,5 +3,8 @@ recursive-include pipeline/jinja2 *.html *.jinja
 include AUTHORS LICENSE README.rst HISTORY.rst
 recursive-include tests *
 recursive-exclude tests *.pyc *.pyo
+recursive-exclude tests/node_modules *
+recursive-exclude tests/npm-cache *
+recursive-exclude tests/npm *
 include docs/Makefile docs/make.bat docs/conf.py
 recursive-include docs *.rst

pipeline/compilers/__init__.py

@@ -12,7 +12,7 @@
 
 from pipeline.conf import settings
 from pipeline.exceptions import CompilerError
-from pipeline.utils import to_class
+from pipeline.utils import to_class, set_std_streams_blocking
 
 
 class Compiler(object):
@@ -120,6 +120,7 @@ def execute_command(self, command, cwd=None, stdout_captured=None):
                                              stdout=stdout,
                                              stderr=subprocess.PIPE)
                 _, stderr = compiling.communicate()
+                set_std_streams_blocking()
 
             if compiling.returncode != 0:
                 stdout_captured = None  # Don't save erroneous result.

pipeline/compressors/__init__.py

@@ -14,7 +14,7 @@
 
 from pipeline.conf import settings
 from pipeline.exceptions import CompressorError
-from pipeline.utils import to_class, relpath
+from pipeline.utils import to_class, relpath, set_std_streams_blocking
 
 URL_DETECTOR = r"""url\((['"]){0,1}\s*(.*?)["']{0,1}\)"""
 URL_REPLACER = r"""url\(__EMBED__(.+?)(\?\d+)?\)"""
@@ -248,6 +248,7 @@ def execute_command(self, command, content):
         if content:
             content = smart_bytes(content)
         stdout, stderr = pipe.communicate(content)
+        set_std_streams_blocking()
         if stderr.strip() and pipe.returncode != 0:
             raise CompressorError(stderr)
         elif self.verbose:

pipeline/conf.py

@@ -1,6 +1,7 @@
 # -*- coding: utf-8 -*-
 from __future__ import unicode_literals
 
+import os
 import collections
 import shlex
 
@@ -101,7 +102,7 @@ def __getitem__(self, key):
         value = self.settings[key]
         if key.endswith(("_BINARY", "_ARGUMENTS")):
             if isinstance(value, string_types):
-                return tuple(shlex.split(value))
+                return tuple(shlex.split(value, posix=(os.name == 'posix')))
             return tuple(value)
         return value
 

pipeline/utils.py

@@ -1,8 +1,16 @@
 from __future__ import unicode_literals
 
+try:
+    import fcntl
+except ImportError:
+    # windows
+    fcntl = None
+
 import importlib
 import mimetypes
 import posixpath
+import os
+import sys
 
 try:
     from urllib.parse import quote
@@ -54,3 +62,19 @@ def relpath(path, start=posixpath.curdir):
     if not rel_list:
         return posixpath.curdir
     return posixpath.join(*rel_list)
+
+
+def set_std_streams_blocking():
+    """
+    Set stdout and stderr to be blocking.
+
+    This is called after Popen.communicate() to revert stdout and stderr back
+    to be blocking (the default) in the event that the process to which they
+    were passed manipulated one or both file descriptors to be non-blocking.
+    """
+    if not fcntl:
+        return
+    for f in (sys.__stdout__, sys.__stderr__):
+        fileno = f.fileno()
+        flags = fcntl.fcntl(fileno, fcntl.F_GETFL)
+        fcntl.fcntl(fileno, fcntl.F_SETFL, flags & ~os.O_NONBLOCK)

tests/assets/compilers/coffee/expected.js

@@ -0,0 +1,12 @@
+(function() {
+  var cube, square;
+
+  square = function(x) {
+    return x * x;
+  };
+
+  cube = function(x) {
+    return square(x) * x;
+  };
+
+}).call(this);

tests/assets/compilers/coffee/input.coffee

@@ -0,0 +1,2 @@
+square = (x) -> x * x
+cube   = (x) -> square(x) * x

tests/assets/compilers/es6/expected.js

@@ -0,0 +1,27 @@
+"use strict";
+
+// Expression bodies
+var odds = evens.map(function (v) {
+  return v + 1;
+});
+var nums = evens.map(function (v, i) {
+  return v + i;
+});
+
+// Statement bodies
+nums.forEach(function (v) {
+  if (v % 5 === 0) fives.push(v);
+});
+
+// Lexical this
+var bob = {
+  _name: "Bob",
+  _friends: [],
+  printFriends: function printFriends() {
+    var _this = this;
+
+    this._friends.forEach(function (f) {
+      return console.log(_this._name + " knows " + f);
+    });
+  }
+};

tests/assets/compilers/es6/input.es6

@@ -0,0 +1,19 @@
+// Expression bodies
+var odds = evens.map(v => v + 1);
+var nums = evens.map((v, i) => v + i);
+
+// Statement bodies
+nums.forEach(v => {
+  if (v % 5 === 0)
+    fives.push(v);
+});
+
+// Lexical this
+var bob = {
+  _name: "Bob",
+  _friends: [],
+  printFriends() {
+    this._friends.forEach(f =>
+      console.log(this._name + " knows " + f));
+  }
+};