diff --git a/.gitignore b/.gitignore index 92c8a672..91a16305 100644 --- a/.gitignore +++ b/.gitignore @@ -1,7 +1,7 @@ deploy.sh node_modules/ parrots.zip -other.zip +guests.zip dist/ # Created by https://www.gitignore.io/api/vim,osx diff --git a/other.json b/guests.json similarity index 100% rename from other.json rename to guests.json diff --git a/other/hd/party-wizard.gif b/guests/hd/party-wizard.gif similarity index 100% rename from other/hd/party-wizard.gif rename to guests/hd/party-wizard.gif diff --git a/gulpfile.js b/gulpfile.js index a77c7831..684a7a00 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -73,17 +73,17 @@ gulp.task('render', ['test', 'zip', 'css'], function () { } return { parrots: JSON.parse(fs.readFileSync('parrots.json')).map(ParrotObjectAddSlackName), - other: JSON.parse(fs.readFileSync('other.json')).map(ParrotObjectAddSlackName), + guests: JSON.parse(fs.readFileSync('guests.json')).map(ParrotObjectAddSlackName), assets: assets, zip: JSON.parse(fs.readFileSync('dist/rev-manifest.json'))['parrots.zip'], - other_zip: JSON.parse(fs.readFileSync('dist/rev-manifest.json'))['other.zip'] + guests_zip: JSON.parse(fs.readFileSync('dist/rev-manifest.json'))['guests.zip'] }; })) .pipe(mustache()) .pipe(gulp.dest("dist/")); }); -gulp.task('zip', ['compress', 'other-compress'], function () { +gulp.task('zip', ['compress', 'guests-compress'], function () { return gulp.src('*.zip') .pipe(rev()) .pipe(gulp.dest('dist/')) @@ -102,11 +102,11 @@ gulp.task('compress', ['test'], function (cb) { }); }); -gulp.task('other-compress', ['test'], function (cb) { - exec('rm -f ./other.zip', function (err, stdout, stderr) { +gulp.task('guests-compress', ['test'], function (cb) { + exec('rm -f ./guests.zip', function (err, stdout, stderr) { console.log(stderr); if(err != null) { cb(err); } - exec("echo \" ~= Party or Die =~\n~= cultofthepartyparrot.com =~\" | zip -o -r -z ./other.zip ./other/*", function(err, stdout, stderr) { + exec("echo \" ~= Party or Die =~\n~= cultofthepartyparrot.com =~\" | zip -o -r -z ./guests.zip ./guests/*", function(err, stdout, stderr) { console.log(stderr); cb(err); }); @@ -118,8 +118,8 @@ gulp.task('images', function () { .pipe(gulp.dest('dist/')); gulp.src('parrots/**/*') .pipe(gulp.dest('dist/parrots/')); - gulp.src('other/**/*') - .pipe(gulp.dest('dist/other/')); + gulp.src('guests/**/*') + .pipe(gulp.dest('dist/guests/')); return gulp.src('src/*.{svg,png,jpg,gif}') .pipe(imagemin()) .pipe(gulp.dest('dist/assets/')); diff --git a/templates/index.html b/templates/index.html index 0bdc180a..b05190ab 100644 --- a/templates/index.html +++ b/templates/index.html @@ -143,16 +143,16 @@

Keyboards!

-

Other Party Things

+

Party Guests

- Download + Download

(zip)

@@ -210,7 +210,7 @@

