eotb 0.2.2 → 0.3.0

data/VERSION

@@ -1 +1 @@
-0.2.2
+0.3.0

data/eotb.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{eotb}
-  s.version = "0.2.2"
+  s.version = "0.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ragnarson"]
-  s.date = %q{2010-07-05}
+  s.date = %q{2010-07-06}
   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 = [
@@ -27,9 +27,6 @@ Gem::Specification.new do |s|
      "VERSION",
      "eotb.gemspec",
      "lib/eotb.rb",
-     "lib/eotb_actor.rb",
-     "lib/eotb_subject.rb",
-     "lib/object.rb",
      "spec/eotb_spec.rb",
      "spec/spec_helper.rb"
   ]

data/lib/eotb.rb

@@ -3,28 +3,44 @@ require 'net/http'
 require 'uri'
 require 'json'
 
-require File.expand_path(File.dirname(__FILE__) + '/object')
-require File.expand_path(File.dirname(__FILE__) + '/eotb_actor')
-require File.expand_path(File.dirname(__FILE__) + '/eotb_subject')
-
 class Eotb
     
   def self.configure(api_key, host = '127.0.0.1', port = '3000')
     @@uri = URI.parse('http://' + host + ':' + port + '/apps/' + api_key + '/events')
     @@post = Net::HTTP::Post.new(@@uri.path)
-    @@api_key = api_key
+    @@api_key = { "event[app_id]" => api_key }
   end
   
   def self.register_event(actor, action, subject = {})
-    api_key = { "event[app_id]" => @@api_key }
-    action = { "event[action]" => action }
-    actor = { "event[actor]" => actor }
-    subject_to_post = {}
-    subject.each { |key, value| subject_to_post["event[subject][#{key.to_s}]"] = value.to_s }
-    
-    event = api_key.merge(actor).merge(action).merge(subject_to_post)
+    event = @@api_key.merge(to_actor(actor)).merge(to_action(action)).merge(to_subject(subject))
     @@post.set_form_data(event)
     Net::HTTP.new(@@uri.host, @@uri.port).start.request(@@post)
   end
   
+  def self.to_actor(actor)
+    { "event[actor]" => format(actor) }
+  end
+  
+  def self.to_action(action)
+    { "event[action]" => action.to_s }
+  end
+  
+  def self.to_subject(subject)
+    subject = JSON.parse subject if subject.is_a? String
+    subject_to_post = {} 
+    subject.each { |key, value| subject_to_post["event[subject][#{key.to_s}]"] = format(value) }
+    subject_to_post
+  end
+  
+  def self.format(object)
+    object_class = object.class
+    if [String, Symbol].member? object_class
+      object.to_s
+    elsif [Array, Hash].member? object_class
+      object.inspect
+    else
+      object_class
+    end
+  end
+  
 end

data/spec/eotb_spec.rb

@@ -3,32 +3,36 @@ require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 describe Eotb do
   
   before(:each) do
-    @response = "302"
-    Eotb.configure("4c3128cfb3dfae0b180000e8")
+    @response = "200"
+    Eotb.configure("4c333965b3dfae07bd00000d")
   end
   
-  it "should register only two arguments" do
-    Eotb.register_event("actor_string", "action_string").code.should == @response
+  it "should register two arguments" do
+    Eotb.register_event("actor", "action").code.should == @response
   end
   
-  it "should register default arguments (strings)" do
-    Eotb.register_event("actor_string", "action_string", {:username => "John"}).code.should == @response
+  it "should register three arguments" do
+    Eotb.register_event("actor", "action", {:username => "John"}).code.should == @response
   end
   
-  it "should register default arguments (symbols)" do
-    Eotb.register_event(:actor_symbol, :action_symbol, {:username => "John"}).code.should == @response
+  it "should register symbols" do
+    Eotb.register_event(:actor, :action, {:username => "John"}).code.should == @response
   end
   
-  it "should register objects with to_actor and to_subject" do
-     Eotb.register_event(Object.new.to_actor, :action_symbol, {:username => Object.new}.to_subject).code.should == @response
+  it "should register objects" do
+     Eotb.register_event(Object.new, :action, {:username => Object.new}).code.should == @response
+  end
+
+  it "should register hashes" do
+     Eotb.register_event({:type => "User"}, :action, {:username => "John"}).code.should == @response
   end
   
-  it "should generate JSON from subject" do
-    {:username => "John"}.to_subject.to_json.should == JSON.generate({:username => "John"})
+  it "should register arrays" do
+     Eotb.register_event([2,3,4], :action, {:username => ["John", "Josh"]}).code.should == @response
   end
   
-  # it "should parse JSON from subject" do
-  #   {:username => "John"}.to_subject.to_json.to_hash.should == JSON.generate({:username => "String"})
-  # end
+  it "should register subject in json" do
+     Eotb.register_event(:actor, :action, "{\"username\":\"John\"}").code.should == @response
+  end
   
 end

metadata

@@ -5,9 +5,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 2
-  - 2
-  version: 0.2.2
+  - 3
+  - 0
+  version: 0.3.0
 platform: ruby
 authors: 
 - Ragnarson
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-05 00:00:00 +02:00
+date: 2010-07-06 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -70,9 +70,6 @@ files:
 - VERSION
 - eotb.gemspec
 - lib/eotb.rb
-- lib/eotb_actor.rb
-- lib/eotb_subject.rb
-- lib/object.rb
 - spec/eotb_spec.rb
 - spec/spec_helper.rb
 has_rdoc: true

data/lib/eotb_actor.rb

@@ -1,13 +0,0 @@
-class EotbActor
-  
-  attr_reader :actor
-  
-  def initialize(object)
-    @actor = object.inspect
-  end
-  
-  def inspect
-    @actor.inspect
-  end
-  
-end

data/lib/eotb_subject.rb

@@ -1,22 +0,0 @@
-class EotbSubject
-  
-  attr_reader :subject
-  
-  def initialize(object)
-    @subject = {}
-    @subject.merge(object).each { |key, value| subject[key] = value.to_s }
-  end
-  
-  def to_json
-    @subject = JSON.generate(@subject)
-  end
-  
-  # def to_hash
-  #   @subject = JSON.parse(@subject)
-  # end
-  
-  def inspect
-    @subject.inspect
-  end
-  
-end

data/lib/object.rb

@@ -1,15 +0,0 @@
-class Object
-  
-  def to_actor
-    EotbActor.new(self).actor
-  end
-  
-end
-
-class Hash
-  
-  def to_subject
-    EotbSubject.new(self).subject
-  end
-  
-end