fnordmetric 0.7.1 → 0.7.3

data/Gemfile

@@ -3,4 +3,4 @@ source :rubygems
 gemspec
 
 gem "rake"
-gem "yajl-ruby", :git => "git://github.com/brianmario/yajl-ruby.git"
+gem "yajl-ruby", :git => "git://github.com/brianmario/yajl-ruby.git"

data/doc/full_example.rb

@@ -15,14 +15,14 @@ FnordMetric.namespace :ulm do
   gauge :messages_read, :tick => 1.day.to_i, :title => "Messages (read)"
   gauge :winks_sent, :tick => 1.day.to_i, :title => "Winks sent"
 
-  gauge :pageviews_per_url_daily, 
-    :tick => 1.day.to_i, 
-    :title => "Daily Pageviews per URL", 
+  gauge :pageviews_per_url_daily,
+    :tick => 1.day.to_i,
+    :title => "Daily Pageviews per URL",
     :three_dimensional => true
 
-  gauge :pageviews_per_url_monthly, 
-    :tick => 30.days.to_i, 
-    :title => "Monthly Pageviews per URL", 
+  gauge :pageviews_per_url_monthly,
+    :tick => 30.days.to_i,
+    :title => "Monthly Pageviews per URL",
     :three_dimensional => true
 
   event :_pageview do
@@ -124,8 +124,8 @@ FnordMetric.namespace :ulm do
     :width => 67,
     :autoupdate => 30,
     :gauges => [
-      :skip_votes, :yes_votes, 
-      :maybe_votes, :winks_sent, :messages_sent, :messages_read, 
+      :skip_votes, :yes_votes,
+      :maybe_votes, :winks_sent, :messages_sent, :messages_read,
     ]
   }
 
@@ -235,7 +235,7 @@ FnordMetric.namespace :ulm do
     if %w(ry201112a ry201112b ry201112_ref).include?(data[:campaign_key])
       incr :rockyou1_requests
     end
