fnordmetric 1.2.1 → 1.2.4

data/lib/fnordmetric.rb

@@ -146,3 +146,4 @@ require "fnordmetric/widgets/bars_widget"
 require "fnordmetric/widgets/toplist_widget"
 require "fnordmetric/widgets/pie_widget"
 require "fnordmetric/widgets/html_widget"
+require "fnordmetric/enterprise/compatibility_handler"

data/lib/fnordmetric/enterprise/compatibility_handler.rb

@@ -0,0 +1,42 @@
+module FnordMetric::Enterprise
+
+  CompatibilityHandler = proc do
+    if data[:_cmd]
+     cmd = data[:_cmd].to_s
+    else
+      FnordMetric.error("missing key: _cmd")
+      next
+    end
+
+    if m = cmd.match(/^SAMPLE (.*)(delta|mean)-([0-9]+) ([0-9]+)$/)
+      gauge_type = m[2].to_sym
+      gauge_tick = m[3].to_i
+      gauge_key = :"#{m[1]}#{gauge_type}-#{gauge_tick}"
+      op_value = m[4].to_i
+    else
+      FnordMetric.error("invalid _cmd")
+      next
+    end
+
+    gauge = if namespace.gauges.has_key?(gauge_key)
+      namespace.gauges[gauge_key]
+    else
+      namespace.opt_gauge(gauge_key,
+        :flush_interval => gauge_tick,
+        :average => (gauge_type == :mean),
+        :zero_config => true)
+    end
+
+    case gauge_type
+
+      when :delta
+        incr gauge, op_value
+
+      when :mean
+        incr_avg gauge, op_value
+
+    end
+
+  end
+
+end

data/lib/fnordmetric/namespace.rb

@@ -38,6 +38,12 @@ class FnordMetric::Namespace
       event[:_session_key] = announce_to_session(event).session_key 
     end
 
+    if event[:_type].to_sym == :_enterprise
+      ctx = FnordMetric::Context.new(opts, FnordMetric::Enterprise::CompatibilityHandler)
+      ctx.call(event, @redis, self)
+      return self
+    end
+
     if FnordMetric::ZeroConfigGauge::TYPES.include?(event[:_type].to_sym)
       ctx = FnordMetric::Context.new(opts, FnordMetric::ZeroConfigGauge::Handler)
       ctx.call(event, @redis, self)

data/lib/fnordmetric/version.rb

@@ -1,3 +1,3 @@
 module FnordMetric
-  VERSION = "1.2.1"
+  VERSION = "1.2.4"
 end

data/lib/fnordmetric/web/web.rb

@@ -16,7 +16,12 @@ class FnordMetric::Web
     middleware_stack = @opts[:use] || []
 
     websocket = FnordMetric::WebSocket.new
-    webapp    = FnordMetric::App.new(@opts)
+
+    webapp = if FnordMetric.options[:http_websocket_only]
+      lambda { |env| [204, {}, [""]] }
+    else
+      FnordMetric::App.new(@opts)
+    end
 
     dispatch  = Rack::Builder.app do
       use Rack::CommonLogger
@@ -33,6 +38,7 @@ class FnordMetric::Web
 
         run webapp
       end
+
     end
 
     unless ["thin", "hatetepe"].include? server

data/spec/gauge_modifiers_spec.rb

@@ -120,6 +120,51 @@ describe FnordMetric::GaugeModifiers do
 
   end
 
+
+  describe "increment enterprise backwards compatibility gauges" do
+
+    it "should create and increment enterprise comaptibility gauges: delta" do
+      @namespace.announce(
+        :_type => "_enterprise", :_time => 1360584960, :_eid  => 1234,
+        :_cmd   => "SAMPLE sales-per-second-delta-20 42")
+
+      @namespace.gauges[:"sales-per-second-delta-20"].should be_a(Gauge)
+
+      gauge_key = "fnordmetric-myns_213-gauge-sales-per-second-delta-20-20"
+      puts gauge_key
+      @redis.hget(gauge_key, "1360584960").should == "42"
+
+      @namespace.announce(
+        :_type => "_enterprise", :_time => 1360584960, :_eid  => 1234,
+        :_cmd   => "SAMPLE sales-per-second-delta-20 11")
+
+
+      @redis.hget(gauge_key, "1360584960").should == "53"
+      @namespace.gauges[:"sales-per-second-delta-20"].value_at(1360584961).should == "53"
+    end
+
+    it "should create and increment enterprise comaptibility gauges: mean" do
+      @namespace.announce(
+        :_type => "_enterprise", :_time => 1360584960, :_eid  => 1234,
+        :_cmd   => "SAMPLE sales-per-second-mean-10 5")
+
+      @namespace.gauges[:"sales-per-second-mean-10"].should be_a(Gauge)
+
+      gauge_key = "fnordmetric-myns_213-gauge-sales-per-second-mean-10-10"
+      @redis.hget(gauge_key, "1360584960").should == "5"
+
+      @namespace.announce(
+        :_type => "_enterprise", :_time => 1360584960, :_eid  => 1234,
+        :_cmd   => "SAMPLE sales-per-second-mean-10 10")
+
+
+      @redis.hget(gauge_key, "1360584960").should == "15"
+      @namespace.gauges[:"sales-per-second-mean-10"].value_at(1360584961).should == 7.5
+    end
+
+
+  end
+
   describe "increment non-progressive gauges" do
 
     it "should increment a non-progressive gauge by 1" do

