Added support for multiple value callback functions

Author: Askupa Software

README.md

@@ -6,7 +6,8 @@
 **Contributors:** ykadosh  
 **Tags:** theme, mods, wordpress, dynamic, css, stylesheet  
 **Tested up to:** 4.4.2  
-**Stable tag:** 1.0.1  
+**Stable tag:** 1.0.2  
+**Requires:** PHP 5.3.0 or newer  
 **License:** GPLv3 or later  
 **License URI:** http://www.gnu.org/licenses/gpl-3.0.html
 

bootstrap.php

@@ -20,6 +20,18 @@
  * Domain Path:     /languages
  */
 
+defined( 'ABSPATH' ) or die( 'No script kiddies please!' );
+
+
+/**
+ * Prevent loading the library more than once
+ */
+if( defined( 'WP_DYNAMIC_CSS' ) ) return;
+define( 'WP_DYNAMIC_CSS', true );
+
+/**
+ * Load required files
+ */
 require_once 'compiler.php';
 require_once 'functions.php';
 

compiler.php

@@ -1,7 +1,7 @@
 <?php
 /**
  * @package   WordPress Dynamic CSS
- * @version   1.0.1
+ * @version   1.0.2
  * @author    Askupa Software <[email protected]>
  * @link      https://github.com/askupasoftware/wp-dynamic-css
  * @copyright 2016 Askupa Software
@@ -33,6 +33,11 @@ class DynamicCSSCompiler
      */
     private $stylesheets = array();
 
+    /**
+     * @var array 
+     */
+    private $callbacks = array();
+    
     /**
      * Returns the *Singleton* instance of this class.
      *
@@ -67,17 +72,18 @@ public function wp_enqueue_style()
      */
     public function compile_printed_styles()
     {
-        $precompiled_css = '';
+        $compiled_css = '';
         $styles = array_filter($this->stylesheets, array( $this, 'filter_print' ) );
 
         // Bail if there are no styles to be printed
         if( count( $styles ) === 0 ) return;
 
         foreach( $styles as $style ) 
         {
-            $precompiled_css .= $this->get_file_contents( $style['path'] )."\n";
+            $css = $this->get_file_contents( $style['path'] );
+            $compiled_css .= $this->compile_css( $css, $this->callbacks[$style['handle']] )."\n";
         }
-        $css = $this->compile_css( $precompiled_css );
+        
         echo "<style id=\"wp-dynamic-css\">\n";
         include 'style.phtml';
         echo "</style>";
@@ -90,33 +96,47 @@ public function compile_printed_styles()
     public function compile_external_styles()
     {
         header( "Content-type: text/css; charset: UTF-8" );
-        $precompiled_css = '';
+        $compiled_css = '';
         $styles = array_filter($this->stylesheets, array( $this, 'filter_external' ) );
 
         foreach( $styles as $style ) 
         {
-            $precompiled_css .= $this->get_file_contents( $style['path'] )."\n";
+            $css = $this->get_file_contents( $style['path'] );
+            $compiled_css .= $this->compile_css( $css, $this->callbacks[$style['handle']] )."\n";
         }
-        $css = $this->compile_css( $precompiled_css );
+        
         include 'style.phtml';
         wp_die();
     }
 
     /**
      * Add a style path to the pool of styles to be compiled
      * 
+     * @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 
      * head, or include it as an external CSS file
      */
-    public function enqueue_style( $path, $print )
+    public function enqueue_style( $handle, $path, $print )
     {
         $this->stylesheets[] = array(
+            'handle'=> $handle,
             'path'  => $path,
             'print' => $print
         );
     }
 
+    /**
+     * Register a value retrieval function and associate it with the given handle
+     * 
+     * @param type $handle The stylesheet's name/id
+     * @param type $callback
+     */
+    public function register_callback( $handle, $callback )
+    {
+        $this->callbacks[$handle] = $callback;
+    }
+
     /**
      * This filter is used to return only the styles that are set to be printed
      * in the document head
@@ -156,19 +176,19 @@ protected function get_file_contents( $path )
 
     /**
      * Parse the given CSS string by converting the variables to their 
-     * corresponding values retrieved by applying the filter 
-     * wp_dynamic_css_get_variable_value.
+     * corresponding values retrieved by applying the callback function
      * 
+     * @param callable $callback A function that replaces the variables with 
+     * their values. The function accepts the variable's name as a parameter
      * @param string $css A string containing dynamic CSS (pre-compiled CSS with 
      * variables)
-     * @uses wp_dynamic_css_get_variable_value filter
      * @return string The compiled CSS after converting the variables to their 
      * corresponding values
      */
-    protected function compile_css( $css )
+    protected function compile_css( $css, $callback )
     {   
-        return preg_replace_callback( '#\$([\w]+)#', function( $matches ) {
-            return apply_filters( 'wp_dynamic_css_get_variable_value', $matches[1] );
+        return preg_replace_callback( '#\$([\w]+)#', function( $matches ) use ( $callback ) {
+            return call_user_func_array( $callback, array($matches[1]) );
         }, $css);
     }
 }

functions.php

@@ -1,7 +1,7 @@
 <?php
 /**
  * @package   WordPress Dynamic CSS
- * @version   1.0.1
+ * @version   1.0.2
  * @author    Askupa Software <[email protected]>
  * @link      https://github.com/askupasoftware/wp-dynamic-css
  * @copyright 2016 Askupa Software
@@ -16,14 +16,15 @@
      * document's <head> section, or load it as an external stylesheet if the 
      * second parameter is set to false
      * 
+     * @param string $handle The stylesheet's name/id
      * @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
      */
-    function wp_dynamic_css_enqueue( $path, $print = true )
+    function wp_dynamic_css_enqueue( $handle, $path, $print = true )
     {
         $dcss = DynamicCSSCompiler::get_instance();
-        $dcss->enqueue_style( $path, $print );
+        $dcss->enqueue_style( $handle, $path, $print );
     }
 }
 
@@ -36,12 +37,15 @@ function wp_dynamic_css_enqueue( $path, $print = true )
      * variables when the dynamic CSS file is compiled. The function accepts 1 
      * parameter which is the name of the variable, without the $ sign
      * 
+     * @param string $handle The name of the stylesheet to be associated with this
+     * callback function
      * @param string|array $callback A callback (or "callable" as of PHP 5.4) 
      * can either be a reference to a function name or method within an 
      * class/object.
      */
-    function wp_dynamic_css_set_callback( $callback )
+    function wp_dynamic_css_set_callback( $handle, $callback )
     {
-        add_filter( 'wp_dynamic_css_get_variable_value', $callback );
+        $dcss = DynamicCSSCompiler::get_instance();
+        $dcss->register_callback( $handle, $callback );
     }
 }

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.1
+Stable tag: 1.0.2
 License: GPLv3 or later
 License URI: http://www.gnu.org/licenses/gpl-3.0.html
 

style.phtml

@@ -3,4 +3,4 @@
  * https://github.com/askupasoftware/wp-dynamic-css
  */
 
-<?php echo $css; ?>
+<?php echo $compiled_css; ?>