joshtronic/pickles
1
0
Fork 0
Code Issues 8 Pull requests Projects Releases Packages Wiki Activity Actions

Added SASS support

Browse source 
Closes #12
This commit is contained in:
Josh Sherman 2013-01-28 16:59:44 -05:00
parent 41ba406ea6
commit 2cb9577ca2
2 changed files with 54 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

36
classes/Dynamic.php
View file

@ -9,7 +9,7 @@
* Redistribution of these files must retain the above copyright notice. * Redistribution of these files must retain the above copyright notice.
* *
* @author Josh Sherman <pickles@joshtronic.com> * @author Josh Sherman <pickles@joshtronic.com>
* @copyright Copyright 2007-2012, Josh Sherman * @copyright Copyright 2007-2013, Josh Sherman
* @license http://www.opensource.org/licenses/mit-license.html * @license http://www.opensource.org/licenses/mit-license.html
* @package PICKLES * @package PICKLES
* @link https://github.com/joshtronic/pickles * @link https://github.com/joshtronic/pickles
@ -100,16 +100,18 @@ class Dynamic extends Object
* Generate Stylesheet Reference * Generate Stylesheet Reference
* *
* Attempts to minify the stylesheet and then returns the reference URI for * Attempts to minify the stylesheet and then returns the reference URI for
* the file, minified or not. Supports LESS, pass it a .less file instead * the file, minified or not. Supports LESS and SASS, pass it a .less file
* and it will be compiled before minification. * or a .scss file instead and it will be compiled before minification.
* *
* @param string $reference URI reference of the Stylesheet * @param string $reference URI reference of the Stylesheet
* @return string URI reference reference with dynamic content * @return string URI reference reference with dynamic content
* @url http://lesscss.org * @url http://lesscss.org
* @url http://sass-lang.com
*/ */
public function css($original_reference) public function css($original_reference)
{ {
$less = false; $less = false;
$sass = false;
// Injects .min into the filename // Injects .min into the filename
$parts = explode('.', $original_reference); $parts = explode('.', $original_reference);
@ -122,10 +124,17 @@ class Dynamic extends Object
{ {
end($parts); end($parts);
if (current($parts) == 'less') switch (current($parts))
{ {
$less = true; case 'less':
$parts[key($parts)] = 'css'; $less = true;
$parts[key($parts)] = 'css';
break;
case 'scss':
$sass = true;
$parts[key($parts)] = 'css';
break;
} }
$parts[key($parts)] = 'min.' . current($parts); $parts[key($parts)] = 'min.' . current($parts);
@ -154,12 +163,21 @@ class Dynamic extends Object
*/ */
if ($this->config->pickles['minify'] === true) if ($this->config->pickles['minify'] === true)
{ {
// Compiles LESS to CSS before minifying // Compiles LESS & SASS to CSS before minifying
if ($less) if ($less || $sass)
{ {
$compiled_filename = str_replace('.min', '', $minified_filename); $compiled_filename = str_replace('.min', '', $minified_filename);
exec('export PATH=$PATH:/usr/local/bin; ' . PICKLES_PATH . 'vendors/cloudhead/less.js/bin/lessc ' . $original_filename . ' > ' . $compiled_filename); if ($less)
{
$command = 'export PATH=$PATH:/usr/local/bin; ' . PICKLES_PATH . 'vendors/cloudhead/less.js/bin/lessc ' . $original_filename . ' > ' . $compiled_filename;
}
elseif ($sass)
{
$command = 'sass ' . $original_filename . ':' . $compiled_filename;
}
exec($command);
$original_filename = $compiled_filename; $original_filename = $compiled_filename;
} }

36
jar.php
View file

@ -3017,7 +3017,7 @@ class Distance
* Redistribution of these files must retain the above copyright notice. * Redistribution of these files must retain the above copyright notice.
* *
* @author Josh Sherman <pickles@joshtronic.com> * @author Josh Sherman <pickles@joshtronic.com>
* @copyright Copyright 2007-2012, Josh Sherman * @copyright Copyright 2007-2013, Josh Sherman
* @license http://www.opensource.org/licenses/mit-license.html * @license http://www.opensource.org/licenses/mit-license.html
* @package PICKLES * @package PICKLES
* @link https://github.com/joshtronic/pickles * @link https://github.com/joshtronic/pickles
@ -3108,16 +3108,18 @@ class Dynamic extends Object
* Generate Stylesheet Reference * Generate Stylesheet Reference
* *
* Attempts to minify the stylesheet and then returns the reference URI for * Attempts to minify the stylesheet and then returns the reference URI for
* the file, minified or not. Supports LESS, pass it a .less file instead * the file, minified or not. Supports LESS and SASS, pass it a .less file
* and it will be compiled before minification. * or a .scss file instead and it will be compiled before minification.
* *
* @param string $reference URI reference of the Stylesheet * @param string $reference URI reference of the Stylesheet
* @return string URI reference reference with dynamic content * @return string URI reference reference with dynamic content
* @url http://lesscss.org * @url http://lesscss.org
* @url http://sass-lang.com
*/ */
public function css($original_reference) public function css($original_reference)
{ {
$less = false; $less = false;
$sass = false;
// Injects .min into the filename // Injects .min into the filename
$parts = explode('.', $original_reference); $parts = explode('.', $original_reference);
@ -3130,10 +3132,17 @@ class Dynamic extends Object
{ {
end($parts); end($parts);
if (current($parts) == 'less') switch (current($parts))
{ {
$less = true; case 'less':
$parts[key($parts)] = 'css'; $less = true;
$parts[key($parts)] = 'css';
break;
case 'scss':
$sass = true;
$parts[key($parts)] = 'css';
break;
} }
$parts[key($parts)] = 'min.' . current($parts); $parts[key($parts)] = 'min.' . current($parts);
@ -3162,12 +3171,21 @@ class Dynamic extends Object
*/ */
if ($this->config->pickles['minify'] === true) if ($this->config->pickles['minify'] === true)
{ {
// Compiles LESS to CSS before minifying // Compiles LESS & SASS to CSS before minifying
if ($less) if ($less || $sass)
{ {
$compiled_filename = str_replace('.min', '', $minified_filename); $compiled_filename = str_replace('.min', '', $minified_filename);
exec('export PATH=$PATH:/usr/local/bin; ' . PICKLES_PATH . 'vendors/cloudhead/less.js/bin/lessc ' . $original_filename . ' > ' . $compiled_filename); if ($less)
{
$command = 'export PATH=$PATH:/usr/local/bin; ' . PICKLES_PATH . 'vendors/cloudhead/less.js/bin/lessc ' . $original_filename . ' > ' . $compiled_filename;
}
elseif ($sass)
{
$command = 'sass ' . $original_filename . ':' . $compiled_filename;
}
exec($command);
$original_filename = $compiled_filename; $original_filename = $compiled_filename;
} }