fnordmetric 0.5.8 → 0.5.9

data/VERSION

@@ -1 +1 @@
-0.5.8
+0.5.9

data/fnordmetric.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "fnordmetric"
-  s.version = "0.5.8"
+  s.version = "0.5.9"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Paul Asmuth"]
-  s.date = "2012-01-03"
+  s.date = "2012-01-04"
   s.description = "FnordMetric is a Ruby Event-Tracking gem on steroids"
   s.email = "paul@paulasmuth.com"
   s.extra_rdoc_files = [

data/lib/fnordmetric/app.rb

@@ -55,6 +55,7 @@ class FnordMetric::App < Sinatra::Base
   end
 
   get '/:namespace' do
+    pass unless current_namespace
     haml :app
   end
 

data/pub/fnordmetric.css

@@ -73,7 +73,7 @@ text-shadow: 1px 0px 2px rgba(255, 255, 255, 1);
 .headbar .button{
   margin:8px 0px; height:16px; float:right; display:block;
   margin-right:-1px;
-  background:url('/sprite.png') no-repeat 0 -49px #eee; 
+  background:url('/fnordmetric/sprite.png') no-repeat 0 -49px #eee; 
   border:1px solid #999;
   border-bottom-color:#888;
   -webkit-box-shadow: 0 1px 0 rgba(0, 0, 0, .1); 
@@ -98,7 +98,11 @@ text-shadow: 1px 0px 2px rgba(255, 255, 255, 1);
 .number .desc{ color:#999; font-size:12px; margin-bottom:5px; display:block;  white-space:nowrap; }
 .number:last-child{ border-right:none; }
 .numbers_container{ padding-right:0px; width:215px; float:left; margin:15px 0 -1px 20px; padding-bottom:5px; border-bottom:1px solid #dedede; }
+
 .numbers_container.size_3{ width:258px; }
+.numbers_container.size_4{ width:358px; }
+.numbers_container.size_5{ width:450px; }
+
 .numbers_container .title{ padding:4px 0 1px 0; color:#333; font-size:14px; display:block;font-weight:400; }
 
 

data/pub/fnordmetric.js

@@ -66,6 +66,26 @@ var FnordMetric = (function(){
     }
   }
 
+  function formatTimeValue(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';
+    }
+  }
+
+  function formatGaugeValue(gauge_key, value){
+    if(gauge_key.slice(0,8) === '__time__'){
+      return formatTimeValue(value);
+    } else {
+      return formatValue(value);
+    }
+  }
+
   function getNextWidgetUID(){
     return (currentWidgetUID += 1);
   }
@@ -137,7 +157,7 @@ var FnordMetric = (function(){
           var _perc  = (parseInt(gdata.values[n][1]) / parseFloat(gdata.count))*100;
           var _item = $('<div class="toplist_item"><div class="title"></div><div class="value"></div><div class="percent"></div></div>');
           $('.title', _item).html(gdata.values[n][0]);
-          $('.value', _item).html(formatValue(parseInt(gdata.values[n][1])));
+          $('.value', _item).html(formatGaugeValue(gkey, parseInt(gdata.values[n][1])));
           $('.percent', _item).html(_perc.toFixed(1) + '%');
           _elem.append(_item);
         });
@@ -268,7 +288,7 @@ var FnordMetric = (function(){
           var new_val = current_val+diff;
           if(new_val > target_val){ new_val = target_val; }
           $(this).attr('data-current', new_val);
-          $('.value', this).html(formatValue(new_val));
+          $('.value', this).html(formatGaugeValue($(this).attr('rel'), new_val));
         }
       });
       if(still_running){

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fnordmetric
 version: !ruby/object:Gem::Version
-  version: 0.5.8
+  version: 0.5.9
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-03 00:00:00.000000000 Z
+date: 2012-01-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bson_ext
-  requirement: &70138582600420 !ruby/object:Gem::Requirement
+  requirement: &70308910325440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 1.4.0
   type: :runtime
   prerelease: false
-  version_requirements: *70138582600420
+  version_requirements: *70308910325440
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &70138582599940 !ruby/object:Gem::Requirement
+  requirement: &70308910324960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 1.2.6
   type: :runtime
   prerelease: false
-  version_requirements: *70138582599940
+  version_requirements: *70308910324960
 - !ruby/object:Gem::Dependency
   name: redis
-  requirement: &70138582599460 !ruby/object:Gem::Requirement
+  requirement: &70308910324480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: 2.2.2
   type: :runtime
   prerelease: false
-  version_requirements: *70138582599460
+  version_requirements: *70308910324480
 - !ruby/object:Gem::Dependency
   name: eventmachine
-  requirement: &70138582598980 !ruby/object:Gem::Requirement
+  requirement: &70308910324000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70138582598980
+  version_requirements: *70308910324000
 - !ruby/object:Gem::Dependency
   name: em-hiredis
-  requirement: &70138582598500 !ruby/object:Gem::Requirement
+  requirement: &70308910323480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70138582598500
+  version_requirements: *70308910323480
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &70138582598020 !ruby/object:Gem::Requirement
+  requirement: &70308910322980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70138582598020
+  version_requirements: *70308910322980
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &70138582597540 !ruby/object:Gem::Requirement
+  requirement: &70308910322360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70138582597540
+  version_requirements: *70308910322360
 - !ruby/object:Gem::Dependency
   name: haml
-  requirement: &70138582597060 !ruby/object:Gem::Requirement
+  requirement: &70308910321760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70138582597060
+  version_requirements: *70308910321760
 - !ruby/object:Gem::Dependency
   name: rack
-  requirement: &70138582596580 !ruby/object:Gem::Requirement
+  requirement: &70308910321100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70138582596580
+  version_requirements: *70308910321100
 - !ruby/object:Gem::Dependency
   name: rack-test
-  requirement: &70138582596100 !ruby/object:Gem::Requirement
+  requirement: &70308910320340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +120,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70138582596100
+  version_requirements: *70308910320340
 - !ruby/object:Gem::Dependency
   name: yajl-ruby
-  requirement: &70138582595620 !ruby/object:Gem::Requirement
+  requirement: &70308910319860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,10 +131,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70138582595620
+  version_requirements: *70308910319860
 - !ruby/object:Gem::Dependency
   name: thin
-  requirement: &70138582595140 !ruby/object:Gem::Requirement
+  requirement: &70308910319200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -142,10 +142,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70138582595140
+  version_requirements: *70308910319200
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70138582594660 !ruby/object:Gem::Requirement
+  requirement: &70308910312620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -153,10 +153,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70138582594660
+  version_requirements: *70308910312620
 - !ruby/object:Gem::Dependency
   name: delorean
-  requirement: &70138582594180 !ruby/object:Gem::Requirement
+  requirement: &70308910312100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -164,10 +164,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70138582594180
+  version_requirements: *70308910312100
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70138582593700 !ruby/object:Gem::Requirement
+  requirement: &70308910311600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -175,10 +175,10 @@ dependencies:
         version: 2.6.0
   type: :development
   prerelease: false
-  version_requirements: *70138582593700
+  version_requirements: *70308910311600
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &70138582593220 !ruby/object:Gem::Requirement
+  requirement: &70308910311120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -186,10 +186,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70138582593220
+  version_requirements: *70308910311120
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70138574037180 !ruby/object:Gem::Requirement
+  requirement: &70308910310640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -197,10 +197,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *70138574037180
+  version_requirements: *70308910310640
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &70138574036020 !ruby/object:Gem::Requirement
+  requirement: &70308910310160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -208,7 +208,7 @@ dependencies:
         version: 1.5.2
   type: :development
   prerelease: false
-  version_requirements: *70138574036020
+  version_requirements: *70308910310160
 description: FnordMetric is a Ruby Event-Tracking gem on steroids
 email: paul@paulasmuth.com
 executables: []