tests/test_app/webroot/css/style1.css tests/test_app/webroot/css/style2.css tests/test_app/webroot/js/script1.js tests/test_app/webroot/js/script2.js vendors/css/style3.css vendors/js/script3.js @@ -1,16 +1,23 @@ <?php App::import('Helper', array('Asset.Asset', 'Javascript', 'Html')); -App::import('Core', array('Folder')); +App::import('Core', array('Folder', 'View')); class AssetTestCase extends CakeTestCase { var $Asset = null; var $Folder = null; + var $View = null; + var $www_root = null; + var $jsCache = null; + var $cssCache = null; - function start() { - parent::start(); - + function startCase() { $this->www_root = ROOT . DS . 'app' . DS . 'plugins' . DS . 'asset' . DS . 'tests' . DS . 'test_app' . DS . 'webroot' . DS; + $this->jsCache = $this->www_root . 'cjs' . DS; + $this->cssCache = $this->www_root . 'ccss' . DS; + + $controller = null; + $this->View = new View($controller); $this->Asset = new AssetHelper(array('www_root' => $this->www_root, 'js' => $this->www_root . 'js' . DS, 'css' => $this->www_root . 'css' . DS)); $this->Asset->Javascript = new JavascriptHelper(); @@ -18,29 +25,57 @@ class AssetTestCase extends CakeTestCase { $this->Folder = new Folder(); } + + function endCase() { + $this->Folder->delete($this->jsCache); + $this->Folder->delete($this->cssCache); + } + + function startTest() { + $this->Asset->js = array(); + $this->Asset->css = array(); + } function testInstances() { $this->assertTrue(is_a($this->Asset, 'AssetHelper')); $this->assertTrue(is_a($this->Asset->Javascript, 'JavascriptHelper')); $this->assertTrue(is_a($this->Asset->Html, 'HtmlHelper')); + $this->assertTrue(is_a($this->View, 'View')); + $this->assertTrue(is_a(ClassRegistry::getObject('view'), 'View')); + } + + function testVendors() { + if(PHP5) { + App::import('Vendor', 'jsmin/jsmin'); + $this->assertTrue(class_exists('JSMin')); + } + + App::import('Vendor', 'csstidy', array('file' => 'class.csstidy.php')); + $this->assertTrue(class_exists('csstidy')); + } + + function testAfterRender() { + $this->View->__scripts = array('script1', 'script2', 'script3'); + $this->Asset->afterRender(); + $this->assertEqual(3, $this->Asset->viewScriptCount); } function testGenerateFileName() { - $files = array('test1', 'test2', 'test3'); + $files = array('script1', 'script2', 'script3'); $name = $this->Asset->__generateFileName($files); - $this->assertEqual('test1_test2_test3', $name); + $this->assertEqual('script1_script2_script3', $name); } function testGenerateFileNameMd5() { $this->Asset->md5FileName = true; - $files = array('test1', 'test2', 'test3'); + $files = array('script1', 'script2', 'script3'); $name = $this->Asset->__generateFileName($files); - $this->assertEqual('658f623f5f77d24124bb35c576304bf3', $name); + $this->assertEqual('4991a54c1356544e1188bf6c8b9e7ae9', $name); $this->Asset->md5FileName = false; } function testGetFileContents() { - $contents = $this->Asset->__getFileContents(array('plugin' => '', 'script' => 'test1'), 'js'); + $contents = $this->Asset->__getFileContents(array('plugin' => '', 'script' => 'script1'), 'js'); $expected = <<<END var str = "I'm a string"; alert(str); @@ -49,7 +84,7 @@ END; } function testGetFileContentsPlugin() { - $contents = $this->Asset->__getFileContents(array('plugin' => 'asset', 'script' => 'test3'), 'js'); + $contents = $this->Asset->__getFileContents(array('plugin' => 'asset', 'script' => 'script3'), 'js'); $expected = <<<END $(function(){ $("#nav").show(); @@ -59,43 +94,38 @@ END; } function testProcessJsNew() { - $outputDir = $this->www_root . 'cjs' . DS; - if(is_dir($outputDir)) { - $this->Folder->delete($outputDir); - } - $this->assertFalse(is_dir($outputDir)); + $this->assertFalse(is_dir($this->jsCache)); - $js = array(array('plugin' => '', 'script' => 'test1'), - array('plugin' => '', 'script' => 'test2'), - array('plugin' => 'asset', 'script' => 'test3')); + $js = array(array('plugin' => '', 'script' => 'script1'), + array('plugin' => '', 'script' => 'script2'), + array('plugin' => 'asset', 'script' => 'script3')); $fileName = $this->Asset->__process('js', $js); $expected = <<<END -/* test1.js (91%) */ +/* script1.js (91%) */ var str="I'm a string";alert(str); -/* test2.js (69%) */ +/* script2.js (73%) */ var sum=0;for(i=0;i<100;i++){sum+=i;} alert(i); -/* test3.js (89%) */ +/* script3.js (89%) */ \$(function(){\$("#nav").show();}); END; - $contents = file_get_contents($outputDir . $fileName); + $contents = file_get_contents($this->jsCache . $fileName); $this->assertEqual($expected, $contents); } function testProcessJsExistingNoChanges() { - $outputDir = $this->www_root . 'cjs' . DS; - $this->Folder->cd($outputDir); - $files = $this->Folder->find('test1_test2_test3_([0-9]{10}).js'); + $this->Folder->cd($this->jsCache); + $files = $this->Folder->find('script1_script2_script3_([0-9]{10}).js'); $this->assertTrue(!empty($files[0])); $origFileName = $files[0]; - $js = array(array('plugin' => '', 'script' => 'test1'), - array('plugin' => '', 'script' => 'test2'), - array('plugin' => 'asset', 'script' => 'test3')); + $js = array(array('plugin' => '', 'script' => 'script1'), + array('plugin' => '', 'script' => 'script2'), + array('plugin' => 'asset', 'script' => 'script3')); $this->Asset->checkTs = true; $fileName = $this->Asset->__process('js', $js); @@ -103,23 +133,98 @@ END; } function testProcessJsExistingWithChanges() { - $outputDir = $this->www_root . 'cjs' . DS; - $this->Folder->cd($outputDir); - $files = $this->Folder->find('test1_test2_test3_([0-9]{10}).js'); + $this->Folder->cd($this->jsCache); + $files = $this->Folder->find('script1_script2_script3_([0-9]{10}).js'); $this->assertTrue(!empty($files[0])); $origFileName = $files[0]; sleep(1); - $touched = touch($this->www_root . 'js' . DS . 'test1.js'); + $touched = touch($this->www_root . 'js' . DS . 'script1.js'); $this->assertTrue($touched); - $js = array(array('plugin' => '', 'script' => 'test1'), - array('plugin' => '', 'script' => 'test2'), - array('plugin' => 'asset', 'script' => 'test3')); + $js = array(array('plugin' => '', 'script' => 'script1'), + array('plugin' => '', 'script' => 'script2'), + array('plugin' => 'asset', 'script' => 'script3')); $this->Asset->checkTs = true; $fileName = $this->Asset->__process('js', $js); $this->assertNotEqual($origFileName, $fileName); } + + function testProcessCssNew() { + $this->assertFalse(is_dir($this->cssCache)); + + $css = array(array('plugin' => '', 'script' => 'style1'), + array('plugin' => '', 'script' => 'style2'), + array('plugin' => 'asset', 'script' => 'style3')); + + $fileName = $this->Asset->__process('css', $css); + $expected = <<<END +/* style1.css (70%) */ +*{margin:0;padding:0;} + +/* style2.css (85%) */ +body{background:#003d4c;color:#fff;font-family:'lucida grande',verdana,helvetica,arial,sans-serif;font-size:90%;margin:0;} + +/* style3.css (69%) */ +h1,h2,h3,h4{font-weight:400;} +END; + $contents = file_get_contents($this->cssCache . $fileName . '.css'); + $this->assertEqual($expected, $contents); + } + + function testInit() { + $this->View->__scripts = array ('<link rel="stylesheet" type="text/css" href="/css/style1.css" />', + '<link rel="stylesheet" type="text/css" href="/css/style2.css" />', + '<script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.3.2/jquery.min.js"></script>', + '<script type="text/javascript" src="/js/script1.js"></script>', + '<script type="text/javascript" src="/js/script2.js"></script>', + '<script type="text/javascript" src="/asset/js/script3.js"></script>' + ); + + + $this->Asset->__init(); + + $this->assertEqual($this->Asset->js, array(array('plugin' => '', 'script' => 'script1'), + array('plugin' => '', 'script' => 'script2'), + array('plugin' => 'asset', 'script' => 'script3'))); + $this->assertEqual($this->Asset->css, array(array('plugin' => '', 'script' => 'style1'), + array('plugin' => '', 'script' => 'style2'))); + } + + function testScriptsForLayout() { + $this->View->__scripts = array ('<link rel="stylesheet" type="text/css" href="/css/style1.css" />', + '<link rel="stylesheet" type="text/css" href="/css/style2.css" />', + '<script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.3.2/jquery.min.js"></script>', + '<script type="text/javascript" src="/js/script1.js"></script>', + '<script type="text/javascript" src="/js/script2.js"></script>', + '<script type="text/javascript" src="/asset/js/script3.js"></script>' + ); + + $scripts = $this->Asset->scripts_for_layout(); + $expected = '/<link rel="stylesheet" type="text\/css" href="\/ccss\/style1_style2_[0-9]{10}.css" \/>' . "\n\t" . + '<script type="text\/javascript" src="\/cjs\/script1_script2_script3_[0-9]{10}.js"><\/script>/'; + + $this->assertPattern($expected, $scripts); + } + + function testWithCodeBlock() { + $this->View->__scripts = array ('<script type="text/javascript" src="/js/script1.js"></script>', + '<script type="text/javascript">//<![CDATA[alert("test");//]]></script>', + '<script type="text/javascript" src="/js/script2.js"></script>' + ); + $scripts = $this->Asset->scripts_for_layout(); + $expected = '/<script type="text\/javascript" src="\/cjs\/script1_script2_[0-9]{10}.js"><\/script><script type="text\/javascript">\/\/<!\[CDATA\[alert\("test"\);\/\/]]><\/script>/'; + $this->assertPattern($expected, $scripts); + } + + function testWithScriptsInLayout() { + $this->View->__scripts = array ('<script type="text/javascript" src="/js/script1.js"></script>', + '<script type="text/javascript" src="/js/layout.js"></script>'); + $this->Asset->viewScriptCount = 1; + $scripts = $this->Asset->scripts_for_layout(); + $expected = '/<script type="text\/javascript" src="\/cjs\/layout_script1_[0-9]{10}.js"><\/script>/'; + $this->assertPattern($expected, $scripts); + } } \ No newline at end of file tests/cases/helpers/asset.test.php @@ -47,16 +47,18 @@ class AssetHelper extends Helper { var $initialized = false; var $js = array(); var $css = array(); + + var $View = null; function __construct($paths=array()) { $this->paths = am($this->paths, $paths); + $this->view =& ClassRegistry::getObject('view'); } //flag so we know the view is done rendering and it's the layouts turn function afterRender() { - $view =& ClassRegistry::getObject('view'); - if ($view) { - $this->viewScriptCount = count($view->__scripts); + if ($this->view) { + $this->viewScriptCount = count($this->view->__scripts); } } @@ -82,18 +84,16 @@ class AssetHelper extends Helper { } //anything leftover is outputted directly - if (!empty($view->__scripts)) { - $scripts_for_layout .= join("\n\t", $view->__scripts); + if (!empty($this->view->__scripts)) { + $scripts_for_layout .= join("\n\t", $this->view->__scripts); } return $scripts_for_layout; } function __init() { - $view =& ClassRegistry::getObject('view'); - //nothing to do - if (!$view->__scripts) { + if (!$this->view->__scripts) { return false; } @@ -106,18 +106,18 @@ class AssetHelper extends Helper { } //compatible with DebugKit - if (!empty($view->viewVars['debugToolbarPanels'])) { - $this->viewScriptCount += 1 + count($view->viewVars['debugToolbarJavascript']); + if (!empty($this->view->viewVars['debugToolbarPanels'])) { + $this->view->viewScriptCount += 1 + count($this->view->viewVars['debugToolbarJavascript']); } //move the layout scripts to the front - $view->__scripts = array_merge( - array_slice($view->__scripts, $this->viewScriptCount), - array_slice($view->__scripts, 0, $this->viewScriptCount) + $this->view->__scripts = array_merge( + array_slice($this->view->__scripts, $this->viewScriptCount), + array_slice($this->view->__scripts, 0, $this->viewScriptCount) ); //split the scripts into js and css - foreach ($view->__scripts as $i => $script) { + foreach ($this->view->__scripts as $i => $script) { if (preg_match('/src="\/?(.*\/)?js\/(.*).js"/', $script, $match)) { $temp = array(); $temp['script'] = $match[2]; @@ -125,7 +125,7 @@ class AssetHelper extends Helper { $this->js[] = $temp; //remove the script since it will become part of the merged script - unset($view->__scripts[$i]); + unset($this->view->__scripts[$i]); } else if (preg_match('/href="\/?(.*\/)css\/(.*).css/', $script, $match)) { $temp = array(); $temp['script'] = $match[2]; @@ -133,7 +133,7 @@ class AssetHelper extends Helper { $this->css[] = $temp; //remove the script since it will become part of the merged script - unset($view->__scripts[$i]); + unset($this->view->__scripts[$i]); } } @@ -176,7 +176,18 @@ class AssetHelper extends Helper { //file doesn't exist. create it. if (!$fileName) { $ts = time(); - + switch($type) { + case 'js': + if (PHP5) { + App::import('Vendor', 'jsmin/jsmin'); + } + case 'css': + App::import('Vendor', 'csstidy', array('file' => 'class.csstidy.php')); + $tidy = new csstidy(); + $tidy->load_template($this->cssCompression); + break; + } + //merge the script $scriptBuffer = ''; foreach($assets as $asset) { @@ -187,21 +198,21 @@ class AssetHelper extends Helper { case 'js': //jsmin only works with PHP5 if (PHP5) { - App::import('Vendor', 'jsmin/jsmin'); $buffer = trim(JSMin::minify($buffer)); } break; case 'css': - App::import('Vendor', 'csstidy', array('file' => 'class.csstidy.php')); - $tidy = new csstidy(); - $tidy->load_template($this->cssCompression); $tidy->parse($buffer); $buffer = $tidy->print->plain(); break; } - $scriptBuffer .= sprintf("/* %s.%s (%d%%) */\n", $asset['script'], $type, (strlen($buffer) / $origSize) * 100); + $delta = 0; + if ($origSize > 0) { + $delta = (strlen($buffer) / $origSize) * 100; + } + $scriptBuffer .= sprintf("/* %s.%s (%d%%) */\n", $asset['script'], $type, $delta); $scriptBuffer .= $buffer . "\n\n"; } views/helpers/asset.php tests/test_app/webroot/js/test1.js tests/test_app/webroot/js/test2.js vendors/js/test3.js 9c27108296c3dbdfdac731d87b891d2c39647357 unknown matt@mcurry.net http://github.com/mcurry/asset/commit/e04210fa473a992a6e50e39a581f585543800314 e04210fa473a992a6e50e39a581f585543800314 2009-05-08T18:57:06-07:00 2009-05-08T18:57:06-07:00 more unit tests 0b74cc9daf76b6b684f10ed33206fc3caeee1fb7 unknown matt@mcurry.net