Skip to content

Allow users to specify a custom ruleset for YSlow when using PhantomJS #121

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
MattCBowman wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Allow users to specify a custom ruleset for YSlow when using PhantomJS #121

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b8a1c09
Allow users to specify a custom ruleset for YSlow when using PhantomJS
MattCBowman Jul 7, 2014
d093d53
Fix some problems noted by JSHint
MattCBowman Jul 7, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 15 additions & 1 deletion src/phantomjs/controller.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,10 @@

// parse args
var i, arg, page, urlCount, viewport,
fs = require('fs'),
webpage = require('webpage'),
args = phantom.args,
customRuleset,
len = args.length,
urls = [],
yslowArgs = {
Expand All @@ -43,6 +45,7 @@ var i, arg, page, urlCount, viewport,
i: 'info',
f: 'format',
r: 'ruleset',
l: 'loadruleset',
h: 'help',
V: 'version',
d: 'dict',
Expand Down Expand Up @@ -74,6 +77,11 @@ for (i = 0; i < len; i += 1) {
// yslow argument alias
i += 1;
yslowArgs[argsAlias[arg]] = args[i];
} else if (arg === 'l' || arg === 'loadruleset') {
// Custom ruleset from file
i += 1;
customRuleset = JSON.parse(fs.open(args[i], 'r').read());
yslowArgs.ruleset = customRuleset.id;
} else if (unaryArgs.hasOwnProperty(arg)) {
// unary argument
unaryArgs[arg] = true;
Expand All @@ -82,6 +90,7 @@ for (i = 0; i < len; i += 1) {
unaryArgs[argsAlias[arg]] = true;
}
}

urlCount = urls.length;

// check for version
Expand All @@ -107,6 +116,7 @@ if (len === 0 || urlCount === 0 || unaryArgs.help) {
' -i, --info <info> specify the information to display/log (basic|grade|stats|comps|all) [all]',
' -f, --format <format> specify the output results format (json|xml|plain|tap|junit) [json]',
' -r, --ruleset <ruleset> specify the YSlow performance ruleset to be used (ydefault|yslow1|yblog) [ydefault]',
' -l, --loadruleset <file> specify a file containing a custom YSlow performance ruleset to be used',
' -b, --beacon <url> specify an URL to log the results',
' -d, --dict include dictionary of results fields',
' -v, --verbose output beacon response information',
Expand Down Expand Up @@ -259,10 +269,14 @@ urls.forEach(function (url) {
ysphantomjs = 'YSLOW.phantomjs = {' +
'resources: ' + JSON.stringify(resources) + ',' +
'args: ' + JSON.stringify(yslowArgs) + ',' +
'loadTime: ' + JSON.stringify(loadTime) + '};';
'loadTime: ' + JSON.stringify(loadTime) + ',' +
'customRuleset: ' + JSON.stringify(customRuleset) + '};';

// YSlow phantomjs controller
controller = function () {
if (YSLOW.phantomjs.customRuleset) {
YSLOW.registerRuleset(YSLOW.phantomjs.customRuleset);
}
YSLOW.phantomjs.run = function () {
try {
var results, xhr, output, threshold,
Expand Down