-  end  
+  end
 
   widget 'Campaigns', {
     :title => "RockYou (1) - PPI vs. Requests vs. Refs",
@@ -263,38 +263,38 @@ FnordMetric.namespace :ulm do
 
 
 
-  gauge :abtest_sidebar_btn_totals, 
-    :tick => 36000.days.to_i, 
-    :title => "(A/B) sidebar_btn: Totals", 
+  gauge :abtest_sidebar_btn_totals,
+    :tick => 36000.days.to_i,
+    :title => "(A/B) sidebar_btn: Totals",
     :three_dimensional => true
 
-  gauge :abtest_sidebar_btn_daily, 
-    :tick => 1.day.to_i, 
-    :title => "(A/B) sidebar_btn: Daily", 
+  gauge :abtest_sidebar_btn_daily,
+    :tick => 1.day.to_i,
+    :title => "(A/B) sidebar_btn: Daily",
     :three_dimensional => true
 
-  gauge :abtest_sidebar_btn_leute_treffen, 
-    :tick => 1.day.to_i, 
+  gauge :abtest_sidebar_btn_leute_treffen,
+    :tick => 1.day.to_i,
     :title => "leute_treffen"
 
-  gauge :abtest_sidebar_btn_jetzt_losflirten, 
-    :tick => 1.day.to_i, 
+  gauge :abtest_sidebar_btn_jetzt_losflirten,
+    :tick => 1.day.to_i,
     :title => "jetzt_losflirten"
 
-  gauge :abtest_sidebar_btn_dates_finden, 
-    :tick => 1.day.to_i, 
+  gauge :abtest_sidebar_btn_dates_finden,
+    :tick => 1.day.to_i,
     :title => "dates_finden"
 
-  gauge :abtest_sidebar_btn_leute_treffen_monthly, 
-    :tick => 1.month.to_i, 
+  gauge :abtest_sidebar_btn_leute_treffen_monthly,
+    :tick => 1.month.to_i,
     :title => "leute_treffen"
 
-  gauge :abtest_sidebar_btn_jetzt_losflirten_monthly, 
-    :tick => 1.month.to_i, 
+  gauge :abtest_sidebar_btn_jetzt_losflirten_monthly,
+    :tick => 1.month.to_i,
     :title => "jetzt_losflirten"
 
-  gauge :abtest_sidebar_btn_dates_finden_monthly, 
-    :tick => 1.month.to_i, 
+  gauge :abtest_sidebar_btn_dates_finden_monthly,
+    :tick => 1.month.to_i,
     :title => "dates_finden"
 
 
@@ -428,46 +428,46 @@ FnordMetric.namespace :ulm do
   end
 
 
-  gauge :competitors_badoo_mau, 
+  gauge :competitors_badoo_mau,
     :tick => 1.day.to_i,
     :title => "Badoo (MAU)"
 
-  gauge :competitors_badoo_dau, 
+  gauge :competitors_badoo_dau,
     :tick => 1.day.to_i,
     :title => "Badoo (DAU)"
 
-  gauge :competitors_zoosk_mau, 
+  gauge :competitors_zoosk_mau,
     :tick => 1.day.to_i,
     :title => "zoosk (MAU)"
 
-  gauge :competitors_zoosk_dau, 
+  gauge :competitors_zoosk_dau,
     :tick => 1.day.to_i,
     :title => "zoosk (DAU)"
 
-  gauge :competitors_areyouinterested_mau, 
+  gauge :competitors_areyouinterested_mau,
     :tick => 1.day.to_i,
     :title => "areyouinterested (MAU)"
 
-  gauge :competitors_areyouinterested_dau, 
+  gauge :competitors_areyouinterested_dau,
     :tick => 1.day.to_i,
     :title => "areyouinterested (DAU)"
 
-  gauge :competitors_onetwolike_mau, 
+  gauge :competitors_onetwolike_mau,
     :tick => 1.day.to_i,
     :title => "onetwolike (MAU)"
 
-  gauge :competitors_onetwolike_dau, 
+  gauge :competitors_onetwolike_dau,
     :tick => 1.day.to_i,
     :title => "onetwolike (DAU)"
 
-  gauge :competitors_kizzle_mau, 
+  gauge :competitors_kizzle_mau,
     :tick => 1.day.to_i,
     :title => "kizzle (MAU)"
 
-  gauge :competitors_kizzle_dau, 
+  gauge :competitors_kizzle_dau,
     :tick => 1.day.to_i,
     :title => "kizzle (DAU)"
-  
+
   event :competition_data do
     set_value(:competitors_badoo_mau, data[:badoo_mau]) if data[:badoo_mau]
     set_value(:competitors_badoo_dau, data[:badoo_dau]) if data[:badoo_dau]
@@ -557,7 +557,7 @@ FnordMetric.namespace :ulm do
   gauge :events_per_hour, :tick => 1.hour.to_i
   gauge :events_per_second, :tick => 1
   gauge :votes_per_second, :tick => 1
-  
+
   event :"*" do
     incr :events_per_minute
     incr :events_per_hour

data/lib/fnordmetric/api.rb

@@ -1,4 +1,3 @@
-require 'securerandom'
 class FnordMetric::API
   @@opts = nil
 
@@ -42,6 +41,6 @@ class FnordMetric::API
   end
 
   def get_next_uuid
-    SecureRandom.uuid
+    rand(8**32).to_s(36)
   end
 end

data/lib/fnordmetric/app.rb

@@ -10,9 +10,9 @@ class FnordMetric::App < Sinatra::Base
     "vendor/highcharts.js" => "application/x-javascript"
   }
 
-  Encoding.default_external = Encoding::UTF_8
-
-  #use Rack::Reloader, 0
+  if RUBY_VERSION =~ /1.9.\d/
+    Encoding.default_external = Encoding::UTF_8
+  end
 
   enable :session
 

data/lib/fnordmetric/ext.rb

@@ -0,0 +1,3 @@
+class Symbol
+  alias :intern :to_sym
+end

data/lib/fnordmetric/inbound_datagram.rb

@@ -0,0 +1,35 @@
+class FnordMetric::InboundDatagram < EventMachine::Connection
+
+  class << self
+    attr_accessor :opts
+  end
+
+  def self.start(opts)
+    self.opts = opts
+    EM.open_datagram_socket(*opts[:inbound_stream], self, opts)
+  end
+
+  def receive_data(event)
+    events << event
+    push_next_event
+  end
+
+  def push_next_event
+    return true if events.empty?
+    api.event(@events.pop)
+    EM.next_tick(&method(:push_next_event))
+  end
+
+  def unbind
+    api.disconnect
+  end
+
+  def api
+    @api ||= FnordMetric::API.new(self.class.opts)
+  end
+
+  def events
+    @events ||= []
+  end
+
+end

