fnordmetric 1.0.0 → 1.0.1

data/fnordmetric.gemspec

@@ -13,8 +13,7 @@ Gem::Specification.new do |s|
   s.summary     = %q{FnordMetric is a Ruby Event-Tracking gem on steroids}
   s.description = %q{FnordMetric is a Ruby Event-Tracking gem on steroids}
   s.licenses    = ["MIT"]
-  
-  s.add_dependency "bson_ext", ">= 1.4.0"
+
   s.add_dependency "sinatra", ">= 1.2.6"
   s.add_dependency "redis", ">= 2.2.2"
   s.add_dependency "eventmachine"

data/lib/fnordmetric.rb

@@ -47,10 +47,7 @@ module FnordMetric
   end
 
   def self.mk_redis
-    host, port = options[:redis_url].gsub("redis://", "").split(":")
-    redis_opts = { :host => host }
-    redis_opts.merge!(:port => port) if port
-    Redis.new(redis_opts)
+    Redis.new(:url => options[:redis_url])
   end
 
   def self.default_options(opts = {})

data/lib/fnordmetric/namespace.rb

@@ -2,7 +2,7 @@ class FnordMetric::Namespace
   
   attr_reader :handlers, :gauges, :opts, :key, :dashboards, :flags
 
-  @@opts = [:event, :gauge, :widget, :set_title, :hide_active_users, :hide_overview]
+  @@opts = [:event, :gauge, :widget, :set_title, :hide_active_users, :hide_overview, :dashboard]
   @@multi_gauges = [:timeseries_gauge, :toplist_gauge, :distribution_gauge]
 
   def initialize(key, opts)
@@ -79,9 +79,9 @@ class FnordMetric::Namespace
     @active_users_available
   end
 
-  def dashboards(name=nil)
+  def dashboards(name=nil, opts = {})
     return @dashboards unless name
-    dash = FnordMetric::Dashboard.new(:title => name)
+    dash = FnordMetric::Dashboard.new(opts.merge(:title => name))
     @dashboards[dash.token.to_s] ||= dash
   end
 
@@ -138,6 +138,10 @@ class FnordMetric::Namespace
     dashboards(dashboard).add_widget(widget)
   end
 
+  def opt_dashboard(dashboard, opts)
+    dashboards(dashboard, opts)
+  end
+
   def build_widget(opts)
     _gauges = [opts[:gauges]].flatten.map{ |g| @gauges.fetch(g) }
     widget_klass = "FnordMetric::#{opts.fetch(:type).to_s.capitalize}Widget"

data/lib/fnordmetric/version.rb

@@ -1,3 +1,3 @@
 module FnordMetric
-  VERSION = "1.0.0"
+  VERSION = "1.0.1"
 end

data/lib/fnordmetric/web/app.rb

@@ -22,11 +22,11 @@ class FnordMetric::App < Sinatra::Base
     include FnordMetric::AppHelpers
   end
 
-  def initialize(opts)
-    @opts = opts
+  def initialize(opts = {})
+    @opts = FnordMetric.default_options(opts)
 
     @namespaces = FnordMetric.namespaces
-    @redis = Redis.connect(:url => opts[:redis_url])
+    @redis = Redis.connect(:url => @opts[:redis_url])
 
     super(nil)
   end

data/readme.md

@@ -2,12 +2,11 @@ FnordMetric
 ===========
 
 FnordMetric is a highly configurable (and pretty fast) realtime app/event 