data/web/js/fnordmetric.gauge_explorer.js

@@ -20,6 +20,7 @@ FnordMetric.views.gaugeExplorer = (function(){
 
   function load(_elem){
     elem = _elem;
+    gauge_list = {};
 
     elem.html('<div class="navbar"></div><div class="ge_controlpanel">' +
        '<label>Select a Gauge</label><select class="ge_gauge_picker">' + 
@@ -123,7 +124,6 @@ FnordMetric.views.gaugeExplorer = (function(){
 
     if (evt.type == "gauge_list_response"){
       $('.ge_gauge_picker', elem).html();
-      gauge_list = {};
       var changed = false;
 
       $(evt.gauges).each(function(n, gauge){

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fnordmetric
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.2.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-13 00:00:00.000000000 Z
+date: 2013-02-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &14744120 !ruby/object:Gem::Requirement
+  requirement: &19052860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 1.2.6
   type: :runtime
   prerelease: false
-  version_requirements: *14744120
+  version_requirements: *19052860
 - !ruby/object:Gem::Dependency
   name: redis
-  requirement: &14743180 !ruby/object:Gem::Requirement
+  requirement: &19051780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 2.2.2
   type: :runtime
   prerelease: false
-  version_requirements: *14743180
+  version_requirements: *19051780
 - !ruby/object:Gem::Dependency
   name: eventmachine
-  requirement: &14742540 !ruby/object:Gem::Requirement
+  requirement: &19145540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *14742540
+  version_requirements: *19145540
 - !ruby/object:Gem::Dependency
   name: websocket-rack
-  requirement: &14856940 !ruby/object:Gem::Requirement
+  requirement: &19144880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -54,10 +54,10 @@ dependencies:
         version: 0.4.0
   type: :runtime
   prerelease: false
-  version_requirements: *14856940
+  version_requirements: *19144880
 - !ruby/object:Gem::Dependency
   name: em-hiredis
-  requirement: &14856440 !ruby/object:Gem::Requirement
+  requirement: &19144380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: 0.1.1
   type: :runtime
   prerelease: false
-  version_requirements: *14856440
+  version_requirements: *19144380
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &14856060 !ruby/object:Gem::Requirement
+  requirement: &19143980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *14856060
+  version_requirements: *19143980
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &14855560 !ruby/object:Gem::Requirement
+  requirement: &19143460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *14855560
+  version_requirements: *19143460
 - !ruby/object:Gem::Dependency
   name: haml
-  requirement: &14855080 !ruby/object:Gem::Requirement
+  requirement: &19143020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *14855080
+  version_requirements: *19143020
 - !ruby/object:Gem::Dependency
   name: rack
-  requirement: &14854660 !ruby/object:Gem::Requirement
+  requirement: &19142600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *14854660
+  version_requirements: *19142600
 - !ruby/object:Gem::Dependency
   name: rack-test
-  requirement: &14854240 !ruby/object:Gem::Requirement
+  requirement: &19142180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +120,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *14854240
+  version_requirements: *19142180
 - !ruby/object:Gem::Dependency
   name: yajl-ruby
-  requirement: &14853820 !ruby/object:Gem::Requirement
+  requirement: &19141720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,10 +131,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *14853820
+  version_requirements: *19141720
 - !ruby/object:Gem::Dependency
   name: thin
-  requirement: &14853280 !ruby/object:Gem::Requirement
+  requirement: &19141140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -142,10 +142,10 @@ dependencies:
         version: 1.3.0
   type: :runtime
   prerelease: false
-  version_requirements: *14853280
+  version_requirements: *19141140
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &14852780 !ruby/object:Gem::Requirement
+  requirement: &19140660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -153,10 +153,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *14852780
+  version_requirements: *19140660
 - !ruby/object:Gem::Dependency
   name: delorean
-  requirement: &14852240 !ruby/object:Gem::Requirement
+  requirement: &19140000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -164,10 +164,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *14852240
+  version_requirements: *19140000
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &14851500 !ruby/object:Gem::Requirement
+  requirement: &19138360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -175,10 +175,10 @@ dependencies:
         version: 2.8.0
   type: :development
   prerelease: false
-  version_requirements: *14851500
+  version_requirements: *19138360
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &14849980 !ruby/object:Gem::Requirement
+  requirement: &19137900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -186,7 +186,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *14849980
+  version_requirements: *19137900
 description: FnordMetric is a Ruby Event-Tracking gem on steroids
 email:
 - paul@paulasmuth.com
@@ -208,6 +208,7 @@ files:
 - lib/fnordmetric/cache.rb
 - lib/fnordmetric/context.rb
 - lib/fnordmetric/defaults.rb
+- lib/fnordmetric/enterprise/compatibility_handler.rb
 - lib/fnordmetric/ext.rb
 - lib/fnordmetric/gauge.rb
 - lib/fnordmetric/gauge_calculations.rb