data/lib/fnordmetric/inbound_stream.rb

@@ -1,17 +1,17 @@
-class FnordMetric::InboundStream < EventMachine::Connection 
+class FnordMetric::InboundStream < EventMachine::Connection
   @@opts = nil
 
   def self.start(opts)
     @@opts = opts
-    EM.start_server(*opts[:inbound_stream], self)    
+    EM.start_server(*(opts[:inbound_stream] << self))
   end
 
   def self.options(opts)
     @@opts = opts
   end
 
-  def receive_data(chunk)     
-    @buffer << chunk         
+  def receive_data(chunk)
+    @buffer << chunk
     next_event
   end
 
@@ -19,12 +19,12 @@ class FnordMetric::InboundStream < EventMachine::Connection
     read_next_event
     push_next_event
   end
-  
+
   def read_next_event
     while (event = @buffer.slice!(/^(.*)\n/))
       @events_buffered += 1
       @events << event
-    end 
+    end
   end
 
   def push_next_event
@@ -32,11 +32,11 @@ class FnordMetric::InboundStream < EventMachine::Connection
     @events_buffered -= 1
     @api.event(@events.pop)
     close_connection?
-    EM.next_tick(&method(:push_next_event))    
+    EM.next_tick(&method(:push_next_event))
   end
 
   def close_connection?
-    @api.disconnect unless @streaming || (@events_buffered!=0) 
+    @api.disconnect unless @streaming || (@events_buffered!=0)
   end
 
   def post_init

data/lib/fnordmetric/session.rb

@@ -97,8 +97,8 @@ class FnordMetric::Session
   end
 
   def add_event_data(event)
-    event.each do |key,value|
-      add_data(key, value) unless key[0]=="_"
+    event.each do |key, value|
+      add_data(key, value) unless key.to_s.starts_with?("_")
     end
   end
 
@@ -109,7 +109,7 @@ class FnordMetric::Session
   def fetch_data!
     @data = Hash.new
     @redis.hgetall(redis_key(:data)).each do |key, value|    
-      if key[0]=="_" 
+      if key.to_s.starts_with?("_")
         fetch_meta_key(key, value)
       else      
         @data[key.intern] = value 

data/lib/fnordmetric/standalone.rb

@@ -5,6 +5,15 @@ task :run do
   FnordMetric.run
 end
 
+task :worker do
+  FnordMetric.server_configuration = {
+    :web_interface  => false,
+    :inbound_stream => false,
+    :start_worker   => true
+  }
+  FnordMetric.run
+end
+
 task :log do
   FnordMetric::Logger.start(dump_file_path)
 end
@@ -14,16 +23,16 @@ task :import do
 end
 
 task :help do
-  puts "usage: #{$0} {run|log|import} [DUMP_FILE=fm_dump.json]"
+  puts "usage: #{$0} {run|worker|log|import} [DUMP_FILE=fm_dump.json]"
 end
 
 task :default => :help
 
 def dump_file_path
   if ENV["DUMP_FILE"].blank?
-  	Rake::Task[:help].execute; exit!
+    Rake::Task[:help].execute; exit!
   else
-  	::File.expand_path(ENV["DUMP_FILE"], ::File.dirname($0))
+    ::File.expand_path(ENV["DUMP_FILE"], ::File.dirname($0))
   end
 end
 

data/lib/fnordmetric/udp_client.rb

@@ -0,0 +1,22 @@
+class FnordMetric::UDPClient
+
+  def initialize(host, port)
+    @sock = UDPSocket.new
+    @sock.connect(host, port)
+  end
+
+  def event(event_data)
+    begin
+      if event_data.is_a?(Hash)
+        event_data = event_data.to_json
+      else
+        JSON.parse(event_data) # void ;)
+      end
+    rescue JSON::ParserError
+      FnordMetric.log("event_lost: can't parse json")
+    else
+      @sock.send(event_data, 0)
+    end
+  end
+
+end

