fnordmetric 0.5.4 → 0.5.5

data/VERSION

@@ -1 +1 @@
-0.5.4
+0.5.5

data/fnordmetric.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "fnordmetric"
-  s.version = "0.5.4"
+  s.version = "0.5.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Paul Asmuth"]

data/lib/fnordmetric/app.rb

@@ -17,6 +17,7 @@ class FnordMetric::App < Sinatra::Base
   def initialize(namespaces, opts)
     @namespaces = {}
     @redis = Redis.new
+    @opts = opts
     namespaces.each do |key, block|
       @namespaces[key] = FnordMetric::Namespace.new(key, opts.clone)
       @namespaces[key].instance_eval(&block)
@@ -114,9 +115,8 @@ class FnordMetric::App < Sinatra::Base
   end
 
   post '/events' do
-    halt 400, 'please specify the event_type' unless params["type"]       
-    event_type = params.delete("type")
-    FnordMetric.track(event_type, parse_params(params))
+    halt 400, 'please specify the event_type (_type)' unless params["_type"]           
+    track_event((8**32).to_s(36), parse_params(params))
   end
 
 private
@@ -134,5 +134,12 @@ private
     object
   end
 
+  def track_event(event_id, event_data)
+    @redis.hincrby "#{@opts[:redis_prefix]}-stats",             "events_received", 1
+    @redis.set     "#{@opts[:redis_prefix]}-event-#{event_id}", event_data.to_json
+    @redis.lpush   "#{@opts[:redis_prefix]}-queue",             event_id
+    @redis.expire  "#{@opts[:redis_prefix]}-event-#{event_id}", @opts[:event_queue_ttl]
+  end
+
 end
 

data/readme.rdoc

@@ -80,18 +80,18 @@ or in your Gemfile:
 
 The slow way: HTTP-Post the json event to the fnordmetric webinterface
 
-  POST http://localhost:2323/events _type=_set_name&name=Horst(..)
+  POST http://localhost:2323/events _type=unicorn_seen
 
-  curl -X POST -d "_type=_set_name&name=Horst(..)" http://localhost:2323/events
+  curl -X POST -d "_type=unicorn_seen" http://localhost:4242/events 
 
 The easy way: Stream one ore more newline-seperated json encoded events through a tcp connection.
 
-  echo "\{\"_type\": \"foobar\"\}\n" | nc localhost 2323
+  echo "\{\"_type\": \"unicorn_seen\"\}\n" | nc localhost 2323
 
 The fast way: Add your event directly to the redis-based queue:
 
-  uuid = "sobv67a9v73sba74"
-  event = { :_type => "foobar" }.to_json
+  uuid = (8**32).to_s(36)
+  event = { :_type => "unicorn_seen" }.to_json
 
   redis.lpush("fnordmetric-queue", uuid) 
   redis.set("fnordmetric-event-#{my_uuid}", event)

data/spec/app_spec.rb

@@ -371,44 +371,16 @@ describe "app" do
 
   describe "events api: creating events" do
 
-    it "should track an event without auth" do
-      pending("fix this")
-      #post "/events", :type => "myevent", :fnord => "foobar"
-      #last_response.status.should == 200
-      #FnordMetric::Event.last.type.should == "myevent"
-      #FnordMetric::Event.last.fnord.should == "foobar"
+    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
-
-    it "should track an event in the past" do
-      pending("fix this")
-    	#my_time = (Time.now-3.years).to_i
-    	#post "/events", :type => "myevent", :time => my_time
-    	#last_response.status.should == 200
-    	#FnordMetric::Event.last.type.should == "myevent"
-    	#FnordMetric::Event.last.time.should == my_time
-    end
-
-    it "should track an event with integer data" do
-      pending("fix this")
-    	#post "/events", :type => "myevent", :blubb => "123"
-    	#last_response.status.should == 200
-    	#FnordMetric::Event.last.type.should == "myevent"
-    	#FnordMetric::Event.last.blubb.should == 123
-    end
-    
-    it "should track an event with float data" do
-      pending("fix this")
-    	#post "/events", :type => "myevent", :blubb => "42.23"
-    	#last_response.status.should == 200
-    	#FnordMetric::Event.last.type.should == "myevent"
-    	#FnordMetric::Event.last.blubb.should == 42.23
+    	post "/events", :fnord => "foobar"
+    	last_response.status.should == 400  	
+    	last_response.body.should == "please specify the event_type"
     end
 
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fnordmetric
 version: !ruby/object:Gem::Version
