Move management of compressors to Environment

CHH · CHH · commit 106f08a3b19e · 2013-01-10T19:09:23.000+01:00
diff --git a/README.md b/README.md
@@ -143,7 +143,8 @@ The `write` method takes an array of options:
 ### Enabling Compression
 
 You can turn on compression by setting the `js_compressor` and
-`css_compressor` config keys.
+`css_compressor` config keys, or by calling `setJsCompressor` or
+`setCssCompressor` on an Environment instance.
 
 Supported Javascript Compressors:
 
diff --git a/lib/Pipe/Config.php b/lib/Pipe/Config.php
@@ -7,14 +7,6 @@
 class Config
 {
     public
-        # Maps compressor names (available as js_compressor/css_compressor) 
-        # to template classes.
-        $compressors = array(
-            "uglify_js" => "\\Pipe\\Compressor\\UglifyJs",
-            "yuglify_css" => "\\Pipe\\Compressor\\YuglifyCss",
-            "yuglify_js" => "\\Pipe\\Compressor\\YuglifyJs",
-        ),
-
         $filename,
         $precompile,
         $precompilePrefix,
@@ -65,19 +57,11 @@ function createEnvironment()
 
         if (!$this->debug) {
             if ($jsCompressor = $this->jsCompressor) {
-                if ($compressor = @$this->compressors[$jsCompressor]) {
-                    $env->registerBundleProcessor('application/javascript', $compressor);
-                } else {
-                    throw new \UnexpectedValueException("JS compressor '$jsCompressor' not found.");
-                }
+                $env->setJsCompressor($jsCompressor);
             }
 
             if ($cssCompressor = $this->cssCompressor) {
-                if ($compressor = @$this->compressors[$cssCompressor]) {
-                    $env->registerBundleProcessor('text/css', $compressor);
-                } else {
-                    throw new \UnexpectedValueException("CSS compressor '$cssCompressor' not found.");
-                }
+                $env->setCssCompressor($cssCompressor);
             }
         }
 
diff --git a/lib/Pipe/Environment.php b/lib/Pipe/Environment.php
@@ -33,6 +33,15 @@ class Environment implements \ArrayAccess
     public $postProcessors;
     public $bundleProcessors;
 
+    public $compressors = array(
+        "uglify_js" => "\\Pipe\\Compressor\\UglifyJs",
+        "yuglify_css" => "\\Pipe\\Compressor\\YuglifyCss",
+        "yuglify_js" => "\\Pipe\\Compressor\\YuglifyJs",
+    );
+
+    protected $jsCompressor;
+    protected $cssCompressor;
+
     function __construct($root = null)
     {
         $this->root = $root;
@@ -121,6 +130,43 @@ function find($logicalPath, $options = array())
         return $asset;
     }
 
+    function setJsCompressor($compressor)
+    {
+        if (!isset($this->compressors[$compressor])) {
+            throw new \InvalidArgumentException(sprintf('Undefined compressor "%s"', $compressor));
+        }
+
+        $js = $this->contentType('.js');
+
+        if ($this->jsCompressor !== null) {
+            $this->bundleProcessors->unregister($js, $this->jsCompressor);
+        }
+
+        $this->jsCompressor = $compressor;
+        $this->bundleProcessors->register($js, $this->compressors[$compressor]);
+    }
+
+    function setCssCompressor($compressor)
+    {
+        if (!isset($this->compressors[$compressor])) {
+            throw new \InvalidArgumentException(sprintf('Undefined compressor "%s"', $compressor));
+        }
+
+        $css = $this->contentType('.css');
+
+        if ($this->cssCompressor !== null) {
+            $this->bundleProcessors->unregister($css, $this->cssCompressor);
+        }
+
+        $this->cssCompressor = $compressor;
+        $this->bundleProcessors->register($css, $this->compressors[$compressor]);
+    }
+
+    function contentType($extension)
+    {
+        return @$this->contentTypes[Path::normalizeExtension($extension)];
+    }
+
     # Sugar for find().
     #
     # logicalPath - The path relative to the virtual file system.
diff --git a/lib/Pipe/Util/ProcessorRegistry.php b/lib/Pipe/Util/ProcessorRegistry.php
@@ -34,6 +34,25 @@ function register($mimeType, $processor)
         return $this;
     }
 
+    function isRegistered($mimeType, $processor)
+    {
+        if (empty($this->processors[$mimeType])) {
+            return false;
+        }
+
+        $index = array_search($processor, $this->processors[$mimeType]);
+
+        return $index !== false;
+    }
+
+    function unregister($mimeType, $processor)
+    {
+        if ($this->isRegistered($mimeType, $processor)) {
+            $index = array_search($processor, $this->processors[$mimeType]);
+            unset($this->processors[$mimeType][$index]);
+        }
+    }
+
     function clear()
     {
         $this->processors = array();
diff --git a/tests/Pipe/Test/ConfigTest.php b/tests/Pipe/Test/ConfigTest.php
@@ -0,0 +1,26 @@
+<?php
+
+namespace Pipe\Test;
+
+use Pipe\Config;
+
+class ConfigTest extends \PHPUnit_Framework_TestCase
+{
+    function testCreateEnvironmentWithCompressors()
+    {
+        $config = new Config(array(
+            'js_compressor' => 'uglify_js',
+            'css_compressor' => 'yuglify_css'
+        ));
+
+        $env = $config->createEnvironment();
+
+        $this->assertTrue($env->bundleProcessors->isRegistered(
+            $env->contentType('.js'), $env->compressors['uglify_js']
+        ));
+
+        $this->assertTrue($env->bundleProcessors->isRegistered(
+            $env->contentType('.css'), $env->compressors['yuglify_css']
+        ));
+    }
+}