data/lib/fnordmetric/version.rb

@@ -1,3 +1,3 @@
 module FnordMetric
-  VERSION = "0.7.1"
+  VERSION = "0.7.3"
 end

data/lib/fnordmetric.rb

@@ -7,11 +7,13 @@ require 'sinatra/base'
 require 'haml'
 require 'rack/server'
 
+require "fnordmetric/ext"
 require "fnordmetric/version"
 
 module FnordMetric
 
   @@namespaces = {}
+  @@server_configuration = nil
 
   def self.namespace(key=nil, &block)
     @@namespaces[key] = block
@@ -26,6 +28,7 @@ module FnordMetric
       :redis_url => "redis://localhost:6379",
       :redis_prefix => "fnordmetric",
       :inbound_stream => ["0.0.0.0", "1337"],
+      :inbound_protocol => :tcp,
       :web_interface => ["0.0.0.0", "4242"],
       :web_interface_server => "thin",
       :start_worker => true,
@@ -75,6 +78,7 @@ module FnordMetric
   def self.run
     start_em
   rescue Exception => e
+    raise e
     log "!!! eventmachine died, restarting... #{e.message}"
     sleep(1); run
   end
@@ -122,11 +126,12 @@ module FnordMetric
       end
 
       if opts[:inbound_stream]
+        inbound_class = opts[:inbound_protocol] == :udp ? InboundDatagram : InboundStream
         begin
-          inbound_stream = InboundStream.start(opts)
-          log "listening on tcp##{opts[:inbound_stream].join(":")}"
+          inbound_stream = inbound_class.start(opts)
+          log "listening on #{opts[:inbound_protocol]}##{opts[:inbound_stream].join(":")}"
         rescue
-          log "cant start FnordMetric::InboundStream. port in use?"
+          log "cant start #{inbound_class.name}. port in use?"
         end
       end
 
@@ -144,7 +149,9 @@ module FnordMetric
 end
 
 require "fnordmetric/api"
+require "fnordmetric/udp_client"
 require "fnordmetric/inbound_stream"
+require "fnordmetric/inbound_datagram"
 require "fnordmetric/worker"
 require "fnordmetric/widget"
 require "fnordmetric/timeline_widget"

data/spec/api_spec.rb

@@ -17,7 +17,7 @@ describe FnordMetric::Event do
       :redis_prefix => "fnordmetric-test",
       :redis => @redis
     }  
-    @api = API.new @opts
+    @api = FnordMetric::API.new @opts
   end
 
   describe "creating events using API" do
@@ -32,7 +32,7 @@ describe FnordMetric::Event do
         :_time => @now
       }.to_json
       event_id = @api.event(json_string)
-      event = Event.find(event_id, @opts)
+      event = FnordMetric::Event.find(event_id, @opts)
       event.type.should == "Fn0rd123"
     end
 
@@ -41,7 +41,7 @@ describe FnordMetric::Event do
         :_type => "Fn0rd234", 
         :_time => @now
       )
-      event = Event.find(event_id, @opts)
+      event = FnordMetric::Event.find(event_id, @opts)
       event.type.should == "Fn0rd234"
     end
 

data/spec/ext_spec.rb

@@ -0,0 +1,14 @@
+require ::File.expand_path('../spec_helper.rb', __FILE__)
+
+describe "core extensions" do
+
+  include FnordMetric
+
+  describe Symbol do
+  	it "should return self when intern was called" do
+  	  sym = :fnord
+  	  sym.intern.should == sym
+  	end
+  end
+
+end

data/spec/gauge_spec.rb

@@ -28,25 +28,25 @@ describe FnordMetric::Gauge do
   end
 
   it "should raise an error when initialize without key" do
-  	lambda{ 
-	    FnordMetric::Gauge.new({:key_prefix => "foo"}) 
-	  }.should raise_error(KeyError)
+    lambda{ 
+      FnordMetric::Gauge.new({:key_prefix => "foo"})
+    }.should raise_error(key_error_klass)
   end
 
   it "should raise an error when initialize without key_prefix" do
-  	lambda{ 
-	    FnordMetric::Gauge.new({:key => "foo"}) 
-	  }.should raise_error(KeyError)
+    lambda{ 
+      FnordMetric::Gauge.new({:key => "foo"})
+    }.should raise_error(key_error_klass)
   end
 
   it "should generate the correct key without append" do