-tracking thing based on ruby eventmachine and redis. You define your own 
-plotting and counting functions as ruby blocks!
+tracking thing based on [ruby eventmachine](http://rubyeventmachine.com/) and [redis](http://redis.io/). You define your own 
+plotting and counting functions as ruby blocks! [See it in action! (RailsCasts)](http://railscasts.com/episodes/378-fnordmetric)
 
 [ ![Build status - Travis-ci](https://secure.travis-ci.org/paulasmuth/fnordmetric.png) ](http://travis-ci.org/paulasmuth/fnordmetric)
 
-
 [ ![Screenshot](https://github.com/paulasmuth/fnordmetric/raw/v1.0-alpha/doc/preview3.png) ](http://github.com/paulasmuth/fnordmetric)
 
 
@@ -26,8 +25,9 @@ FnordMetric.namespace :myapp do
   # timeline+plot and punchcard
   timeseries_gauge :unicorns_seen_per_hour, 
     :resolution => 5.minutes,
-    :title => "Unicorns seenper Hour",
-    :punchcard => true
+    :title => "Unicorns seen per Hour",
+    :punchcard => true,
+    :series => [:num_unicorns]
 
   # on every event like { _type: 'unicorn_seen' }
   event(:unicorn_seen) do
@@ -64,11 +64,13 @@ Check out the docs in [the wiki](http://github.com/paulasmuth/fnordmetric/wiki)
 + [Blog: Monitor your Python App With FnordMetric](http://stephenholiday.com/articles/2012/monitor-your-python-app-with-fnordmetric/)
 + [Blog: FnordMetric and C (Blog/Howto)](http://johnmurray.io/log/2012/01/19/FnordMetrics-and-C%23.md)
 + [Blog: FnordMetric HowTo (russian)](http://www.pvsm.ru/ruby/2723)
++ [RailsCast: FnordMetric (378)](http://railscasts.com/episodes/378-fnordmetric)
 
 
 ### More Resources
 
-+ [PHP API for FnordMetric (github.com/leemachin/fnordmetric-php-api)](https://github.com/leemachin/fnordmetric-php-api)
++ [PHP API for FnordMetric (use TCP) (github.com/leemachin/fnordmetric-php-api)](https://github.com/leemachin/fnordmetric-php-api)
++ [PHP API for FnordMetric directly into Redis (github.com/votintsev/fnordmetric-php-redis)](https://github.com/votintsev/fnordmetric-php-redis)
 + [Python API for FnordMetric (github.com/sholiday/pyfnordmetric)](https://github.com/sholiday/pyfnordmetric)
 + [Another Ruby API for FnordMetric](https://github.com/savonarola/fnordmetric-client)
 + [Beanstalk Monitoring with FnordMetric](https://github.com/sholiday/fnordstalk)
@@ -93,7 +95,7 @@ FnordMetric.namespace :myapp do
   timeseries_gauge :number_of_signups,
     :group => "My Group",
     :title => "Number of Signups",
-    :key_nouns => ["Singup", "Signups"],
+    :key_nouns => ["Signup", "Signups"],
     :series => [:via_twitter, :via_facebook],
     :resolution => 2.minutes
 
@@ -139,7 +141,7 @@ FnordMetric.namespace :myapp do
 
   gauge :pageviews_daily_unique, :tick => 1.day.to_i, :unique => true, :title => "Unique Visits (Daily)"
   gauge :pageviews_hourly_unique, :tick => 1.hour.to_i, :unique => true, :title => "Unique Visits (Hourly)"
-  gauge :pageviews_monthly_unique, :tick => 40.days.to_i, :unique => true, :title => "Unique Visits (Month)"
+  gauge :pageviews_monthly_unique, :tick => 40.days.to_i, :unique => true, :title => "Unique Visits (Monthly)"
 
   gauge :messages_sent, :tick => 1.day.to_i, :title => "Messages (sent)"
   gauge :messages_read, :tick => 1.day.to_i, :title => "Messages (read)"
@@ -184,7 +186,7 @@ FnordMetric.namespace :myapp do
 
 
   widget 'TechStats', {
-    :title => "Events/Second",
+    :title => "Events per Second",
     :type => :timeline,
     :width => 50,
     :gauges => :events_per_second,
@@ -288,7 +290,7 @@ def start_example_data_generator
     loop do
       api.event(:_type => :signup, :referrer => (rand(3) == 1 ? :twitter : :facebook))
       api.event(:_type => :search, :keyword => (%w(Donau Dampf Schiff Fahrts Kaptitaens Muetzen Staender).shuffle[0..2] * ""))
-      api.event(:_type => :user_demography, :age => rand(15..85), :gender => (rand(2)==1 ? :female : :male) )
+      api.event(:_type => :user_demography, :age => [*15..85].sample, :gender => (rand(2)==1 ? :female : :male) )
       sleep (rand(10)/10.to_f)
     end
   end

data/spec/spec_helper.rb

@@ -43,4 +43,7 @@ end
 
 def key_error_klass
   RUBY_VERSION =~ /1.9.\d/ ? KeyError : IndexError
-end
+end
+
+include Rack::Test::Methods
+include FnordMetric

data/web/fnordmetric.css

@@ -5,7 +5,7 @@ body {
   margin:0;
   padding:0;
   overflow-y:scroll;
-  font: 12px/20px "Gotham Narrow" "Helvetica Neue", Helvetica, Arial, sans-serif;
+  font: 12px/20px "Gotham Narrow", "Helvetica Neue", Helvetica, Arial, sans-serif;
   overflow-x:hidden;
 }
 

data/web/haml/app.haml

@@ -16,7 +16,7 @@
     %script{:src => "/js/fnordmetric.pie_widget.js", :type => "text/javascript"}
     %script{:src => "/js/fnordmetric.toplist_widget.js", :type => "text/javascript"}
     %script{:src => "/js/fnordmetric.html_widget.js", :type => "text/javascript"}
-    %script{:src => "/js/fnordmetric.realtime_value_widget.js", :type => "text/javascript"}
+    %script{:src => "/js/fnordmetric.realtime_timeline_widget.js", :type => "text/javascript"}
     %script{:src => "/js/fnordmetric.timeseries_widget.js", :type => "text/javascript"}
     %script{:src => "/js/fnordmetric.overview_view.js", :type => "text/javascript"}
     %script{:src => "/js/fnordmetric.gauge_view.js", :type => "text/javascript"}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fnordmetric
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,22 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-31 00:00:00.000000000 Z
+date: 2013-02-08 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: bson_ext
-  requirement: &20343380 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 1.4.0
-  type: :runtime
-  prerelease: false
-  version_requirements: *20343380
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &20342880 !ruby/object:Gem::Requirement
+  requirement: &21192660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +21,10 @@ dependencies:
         version: 1.2.6
   type: :runtime
   prerelease: false
-  version_requirements: *20342880
+  version_requirements: *21192660
 - !ruby/object:Gem::Dependency
   name: redis
-  requirement: &20342420 !ruby/object:Gem::Requirement
+  requirement: &21190360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +32,10 @@ dependencies:
         version: 2.2.2
   type: :runtime
   prerelease: false
-  version_requirements: *20342420
+  version_requirements: *21190360
 - !ruby/object:Gem::Dependency
   name: eventmachine
-  requirement: &20342040 !ruby/object:Gem::Requirement
+  requirement: &21188420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *20342040
+  version_requirements: *21188420
 - !ruby/object:Gem::Dependency
   name: websocket-rack
-  requirement: &20341500 !ruby/object:Gem::Requirement
+  requirement: &21185340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -65,10 +54,10 @@ dependencies:
         version: 0.4.0
   type: :runtime
   prerelease: false
-  version_requirements: *20341500
+  version_requirements: *21185340
 - !ruby/object:Gem::Dependency
   name: em-hiredis
-  requirement: &20357400 !ruby/object:Gem::Requirement
+  requirement: &21196680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -76,10 +65,10 @@ dependencies:
         version: 0.1.1
   type: :runtime
   prerelease: false
-  version_requirements: *20357400
+  version_requirements: *21196680
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &20357020 !ruby/object:Gem::Requirement
+  requirement: &21195740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +76,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *20357020
+  version_requirements: *21195740
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &20356560 !ruby/object:Gem::Requirement
+  requirement: &21193800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +87,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *20356560
+  version_requirements: *21193800
 - !ruby/object:Gem::Dependency
   name: haml
-  requirement: &20356140 !ruby/object:Gem::Requirement
+  requirement: &21208740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +98,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *20356140
+  version_requirements: *21208740
 - !ruby/object:Gem::Dependency
   name: rack
-  requirement: &20355720 !ruby/object:Gem::Requirement
+  requirement: &21207680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +109,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *20355720
+  version_requirements: *21207680
 - !ruby/object:Gem::Dependency
   name: rack-test
-  requirement: &20355300 !ruby/object:Gem::Requirement
+  requirement: &21205940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,10 +120,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *20355300
+  version_requirements: *21205940
 - !ruby/object:Gem::Dependency
   name: yajl-ruby
-  requirement: &20354880 !ruby/object:Gem::Requirement
+  requirement: &21217620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -142,10 +131,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *20354880
+  version_requirements: *21217620
 - !ruby/object:Gem::Dependency
   name: thin
-  requirement: &20354380 !ruby/object:Gem::Requirement
+  requirement: &21216440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -153,10 +142,10 @@ dependencies:
         version: 1.3.0
   type: :runtime
   prerelease: false
-  version_requirements: *20354380
+  version_requirements: *21216440
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &20353960 !ruby/object:Gem::Requirement
+  requirement: &21215840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -164,10 +153,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *20353960
+  version_requirements: *21215840
 - !ruby/object:Gem::Dependency
   name: delorean
-  requirement: &20353500 !ruby/object:Gem::Requirement
+  requirement: &21215020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -175,10 +164,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *20353500
+  version_requirements: *21215020
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &20353000 !ruby/object:Gem::Requirement
+  requirement: &21214160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -186,10 +175,10 @@ dependencies:
         version: 2.8.0
   type: :development
   prerelease: false
-  version_requirements: *20353000
+  version_requirements: *21214160
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &20352580 !ruby/object:Gem::Requirement
+  requirement: &21213400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -197,7 +186,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *20352580
+  version_requirements: *21213400
 description: FnordMetric is a Ruby Event-Tracking gem on steroids
 email:
 - paul@paulasmuth.com
@@ -258,7 +247,6 @@ files:
 - lib/fnordmetric/worker.rb
 - readme.md
 - spec/api_spec.rb
-- spec/app_spec.rb
 - spec/context_spec.rb
 - spec/dashboard_spec.rb
 - spec/event_spec.rb
@@ -343,7 +331,6 @@ specification_version: 3
 summary: FnordMetric is a Ruby Event-Tracking gem on steroids
 test_files:
 - spec/api_spec.rb
-- spec/app_spec.rb
 - spec/context_spec.rb
 - spec/dashboard_spec.rb
 - spec/event_spec.rb

data/spec/app_spec.rb

@@ -1,486 +0,0 @@
-require ::File.expand_path('../spec_helper.rb', __FILE__)
-
-include Rack::Test::Methods
-include FnordMetric
-
-=begin
-describe "app" do
-
-  before(:all) do
-    redis = Redis.new
-    @redis = RedisWrap.new(redis, false)
-    @opts = { 
-      :redis_prefix => "fnordmetric",
-      :session_data_ttl => 120,
-    }
-    @now = Time.utc(1992,01,13,5,23,23).to_i   
-    @namespace = Namespace.new(:foospace, @opts)
-    @redis_wrap = RedisWrap.new(@redis)
-  end
-
-  def app
-    @app ||= FnordMetric::App.new({
-      :foospace => proc{        
-        widget 'Blubb', nil
-
-        gauge :testgauge, :tick => 1.hour.to_i, :progressive => true
-        gauge :test3gauge, :tick => 1.hour.to_i, :three_dimensional => true
-
-      }
-    }, @opts)
-  end
-
-  it "should redirect to the first namespace" do
-  	get "/"
-  	last_response.status.should == 302
-  	last_response.location.should == "http://example.org/foospace"
-  end
-
-  it "should render the namespace" do
-    get "/foospace"
-    last_response.status.should == 200
-  end
-
-  it "should render the dashboards" do
-    @app ||= FnordMetric::App.new({
-      :foospace => proc{        
-        widget 'Blubb', nil
-      }
-    }, @opts)
-  	get "/foospace"
-  	last_response.status.should == 200
-    last_response.body.should include("Blubb")
-  end
-
-  it "should render the dashboards" do
-    @app ||= FnordMetric::App.new({
-      :foospace => proc{        
-        widget 'Blubb', nil
-        widget 'Fnord', nil
-      }
-    }, @opts)
-    get "/foospace"
-    last_response.status.should == 200
-    last_response.body.should include("Blubb")
-    last_response.body.should include("Fnord")
-  end
-
-  describe "sessions api" do
-  
-    before(:each) do
-      @redis.keys("fnordmetric-foospace*").each { |k| @redis.del(k) }  
-    end
-
-    it "should render a list of all active sessions" do
-      @namespace.ready!(@redis_wrap).announce(
-        :_time => Time.now.to_i, 
-        :_type => "foobar", 
-        :_session => "sess213"
-      )
-      get "/foospace/sessions" 
-      JSON.parse(last_response.body).should have_key("sessions")
-      JSON.parse(last_response.body)["sessions"].length.should == 1
-    end
-
-    it "should render a list of all active sessions with timestamps" do
-      @namespace.ready!(@redis_wrap).announce(
-        :_time => @now-5, 
-        :_type => "foobar", 
-        :_session => "sess213"
-      )
-      get "/foospace/sessions" 
-      sess = JSON.parse(last_response.body)["sessions"].first
-      sess["_updated_at"].should == (@now-5).to_s
-    end
-
-    it "should render a list of all active sessions with usernames" do
-      @namespace.ready!(@redis_wrap).announce(
-        :_time => @now, 
-        :_type => "_set_name", 
-        :_session => "sess213",
-        :name => "Hans Peter"
-      )
-      get "/foospace/sessions" 
-      sess = JSON.parse(last_response.body)["sessions"].first
-      sess["_name"].should == "Hans Peter"
-    end
-
-    it "should render a list of all active sessions with user pictures" do
-      @namespace.ready!(@redis_wrap).announce(
-        :_time => @now, 
-        :_type => "_set_picture", 
-        :_session => "sess213",
-        :url => "http://myhost.com/mypic.jpg"
-      )
-      get "/foospace/sessions" 
-      sess = JSON.parse(last_response.body)["sessions"].first
-      sess["_picture"].should == "http://myhost.com/mypic.jpg"
-    end
-
-    it "should render a list of all active sessions with hashed keys" do
-      @namespace.ready!(@redis_wrap).announce(
-        :_time => @now-5, 
-        :_type => "foobar", 
-        :_session => "sess133"
-      )
-      get "/foospace/sessions" 
-      sess = JSON.parse(last_response.body)["sessions"].first
-      sess["session_key"].should == Digest::MD5.hexdigest("sess133")
-    end
-
-    it "should not render more than 100 sessions at once" do
-      123.times do |n|
-        @namespace.ready!(@redis_wrap).announce(
-          :_time => Time.now.to_i, 
-          :_type => "foobar", 
-          :_session => "sess213-#{n}"
-        )
-      end
-      get "/foospace/sessions" 
-      JSON.parse(last_response.body).should have_key("sessions")
-      JSON.parse(last_response.body)["sessions"].length.should == 100
-    end
-
-    it "should render sessions ordered by last_updated_at" do
-      context = @namespace.ready!(@redis_wrap)
-      context.announce(
-        :_time => Time.now.to_i, 
-        :_type => "foobar", 
-        :_session => "sessfoo"
-      )
-      context.announce(
-        :_time => Time.now.to_i-23, 
-        :_type => "foobar", 
-        :_session => "sessbar"
-      )
-      context.announce(
-        :_time => Time.now.to_i-5, 
-        :_type => "foobar", 
-        :_session => "sessfnord"
-      )
-      get "/foospace/sessions" 
-      sessions = JSON.parse(last_response.body)["sessions"]
-      sessions.length.should == 3
-      sessions[0]["session_key"].should == Digest::MD5.hexdigest("sessfoo")
-      sessions[1]["session_key"].should == Digest::MD5.hexdigest("sessfnord")
-      sessions[2]["session_key"].should == Digest::MD5.hexdigest("sessbar")
-    end
-
-  end
-
-  describe "events api: rendering events" do
-
-    before(:each) do
-      @redis.keys("fnordmetric-foospace*").each { |k| @redis.del(k) }  
-    end
-
-    it "should render a list of all events" do
-      @namespace.ready!(@redis_wrap).announce(
-        :_eid => "sdkjgh9sd8f",
-        :_time => Time.now.to_i, 
-        :_type => "foobar!!!"
-      )
-      get "/foospace/events" 
-      JSON.parse(last_response.body).should have_key("events")
-      JSON.parse(last_response.body)["events"].length.should == 1
-    end
-
-    it "should render a list of all events including event-times" do
-      @namespace.ready!(@redis_wrap).announce(
-        :_eid => "sdkjgh9sd8f",
-        :_time => @now-23, 
-        :_type => "foobar!!!"
-      )
-      get "/foospace/events" 
-      JSON.parse(last_response.body).should have_key("events")
-      JSON.parse(last_response.body)["events"].length.should == 1
-      JSON.parse(last_response.body)["events"].first["_time"].to_i.should == @now-23
-    end
-
-    it "should render a list of all events including event-ids" do
-      @namespace.ready!(@redis_wrap).announce(
-        :_eid => "sdkjgh9sd8f",
-        :_time => Time.now.to_i, 
-        :_type => "foobar!!!"
-      )
-      get "/foospace/events" 
-      JSON.parse(last_response.body).should have_key("events")
-      JSON.parse(last_response.body)["events"].length.should == 1
-      JSON.parse(last_response.body)["events"].first["_eid"].should == "sdkjgh9sd8f"
-    end
-
-
-    it "should render a list of all events including event-types" do
-      create_event("sdkjgh9sd8f", { 
-        :_eid => "sdkjgh9sd8f",
-        :_time => Time.now.to_i, 
-        :_type => "foobar!!!"
-      })
-      get "/foospace/events" 
-      JSON.parse(last_response.body).should have_key("events")
-      JSON.parse(last_response.body)["events"].length.should == 1
-      JSON.parse(last_response.body)["events"].first["_type"].should == "foobar!!!"
-    end
-
-    it "should render a list of all events including _session-data" do
-      create_event("65785678634", {
-        :_eid => "65785678634",
-        :_time => @now-23, 
-        :_type => "foobar!!!",
-        :_session => "blubb123"
-      })
-      get "/foospace/events" 
-      JSON.parse(last_response.body).should have_key("events")
-      JSON.parse(last_response.body)["events"].length.should == 1
-      JSON.parse(last_response.body)["events"].first["_session"].should == "blubb123"
-    end
-
-    it "should render a list of all events including _session-data" do
-      create_event("4234234634", { 
-        :_eid => "4234234634",
-        :_time => @now-23, 
-        :_type => "foobar!!!",
-        :_session => "blubb123",
-        :fnord => "yeah"
-      })
-      get "/foospace/events" 
-      JSON.parse(last_response.body).should have_key("events")
-      JSON.parse(last_response.body)["events"].length.should == 1
-      blubb123_md5 = "e5fa475b26873af5ec6c77668f9975a5"
-      JSON.parse(last_response.body)["events"].first["_session_key"].should == blubb123_md5
-    end
-
-    it "should render a list of all events in the correct chronological order" do
-      create_event("daasdasd", { 
-        :_eid => "daasdasd",
-        :_time => @now-23, 
-        :_type => "foobar!!!"
-      })
-      create_event("345345345", { 
-        :_eid => "345345345",
-        :_time => @now-5, 
-        :_type => "foobar!!!"
-      })
-      create_event("sdygsygsdg", { 
-        :_eid => "sdygsygsdg",
-        :_time => @now-16, 
-        :_type => "foobar!!!"
-      })
-      get "/foospace/events" 
-      JSON.parse(last_response.body).should have_key("events")
-      JSON.parse(last_response.body)["events"].length.should == 3
-      JSON.parse(last_response.body)["events"][0]["_eid"].should == "345345345"
-      JSON.parse(last_response.body)["events"][1]["_eid"].should == "sdygsygsdg"
-      JSON.parse(last_response.body)["events"][2]["_eid"].should == "daasdasd"
-    end
-
-    it "should not render more than 100 events at a time" do
-      120.times do |n|
-        create_event("sdygsygsdg-#{n}", { 
-          :_eid => "sdygsygsdg-#{n}",
-          :_time => @now-16, 
-          :_type => "foobar!!!"
-        })
-      end
-      get "/foospace/events" 
-      JSON.parse(last_response.body).should have_key("events")
-      JSON.parse(last_response.body)["events"].length.should == 100
-    end
-
-    it "should render all events since a time, not including events at that exact time" do
-      create_event("daasdasd", { 
-        :_eid => "daasdasd",
-        :_time => @now-23, 
-        :_type => "foobar!!!"
-      })
-      create_event("345345345", { 
-        :_eid => "345345345",
-        :_time => @now-5, 
-        :_type => "foobar!!!"
-      })
-      create_event("sdygsygsdg", { 
-        :_eid => "sdygsygsdg",
-        :_time => @now-16, 
-        :_type => "foobar!!!"
-      })
-      get "/foospace/events?since=#{@now-24}" 
-      JSON.parse(last_response.body)["events"].length.should == 3
-      get "/foospace/events?since=#{@now-17}" 
-      JSON.parse(last_response.body)["events"].length.should == 2
-      get "/foospace/events?since=#{@now-16}" 
-      JSON.parse(last_response.body)["events"].length.should == 1
-      get "/foospace/events?since=#{@now-2}" 
-      JSON.parse(last_response.body)["events"].length.should == 0
-    end
-
-    it "should render all events for a single event type" do
-      @namespace.ready!(@redis_wrap).announce(
-        :_type => "fn0rd",
-        :_time => @now,
-        :_eid => "124234"
-      )
-      @namespace.ready!(@redis_wrap).announce(
-        :_type => "f00bar",
-        :_time => @now,
-        :_eid => "12235234"
-      )
-      @namespace.ready!(@redis_wrap).announce(
-        :_type => "fn0rd",
-        :_time => @now,
-        :_eid => "124234234"
-      )
-      get "/foospace/events?type=fn0rd" 
-      JSON.parse(last_response.body)["events"].length.should == 2
-      get "/foospace/events?type=f00bar" 
-      JSON.parse(last_response.body)["events"].length.should == 1
-    end
-
-    it "should render all events for a single session key" do
-      @namespace.ready!(@redis_wrap).announce(
-        :_time => @now,
-        :_session => "max_session",
-        :_eid => "124234"
-      )
-      @namespace.ready!(@redis_wrap).announce(
-        :_time => @now,
-        :_session => "kate_session",
-        :_eid => "12235234"
-      )
-      @namespace.ready!(@redis_wrap).announce(
-        :_time => @now,
-        :_session => "kate_session",
-        :_eid => "124234234"
-      )
-      @namespace.ready!(@redis_wrap).announce(
-        :_time => @now,
-        :_eid => "124234234"
-      )
-      max_session_key = Digest::MD5.hexdigest "max_session"
-      kate_session_key = Digest::MD5.hexdigest "kate_session"
-
-      get "/foospace/events?session_key=#{max_session_key}"
-      events = JSON.parse(last_response.body)["events"]
-      events.length.should == 1
-
-      get "/foospace/events?session_key=#{kate_session_key}"
-      events = JSON.parse(last_response.body)["events"]
-      events.length.should == 2
-    end
-
-    it "should render a list of event types" do
-      @namespace.ready!(@redis_wrap).announce(
-        :_type => "fn0rd",
-        :_time => @now,
-        :_eid => "124234"
-      )
-      @namespace.ready!(@redis_wrap).announce(
-        :_type => "f00bar",
-        :_time => @now,
-        :_eid => "12235234"
-      )
-      @namespace.ready!(@redis_wrap).announce(
-        :_type => "fn0rd",
-        :_time => @now,
-        :_eid => "124234234"
-      )
-      get "/foospace/event_types" 
-      JSON.parse(last_response.body)["types"].length.should == 2
-      JSON.parse(last_response.body)["types"].should include("fn0rd")
-      JSON.parse(last_response.body)["types"].should include("f00bar")
-    end
-
-    it "should render all events for a single session"
-
-    it "should render all events for a single session since a unix timestamp"
-
-    it "should render all events for a single session, but not more than 100"
-
-    def create_event(event_id, event_data)        
-      @redis_wrap.zadd(@namespace.key_prefix(:timeline), event_data.delete(:_time), event_id)
-      @redis_wrap.set("fnordmetric-event-#{event_id}", event_data.to_json)        
-    end
-
-  end
-
-  describe "events api: creating events" do
-
-    it "should track an event without auth" do      
-      post "/events", :_type => "myevent", :fnord => "foobar"
-      last_response.status.should == 200
-    end
-
-    it "should return 400 if no type is provided" do
-      pending("fix this")
-    	post "/events", :fnord => "foobar"
-    	last_response.status.should == 400  	
-    	last_response.body.should == "please specify the event_type"
-    end
-
-  end
-
-  describe "gauges api" do
-
-    before(:all) do
-      @redis.keys("fnordmetric-foospace*").each { |k| @redis.del(k) }  
-      gauge_key = "fnordmetric-foospace-gauge-testgauge-#{1.hour.to_i}"
-      @redis.hset(gauge_key, 1323687600, "18")  
-      @redis.hset(gauge_key, 1323691200, "23")
-    end
-
-    it "should return the right answer for: /metric/:name?at=timestamp" do      
-      get "/foospace/gauge/testgauge?at=1323691205"
-      JSON.parse(last_response.body).first.last.to_i.should == 23
-    end
-
-    it "should return the right answer for: /metric/:name?at=timestamp" do      
-      get "/foospace/gauge/testgauge?at=1323691200"
-      JSON.parse(last_response.body).first.last.to_i.should == 23
-    end
-
-    it "should return the right answer for: /metric/:name?at=timestamp-timstamp" do  
-      get "/foospace/gauge/testgauge?at=1323691200-1323691205"
-      JSON.parse(last_response.body).first.last.to_i.should == 18
-    end
-
-    it "should return the right answer for: /metric/:name?at=timestamp-timstamp" do  
-      get "/foospace/gauge/testgauge?at=1323691201-1323695205"
-      JSON.parse(last_response.body).keys.length
-    end
-
-    it "should return the right answer for: /metric/:name?at=timestamp-timstamp" do  
-      get "/foospace/gauge/testgauge?at=1323691199-1323701201"
-      JSON.parse(last_response.body).keys.length.should == 4
-      JSON.parse(last_response.body)["1323687600"].to_i.should == 18
-      JSON.parse(last_response.body)["1323691200"].to_i.should == 23
-    end
-
-    it "should return the right answer for: /metric/:name?at=timestamp-timstamp&sum=true" do  
-      get "/foospace/gauge/testgauge?at=1323691199-1323701201&sum=true"
-      JSON.parse(last_response.body).keys.length.should == 1
-      JSON.parse(last_response.body)["sum"].to_i.should == 18+23
-    end
-
-  end
-
-  describe "three-dim gauges api" do
-
-    before(:all) do
-      @redis.keys("fnordmetric-foospace*").each { |k| @redis.del(k) }  
-      gauge_key = "fnordmetric-foospace-gauge-test3gauge-#{1.hour.to_i}-1323691200"
-      @redis.zadd(gauge_key, 18, "fnordyblubb")  
-      @redis.zadd(gauge_key, 23, "uberfoo")  
-      @redis.set(gauge_key+"-count", 41)
-    end
-
-    it "should return the right answer for: /metric/:name?at=timestamp" do      
-      get "/foospace/gauge/test3gauge?at=1323691205"
-      JSON.parse(last_response.body)["count"].to_i.should == 41
-      JSON.parse(last_response.body)["values"].length.should == 2
-      JSON.parse(last_response.body)["values"][0].should == ["uberfoo", "23"]
-      JSON.parse(last_response.body)["values"][1].should == ["fnordyblubb", "18"]
-    end
-
-  end
-
-end
-=end