Code Cleanup

.editorconfig

@@ -11,3 +11,7 @@ insert_final_newline = true
 
 [*.md]
 trim_trailing_whitespace = false
+
+[*.yml]
+indent_style = space
+indent_size = 2

.gitignore

@@ -10,5 +10,5 @@ CVS/
 .svn
 *~
 .com.apple.timemachine.supported
-.idea
-docs/
+.idea/
+docs/

.npmignore

@@ -10,5 +10,4 @@ docs/
 examples/
 screwdriver/
 Makefile
-.idea
-docs/
+.idea/

.travis.yml

@@ -15,6 +15,7 @@ script:
 
 after_script:
   - cat ./coverage/lcov.info | ./node_modules/coveralls/bin/coveralls.js
+  - CODECLIMATE_REPO_TOKEN=46b538e32a131ea7637cbbc30f08237cef088467c9b9ec25419a961962fa96b3 ./node_modules/codeclimate-test-reporter/bin/codeclimate.js < ./coverage/lcov.info
 
 notifications:
   webhooks:

CHANGELOG.md

@@ -2,6 +2,7 @@ CHANGELOG
 =========
 
 v0.10.0 
+* General cleanup
 * Add support for Node 0.12
 * Add support for IO.js
 

LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2014 Yahoo! Inc.
+Copyright (c) 2014-2015 Yahoo! Inc.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -18,4 +18,4 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+SOFTWARE.

README.md

@@ -181,6 +181,7 @@ The following third-party libraries are used by this module:
 
 ###Dev-Dependencies
 * chai: http://chaijs.com
+* codeclimate-test-reporter: https://github.com/codeclimate/javascript-test-reporter
 * coveralls: https://github.com/cainus/node-coveralls
 * istanbul: https://github.com/gotwarlost/istanbul
 * mocha: https://github.com/visionmedia/mocha
@@ -190,4 +191,4 @@ The following third-party libraries are used by this module:
 
 The MIT License
 
-Copyright 2014 Yahoo Inc.
+Copyright 2014-2015 Yahoo Inc.

examples/loadFromMemory.js

@@ -1,7 +1,8 @@
-// Copyright 2014, Yahoo! Inc.
+// Copyright 2014-2015, Yahoo! Inc.
 // Copyrights licensed under the Mit License. See the accompanying LICENSE file for terms.
 
-var PNGImage = require('../index'), fs = require('fs');
+var PNGImage = require('../index'),
+	fs = require('fs');
 
 var blob = fs.readFileSync(__dirname + '/squirrel.png');
 

index.js

@@ -1,12 +1,12 @@
-// Copyright 2014, Yahoo! Inc.
+// Copyright 2014-2015, Yahoo! Inc.
 // Copyrights licensed under the Mit License. See the accompanying LICENSE file for terms.
 
-var fs            = require('fs'), _ = require('underscore'),
-
-	PNG           = require('pngjs').PNG,
-
-	pixel         = require('./lib/pixel'), conversion = require('./lib/conversion'), filters = require('./lib/filters'),
-
+var fs = require('fs'),
+	_ = require('underscore'),
+	PNG = require('pngjs').PNG,
+	pixel = require('./lib/pixel'),
+	conversion = require('./lib/conversion'),
+	filters = require('./lib/filters'),
 	streamBuffers = require("stream-buffers");
 
 /**
@@ -69,7 +69,8 @@ PNGImage.setFilter = function (key, fn) {
  */
 PNGImage.createImage = function (width, height) {
 	var image = new PNG({
-		width: width, height: height
+		width: width,
+		height: height
 	});
 	return new PNGImage(image);
 };