-  version: 0.5.4
+  version: 0.5.5
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2011-12-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bson_ext
-  requirement: &84790870 !ruby/object:Gem::Requirement
+  requirement: &81646210 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 1.4.0
   type: :runtime
   prerelease: false
-  version_requirements: *84790870
+  version_requirements: *81646210
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &84790360 !ruby/object:Gem::Requirement
+  requirement: &81645630 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 1.2.6
   type: :runtime
   prerelease: false
-  version_requirements: *84790360
+  version_requirements: *81645630
 - !ruby/object:Gem::Dependency
   name: redis
-  requirement: &84789850 !ruby/object:Gem::Requirement
+  requirement: &81645130 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: 2.2.2
   type: :runtime
   prerelease: false
-  version_requirements: *84789850
+  version_requirements: *81645130
 - !ruby/object:Gem::Dependency
   name: eventmachine
-  requirement: &84789450 !ruby/object:Gem::Requirement
+  requirement: &81644700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *84789450
+  version_requirements: *81644700
 - !ruby/object:Gem::Dependency
   name: em-hiredis
-  requirement: &84788980 !ruby/object:Gem::Requirement
+  requirement: &81644350 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *84788980
+  version_requirements: *81644350
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &84788680 !ruby/object:Gem::Requirement
+  requirement: &81643990 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *84788680
+  version_requirements: *81643990
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &84788410 !ruby/object:Gem::Requirement
+  requirement: &82478780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *84788410
+  version_requirements: *82478780
 - !ruby/object:Gem::Dependency
   name: haml
-  requirement: &84733550 !ruby/object:Gem::Requirement
+  requirement: &82478540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *84733550
+  version_requirements: *82478540
 - !ruby/object:Gem::Dependency
   name: rack
-  requirement: &84733040 !ruby/object:Gem::Requirement
+  requirement: &82478300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *84733040
+  version_requirements: *82478300
 - !ruby/object:Gem::Dependency
   name: rack-test
-  requirement: &84732470 !ruby/object:Gem::Requirement
+  requirement: &82478060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +120,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *84732470
+  version_requirements: *82478060
 - !ruby/object:Gem::Dependency
   name: yajl-ruby
-  requirement: &84731710 !ruby/object:Gem::Requirement
+  requirement: &82477820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,10 +131,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *84731710
+  version_requirements: *82477820
 - !ruby/object:Gem::Dependency
   name: thin
-  requirement: &84730670 !ruby/object:Gem::Requirement
+  requirement: &82477580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -142,10 +142,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *84730670
+  version_requirements: *82477580
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &84730280 !ruby/object:Gem::Requirement
+  requirement: &82477340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -153,10 +153,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *84730280
+  version_requirements: *82477340
 - !ruby/object:Gem::Dependency
   name: delorean
-  requirement: &84729890 !ruby/object:Gem::Requirement
+  requirement: &82477100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -164,10 +164,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *84729890
+  version_requirements: *82477100
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &84729450 !ruby/object:Gem::Requirement
+  requirement: &82476860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -175,10 +175,10 @@ dependencies:
         version: 2.6.0
   type: :development
   prerelease: false
-  version_requirements: *84729450
+  version_requirements: *82476860
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &84728530 !ruby/object:Gem::Requirement
+  requirement: &82476620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -186,10 +186,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *84728530
+  version_requirements: *82476620
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &84727640 !ruby/object:Gem::Requirement
+  requirement: &82476380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -197,10 +197,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *84727640
+  version_requirements: *82476380
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &84602760 !ruby/object:Gem::Requirement
+  requirement: &82476140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -208,7 +208,7 @@ dependencies:
         version: 1.5.2
   type: :development
   prerelease: false
-  version_requirements: *84602760
+  version_requirements: *82476140
 description: FnordMetric is a Ruby Event-Tracking gem on steroids
 email: paul@paulasmuth.com
 executables: []