Completing 2.0.0

.npmignore

@@ -1,9 +1,8 @@
 /node_modules/
-lib/filesize.min.js
-lib/filesize.map
-src
-test
-.jamignore
+/lib/filesize.min.js
+/lib/filesize.map
+/src/
+/test/
 .jshintrc
 .travis.yml
 Gruntfile.js

Gruntfile.js

@@ -73,4 +73,4 @@ module.exports = function(grunt) {
 	grunt.registerTask("test", ["nodeunit"]);
 	grunt.registerTask("build", ["concat", "sed", "exec"]);
 	grunt.registerTask("default", ["build", "test", "lint"]);
-};
+};

LICENSE

@@ -1,9 +1,27 @@
-Copyright (c) 2012, Jason Mulligan
+Copyright (c) 2013, Jason Mulligan
 All rights reserved.
 
-Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
 
-Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
-Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
-Neither the name of avoidwork inc. nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+  Redistributions of source code must retain the above copyright notice, this
+  list of conditions and the following disclaimer.
+
+  Redistributions in binary form must reproduce the above copyright notice, this
+  list of conditions and the following disclaimer in the documentation and/or
+  other materials provided with the distribution.
+
+  Neither the name of the {organization} nor the names of its
+  contributors may be used to endorse or promote products derived from
+  this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

README.md