Other Party Things

} } trackLinkClickEvent("parrots_zip", "parrots.zip"); - trackLinkClickEvent("other_zip", "other.zip"); + trackLinkClickEvent("guests_zip", "guests.zip"); trackLinkClickEvent("parrot_svg", "parrot.svg"); if(window.console && window.console.log) { console.log("PARTY PARROT WANTS YOUR SOUL: http://codepen.io/codevinsky/full/LWprYo/"); } diff --git a/test/json.js b/test/json.js index 7e9814f1..17e8b577 100644 --- a/test/json.js +++ b/test/json.js @@ -66,10 +66,10 @@ describe("parrots.json", function () { }); }); -describe("other.json", function () { +describe("guests.json", function () { it("should validate", function () { - var other_json = JSON.parse(fs.readFileSync(__dirname + '/../other.json', 'utf8')), - validation_result = validate(other_json, json_schema); + var guests_json = JSON.parse(fs.readFileSync(__dirname + '/../guests.json', 'utf8')), + validation_result = validate(guests_json, json_schema); // Schema errors in mocha are pretty useless, so print some here. validation_result.errors.forEach(function (e) { @@ -85,27 +85,27 @@ describe("other.json", function () { }); it("should not have extra gifs", function () { - var other_json = JSON.parse(fs.readFileSync(__dirname + '/../other.json', 'utf8')); - other_json.forEach(function(other) { - assert.ok(fs.existsSync(__dirname + '/../other/' + other.gif) || fs.existsSync(__dirname + '/../other/' + other.hd), other.name); + var guests_json = JSON.parse(fs.readFileSync(__dirname + '/../guests.json', 'utf8')); + guests_json.forEach(function(guests) { + assert.ok(fs.existsSync(__dirname + '/../guests/' + guests.gif) || fs.existsSync(__dirname + '/../guests/' + guests.hd), guests.name); }); }); it("should contain all gifs", function () { - var other = JSON.parse(fs.readFileSync(__dirname + '/../other.json', 'utf8')).map(function(other) { return other.gif; }).filter(function(gif) { return gif != undefined; }); - var other_gifs = fs.readdirSync(__dirname + '/../other'); - other_gifs.forEach(function(gif) { - if(! fs.statSync(__dirname + '/../other/' + gif).isFile()) { return; } - assert.ok(-1 !== other.indexOf(gif), gif); + var guests = JSON.parse(fs.readFileSync(__dirname + '/../guests.json', 'utf8')).map(function(guests) { return guests.gif; }).filter(function(gif) { return gif != undefined; }); + var guests_gifs = fs.readdirSync(__dirname + '/../guests'); + guests_gifs.forEach(function(gif) { + if(! fs.statSync(__dirname + '/../guests/' + gif).isFile()) { return; } + assert.ok(-1 !== guests.indexOf(gif), gif); }); }); it("should contain all HD gifs", function () { - var hd_other = JSON.parse(fs.readFileSync(__dirname + '/../other.json', 'utf8')).map(function(other) { return other.hd; }).filter(function(hd) { return hd != undefined; }); - var other_hd_gifs = fs.readdirSync(__dirname + '/../other/hd'); - other_hd_gifs.forEach(function(gif) { - if(! fs.statSync(__dirname + '/../other/hd/' + gif).isFile()) { return; } - assert.ok(-1 !== hd_other.indexOf('hd/' + gif), gif); + var hd_guests = JSON.parse(fs.readFileSync(__dirname + '/../guests.json', 'utf8')).map(function(guests) { return guests.hd; }).filter(function(hd) { return hd != undefined; }); + var guests_hd_gifs = fs.readdirSync(__dirname + '/../guests/hd'); + guests_hd_gifs.forEach(function(gif) { + if(! fs.statSync(__dirname + '/../guests/hd/' + gif).isFile()) { return; } + assert.ok(-1 !== hd_guests.indexOf('hd/' + gif), gif); }); }); }); diff --git a/test/size.js b/test/size.js index b762f777..c5f61300 100644 --- a/test/size.js +++ b/test/size.js @@ -8,30 +8,30 @@ describe("gifs", function() { it("in HD should weight less than 64KB", function() { var parrot_hd_gifs = fs.readdirSync(__dirname + '/../parrots/hd'), - other_hd_gifs = fs.readdirSync(__dirname + '/../other/hd'); + guests_hd_gifs = fs.readdirSync(__dirname + '/../guests/hd'); parrot_hd_gifs.forEach(function(gif) { var size = fs.statSync(__dirname + '/../parrots/hd/' + gif).size; assert(size <= convert(64).from('KB').to('B'), gif + " is too big(" + convert(size).from('B').to('KB') + " KB)"); }); - other_hd_gifs.forEach(function(gif) { - var size = fs.statSync(__dirname + '/../other/hd/' + gif).size; + guests_hd_gifs.forEach(function(gif) { + var size = fs.statSync(__dirname + '/../guests/hd/' + gif).size; assert(size <= convert(64).from('KB').to('B'), gif + " is too big(" + convert(size).from('B').to('KB') + " KB)"); }); }); it("in SD should weight less than 64KB", function() { var parrot_gifs = fs.readdirSync(__dirname + '/../parrots'), - other_gifs = fs.readdirSync(__dirname + '/../other'); + guests_gifs = fs.readdirSync(__dirname + '/../guests'); parrot_gifs.forEach(function(gif) { var size = fs.statSync(__dirname + '/../parrots/' + gif).size; assert(size <= convert(64).from('KB').to('B'), gif + " is too big(" + convert(size).from('B').to('KB') + " KB)"); }); - other_gifs.forEach(function(gif) { - var size = fs.statSync(__dirname + '/../other/' + gif).size; + guests_gifs.forEach(function(gif) { + var size = fs.statSync(__dirname + '/../guests/' + gif).size; assert(size <= convert(64).from('KB').to('B'), gif + " is too big(" + convert(size).from('B').to('KB') + " KB)"); }); }); @@ -39,8 +39,8 @@ describe("gifs", function() { it("should never be wider or taller than 128px", function () { var parrot_hd_gifs = fs.readdirSync(__dirname + '/../parrots/hd'), parrot_gifs = fs.readdirSync(__dirname + '/../parrots'), - other_hd_gifs = fs.readdirSync(__dirname + '/../other/hd'), - other_gifs = fs.readdirSync(__dirname + '/../other'); + guests_hd_gifs = fs.readdirSync(__dirname + '/../guests/hd'), + guests_gifs = fs.readdirSync(__dirname + '/../guests'); parrot_gifs.forEach(function(gif) { if(gif == "hd") { return; } // Skip the HD directory @@ -55,15 +55,15 @@ describe("gifs", function() { assert(dimensions.height <= 128, gif + " is taller than 128px"); }); - other_gifs.forEach(function(gif) { + guests_gifs.forEach(function(gif) { if(gif == "hd") { return; } // Skip the HD directory - var dimensions = imageSize(__dirname + '/../other/' + gif); + var dimensions = imageSize(__dirname + '/../guests/' + gif); assert(dimensions.width <= 128, gif + " is wider than 128px"); assert(dimensions.height <= 128, gif + " is taller than 128px"); }); - other_hd_gifs.forEach(function(gif) { - var dimensions = imageSize(__dirname + '/../other/hd/' + gif); + guests_hd_gifs.forEach(function(gif) { + var dimensions = imageSize(__dirname + '/../guests/hd/' + gif); assert(dimensions.width <= 128, gif + " is wider than 128px"); assert(dimensions.height <= 128, gif + " is taller than 128px"); });