Merge pull request #378 from adamwdraper/fix-bytes-for-legacy

adamwdraper · web-flow · commit b50f4c977343 · 2016-11-21T10:14:14.000-08:00
Fix bytes for legacy
diff --git a/README.md b/README.md
@@ -47,11 +47,15 @@ See [the english unit tests](https://github.com/adamwdraper/Numeral-js/blob/mast
 
 # Changelog
 
+### 1.5.5
+
+Bug fix: Switch bytes back to `b` and change iecBinary to `ib`, and calculate both using 1024 for backwards compatibility
+
 ### 1.5.4
 
 Tests: Changed all tests to use Mocha and Chai
 
-Tests: Added browser tests for Chrome, Firefox, and IE using saucelabs 
+Tests: Added browser tests for Chrome, Firefox, and IE using saucelabs
 
 Added reset function to reset numeral to default options
 
diff --git a/bower.json b/bower.json
@@ -1,7 +1,7 @@
 {
   "name": "numeral",
   "repo": "adamwdraper/Numeral-js",
-  "version": "1.5.4",
+  "version": "1.5.5",
   "description": "Format and manipulate numbers.",
   "keywords": [
     "numeral",
diff --git a/component.json b/component.json
@@ -1,7 +1,7 @@
 {
   "name": "numeral",
   "repo": "adamwdraper/Numeral-js",
-  "version": "1.5.4",
+  "version": "1.5.5",
   "description": "Format and manipulate numbers.",
   "keywords": [
     "numeral",
diff --git a/min/numeral.min.js b/min/numeral.min.js
diff --git a/numeral.js b/numeral.js
@@ -1,6 +1,6 @@
 /*! @preserve
  * numeral.js
- * version : 1.5.4
+ * version : 1.5.5
  * author : Adam Draper
  * license : MIT
  * http://adamwdraper.github.com/Numeral-js/
@@ -13,7 +13,7 @@
     ************************************/
 
     var numeral,
-        VERSION = '1.5.4',
+        VERSION = '1.5.5',
         // internal storage for language config files
         languages = {},
         defaults = {
@@ -105,8 +105,8 @@
             millionRegExp,
             billionRegExp,
             trillionRegExp,
-            binarySuffixes = ['KiB', 'MiB', 'GiB', 'TiB', 'PiB', 'EiB', 'ZiB', 'YiB'],
-            decimalSuffixes = ['KB', 'MB', 'GB', 'TB', 'PB', 'EB', 'ZB', 'YB'],
+            suffixes = ['KB', 'MB', 'GB', 'TB', 'PB', 'EB', 'ZB', 'YB'],
+            iecSuffixes = ['KiB', 'MiB', 'GiB', 'TiB', 'PiB', 'EiB', 'ZiB', 'YiB'],
             bytesMultiplier = false,
             power;
 
@@ -127,10 +127,12 @@
                 trillionRegExp = new RegExp('[^a-zA-Z]' + languages[options.currentLanguage].abbreviations.trillion + '(?:\\)|(\\' + languages[options.currentLanguage].currency.symbol + ')?(?:\\))?)?$');
 
                 // see if bytes are there so that we can multiply to the correct number
-                for (power = 0; power <= binarySuffixes.length && !bytesMultiplier; power++) {
-                    if (string.indexOf(binarySuffixes[power]) > -1) { bytesMultiplier = Math.pow(1024, power + 1); }
-                    else if (string.indexOf(decimalSuffixes[power]) > -1) { bytesMultiplier = Math.pow(1000, power + 1); }
-                    else { bytesMultiplier = false; }
+                for (power = 0; power <= suffixes.length; power++) {
+                    bytesMultiplier = ((string.indexOf(suffixes[power]) > -1) || (string.indexOf(iecSuffixes[power]) > -1))? Math.pow(1024, power + 1) : false;
+
+                    if (bytesMultiplier) {
+                        break;
+                    }
                 }
 
                 // do some math to create our number
@@ -245,6 +247,12 @@
         return Number(seconds);
     }
 
+    /*  format keys:
+     *  a - abbreviation
+     *  ib - binary bytes
+     *  b - decimal bytes
+     *  o - ordinal
+     */
     function formatNumber(value, format, roundingFunction) {
         var negP = false,
             signed = false,
@@ -258,16 +266,17 @@
             bytes = '',
             ord = '',
             abs = Math.abs(value),
-            binarySuffixes = ['B', 'KiB', 'MiB', 'GiB', 'TiB', 'PiB', 'EiB', 'ZiB', 'YiB'],
-            decimalSuffixes = ['B', 'KB', 'MB', 'GB', 'TB', 'PB', 'EB', 'ZB', 'YB'],
+            iecSuffixes = ['B', 'KiB', 'MiB', 'GiB', 'TiB', 'PiB', 'EiB', 'ZiB', 'YiB'],
+            suffixes = ['B', 'KB', 'MB', 'GB', 'TB', 'PB', 'EB', 'ZB', 'YB'],
             min,
             max,
             power,
             w,
             precision,
             thousands,
             d = '',
-            neg = false;
+            neg = false,
+            iecBinary = false;
 
         // check if number is zero and a custom zero format has been set
         if (value === 0 && options.zeroFormat !== null) {
@@ -320,46 +329,28 @@
                 }
             }
 
-            // see if we are formatting binary bytes
+            // see if we are formatting bytes
             if (format.indexOf('b') > -1) {
-                // check for space before
-                if (format.indexOf(' b') > -1) {
-                    bytes = ' ';
-                    format = format.replace(' b', '');
-                } else {
-                    format = format.replace('b', '');
-                }
-
-                for (power = 0; power <= binarySuffixes.length; power++) {
-                    min = Math.pow(1024, power);
-                    max = Math.pow(1024, power + 1);
 
-                    if (value >= min && value < max) {
-                        bytes = bytes + binarySuffixes[power];
-                        if (min > 0) {
-                            value = value / min;
-                        }
-                        break;
-                    }
+                // check for IEC Binary byte notation
+                if (format.indexOf('ib') > -1) {
+                    iecBinary = true;
                 }
-            }
 
-            // see if we are formatting decimal bytes
-            if (format.indexOf('d') > -1) {
                 // check for space before
-                if (format.indexOf(' d') > -1) {
+                if (format.indexOf(' b') > -1 || format.indexOf(' ib') > -1) {
                     bytes = ' ';
-                    format = format.replace(' d', '');
+                    format = format.replace(' ib', '').replace(' b', '');
                 } else {
-                    format = format.replace('d', '');
+                    format = format.replace('ib', '').replace('b', '');
                 }
 
-                for (power = 0; power <= decimalSuffixes.length; power++) {
-                    min = Math.pow(1000, power);
-                    max = Math.pow(1000, power+1);
+                for (power = 0; power <= suffixes.length; power++) {
+                    min = Math.pow(1024, power);
+                    max = Math.pow(1024, power+1);
 
                     if (value >= min && value < max) {
-                        bytes = bytes + decimalSuffixes[power];
+                        bytes = bytes + (iecBinary ? iecSuffixes[power] : suffixes[power]);
                         if (min > 0) {
                             value = value / min;
                         }
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "numeral",
-  "version": "1.5.4",
+  "version": "1.5.5",
   "description": "Format and manipulate numbers.",
   "homepage": "http://numeraljs.com",
   "author": {
diff --git a/tests/numeral/format.js b/tests/numeral/format.js
@@ -133,16 +133,16 @@ describe('Format', function() {
         it('should format to bytes', function() {
             var tests = [
                     [100,'0b','100B'],
-                    [1024*2,'0 b','2 KiB'],
-                    [1024*1024*5,'0b','5MiB'],
-                    [1024*1024*1024*7.343,'0.[0] b','7.3 GiB'],
-                    [1024*1024*1024*1024*3.1536544,'0.000b','3.154TiB'],
-                    [1024*1024*1024*1024*1024*2.953454534534,'0b','3PiB'],
-                    [1000*2,'0 d','2 KB'],
-                    [1000*1000*5,'0d','5MB'],
-                    [1000*1000*1000*7.343,'0.[0] d','7.3 GB'],
-                    [1000*1000*1000*1000*3.1536544,'0.000d','3.154TB'],
-                    [1000*1000*1000*1000*1000*2.953454534534,'0d','3PB']
+                    [1024*2,'0 ib','2 KiB'],
+                    [1024*1024*5,'0ib','5MiB'],
+                    [1024*1024*1024*7.343,'0.[0] ib','7.3 GiB'],
+                    [1024*1024*1024*1024*3.1536544,'0.000ib','3.154TiB'],
+                    [1024*1024*1024*1024*1024*2.953454534534,'0ib','3PiB'],
+                    [1024*2,'0 b','2 KB'],
+                    [1024*1024*5,'0b','5MB'],
+                    [1024*1024*1024*7.343,'0.[0] b','7.3 GB'],
+                    [1024*1024*1024*1024*3.1536544,'0.000b','3.154TB'],
+                    [1024*1024*1024*1024*1024*2.953454534534,'0b','3PB']
                 ],
                 i;
 
diff --git a/tests/numeral/unformat.js b/tests/numeral/unformat.js
@@ -60,7 +60,7 @@ describe('Unformat', function() {
             var tests = [
                 ['100B', 100],
                 ['3.154 TiB', 3467859674006],
-                ['3.154 TB', 3154000000000]
+                ['3.154 TB', 3467859674006]
             ];
 
             for (var i = 0; i < tests.length; i++) {

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "numeral",`
`3`	`3`	`"repo": "adamwdraper/Numeral-js",`
`4`		`- "version": "1.5.4",`
	`4`	`+ "version": "1.5.5",`
`5`	`5`	`"description": "Format and manipulate numbers.",`
`6`	`6`	`"keywords": [`
`7`	`7`	`"numeral",`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "numeral",`
`3`		`- "version": "1.5.4",`
	`3`	`+ "version": "1.5.5",`
`4`	`4`	`"description": "Format and manipulate numbers.",`
`5`	`5`	`"homepage": "http://numeraljs.com",`
`6`	`6`	`"author": {`