eotb 0.5.2 → 0.5.3

data/Gemfile.lock

@@ -0,0 +1,22 @@
+GEM
+  remote: http://rubygems.org/
+  specs:
+    gemcutter (0.6.1)
+    git (1.2.5)
+    jeweler (1.4.0)
+      gemcutter (>= 0.1.0)
+      git (>= 1.2.5)
+      rubyforge (>= 2.0.0)
+    json (1.4.6)
+    json_pure (1.4.6)
+    rspec (1.3.0)
+    rubyforge (2.0.4)
+      json_pure (>= 1.1.7)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  jeweler (>= 1.4.0)
+  json (>= 1.4.3)
+  rspec (>= 1.3.0)

data/README.rdoc

@@ -39,7 +39,8 @@ As a result you will get API Key of your application.
 Add file <tt>eotb.rb</tt> in directory <tt>config/initializers</tt> of your rails application with content:
 
   require 'Eotb'
-  Eotb.configure("your_api_key", "host", "port") # default host and port are 127.0.0.1 and 3000
+  Eotb.configure("your_api_key", "events", "host", "port") # default host and port are 127.0.0.1 and 3000
+  #events - number of events sent in one package/request to beholder, default 1.
 
 Register events by:
 

data/VERSION

@@ -1 +1 @@
-0.5.2
+0.5.3

data/eotb.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{eotb}
-  s.version = "0.5.2"
+  s.version = "0.5.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ragnarson"]
-  s.date = %q{2010-08-23}
+  s.date = %q{2010-08-30}
   s.description = %q{Rails plugin which allow you easily track and observe your apps}
   s.email = %q{bartlomiej.kozal@ragnarson.com}
   s.extra_rdoc_files = [
@@ -20,6 +20,7 @@ Gem::Specification.new do |s|
     ".document",
      ".gitignore",
      "Gemfile",
+     "Gemfile.lock",
      "LICENSE",
      "README.rdoc",
      "Rakefile",

data/lib/eotb.rb

@@ -8,22 +8,33 @@ class Eotb
 
   METHODS = [:to_actor, :to_subject, :to_json, :to_hash, :inspect]
     
-  def self.configure(api_key, host = '127.0.0.1', port = '3000')
+  def self.configure(api_key, events = 1, host = '127.0.0.1', port = '3000')
     @@uri = URI.parse('http://' + host + ':' + port + '/events/' + api_key)
     @@post = Net::HTTP::Post.new(@@uri.path)
+    @@events = {}
+    @@counter = 1
+    events >= 1 ? @@reset = events : @@reset = 1
   end
+
   
   def self.register_event(actor, action, subject = {})
-    action = { "event[action]" => action.to_s }    
+    action = { "event#{@@counter}[action]" => action.to_s }    
     event = (hash_format(actor, :actor)).merge(action).merge(hash_format(subject, :subject))
-    @@post.set_form_data(event)
-    begin
-    Timeout::timeout(2) {
-      Net::HTTP.new(@@uri.host, @@uri.port).start.request(@@post)
-    }
-    rescue => e
-     	logger = Logger.new("log/#{ENV['RAILS_ENV']}.log")
-	    logger.error "ERROR eotb gem: " + e.to_s
+
+    @@events.merge! event
+    if (@@counter == @@reset)
+      @@post.set_form_data(@@events)
+      @@counter = 1
+      begin
+      Timeout::timeout(2) {
+        Net::HTTP.new(@@uri.host, @@uri.port).start.request(@@post)
+      }
+      rescue => e
+       	logger = Logger.new("log/#{ENV['RAILS_ENV']}.log")
+	      logger.error "ERROR eotb gem: " + e.to_s
+      end
+    else
+      @@counter += 1
     end
   end
   
@@ -49,10 +60,10 @@ class Eotb
     if hash.is_a?(Hash)
       h = hash_flatten(hash).map do |k, v|
         key = k.map{ |e| "[#{e}]" }.join
-        "\"event[#{type}]#{key}\" => #{value_format(v)}"
+        "\"event#{@@counter}[#{type}]#{key}\" => #{value_format(v)}"
       end.join(', ')
     else
-      h = "\"event[#{type}]\" => #{value_format(hash)}"
+      h = "\"event#{@@counter}[#{type}]\" => #{value_format(hash)}"
     end
     eval "{#{h.to_s}}"
   end

data/spec/eotb_spec.rb

@@ -2,18 +2,28 @@ require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
 describe Eotb do
   
+    it "should log errors" do 
+      logger = mock(Logger)
+      logger.stub(:new) { logger }
+      logger.stub(:error) { @response }
+      Eotb.register_event(:actor, :action, {:username => "John"}).should == @response
+    end
+  
   describe "shoud format objects" do
+    before do
+      @@counter = 0
+    end
     
     it "should format actor in string" do
-      Eotb.hash_format("actor", :actor).should == {"event[actor]" => "actor"}
+      Eotb.hash_format("actor", :actor).should == {"event0[actor]" => "actor"}
     end
 
     it "should format actor in hash" do
-      Eotb.hash_format({:type => "User"}, :actor).should == {"event[actor][type]" => "User"}
+      Eotb.hash_format({:type => "User"}, :actor).should == {"event0[actor][type]" => "User"}
     end
 
     it "should format actor in nested hash" do
-      Eotb.hash_format({:type => { :account => "User"}}, :actor).should == {"event[actor][type][account]" => "User"}
+      Eotb.hash_format({:type => { :account => "User"}}, :actor).should == {"event0[actor][type][account]" => "User"}
     end
     
   end
@@ -22,7 +32,7 @@ describe Eotb do
     
     before(:each) do
       @response = "200"
-      Eotb.configure("0"*40)
+      Eotb.configure("0"*40, 1)
       Net::HTTP.stub(:new) { Net::HTTP } 
       Net::HTTP.stub(:start) { Net::HTTP } 
       Net::HTTP.stub(:request) { "200" }
@@ -30,6 +40,7 @@ describe Eotb do
 
     it "should register two arguments" do
       Eotb.register_event("actor", "action").should == @response
+      Eotb.register_event("act2or", "acti2on").should == @response
     end
 
     it "should register three arguments" do
@@ -55,13 +66,24 @@ describe Eotb do
     it "should register arrays" do
       Eotb.register_event([2,3,4], :action, {:username => ["John", "Josh"]}).should == @response
     end
+  
+  end
+  
+  describe "should register data in one package" do
     
-    it "should log errors" do 
-      logger = mock(Logger)
-      logger.stub(:new) { logger }
-      logger.stub(:error) { @response }
-      Eotb.register_event(:actor, :action, {:username => "John"}).should == @response
+    before(:each) do
+      @response = "200"
+      Eotb.configure("0"*40, 5)
+      Net::HTTP.stub(:new) { Net::HTTP } 
+      Net::HTTP.stub(:start) { Net::HTTP } 
+      Net::HTTP.stub(:request) { "200" }
+    end
+    
+    it "when registering 5 events" do
+      4.times {Eotb.register_event("actor", "action", {:username => "John"})}
+      Eotb.register_event("actor", "action", {:username => "John"}).should == @response
     end
+
     
   end
   

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: eotb
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 13
   prerelease: false
   segments: 
   - 0
   - 5
-  - 2
-  version: 0.5.2
+  - 3
+  version: 0.5.3
 platform: ruby
 authors: 
 - Ragnarson
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-23 00:00:00 +02:00
+date: 2010-08-30 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -95,6 +95,7 @@ files:
 - .document
 - .gitignore
 - Gemfile
+- Gemfile.lock
 - LICENSE
 - README.rdoc
 - Rakefile