fnordmetric 0.6.1 → 0.6.2

data/VERSION

@@ -1 +1 @@
-0.6.1
+0.6.2

data/fnordmetric.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{fnordmetric}
-  s.version = "0.6.1"
+  s.version = "0.6.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Paul Asmuth"]
-  s.date = %q{2012-01-12}
+  s.date = %q{2012-01-13}
   s.description = %q{FnordMetric is a Ruby Event-Tracking gem on steroids}
   s.email = %q{paul@paulasmuth.com}
   s.extra_rdoc_files = [
@@ -30,6 +30,7 @@ Gem::Specification.new do |s|
     "haml/app.haml",
     "haml/widget.haml",
     "lib/fnordmetric.rb",
+    "lib/fnordmetric/api.rb",
     "lib/fnordmetric/app.rb",
     "lib/fnordmetric/average_metric.rb",
     "lib/fnordmetric/bars_widget.rb",
@@ -64,6 +65,7 @@ Gem::Specification.new do |s|
     "pub/sprite.png",
     "pub/vendor/highcharts.js",
     "pub/vendor/jquery-1.6.1.min.js",
+    "spec/api_spec.rb",
     "spec/app_spec.rb",
     "spec/context_spec.rb",
     "spec/dashboard_spec.rb",
@@ -79,9 +81,10 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/paulasmuth/fnordmetric}
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.5.2}
+  s.rubygems_version = %q{1.6.2}
   s.summary = %q{FnordMetric is a Ruby Event-Tracking gem on steroids}
   s.test_files = [
+    "spec/api_spec.rb",
     "spec/app_spec.rb",
     "spec/context_spec.rb",
     "spec/dashboard_spec.rb",

data/lib/fnordmetric.rb

@@ -12,8 +12,8 @@ module FnordMetric
 
   @@namespaces = {}
 
-  def self.namespace(key=nil, &block)    
-    @@namespaces[key] = block    
+  def self.namespace(key=nil, &block)
+    @@namespaces[key] = block
   end
 
   def self.server_configuration=(configuration)
@@ -23,7 +23,7 @@ module FnordMetric
   def self.default_options(opts)
 
     opts[:redis_url] ||= "redis://localhost:6379"
-    opts[:redis_prefix] ||= "fnordmetric"            
+    opts[:redis_prefix] ||= "fnordmetric"
 
     opts[:inbound_stream] ||= ["0.0.0.0", "1337"]
     opts[:web_interface] ||= ["0.0.0.0", "4242"]
@@ -38,8 +38,8 @@ module FnordMetric
     opts[:event_data_ttl] ||= 3600*24*30
 
     # session data is kept for one month
-    opts[:session_data_ttl] ||= 3600*24*30 
-    
+    opts[:session_data_ttl] ||= 3600*24*30
+
     opts
   end
 
@@ -49,25 +49,10 @@ module FnordMetric
       trap("TERM", &method(:shutdown))
       trap("INT",  &method(:shutdown))
 
-      opts = default_options(opts)      
-
-      if opts[:start_worker]
-        worker = Worker.new(@@namespaces.clone, opts)
-        worker.ready!   
-      end
-
-      if opts[:inbound_stream]
-        begin   
-          inbound_stream = InboundStream.start(opts)           
-          log "listening on tcp##{opts[:inbound_stream].join(":")}"
-        rescue
-          log "cant start FnordMetric::InboundStream. port in use?"
-        end
-      end
+      app = embedded(opts)
 
       if opts[:web_interface]
-        begin             
-          app = FnordMetric::App.new(@@namespaces.clone, opts)
+        begin
           Thin::Server.start(*opts[:web_interface], app)
           log "listening on http##{opts[:web_interface].join(":")}"
         rescue Exception => e
@@ -75,14 +60,7 @@ module FnordMetric
         end
       end
 
-      if opts[:print_stats]        
-        redis = connect_redis(opts[:redis_url])
-        EM::PeriodicTimer.new(opts[:print_stats]) do 
-          print_stats(opts, redis) 
-        end
-      end
-
-    end 
+    end
   end
 
   def self.log(msg)
@@ -113,21 +91,60 @@ module FnordMetric
 
   def self.print_stats(opts, redis) # FIXME: refactor this mess
     keys = [:events_received, :events_processed]
-    redis.llen("#{opts[:redis_prefix]}-queue") do |queue_length|      
+    redis.llen("#{opts[:redis_prefix]}-queue") do |queue_length|
       redis.hmget("#{opts[:redis_prefix]}-stats", *keys) do |data|
         data_human = keys.size.times.map{|n|"#{keys[n]}: #{data[n]}"}
         log "#{data_human.join(", ")}, queue_length: #{queue_length}"
-      end  
+      end
     end
   end
 
-  def self.standalone    
+  def self.standalone
     require "fnordmetric/logger"
     require "fnordmetric/standalone"
   end
 
+  # returns a Rack app which can be mounted under any path.
+  # `:start_worker`   starts a worker
+  # `:inbound_stream` starts the TCP interface
+  # `:print_stats`    periodicaly prints worker stats
+  def self.embedded(opts={})
+    opts = default_options(opts)
+    app  = nil
+
+    if opts[:rack_app] or opts[:web_interface]
+      app = FnordMetric::App.new(@@namespaces.clone, opts)
+    end
+
+    EM.next_tick do
+      if opts[:start_worker]
+        worker = Worker.new(@@namespaces.clone, opts)
+        worker.ready!
+      end
+
+      if opts[:inbound_stream]
+        begin
+          inbound_stream = InboundStream.start(opts)
+          log "listening on tcp##{opts[:inbound_stream].join(":")}"
+        rescue
+          log "cant start FnordMetric::InboundStream. port in use?"
+        end
+      end
+
+      if opts[:print_stats]
+        redis = connect_redis(opts[:redis_url])
+        EM::PeriodicTimer.new(opts[:print_stats]) do
+          print_stats(opts, redis)
+        end
+      end
+    end
+
+    app
+  end
+
 end
 
+require "fnordmetric/api"
 require "fnordmetric/inbound_stream"
 require "fnordmetric/worker"
 require "fnordmetric/widget"

data/lib/fnordmetric/api.rb

@@ -0,0 +1,38 @@
+require 'securerandom'
+class FnordMetric::API
+  @@opts = nil
+  def initialize opts
+    @@opts = FnordMetric.default_options(opts)
+    connect
+  end
+  
+  def connect
+    @redis = @@opts[:redis] if @@opts[:redis]
+    @redis = Redis.connect(:url => @@opts[:redis_url])
+  end
+  
+  def event(event_data)
+    event_data = event_data.to_json if event_data.is_a?(Hash)
+    push_event(get_next_uuid, event_data)
+  end
+
+  def disconnect
+    @redis.quit
+  end
+  
+  private 
+  
+  def push_event(event_id, event_data)    
+    prefix = @@opts[:redis_prefix]
+    @redis.hincrby "#{prefix}-testdata",          "events_received", 1
+    @redis.hincrby "#{prefix}-stats",             "events_received", 1
+    @redis.set     "#{prefix}-event-#{event_id}", event_data
+    @redis.lpush   "#{prefix}-queue",             event_id       
+    @redis.expire  "#{prefix}-event-#{event_id}", @@opts[:event_queue_ttl]
+    event_id
+  end
+  
+  def get_next_uuid
+    SecureRandom.uuid
+  end
+end

data/lib/fnordmetric/app.rb

@@ -1,18 +1,18 @@
 # encoding: utf-8
 
 class FnordMetric::App < Sinatra::Base
-  
+
   @@sessions = Hash.new
-  
+
   Encoding.default_external = Encoding::UTF_8
 
   #use Rack::Reloader, 0
-  
+
   enable :session
 
-  set :haml, :format => :html5 
+  set :haml, :format => :html5
   set :views, ::File.expand_path('../../../haml', __FILE__)
-  set :public, ::File.expand_path('../../../pub', __FILE__)
+  set :public_folder, ::File.expand_path('../../../pub', __FILE__)
 
   def initialize(namespaces, opts)
     @namespaces = {}
@@ -25,7 +25,7 @@ class FnordMetric::App < Sinatra::Base
     end
     super(nil)
   end
-  
+
   helpers do
     include Rack::Utils
     alias_method :h, :escape_html
@@ -38,7 +38,7 @@ class FnordMetric::App < Sinatra::Base
       @namespaces
     end
 
-    def current_namespace          
+    def current_namespace
       @namespaces[@namespaces.keys.detect{ |k|
         k.to_s == params[:namespace]
       }.try(:intern)]
@@ -47,7 +47,7 @@ class FnordMetric::App < Sinatra::Base
   end
 
   if ENV['RACK_ENV'] == "test"
-    set :raise_errors, true 
+    set :raise_errors, true
   end
 
   get '/' do
@@ -78,7 +78,7 @@ class FnordMetric::App < Sinatra::Base
       params[:sum] ? { :sum => _values.values.compact.map(&:to_i).sum } : _values
     else
       { (_t = gauge.tick_at(Time.now.to_i-gauge.tick)) => gauge.value_at(_t) }
-    end    
+    end
 
     data.to_json
   end
@@ -88,14 +88,14 @@ class FnordMetric::App < Sinatra::Base
     sessions = current_namespace.sessions(:all, :limit => 100).map do |session|
       session.fetch_data!
       session.to_json
-    end 
+    end
 
     { :sessions => sessions }.to_json
   end
 
   get '/:namespace/events' do
 
-    events = if params[:type] 
+    events = if params[:type]
       current_namespace.events(:by_type, :type => params[:type])
     elsif params[:session_key]
       current_namespace.events(:by_session_key, :session_key => params[:session_key])
@@ -122,7 +122,7 @@ class FnordMetric::App < Sinatra::Base
   end
 
   post '/events' do
-    halt 400, 'please specify the event_type (_type)' unless params["_type"]           
+    halt 400, 'please specify the event_type (_type)' unless params["_type"]
     track_event((8**32).to_s(36), parse_params(params))
   end
 
@@ -130,7 +130,7 @@ private
 
   def parse_params(hash)
     hash.tap do |h|
-      h.keys.each{ |k| h[k] = parse_param(h[k]) }      
+      h.keys.each{ |k| h[k] = parse_param(h[k]) }
     end
   end
 

data/lib/fnordmetric/inbound_stream.rb

@@ -1,6 +1,4 @@
-require 'securerandom'
 class FnordMetric::InboundStream < EventMachine::Connection 
-
   @@opts = nil
 
   def self.start(opts)
@@ -13,18 +11,6 @@ class FnordMetric::InboundStream < EventMachine::Connection
     EM.defer{ next_event }
   end
 
-  def push_event(event_id, event_data)    
-    prefix = @@opts[:redis_prefix]
-        
-    @redis.hincrby "#{prefix}-stats",             "events_received", 1
-    @redis.set     "#{prefix}-event-#{event_id}", event_data
-    @redis.lpush   "#{prefix}-queue",             event_id       
-    @redis.expire  "#{prefix}-event-#{event_id}", @@opts[:event_queue_ttl]
-    
-    @events_buffered -= 1
-    close_connection?
-  end
-  
   def next_event
     read_next_event
     push_next_event
@@ -39,20 +25,18 @@ class FnordMetric::InboundStream < EventMachine::Connection
 
   def push_next_event
     return true if @events.empty?
-    push_event(get_next_uuid, @events.pop) 
+    @events_buffered -= 1
+    @api.event(@events.pop)
+    close_connection?
     EM.next_tick(&method(:push_next_event))    
   end
 
-  def get_next_uuid
-    SecureRandom.uuid
-  end
-
   def close_connection?
-    @redis.quit unless @streaming || (@events_buffered!=0) 
+    @api.disconnect unless @streaming || (@events_buffered!=0) 
   end
 
   def post_init
-    @redis = Redis.connect(:url => @@opts[:redis_url])
+    @api = FnordMetric::API.new(@@opts)
     @events_buffered = 0
     @streaming = true
     @buffer = ""
@@ -63,5 +47,4 @@ class FnordMetric::InboundStream < EventMachine::Connection
     @streaming = false
     close_connection?
   end
-
 end

data/pub/fnordmetric.css

@@ -4,7 +4,7 @@ body{ background:#3b3e45; color:#333; margin:0; padding:0; overflow-y:scroll; fo
 .shown{ display: block; }
 .hidden{ display: none; }
 
-.topbar{ height:38px; background:#24272c; position:fixed; top:0px; width:100%;}
+.topbar{ height:38px; background:#24272c; position:fixed; top:0px; width:100%; z-index: 1}
 .topbar ul { list-style-type:none; margin:0; }
 .topbar ul li { padding: 5px 10px 5px 10px; background-color:#3b3e45; display:inline; height:38px; line-height:38px; border-radius:3px; margin-right:5px;}
 .topbar ul li a { color:#ccc; font-size:13px; text-decoration:none; }
@@ -122,7 +122,7 @@ ul.session_list li .history:hover{ color:#333; text-decoration:underline; }
 .sessions_feed ul.feed_inner li .message{ font-size:12px; line-height:19px; padding-top:9px; display:block; }
 .sessions_feed ul.feed_inner li .properties{ margin-left:50px; font-size:10px; display:block; color:#555; }
 .sessions_feed ul.feed_inner li .time{ font-size:10px; line-height:20px; padding-top:19px; padding-right:10px; display:block; color:#999; float:right; font-style:italic; }
-.sessions_feed ul.feed_inner li .picture{ height:40px; overflow:hidden; width:40px; float:left; background:#333; margin:7px 10px 0 0;  }
+.sessions_feed ul.feed_inner li .picture{ height:40px; overflow:hidden; width:40px; float:left; background:#333; margin:7px 10px 0 0; cursor:pointer; }
 .sessions_sidebar{ min-height:1200px; float:right; width:250px; border-left:1px solid #C7C9CC; }
 .events_sidebar{ min-height:1200px; float:left; width:200px; border-right:1px solid #C7C9CC; }
 

data/pub/fnordmetric.js

@@ -959,8 +959,6 @@ var FnordMetric = (function(){
 
         listElem.append(
           $('<li class="session"></li>').append(
-            $('<input type="checkbox" />').click(function(){ updateEventFilter(); })
-          ).append(
             $('<div class="picture"></div>').html(session_picture)
           ).append(
             $('<span class="name"></span>').html(session_name)
@@ -969,9 +967,9 @@ var FnordMetric = (function(){
           ).append(
             $('<span class="history"></span>').html('history')
             .click(function(){
-              setCheckboxesCheckedState(true, false);
-              $('input', $(this).parent()).attr('checked', true);
-              updateEventFilter(); loadEventHistory({session_key: session_data["session_key"]});
+              setCheckboxesCheckedState(true, false);              
+              updateEventFilter(); 
+              loadEventHistory({session_key: session_data["session_key"]});
             })
           ).attr('data-session', session_data["session_key"])
         );
@@ -1002,16 +1000,22 @@ var FnordMetric = (function(){
       event_time.html(formatTimeOfDay(event_data._time));
 
       if(event_data._session_key && event_data._session_key.length > 0){
+        var __session_key = event_data._session_key;
+        var load_usersession = (function(){
+          loadEventHistory({session_key: __session_key});
+        });
         if(session_data=sessionData[event_data._session_key]){
           if(session_data._name){
             event_props.append(
-              $('<strong></strong>').html(session_data._name)
+              $('<strong></strong>').html(session_data._name).css({
+                'cursor': 'pointer'
+              }).click(load_usersession)
             );
           }
           if(session_data._picture){
             event_picture.append(
               $('<img width="40" />').attr('src', session_data._picture)
-            )
+            ).click(load_usersession);
           }
         }
       }

data/spec/api_spec.rb

@@ -0,0 +1,49 @@
+require ::File.expand_path('../spec_helper.rb', __FILE__)
+
+describe FnordMetric::Event do
+
+  include FnordMetric
+
+  before(:all) do
+    @now = Time.utc(1992,01,13,5,23,23).to_i   
+    @redis = Redis.new
+    @redis_wrap = RedisWrap.new(@redis)
+
+    @namespace = "fnordmetric-test-ns1234-api" 
+    @timeline = "#{@namespace}-timeline"
+
+    @opts = {         
+      :namespace_prefix => "#{@namespace}",
+      :redis_prefix => "fnordmetric-test",
+      :redis => @redis
+    }  
+    @api = API.new @opts
+  end
+
+  describe "creating events using API" do
+
+    before(:each) do        
+      @redis.keys("fnordmetric-test-*").each { |k| @redis.del(k) }     
+    end
+
+    it "should create an event from a (json-)string" do
+      json_string = {
+        :_type => "Fn0rd123", 
+        :_time => @now
+      }.to_json
+      event_id = @api.event(json_string)
+      event = Event.find(event_id, @opts)
+      event.type.should == "Fn0rd123"
+    end
+
+    it "should create an event from a hash" do
+      event_id = @api.event(
+        :_type => "Fn0rd234", 
+        :_time => @now
+      )
+      event = Event.find(event_id, @opts)
+      event.type.should == "Fn0rd234"
+    end
+
+  end
+end

metadata

@@ -2,7 +2,7 @@
 name: fnordmetric
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.6.1
+  version: 0.6.2
 platform: ruby
 authors: 
 - Paul Asmuth
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-01-12 00:00:00 +01:00
+date: 2012-01-13 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -234,6 +234,7 @@ files:
 - haml/app.haml
 - haml/widget.haml
 - lib/fnordmetric.rb
+- lib/fnordmetric/api.rb
 - lib/fnordmetric/app.rb
 - lib/fnordmetric/average_metric.rb
 - lib/fnordmetric/bars_widget.rb
@@ -268,6 +269,7 @@ files:
 - pub/sprite.png
 - pub/vendor/highcharts.js
 - pub/vendor/jquery-1.6.1.min.js
+- spec/api_spec.rb
 - spec/app_spec.rb
 - spec/context_spec.rb
 - spec/dashboard_spec.rb
@@ -303,11 +305,12 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.5.2
+rubygems_version: 1.6.2
 signing_key: 
 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