Merge lp:~stephen-stewart/snapweb/show-download-or-installed-size into lp:~snappy-dev/snapweb/trunk

[Stephen Stewart]

add, but not yet show, a pretty download/installed size attr on the snap model

add, but not yet show, a pretty download size attr on the snap model

[lp:~stephen-stewart/snapweb/show-download-or-installed-size]

135. By Stephen Stewart on 2015-05-26

add tests for parsing installed_size/download_size

[Michael Vogt (mvo)]

This looks good to me (but mind you, I'm not a JS wizz). The testing is nice.

review: Approve

=== modified file 'package.json'
--- package.json	2015-05-08 22:41:11 +0000
+++ package.json	2015-05-26 11:53:54 +0000
@@ -37,6 +37,7 @@
     "lodash": "~3.3.1",
     "normalize.css": "^3.0.3",
     "postcss-bem-linter": "git://github.com/necolas/postcss-bem-linter",
+    "pretty-bytes": "^1.0.4",
     "vinyl-buffer": "~1.0.0",
     "vinyl-source-stream": "~1.1.0",
     "watchify": "~3.1.2"

=== modified file 'www/src/js/models/snap.js'
--- www/src/js/models/snap.js	2015-05-11 10:30:57 +0000
+++ www/src/js/models/snap.js	2015-05-26 11:53:54 +0000
@@ -3,6 +3,7 @@
 var _ = require('lodash');
 var Backbone = require('backbone');
 var Radio = require('backbone.radio');
+var prettyBytes = require('pretty-bytes');
 var CONF = require('../config.js');
 var chan = Radio.channel('root');
 
@@ -57,12 +58,36 @@
       chan.command('alert:error', model);
     });
 
-    this.on('add change:message', this.onMessageChange);
-
-    this.on('add change:status', this.handleStatusChange);
-  },
-
-  handleStatusChange: function(model) {
+    this.on('add change:status', this.onStatusChange);
+    this.on('change:installed_size', this.onInstalledSizeChange);
+    this.on('change:download_size', this.onDownloadSizeChange);
+  },
+
+  onDownloadSizeChange: function(model) {
+    var bytes = model.get('download_size');
+    model.set(
+      'prettyDownloadSize',
+      this.prettifyBytes(Number(model.get('download_size')))
+    );
+  },
+
+  onInstalledSizeChange: function(model) {
+    var bytes = model.get('installed_size');
+    model.set(
+      'prettyInstalledSize',
+      this.prettifyBytes(Number(model.get('installed_size')))
+    );
+  },
+
+  prettifyBytes: function(bytes) {
+    if (_.isFinite(bytes)) {
+      return prettyBytes(bytes);
+    } else {
+      return '';
+    }
+  },
+
+  onStatusChange: function(model) {
     this.setInstallActionString(model);
     this.setInstallHTMLClass(model);
   },
@@ -157,6 +182,20 @@
       }
     }
 
+    if (response.hasOwnProperty('download_size')) {
+      this.set(
+        //jscs:disable requireCamelCaseOrUpperCaseIdentifiers
+        'prettyDownloadSize', this.prettifyBytes(Number(response.download_size))
+      );
+    }
+
+    if (response.hasOwnProperty('installed_size')) {
+      this.set(
+        //jscs:disable requireCamelCaseOrUpperCaseIdentifiers
+        'prettyInstalledSize', this.prettifyBytes(Number(response.installed_size))
+      );
+    }
+
     return response;
   },
 

=== modified file 'www/tests/modelSpec.js'
--- www/tests/modelSpec.js	2015-05-06 09:46:30 +0000
+++ www/tests/modelSpec.js	2015-05-26 11:53:54 +0000
@@ -67,6 +67,27 @@
       expect(this.model.get('installActionString')).toBe(undefined);
     });
 
+    it('should set pretty byte attr or empty string if bad', function() {
+      this.model.set('installed_size', 0);
+      expect(this.model.get('prettyInstalledSize')).toBe('0 B');
+      // we coerce strings to numbers in the setters
+      this.model.set('installed_size', '1');
+      expect(this.model.get('prettyInstalledSize')).toBe('1 B');
+      // bad
+      this.model.set('installed_size', 'foo');
+      expect(this.model.get('prettyInstalledSize')).toBe('');
+    });
+
+    it('should parse response to create prettyInstalledSize', function() {
+      this.model.parse({'installed_size': 0});
+      expect(this.model.get('prettyInstalledSize')).toBe('0 B');
+    });
+
+    it('should parse response to create prettyDownloadSize', function() {
+      this.model.parse({'download_size': 0});
+      expect(this.model.get('prettyDownloadSize')).toBe('0 B');
+    });
+
   });
 
   describe('sync methods', function() {