johnf-fnordmetric 1.2.7 → 1.2.10

data/lib/fnordmetric/api.rb

@@ -4,7 +4,11 @@ class FnordMetric::API
 
   def initialize(opts={})
     @@opts = FnordMetric.default_options(opts)
-    connect
+    if @@opts[:redis]
+      @redis = @@opts.delete :redis
+    else
+      connect
+    end
   end
 
   def connect

data/lib/fnordmetric/version.rb

@@ -1,3 +1,3 @@
 module FnordMetric
-  VERSION = "1.2.7"
+  VERSION = "1.2.10"
 end

data/spec/widget_spec.rb

@@ -96,10 +96,10 @@ describe FnordMetric::Widget do
       :gauges => [@gauge2]
     ) 
     Delorean.time_travel_to(Time.utc(1992,01,13,18,23,23)) do
-      Time.at(widget.ticks[0]).utc.should == Time.utc(1992,01,12,18,00)
-      Time.at(widget.ticks[1]).utc.should == Time.utc(1992,01,12,19,00)
-      Time.at(widget.ticks[-1]).utc.should == Time.utc(1992,01,13,18,00)
-      Time.at(widget.ticks[-2]).utc.should == Time.utc(1992,01,13,17,00)
+      Time.at(widget.ticks.to_a[0]).utc.should == Time.utc(1992,01,12,18,00)
+      Time.at(widget.ticks.to_a[1]).utc.should == Time.utc(1992,01,12,19,00)
+      Time.at(widget.ticks.to_a[-1]).utc.should == Time.utc(1992,01,13,18,00)
+      Time.at(widget.ticks.to_a[-2]).utc.should == Time.utc(1992,01,13,17,00)
     end
   end
 
@@ -110,4 +110,4 @@ private
     (a.last.to_i - b.last.to_i).should == 0
   end
 
-end
+end

data/web/js/fnordmetric.util.js

@@ -2,10 +2,6 @@ FnordMetric.util.getNextWidgetUID = function(){
   return (FnordMetric.currentWidgetUID += 1);
 }
 
-FnordMetric.util.decPrint = function(val){
-  return (val < 10 ? '0'+val : val);
-}
-
 FnordMetric.util.formatTimeOfDay = function(_time){
   if(_time === null) {
     return "";
@@ -18,22 +14,6 @@ FnordMetric.util.formatTimeOfDay = function(_time){
   }
 }
 
-FnordMetric.util.formatTimeRange = function(range){
-  if (range < 60){
-    return parseInt(range) + ' sec';
-  } else if(range<3600){
-    return parseInt(range/60) + ' min';
-  } else if(range==3600){
-    return '1 hour';
-  } else if(range<(3600*24)){
-    return parseInt(range/3600) + ' hours';
-  } else if(range==(3600*24)){
-    return '1 day';
-  } else {
-    return parseInt(range/(3600*24)) + ' days';
-  }
-}
-
 FnordMetric.util.formatTimeRangePre = function(range, offset){
   if(!offset){ offset=0; } else { offset=parseInt(offset); }
   if((offset == 0) && (range==(3600*24))){
@@ -80,42 +60,6 @@ FnordMetric.util.formatOffset = function(offset, next_offset){
   }
 }
 
-FnordMetric.util.formatValue = function(value){
-  if(value < 10){
-    return value.toFixed(1);
-  }
-  if(value < 100){
-    return value.toFixed(1);
-  } else if(value > 1000){
-    return (value/1000.0).toFixed(1) + "k";
-  } else {
-    return value.toFixed(0);
-  }
-}
-
-FnordMetric.util.formatTimeValue = function(value){
-  if (value < 60){
-    return parseFloat(value).toFixed(1) + 's';
-  } else if(value<3600){
-    return parseFloat(value/60).toFixed(1) + 'm';
-  } else if(value<(3600*24)){
-    return parseFloat(value/3600).toFixed(1) + 'h';
-  } else {
-    return parseFloat(value/(3600*24)).toFixed(1) + 'd';
-  }
-}
-
-FnordMetric.util.formatPercentValue = function(value){
-  value = parseFloat(value);
-  if(value < 10){
-    return value.toFixed(2) + '%';    
-  } else if(value < 100){
-    return value.toFixed(1) + '%';    
-  } else {
-    return '100%';
-  }
-}
-
 FnordMetric.util.formatGaugeValue = function(gauge_key, value){
   if(!gauge_key){ gauge_key = ""; }
   if(gauge_key.slice(0,8) === '__time__'){
@@ -160,15 +104,6 @@ FnordMetric.util.updateNumbers = function(trgt_elem, diff_factor, single){
   }
 }
 
-FnordMetric.util.dateFormat = function(timestamp){
-  var t = new Date(timestamp*1000);
-  return FnordMetric.util.decPrint(t.getDate())      + "." + 
-         FnordMetric.util.decPrint((t.getMonth()+1)) + "." + 
-         FnordMetric.util.decPrint(t.getFullYear())  + " " +
-         FnordMetric.util.decPrint(t.getHours())     + ":" +
-         FnordMetric.util.decPrint(t.getMinutes())   + " ";
-}
-
 FnordMetric.util.format = function(elem){
   $('.ui_trend, .ui_value', $(elem)).each(function(){
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: johnf-fnordmetric
 version: !ruby/object:Gem::Version
-  version: 1.2.7
+  version: 1.2.10
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-18 00:00:00.000000000 Z
+date: 2013-06-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
@@ -407,7 +407,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4560229331879220322
+      hash: 1119626446438757459
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -416,7 +416,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4560229331879220322
+      hash: 1119626446438757459
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23