-  	gauge = FnordMetric::Gauge.new({:key_prefix => "fnordmetrics-myns", :key => "mygauge", :tick => 23})
-  	gauge.key.should == "fnordmetrics-myns-gauge-mygauge-23"
+    gauge = FnordMetric::Gauge.new({:key_prefix => "fnordmetrics-myns", :key => "mygauge", :tick => 23})
+    gauge.key.should == "fnordmetrics-myns-gauge-mygauge-23"
   end
 
   it "should generate the correct key with append" do
-  	gauge = FnordMetric::Gauge.new({:key_prefix => "fnordmetrics-myns", :key => "mygauge", :tick => 23})
-  	gauge.key(:fnord).should == "fnordmetrics-myns-gauge-mygauge-23-fnord"
+    gauge = FnordMetric::Gauge.new({:key_prefix => "fnordmetrics-myns", :key => "mygauge", :tick => 23})
+    gauge.key(:fnord).should == "fnordmetrics-myns-gauge-mygauge-23-fnord"
   end
 
   describe "ticks" do
@@ -93,7 +93,7 @@ describe FnordMetric::Gauge do
     it "should retrieve a gauge value at the current tick"
 
     it "should call the value calculation block and return the result" do
-      @gauge.value_at(@now){ |v| v.to_i + 123 }.should == 177
+      @gauge.value_at(@now){ |v, t| v.to_i + 123 }.should == 177
     end
 
     it "should return the correct value_at per session" do
@@ -166,7 +166,7 @@ describe FnordMetric::Gauge do
     end
 
     it "should receive gauge values with custom calculation for multiple ticks" do  