@@ -98,10 +99,10 @@ PNGImage.copyImage = function (image) {
  * @return {PNGImage}
  */
 PNGImage.readImage = function (filename, fn) {
-	var image = new PNG(), resultImage = new PNGImage(image);
+	var image = new PNG(),
+		resultImage = new PNGImage(image);
 
-	fn = fn || function () {
-	};
+	fn = fn || function () {};
 
 	fs.createReadStream(filename).once('error', function(err) {
 		fn(err, undefined);
@@ -126,10 +127,10 @@ PNGImage.readImage = function (filename, fn) {
  * @return {PNGImage}
  */
 PNGImage.loadImage = function (blob, fn) {
-	var image = new PNG(), resultImage = new PNGImage(image);
+	var image = new PNG(),
+		resultImage = new PNGImage(image);
 
-	fn = fn || function () {
-	};
+	fn = fn || function () {};
 
 	image.once('error', function (err) {
 		fn(err, resultImage);
@@ -241,7 +242,12 @@ PNGImage.prototype = {
 	 * @param {float} [color.opacity] Opacity of color
 	 */
 	fillRect: function (x, y, width, height, color) {
-		var i, iLen = x + width, j, jLen = y + height, index;
+
+		var i,
+			iLen = x + width,
+			j,
+			jLen = y + height,
+			index;
 
 		for (i = x; i < iLen; i++) {
 			for (j = y; j < jLen; j++) {
@@ -262,7 +268,8 @@ PNGImage.prototype = {
 	 */
 	applyFilters: function (filters, returnResult) {
 
-		var image, newFilters;
+		var image,
+			newFilters;
 
 		// Convert to array
 		if (_.isString(filters)) {
@@ -273,7 +280,7 @@ PNGImage.prototype = {
 
 		// Format array as needed by the function
 		newFilters = [];
-		_.each(filters, function (filter) {
+		(filters || []).forEach(function (filter) {
 
 			if (_.isString(filter)) {
 				newFilters.push({key: filter, options: {}});
@@ -286,7 +293,7 @@ PNGImage.prototype = {
 
 		// Process filters
 		image = this;
-		_.each(filters, function (filter) {
+		(filters || []).forEach(function (filter) {
 
 			var currentFilter = PNGImage.filters[filter.key];
 
@@ -299,7 +306,7 @@ PNGImage.prototype = {
 
 			image = currentFilter(this, filter.options);
 
-		}, this);
+		}.bind(this));
 
 		// Overwrite current image, or just returning it
 		if (!returnResult) {
@@ -332,8 +339,7 @@ PNGImage.prototype = {
 	 */
 	writeImage: function (filename, fn) {
 
-		fn = fn || function () {
-		};
+		fn = fn || function () {};
 
 		this._image.pack().pipe(fs.createWriteStream(filename)).once('close', function () {
 			this._image.removeListener('error', fn);
@@ -356,8 +362,7 @@ PNGImage.prototype = {
 			initialSize: (100 * 1024), incrementAmount: (10 * 1024)
 		});
 
-		fn = fn || function () {
-		};
+		fn = fn || function () {};
 
 		this._image.pack().pipe(writeBuffer).once('close', function () {
 			this._image.removeListener('error', fn);
@@ -377,7 +382,7 @@ _.extend(PNGImage.prototype, conversion);
 
 
 // Adds all standard filters
-_.each(_.keys(filters), function (key) {
+_.keys(filters).forEach(function (key) {
 	PNGImage.setFilter(key, filters[key]);
 });
 

lib/conversion.js

@@ -1,4 +1,4 @@
-// Copyright 2014 Yahoo! Inc.
+// Copyright 2014-2015 Yahoo! Inc.
 // Copyrights licensed under the Mit License. See the accompanying LICENSE file for terms.
 
 /**
@@ -18,7 +18,17 @@ module.exports = {
 	 * @return {int}
 	 */
 	getBlurPixelAtIndex: function (idx, funcName) {
-		var colors = 0, colorCounter = 0, fn, width = this._image.width, height = this._image.height, dim = width * height, spaceOnRight, spaceOnLeft, spaceOnTop, spaceOnBottom;
+
+		var colors = 0,
+			colorCounter = 0,
+			fn,
+			width = this._image.width,
+			height = this._image.height,
+			dim = width * height,
+			spaceOnRight,
+			spaceOnLeft,
+			spaceOnTop,
+			spaceOnBottom;
 
 		funcName = funcName || "getLuminosityAtIndex";
 
@@ -87,7 +97,13 @@ module.exports = {
 	 * @return {object} YIQ-value
 	 */
 	getYIQAtIndex: function (idx) {
-		var r = this.getRed(idx), g = this.getGreen(idx), b = this.getBlue(idx), y, i, q;
+
+		var r = this.getRed(idx),
+			g = this.getGreen(idx),
+			b = this.getBlue(idx),
+			y,
+			i,
+			q;
 
 		y = this.getLumaAtIndex(idx);
 		i = Math.floor((0.595716 * r) - (0.274453 * g) - (0.321263 * b));
@@ -147,7 +163,9 @@ module.exports = {
 	 * @return {object} Color
 	 */
 	getSepiaAtIndex: function (idx) {
-		var r = this.getRed(idx), g = this.getGreen(idx), b = this.getBlue(idx);
+		var r = this.getRed(idx),
+			g = this.getGreen(idx),
+			b = this.getBlue(idx);
 
 		r = Math.floor((0.393 * r) + (0.769 * g) + (0.189 * b));
 		g = Math.floor((0.349 * r) + (0.686 * g) + (0.168 * b));
@@ -206,7 +224,9 @@ module.exports = {
 	 * @return {int} Lightness
 	 */
 	getLightnessAtIndex: function (idx) {
-		var r = this.getRed(idx), g = this.getGreen(idx), b = this.getBlue(idx);
+		var r = this.getRed(idx),
+			g = this.getGreen(idx),
+			b = this.getBlue(idx);
 
 		return Math.floor((Math.max(r, g, b) + Math.min(r, g, b)) / 2);
 	},

lib/filters.js

@@ -1,4 +1,4 @@
-// Copyright 2014 Yahoo! Inc.
+// Copyright 2014-2015 Yahoo! Inc.
 // Copyrights licensed under the Mit License. See the accompanying LICENSE file for terms.
 
 var blur = require('./filters/blur');

lib/filters/blur.js

@@ -1,4 +1,4 @@
-// Copyright 2014 Yahoo! Inc.
+// Copyright 2014-2015 Yahoo! Inc.
 // Copyrights licensed under the Mit License. See the accompanying LICENSE file for terms.
 
 /**
@@ -13,7 +13,9 @@
  */
 module.exports = function (source, destination, options) {
 
-	var dim = source.getWidth() * source.getHeight(), idx, value;
+	var dim = source.getWidth() * source.getHeight(),
+		idx,
+		value;
 
 	for (idx = 0; idx < dim; idx++) {
 		value = source.getBlurPixelAtIndex(idx, options.funcName);

lib/filters/grayScale.js

@@ -1,4 +1,4 @@
-// Copyright 2014 Yahoo! Inc.
+// Copyright 2014-2015 Yahoo! Inc.
 // Copyrights licensed under the Mit License. See the accompanying LICENSE file for terms.
 
 /**
@@ -12,7 +12,9 @@
  */
 module.exports = function (source, destination, options) {
 
-	var dim = source.getWidth() * source.getHeight(), idx, value;
+	var dim = source.getWidth() * source.getHeight(),
+		idx,
+		value;
 
 	for (idx = 0; idx < dim; idx++) {
 		value = source.getGrayScaleAtIndex(idx);

lib/filters/lightness.js

@@ -1,4 +1,4 @@
-// Copyright 2014 Yahoo! Inc.
+// Copyright 2014-2015 Yahoo! Inc.
 // Copyrights licensed under the Mit License. See the accompanying LICENSE file for terms.
 
 /**
@@ -12,7 +12,9 @@
  */
 module.exports = function (source, destination, options) {
 
-	var dim = source.getWidth() * source.getHeight(), idx, value;
+	var dim = source.getWidth() * source.getHeight(),
+		idx,
+		value;
 
 	for (idx = 0; idx < dim; idx++) {
 		value = source.getLightnessAtIndex(idx);

lib/filters/luma.js

@@ -1,4 +1,4 @@
-// Copyright 2014 Yahoo! Inc.
+// Copyright 2014-2015 Yahoo! Inc.
 // Copyrights licensed under the Mit License. See the accompanying LICENSE file for terms.
 
 /**
@@ -12,7 +12,9 @@
  */
 module.exports = function (source, destination, options) {
 
-	var dim = source.getWidth() * source.getHeight(), idx, value;
+	var dim = source.getWidth() * source.getHeight(),
+		idx,
+		value;
 
 	for (idx = 0; idx < dim; idx++) {
 		value = source.getLumaAtIndex(idx);

lib/filters/luminosity.js

@@ -1,4 +1,4 @@
-// Copyright 2014 Yahoo! Inc.
+// Copyright 2014-2015 Yahoo! Inc.
 // Copyrights licensed under the Mit License. See the accompanying LICENSE file for terms.
 
 /**
@@ -12,7 +12,9 @@
  */
 module.exports = function (source, destination, options) {
 
-	var dim = source.getWidth() * source.getHeight(), idx, value;
+	var dim = source.getWidth() * source.getHeight(),
+		idx,
+		value;
 
 	for (idx = 0; idx < dim; idx++) {
 		value = source.getLuminosityAtIndex(idx);

lib/filters/sepia.js

@@ -1,4 +1,4 @@
-// Copyright 2014 Yahoo! Inc.
+// Copyright 2014-2015 Yahoo! Inc.
 // Copyrights licensed under the Mit License. See the accompanying LICENSE file for terms.
 
 /**
@@ -12,7 +12,9 @@
  */
 module.exports = function (source, destination, options) {
 
-	var dim = source.getWidth() * source.getHeight(), idx, value;
+	var dim = source.getWidth() * source.getHeight(),
+		idx,
+		value;
 
 	for (idx = 0; idx < dim; idx++) {
 		value = source.getSepiaAtIndex(idx);

lib/pixel.js

@@ -1,4 +1,4 @@
-// Copyright 2014 Yahoo! Inc.
+// Copyright 2014-2015 Yahoo! Inc.
 // Copyrights licensed under the Mit License. See the accompanying LICENSE file for terms.
 
 /**