@@ -1,21 +1,35 @@
 [![build status](https://secure.travis-ci.org/avoidwork/filesize.js.png)](http://travis-ci.org/avoidwork/filesize.js)
 # filesize.js
 
-filesize.js provides a simple way to get a human readable file size string from a number (float or integer) or string.  An optional second parameter is the decimal place to round to (default is 2), or _true_ which triggers Unix style output. An optional third parameter lets you disable `bit` sizes, e.g. "kb".
+filesize.js provides a simple way to get a human readable file size string from a number (float or integer) or string.
 
-## Examples
+## Optional settings
+
+`filesize()` accepts an optional descriptor Object as a second argument, so you can customize the output.
+
+#### bits
+Enables `bit` sizes, default is `false`
+
+#### unix
+Enables unix style human readable output, e.g `ls -lh`, default is `false`
 
-1.10.0 switched to base 10, all previous versions use base 2.
+#### base
+Number base, default is `10`
+
+#### round
+Decimal place, default is `2`
+
+#### spacer
+Character between the `result` and `suffix`, default is `" "`
+
+## Examples
 
 ```javascript
-filesize(500);                    // "4.00 Kb"
-filesize(500, true);              // "4.0k"
-filesize(1500);                   // "1.50 KB"
-filesize("1500000000");           // "1.50 GB"
-filesize("1500000000", 0);        // "2GB"
-filesize(1212312421412412);       // "1.21 PB PB"
-filesize(1212312421412412, true); // "1.1P" - shorthand output, similar to "ls -h"
-filesize(265318, 2, false)        // "265.32 kB" - disabled `bit` sizes with third argument
+filesize(500);                         // "500 B"
+filesize(500, {bits: true});           // "4.00 kb"
+filesize(265318);                      // "265.32 kB"
+filesize(265318, {base: 2});           // "259.10 kB"
+filesize(265318, {base: 2, round: 1}); // "259.1 kB"
 ```
 
 ## How can I load filesize.js?

lib/filesize.js

@@ -15,8 +15,7 @@ var bit   = /b$/,
     bite  = /^B$/,
     radix = 10,
     right = /\.(.*)/,
-    zero  = /^0$/,
-    options;
+    zero  = /^0$/;
 
 /**
  * filesize
@@ -30,18 +29,18 @@ function filesize ( arg, descriptor ) {
 	var result = "",
 	    skip   = false,
 	    i      = 6,
-	    base, bits, pos, neg, num, size, sizes, shrt, spacer, suffix, z;
+	    base, bits, neg, num, round, size, sizes, unix, spacer, suffix, z;
 
 	if ( isNaN( arg ) ) {
 		throw new Error( "Invalid arguments" );
 	}
 
 	descriptor = descriptor || {};
-	bits       = ( descriptor.bits     === true );
-	shrt       = ( descriptor["short"] === true );
-	base       = descriptor.base   !== undefined ? descriptor.base   : 10;
-	pos        = descriptor.pos    !== undefined ? descriptor.pos    : shrt ? 0  : 2;
-	spacer     = descriptor.spacer !== undefined ? descriptor.spacer : shrt ? "" : " ";
+	bits       = ( descriptor.bits === true );
+	unix       = ( descriptor.unix === true );
+	base       = descriptor.base   !== undefined ? descriptor.base   : unix ? 2  : 10;
+	round      = descriptor.round  !== undefined ? descriptor.round  : unix ? 1  : 2;
+	spacer     = descriptor.spacer !== undefined ? descriptor.spacer : unix ? "" : " ";
 	num        = Number( arg );
 	neg        = ( num < 0 );
 
@@ -52,11 +51,11 @@ function filesize ( arg, descriptor ) {
 
 	// Zero is now a special case because bytes divide by 1
 	if ( num === 0 ) {
-		if ( shrt ) {
+		if ( unix ) {
 			result = "0";
 		}
 		else {
-			result = "0 B";
+			result = "0" + spacer + "B";
 		}
 	}
 	else {
@@ -69,30 +68,34 @@ function filesize ( arg, descriptor ) {
 			if ( num >= size ) {
 				// Treating bytes as cardinal
 				if ( bite.test( suffix ) ) {
-					skip = true;
-					pos  = 0;
+					skip  = true;
+					round = 0;
 				}
 
-				result = ( num / size ).toFixed( pos );
+				result = ( num / size ).toFixed( round );
 
-				if ( !skip && shrt ) {
+				if ( !skip && unix ) {
 					if ( bits && bit.test( suffix ) ) {
 						suffix = suffix.toLowerCase();
 					}
 
 					suffix = suffix.charAt( 0 );
 					z      = right.exec( result );
 
-					if ( suffix === "k" ) {
+					if ( !bits && suffix === "k" ) {
 						suffix = "K";
 					}
 
 					if ( z !== null && z[1] !== undefined && zero.test( z[1] ) ) {
 						result = parseInt( result, radix );
 					}
+
+					result += spacer + suffix;
+				}
+				else if ( !unix ) {
+					result += spacer + suffix;
 				}
 
-				result += spacer + suffix;
 				break;
 			}
 		}
@@ -111,7 +114,7 @@ function filesize ( arg, descriptor ) {
  *
  * @type {Object}
  */
-options = {
+var options = {
 	2 : {
 		bits  : [["B", 1], ["kb", 128],  ["Mb", 131072],  ["Gb", 134217728],  ["Tb", 137438953472],  ["Pb", 140737488355328]],
 		bytes : [["B", 1], ["kB", 1024], ["MB", 1048576], ["GB", 1073741824], ["TB", 1099511627776], ["PB", 1125899906842624]]

lib/filesize.map

@@ -2,7 +2,7 @@
 "version":3,
 "file":"filesize.min.js",
 "lineCount":10,
-"mappings":"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",
+"mappings":"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",
 "sources":["filesize.js"],
-"names":["global","filesize","arg","descriptor","result","skip","i","base","bits","pos","neg","num","size","sizes","shrt","spacer","isNaN","Error","undefined","Number","options","suffix","bite","test","toFixed","bit","toLowerCase","charAt","z","right","exec","zero","parseInt","radix","exports","module","define"]
+"names":["global","filesize","arg","descriptor","result","skip","i","base","bits","neg","num","round","size","sizes","unix","spacer","isNaN","Error","undefined","Number","options","suffix","bite","test","toFixed","bit","toLowerCase","charAt","z","right","exec","zero","parseInt","radix","exports","module","define"]
 }

src/filesize.js

@@ -10,18 +10,18 @@ function filesize ( arg, descriptor ) {
 	var result = "",
 	    skip   = false,
 	    i      = 6,
-	    base, bits, pos, neg, num, size, sizes, shrt, spacer, suffix, z;
+	    base, bits, neg, num, round, size, sizes, unix, spacer, suffix, z;
 
 	if ( isNaN( arg ) ) {
 		throw new Error( "Invalid arguments" );
 	}
 
 	descriptor = descriptor || {};
-	bits       = ( descriptor.bits     === true );
-	shrt       = ( descriptor["short"] === true );
-	base       = descriptor.base   !== undefined ? descriptor.base   : 10;
-	pos        = descriptor.pos    !== undefined ? descriptor.pos    : shrt ? 0  : 2;
-	spacer     = descriptor.spacer !== undefined ? descriptor.spacer : shrt ? "" : " ";
+	bits       = ( descriptor.bits === true );
+	unix       = ( descriptor.unix === true );
+	base       = descriptor.base   !== undefined ? descriptor.base   : unix ? 2  : 10;
+	round      = descriptor.round  !== undefined ? descriptor.round  : unix ? 1  : 2;
+	spacer     = descriptor.spacer !== undefined ? descriptor.spacer : unix ? "" : " ";
 	num        = Number( arg );
 	neg        = ( num < 0 );
 
@@ -32,11 +32,11 @@ function filesize ( arg, descriptor ) {
 
 	// Zero is now a special case because bytes divide by 1
 	if ( num === 0 ) {
-		if ( shrt ) {
+		if ( unix ) {
 			result = "0";
 		}
 		else {
-			result = "0 B";
+			result = "0" + spacer + "B";
 		}
 	}
 	else {
@@ -49,30 +49,34 @@ function filesize ( arg, descriptor ) {
 			if ( num >= size ) {
 				// Treating bytes as cardinal
 				if ( bite.test( suffix ) ) {
-					skip = true;
-					pos  = 0;
+					skip  = true;
+					round = 0;
 				}
 
-				result = ( num / size ).toFixed( pos );
+				result = ( num / size ).toFixed( round );
 
-				if ( !skip && shrt ) {
+				if ( !skip && unix ) {
 					if ( bits && bit.test( suffix ) ) {
 						suffix = suffix.toLowerCase();
 					}
 
 					suffix = suffix.charAt( 0 );
 					z      = right.exec( result );
 
-					if ( suffix === "k" ) {
+					if ( !bits && suffix === "k" ) {
 						suffix = "K";
 					}
 
 					if ( z !== null && z[1] !== undefined && zero.test( z[1] ) ) {
 						result = parseInt( result, radix );
 					}
+
+					result += spacer + suffix;
+				}
+				else if ( !unix ) {
+					result += spacer + suffix;
 				}
 
-				result += spacer + suffix;
 				break;
 			}
 		}

src/intro.js

@@ -5,5 +5,4 @@ var bit   = /b$/,
     bite  = /^B$/,
     radix = 10,
     right = /\.(.*)/,
-    zero  = /^0$/,
-    options;
+    zero  = /^0$/;

src/options.js

@@ -3,7 +3,7 @@
  *
  * @type {Object}
  */
-options = {
+var options = {
 	2 : {
 		bits  : [["B", 1], ["kb", 128],  ["Mb", 131072],  ["Gb", 134217728],  ["Tb", 137438953472],  ["Pb", 140737488355328]],
 		bytes : [["B", 1], ["kB", 1024], ["MB", 1048576], ["GB", 1073741824], ["TB", 1099511627776], ["PB", 1125899906842624]]