pulse-meter 0.2.5 → 0.2.6

data/lib/pulse-meter/version.rb

@@ -1,3 +1,3 @@
 module PulseMeter
-  VERSION = "0.2.5"
+  VERSION = "0.2.6"
 end

data/lib/pulse-meter/visualize/public/js/application.coffee

@@ -3,6 +3,8 @@ document.startApp = ->
 	
 	String::capitalize = ->
 	  @charAt(0).toUpperCase() + @slice(1)
+	String::strip = ->
+		if String::trim? then @trim() else @replace /^\s+|\s+$/g, ""
 
 	PageInfo = Backbone.Model.extend {
 	}
@@ -169,7 +171,7 @@ document.startApp = ->
 					position: 'bottom'
 				}
 				vAxis: {
-					title: @get('valuesTitle')
+					title: "#{@get('valuesTitle')} / #{@humanizedInterval()}"
 				}
 				hAxis: {
 					format: format
@@ -177,6 +179,28 @@ document.startApp = ->
 				series: @get('series').options
 				axisTitlesPosition: 'in'
 			}
+
+		humanizedInterval: ->
+			interval = @get('interval')
+			res = ""
+			s = interval % 60
+			res = "#{s} s" if s > 0
+			interval = (interval - s) / 60
+			return res unless interval > 0
+
+			m = interval % 60
+			res = "#{m} m #{res}".strip() if m > 0
+			interval = (interval - m) / 60
+			return res unless interval > 0
+
+			h = interval % 24
+			res = "#{h} h #{res}".strip() if h > 0
+			d = (interval - h) / 24
+			if d > 0
+				"#{d} d #{res}".strip()
+			else
+				res
+
 		
 		cutoff: (min, max) ->
 			_.each(@get('series').rows, (row) ->

data/lib/pulse-meter/visualize/public/js/application.js

@@ -9,6 +9,13 @@
     String.prototype.capitalize = function() {
       return this.charAt(0).toUpperCase() + this.slice(1);
     };
+    String.prototype.strip = function() {
+      if (String.prototype.trim != null) {
+        return this.trim();
+      } else {
+        return this.replace(/^\s+|\s+$/g, "");
+      }
+    };
     PageInfo = Backbone.Model.extend({});
     PageInfoList = Backbone.Collection.extend({
       model: PageInfo,
@@ -227,7 +234,7 @@
             position: 'bottom'
           },
           vAxis: {
-            title: this.get('valuesTitle')
+            title: "" + (this.get('valuesTitle')) + " / " + (this.humanizedInterval())
           },
           hAxis: {
             format: format
@@ -237,6 +244,28 @@
         });
       };
 
+      SeriesPresenter.prototype.humanizedInterval = function() {
+        var d, h, interval, m, res, s;
+        interval = this.get('interval');
+        res = "";
+        s = interval % 60;
+        if (s > 0) res = "" + s + " s";
+        interval = (interval - s) / 60;
+        if (!(interval > 0)) return res;
+        m = interval % 60;
+        if (m > 0) res = ("" + m + " m " + res).strip();
+        interval = (interval - m) / 60;
+        if (!(interval > 0)) return res;
+        h = interval % 24;
+        if (h > 0) res = ("" + h + " h " + res).strip();
+        d = (interval - h) / 24;
+        if (d > 0) {
+          return ("" + d + " d " + res).strip();
+        } else {
+          return res;
+        }
+      };
+
       SeriesPresenter.prototype.cutoff = function(min, max) {
         return _.each(this.get('series').rows, function(row) {
           var i, value, _i, _ref, _results;

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pulse-meter
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.2.6
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-19 00:00:00.000000000 Z
+date: 2012-07-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gon-sinatra
@@ -466,6 +466,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -2459703575174503606
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24