Cavemanon/piratepoet
8
Fork 0
Code Pull Requests Actions Releases 16 Activity

Add cache breaker query string to plugin static asset URLs

Browse Source 
MAILPOET-713
This commit is contained in:
Tautvidas Sipavičius
2016-12-07 16:22:44 +02:00
parent 058ba53622
commit 6728203672
3 changed files with 78 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/Config/Renderer.php
View File

@@ -55,8 +55,8 @@ class Renderer {
function setupGlobalVariables() {
$this->renderer->addExtension(new Twig\Assets(array(
'assets_url' => Env::$assets_url,
'assets_path' => Env::$assets_path
'version' => Env::$version,
'assets_url' => Env::$assets_url
)));
}

29
lib/Twig/Assets.php
View File

@@ -47,8 +47,13 @@ class Assets
$output = array();
foreach($stylesheets as $stylesheet) {
$output[] = '<link rel="stylesheet" type="text/css"'.
' href="'.$this->_globals['assets_url'].'/css/'.$stylesheet.'">';
$url = $this->appendVersionToUrl(
$this->_globals['assets_url'] . '/css/' . $stylesheet
);
$output[] = sprintf(
'<link rel="stylesheet" type="text/css" href="%s">',
$url
);
}
return join("\n", $output);
@@ -59,15 +64,25 @@ class Assets
$output = array();
foreach($scripts as $script) {
$output[] = '<script type="text/javascript"'.
' src="'.$this->_globals['assets_url'].'/js/'.$script.'">'.
'</script>';
$url = $this->appendVersionToUrl(
$this->_globals['assets_url'] . '/js/' . $script
);
$output[] = sprintf(
'<script type="text/javascript" src="%s"></script>',
$url
);
}
return join("\n", $output);
}
public function generateImageUrl($path) {
return $this->_globals['assets_url'].'/img/'.$path;
return $this->appendVersionToUrl(
$this->_globals['assets_url'] . '/img/' . $path
);
}
}
public function appendVersionToUrl($url) {
return add_query_arg('mailpoet_version', $this->_globals['version'], $url);
}
}

54
tests/unit/Twig/AssetsTest.php Normal file
View File

@@ -0,0 +1,54 @@
<?php
use \MailPoet\Twig\Assets;
class AssetsTest extends MailPoetTest {
function _before() {
$this->assets_url = 'https://www.testing.com/wp-content/plugins/mailpoet/assets';
$this->version = '1.2.3';
$this->assetsExtension = new Assets(array(
'assets_url' => $this->assets_url,
'version' => $this->version
));
}
function testItGeneratesJavascriptTags() {
expect($this->assetsExtension->generateJavascript('script1.js', 'script2.js'))->equals(
'<script type="text/javascript" src="' . $this->assets_url . '/js/script1.js?mailpoet_version=' . $this->version . '"></script>'
. "\n"
. '<script type="text/javascript" src="' . $this->assets_url . '/js/script2.js?mailpoet_version=' . $this->version . '"></script>'
);
}
function testItGeneratesStylesheetTags() {
expect($this->assetsExtension->generateStylesheet('style1.css', 'style2.css'))->equals(
'<link rel="stylesheet" type="text/css" href="' . $this->assets_url . '/css/style1.css?mailpoet_version=' . $this->version . '">'
. "\n"
. '<link rel="stylesheet" type="text/css" href="' . $this->assets_url . '/css/style2.css?mailpoet_version=' . $this->version . '">'
);
}
function testItGeneratesImageUrls() {
expect($this->assetsExtension->generateImageUrl('image1.png'))->equals(
$this->assets_url . '/img/image1.png?mailpoet_version=' . $this->version
);
}
function testItAppendsVersionToUrl() {
$without_file = 'http://url.com/';
expect($this->assetsExtension->appendVersionToUrl($without_file))->equals(
$without_file . '?mailpoet_version=' . $this->version
);
$with_file = 'http://url.com/file.php';
expect($this->assetsExtension->appendVersionToUrl($with_file))->equals(
$with_file . '?mailpoet_version=' . $this->version
);
$with_folder = 'http://url.com/folder/file.php';
expect($this->assetsExtension->appendVersionToUrl($with_folder))->equals(
$with_folder . '?mailpoet_version=' . $this->version
);
$with_query_string = 'http://url.com/folder/file.php?name=value';
expect($this->assetsExtension->appendVersionToUrl($with_query_string))->equals(
$with_query_string . '&mailpoet_version=' . $this->version
);
}
}