Added support for CSS minification

Askupa Software · Askupa Software · commit fa66abf02309 · 2016-05-01T22:59:33.000-05:00
diff --git a/README.md b/README.md
@@ -6,7 +6,7 @@
 **Contributors:** ykadosh  
 **Tags:** theme, mods, wordpress, dynamic, css, stylesheet  
 **Tested up to:** 4.5.0  
-**Stable tag:** 1.0.3  
+**Stable tag:** 1.0.4  
 **Requires:** PHP 5.3.0 or newer  
 **WordPress plugin:** [wordpress.org/plugins/wp-dynamic-css/](https://wordpress.org/plugins/wp-dynamic-css/)  
 **License:** GPLv3 or later  
@@ -271,7 +271,7 @@ body {
 *Enqueue a dynamic stylesheet*
 
 ```php 
-function wp_dynamic_css_enqueue( $handle, $path, $print = true )
+function wp_dynamic_css_enqueue( $handle, $path, $print = true, $minify = false )
 ```
 
 This function will either print the compiled version of the stylesheet to the document's <head> section, or load it as an external stylesheet if `$print` is set to false.
@@ -280,6 +280,7 @@ This function will either print the compiled version of the stylesheet to the do
 * `$handle` (*string*) The stylesheet's name/id
 * `$path` (*string*) The absolute path to the dynamic CSS file
 * `$print` (*boolean*) Whether to print the compiled CSS to the document head, or load it as an external CSS file via an http request
+* `$minify` (*boolean*) Whether to minify the CSS output
 
 ### wp_dynamic_css_set_callback
 
@@ -299,11 +300,15 @@ Set a callback function that will be used to convert variables to actual values.
 
 * ~~Add support for loading the compiled CSS externally instead of printing to the document head~~ (Added in 1.0.1)
 * ~~Add support for multiple value callback functions~~ (Added in 1.0.2)
+* ~~Add option for minification~~ (Added in 1.0.4)
 * Add support for caching and improve performance
-* Add option for minification
 
 ## Changelog
 
+**1.0.4**
+* Set cache-control to no-cache so that changes to options are reflected immediately
+* Added support for CSS minification
+
 **1.0.3**
 * Added support for variable subscripts
 
diff --git a/bootstrap.php b/bootstrap.php
@@ -13,7 +13,7 @@
  * Plugin Name:     WordPress Dynamic CSS
  * Plugin URI:      https://github.com/askupasoftware/wp-dynamic-css
  * Description:     Dynamic CSS compiler for WordPress
- * Version:         1.0.3
+ * Version:         1.0.4
  * Author:          Askupa Software
  * Author URI:      http://www.askupasoftware.com
  * Text Domain:     wp-dynamic-css
diff --git a/compiler.php b/compiler.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * @package   WordPress Dynamic CSS
- * @version   1.0.3
+ * @version   1.0.4
  * @author    Askupa Software <contact@askupasoftware.com>
  * @link      https://github.com/askupasoftware/wp-dynamic-css
  * @copyright 2016 Askupa Software
@@ -91,7 +91,7 @@ public function compile_printed_styles()
     public function compile_external_styles()
     {
         header( "Content-type: text/css; charset: UTF-8" );
-        header( "Cache-Control: no-cache, must-revalidate" ); //set headers to NOT cache a page so that changes to options are reflected immediately
+        header( "Cache-Control: no-cache, must-revalidate" ); //set headers to NOT cache so that changes to options are reflected immediately
         
         $compiled_css = $this->compile_styles( array_filter($this->stylesheets, array( $this, 'filter_external' ) ) );
         
@@ -104,15 +104,17 @@ public function compile_external_styles()
      * 
      * @param string $handle The stylesheet's name/id
      * @param string $path The absolute path to the dynamic style
-     * @param boolean $print Whether to print the compiled CSS to the document 
+     * @param boolean $print Whether to print the compiled CSS to the document
      * head, or include it as an external CSS file
+     * @param boolean $minify Whether to minify the CSS output
      */
-    public function enqueue_style( $handle, $path, $print )
+    public function enqueue_style( $handle, $path, $print, $minify )
     {
         $this->stylesheets[] = array(
             'handle'=> $handle,
             'path'  => $path,
-            'print' => $print
+            'print' => $print,
+            'minify'=> $minify
         );
     }
     
@@ -140,11 +142,24 @@ protected function compile_styles( $styles )
         foreach( $styles as $style ) 
         {
             $css = file_get_contents( $style['path'] );
+            if( $style['minify'] ) $css = $this->minify_css ( $css );
             $compiled_css .= $this->compile_css( $css, $this->callbacks[$style['handle']] )."\n";
         }
         return $compiled_css;
     }
     
+    /**
+     * Minify a given CSS string by removing comments, whitespaces and newlines
+     * 
+     * @see http://stackoverflow.com/a/6630103/1096470
+     * @param string $css CSS style to minify
+     * @return string Minified CSS
+     */
+    protected function minify_css( $css )
+    {
+        return preg_replace( '@({)\s+|(\;)\s+|/\*.+?\*\/|\R@is', '$1$2 ', $css );
+    }
+
     /**
      * This filter is used to return only the styles that are set to be printed
      * in the document head
diff --git a/functions.php b/functions.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * @package   WordPress Dynamic CSS
- * @version   1.0.3
+ * @version   1.0.4
  * @author    Askupa Software <contact@askupasoftware.com>
  * @link      https://github.com/askupasoftware/wp-dynamic-css
  * @copyright 2016 Askupa Software
@@ -20,11 +20,12 @@
      * @param string $path The absolute path to the dynamic CSS file
      * @paran boolean $print Whether to print the compiled CSS to the document 
      * head, or include it as an external CSS file
+     * @param boolean $minify Whether to minify the CSS output
      */
-    function wp_dynamic_css_enqueue( $handle, $path, $print = true )
+    function wp_dynamic_css_enqueue( $handle, $path, $print = true, $minify = false )
     {
         $dcss = DynamicCSSCompiler::get_instance();
-        $dcss->enqueue_style( $handle, $path, $print );
+        $dcss->enqueue_style( $handle, $path, $print, $minify );
     }
 }
 
diff --git a/readme.txt b/readme.txt
@@ -3,7 +3,7 @@ Contributors: Askupa Software
 Tags: dynamic css, css, customizer, get_theme_mod, css variables, css compiler
 Requires at least: 3.0
 Tested up to: 4.4.2
-Stable tag: 1.0.3
+Stable tag: 1.0.4
 License: GPLv3 or later
 License URI: http://www.gnu.org/licenses/gpl-3.0.html
 
@@ -70,6 +70,10 @@ Please follow the instructions on the plugin's [GitHub page](https://github.com/
 
 == Changelog ==
 
+= 1.0.4 =
+* (FIX) Set cache-control to no-cache so that changes to options are reflected immediately
+* (NEW) Added support for CSS minification
+
 = 1.0.3 =
 * (NEW) Added support for variable subscripts
 
