Simplifying filesize.partial() & adding a test

avoidwork · Jan 21, 2017 · 4d1e9ea · 4d1e9ea
1 parent 245aa6d
commit 4d1e9ea
Show file tree

Hide file tree

Showing 7 changed files with 20 additions and 13 deletions.
diff --git a/lib/filesize.es6.js b/lib/filesize.es6.js
@@ -3,7 +3,7 @@
  *
  * @copyright 2017 Jason Mulligan <jason.mulligan@avoidwork.com>
  * @license BSD-3-Clause
- * @version 3.4.1
+ * @version 3.4.2
  */
 (function (global) {
 	const b = /^(b|B)$/,
@@ -121,7 +121,7 @@
 	}
 
 	// Partial application for functional programming
-	filesize.partial = (descriptor = {}) => arg => filesize(arg, descriptor);
+	filesize.partial = opt => arg => filesize(arg, opt);
 
 	// CommonJS, AMD, script tag
 	if (typeof exports !== "undefined") {

diff --git a/lib/filesize.js b/lib/filesize.js
@@ -5,7 +5,7 @@
  *
  * @copyright 2017 Jason Mulligan <jason.mulligan@avoidwork.com>
  * @license BSD-3-Clause
- * @version 3.4.1
+ * @version 3.4.2
  */
 (function (global) {
 	var b = /^(b|B)$/,
@@ -136,10 +136,9 @@
 	}
 
 	// Partial application for functional programming
-	filesize.partial = function () {
-		var descriptor = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+	filesize.partial = function (opt) {
 		return function (arg) {
-			return filesize(arg, descriptor);
+			return filesize(arg, opt);
 		};
 	};
 

diff --git a/lib/filesize.min.js b/lib/filesize.min.js
diff --git a/lib/filesize.min.js.map b/lib/filesize.min.js.map
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "filesize",
   "description": "JavaScript library to generate a human readable String describing the file size",
-  "version": "3.4.1",
+  "version": "3.4.2",
   "homepage": "http://filesizejs.com",
   "author": "Jason Mulligan <jason.mulligan@avoidwork.com>",
   "repository": {

diff --git a/src/filesize.js b/src/filesize.js
@@ -101,4 +101,4 @@
 	}
 
 	// Partial application for functional programming
-	filesize.partial = (descriptor = {}) => arg => filesize(arg, descriptor);
+	filesize.partial = opt => arg => filesize(arg, opt);
diff --git a/test/filesize_test.js b/test/filesize_test.js
@@ -123,17 +123,25 @@ exports["filesize"] = {
 	suffixes: function (test) {
 		test.expect(2);
 
-		test.equal(filesize(this.byte,     {suffixes: {B: "Б"}}), "1 Б",     "Should be '1 Б'");
+		test.equal(filesize(this.byte,     {suffixes: {B: "Б"}}), "1 Б",  "Should be '1 Б'");
 		test.equal(filesize(this.kilobyte, {suffixes: {B: "Б"}}), "1 KB", "Should be '1 KB'");
 
 		test.done();
 	},
 	symbols: function (test) {
 		test.expect(2);
 
-		test.equal(filesize(this.byte,     {symbols: {B: "Б"}}), "1 Б",     "Should be '1 Б'");
+		test.equal(filesize(this.byte,     {symbols: {B: "Б"}}), "1 Б",  "Should be '1 Б'");
 		test.equal(filesize(this.kilobyte, {symbols: {B: "Б"}}), "1 KB", "Should be '1 KB'");
 
+		test.done();
+	},
+	partial: function (test) {
+		test.expect(1);
+		test.size = filesize.partial({exponent: 0});
+
+		test.equal(test.size(this.kilobyte), "1024 B", "Should be '1024 B'");
+
 		test.done();
 	}
 };