-      @gauge.values_at([@now, @now+8]){ |val|
+      @gauge.values_at([@now, @now+8]){ |val, time|
         val.to_i + 30
       }.should == {
         695280200 => 84,
@@ -230,7 +230,7 @@ describe FnordMetric::Gauge do
     end
 
     it "should call the value calculation block and return the result" do
-      vals = @gauge.field_values_at(1323691200){ |v| v.to_i + 123 }
+      vals = @gauge.field_values_at(1323691200){ |v, t| v.to_i + 123 }
       vals.should be_a(Array)
       vals.length.should == 2
       vals[0].should == ["uberfoo", 146]

data/spec/inbound_datagram_spec.rb

@@ -0,0 +1,34 @@
+require ::File.expand_path('../spec_helper.rb', __FILE__)
+
+describe FnordMetric::InboundDatagram do
+
+  let(:inbound_datagram) { FnordMetric::InboundDatagram.new(nil) }
+
+  before(:all) do
+    @redis = Redis.new
+    @redis_wrap = RedisWrap.new(@redis)
+    FnordMetric::InboundDatagram.opts = {
+      :redis_url => "redis://localhost:6379",
+      :redis_prefix => "fnordmetric-test",
+      :event_queue_ttl => 120
+    }
+  end
+
+  describe "pushing new events" do
+    it "should add parsable event to the queue" do
+      data = %Q{{"_type": "started"}}
+
+      lambda {
+        inbound_datagram.receive_data data
+      }.should change { @redis.llen("fnordmetric-test-queue") }.by +1
+    end
+
+    it "should reject non parsable events" do
+      broken_data = %Q{{"_type" => "started"}}
+
+      lambda {
+        inbound_datagram.receive_data broken_data
+      }.should_not change { @redis.llen("fnordmetric-test-queue") }
+    end
+  end
+end

data/spec/inbound_stream_spec.rb

@@ -24,7 +24,7 @@ describe FnordMetric::InboundStream do
 
     it "should reject non parsable events" do
       broken_data = %Q{{"_type": \n"started"}\n}
-    
+
       lambda {
         @inbound_stream.receive_data broken_data
       }.should_not change { @redis.llen("fnordmetric-test-queue") }

data/spec/session_spec.rb

@@ -25,7 +25,7 @@ describe FnordMetric::Session do
     end
 
     it "should add a new session on intialize" do        
-      Session.create(
+      FnordMetric::Session.create(
         :namespace_prefix => @namespace,
         :event => @event, 
         :session_data_ttl => 10,
@@ -35,7 +35,7 @@ describe FnordMetric::Session do
     end
 
     it "should add a new session on intialize and hash the session token" do               
-      Session.create(
+      FnordMetric::Session.create(
         :namespace_prefix => @namespace,
         :event => @event, 
         :session_data_ttl => 10,
@@ -45,7 +45,7 @@ describe FnordMetric::Session do
     end
 
     it "should add a new session on intialize and set the timestamp as score" do               
-      Session.create(
+      FnordMetric::Session.create(
         :namespace_prefix => @namespace,
         :event => @event, 
         :session_data_ttl => 10,
@@ -57,7 +57,7 @@ describe FnordMetric::Session do
     it "should update the timestamp on a existing session" do     
       @redis.zadd(@sessions, @now-10, @md5_key)
       @redis.zscore(@sessions, @md5_key).to_i.should == @now-10
-      Session.create(
+      FnordMetric::Session.create(
         :namespace_prefix => @namespace,
         :event => @event, 
         :session_data_ttl => 10,
@@ -67,7 +67,7 @@ describe FnordMetric::Session do
     end
 
     it "should add the event_id to the session-event set on a new session" do               
-      Session.create(
+      FnordMetric::Session.create(
         :namespace_prefix => @namespace,
         :event => @event, 
         :session_data_ttl => 10,
@@ -82,7 +82,7 @@ describe FnordMetric::Session do
         :_type => "_set_name", 
         :name => "Horst Mayer"
       )            
-      Session.create(
+      FnordMetric::Session.create(
         :namespace_prefix => @namespace,
         :event => event_data,
         :session_data_ttl => 10,
@@ -97,7 +97,7 @@ describe FnordMetric::Session do
         :_type => "_set_picture", 
         :url => "http://myhost/mypic.jpg"
       )
-      Session.create(
+      FnordMetric::Session.create(
         :namespace_prefix => @namespace,
         :event => event_data,
         :session_data_ttl => 10,
@@ -113,7 +113,7 @@ describe FnordMetric::Session do
         :fnord => "blubb", 
         :foobar => "123"
       )
-      Session.create(
+      FnordMetric::Session.create(
         :namespace_prefix => @namespace,
         :event => event_data,
         :session_data_ttl => 10,
@@ -130,7 +130,7 @@ describe FnordMetric::Session do
         :fnord => "blubb", 
         :foobar => "123"
       )
-      Session.create(
+      FnordMetric::Session.create(
         :namespace_prefix => @namespace,
         :event => event_data,
         :session_data_ttl => 10,
@@ -159,24 +159,24 @@ describe FnordMetric::Session do
     it "should find all sessions" do
       create_session("sess533", @now, {})
       create_session("sess343", @now, {})
-      Session.all(@opts).length.should == 2
+      FnordMetric::Session.all(@opts).length.should == 2
     end
 
     it "should find all sessions and return session objects" do
       create_session("sess523", @now, {})
-      Session.all(@opts).first.should be_a(FnordMetric::Session)
+      FnordMetric::Session.all(@opts).first.should be_a(FnordMetric::Session)
     end
 
     it "should find a session and return a session object" do
       create_session("sess223", @now, {})
-      sess = Session.find(Digest::MD5.hexdigest("sess223"), @opts)
+      sess = FnordMetric::Session.find(Digest::MD5.hexdigest("sess223"), @opts)
       sess.should be_a(FnordMetric::Session)
       sess.session_key.should == Digest::MD5.hexdigest("sess223")
     end
 
     it "should find a sessions and return a session object with data" do
       create_session("sess123", @now, { :fnord => "blubb" })
-      sess = Session.find(Digest::MD5.hexdigest("sess123"), @opts)  
+      sess = FnordMetric::Session.find(Digest::MD5.hexdigest("sess123"), @opts)  
       sess.fetch_data!    
       sess.data(:fnord).should == "blubb"
     end
@@ -184,7 +184,7 @@ describe FnordMetric::Session do
     it "should not include special attributes in data" do
       event_data = { :_name => "Horst Mayer", :_picture => "http://myhost/mypic.jpg" }
       create_session("sess173", @now, event_data)
-      sess = Session.find(Digest::MD5.hexdigest("sess173"), @opts)      
+      sess = FnordMetric::Session.find(Digest::MD5.hexdigest("sess173"), @opts)      
       sess.fetch_data!
       sess.data(:_name).should == nil
       sess.data(:_picture).should == nil
@@ -193,7 +193,7 @@ describe FnordMetric::Session do
     it "should find a session and return a session object with picture" do
       event_data = { :_name => "Horst Mayer", :_picture => "http://myhost/mypic.jpg" }
       create_session("sess163", @now, event_data)
-      sess = Session.find(Digest::MD5.hexdigest("sess163"), @opts)      
+      sess = FnordMetric::Session.find(Digest::MD5.hexdigest("sess163"), @opts)      
       sess.fetch_data!
       sess.picture.should == "http://myhost/mypic.jpg"
     end
@@ -201,7 +201,7 @@ describe FnordMetric::Session do
     it "should find a session and return a session object with name" do
       event_data = { :_name => "Horst Mayer", :_picture => "http://myhost/mypic.jpg" }
       create_session("sess143", @now, event_data)
-      sess = Session.find(Digest::MD5.hexdigest("sess143"), @opts)      
+      sess = FnordMetric::Session.find(Digest::MD5.hexdigest("sess143"), @opts)      
       sess.fetch_data!
       sess.name.should == "Horst Mayer"
     end
@@ -210,7 +210,7 @@ describe FnordMetric::Session do
       sesshash = create_session("sess923", @now, {})
       @redis_wrap.zadd("#{@namespace}-session-#{sesshash}-events", @now, "shmoo")       
       @redis_wrap.zadd("#{@namespace}-session-#{sesshash}-events", @now, "fnord")
-      sess = Session.find(sesshash, @opts)
+      sess = FnordMetric::Session.find(sesshash, @opts)
       sess.fetch_event_ids!
       sess.event_ids.should include("shmoo")
       sess.event_ids.should include("fnord")

data/spec/spec_helper.rb

@@ -36,3 +36,7 @@ class RedisWrap
   end
 
 end
+
+def key_error_klass
+  RUBY_VERSION =~ /1.9.\d/ ? KeyError : IndexError
+end

metadata

@@ -1,204 +1,199 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: fnordmetric
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 0.7.3
   prerelease: 
-  version: 0.7.1
 platform: ruby
-authors: 
+authors:
 - Paul Asmuth
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-04-21 00:00:00 +02:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-05-07 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: bson_ext
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &83157930 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.4.0
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: sinatra
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *83157930
+- !ruby/object:Gem::Dependency
+  name: sinatra
+  requirement: &83157680 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.2.6
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: redis
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *83157680
+- !ruby/object:Gem::Dependency
+  name: redis
+  requirement: &83157420 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 2.2.2
   type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: eventmachine
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *83157420
+- !ruby/object:Gem::Dependency
+  name: eventmachine
+  requirement: &83157230 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: em-hiredis
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: *83157230
+- !ruby/object:Gem::Dependency
+  name: em-hiredis
+  requirement: &83156900 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: json
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: *83156900
+- !ruby/object:Gem::Dependency
+  name: json
+  requirement: &83156630 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  name: i18n
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  version_requirements: *83156630
+- !ruby/object:Gem::Dependency
+  name: i18n
+  requirement: &83156340 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id007
-- !ruby/object:Gem::Dependency 
-  name: haml
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  version_requirements: *83156340
+- !ruby/object:Gem::Dependency
+  name: haml
+  requirement: &83174100 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id008
-- !ruby/object:Gem::Dependency 
-  name: rack
   prerelease: false
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  version_requirements: *83174100
+- !ruby/object:Gem::Dependency
+  name: rack
+  requirement: &83173890 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id009
-- !ruby/object:Gem::Dependency 
-  name: rack-test
   prerelease: false
-  requirement: &id010 !ruby/object:Gem::Requirement 
+  version_requirements: *83173890
+- !ruby/object:Gem::Dependency
+  name: rack-test
+  requirement: &83173650 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id010
-- !ruby/object:Gem::Dependency 
-  name: yajl-ruby
   prerelease: false
-  requirement: &id011 !ruby/object:Gem::Requirement 
+  version_requirements: *83173650
+- !ruby/object:Gem::Dependency
+  name: yajl-ruby
+  requirement: &83173430 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id011
-- !ruby/object:Gem::Dependency 
-  name: thin
   prerelease: false
-  requirement: &id012 !ruby/object:Gem::Requirement 
+  version_requirements: *83173430
+- !ruby/object:Gem::Dependency
+  name: thin
+  requirement: &83173150 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id012
-- !ruby/object:Gem::Dependency 
-  name: activesupport
   prerelease: false
-  requirement: &id013 !ruby/object:Gem::Requirement 
+  version_requirements: *83173150
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: &83172890 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id013
-- !ruby/object:Gem::Dependency 
-  name: delorean
   prerelease: false
-  requirement: &id014 !ruby/object:Gem::Requirement 
+  version_requirements: *83172890
+- !ruby/object:Gem::Dependency
+  name: delorean
+  requirement: &83172580 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id014
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id015 !ruby/object:Gem::Requirement 
+  version_requirements: *83172580
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: &83172090 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 2.8.0
   type: :development
-  version_requirements: *id015
-- !ruby/object:Gem::Dependency 
-  name: shoulda
   prerelease: false
-  requirement: &id016 !ruby/object:Gem::Requirement 
+  version_requirements: *83172090
+- !ruby/object:Gem::Dependency
+  name: shoulda
+  requirement: &83171880 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id016
+  prerelease: false
+  version_requirements: *83171880
 description: FnordMetric is a Ruby Event-Tracking gem on steroids
-email: 
+email:
 - paul@paulasmuth.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - Gemfile
 - README.md
 - Rakefile
@@ -220,11 +215,13 @@ files:
 - lib/fnordmetric/count_metric.rb
 - lib/fnordmetric/dashboard.rb
 - lib/fnordmetric/event.rb
+- lib/fnordmetric/ext.rb
 - lib/fnordmetric/funnel_widget.rb
 - lib/fnordmetric/gauge.rb
 - lib/fnordmetric/gauge_calculations.rb
 - lib/fnordmetric/gauge_modifiers.rb
 - lib/fnordmetric/html_widget.rb
+- lib/fnordmetric/inbound_datagram.rb
 - lib/fnordmetric/inbound_stream.rb
 - lib/fnordmetric/logger.rb
 - lib/fnordmetric/metric.rb
@@ -238,6 +235,7 @@ files:
 - lib/fnordmetric/sum_metric.rb
 - lib/fnordmetric/timeline_widget.rb
 - lib/fnordmetric/toplist_widget.rb
+- lib/fnordmetric/udp_client.rb
 - lib/fnordmetric/version.rb
 - lib/fnordmetric/widget.rb
 - lib/fnordmetric/worker.rb
@@ -251,55 +249,57 @@ files:
 - spec/context_spec.rb
 - spec/dashboard_spec.rb
 - spec/event_spec.rb
+- spec/ext_spec.rb
 - spec/fnordmetric_spec.rb
 - spec/gauge_modifiers_spec.rb
 - spec/gauge_spec.rb
+- spec/inbound_datagram_spec.rb
 - spec/inbound_stream_spec.rb
 - spec/namespace_spec.rb
 - spec/session_spec.rb
 - spec/spec_helper.rb
 - spec/widget_spec.rb
 - spec/worker_spec.rb
-has_rdoc: true
 homepage: http://github.com/paulasmuth/fnordmetric
-licenses: 
+licenses:
 - MIT
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.8.6
 signing_key: 
 specification_version: 3
 summary: FnordMetric is a Ruby Event-Tracking gem on steroids
-test_files: 
+test_files:
 - spec/api_spec.rb
 - spec/app_spec.rb
 - spec/context_spec.rb
 - spec/dashboard_spec.rb
 - spec/event_spec.rb
+- spec/ext_spec.rb
 - spec/fnordmetric_spec.rb
 - spec/gauge_modifiers_spec.rb
 - spec/gauge_spec.rb
+- spec/inbound_datagram_spec.rb
 - spec/inbound_stream_spec.rb
 - spec/namespace_spec.rb
 - spec/session_spec.rb
 - spec/spec_helper.rb
 - spec/widget_spec.rb
 - spec/worker_spec.rb
+has_rdoc: