eotb 0.1.5 → 0.2.0

data/VERSION

@@ -1 +1 @@
-0.1.5
+0.2.0

data/eotb.gemspec

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

data/lib/eotb.rb

@@ -4,25 +4,27 @@ require 'uri'
 require 'json'
 
 require File.expand_path(File.dirname(__FILE__) + '/object')
-require File.expand_path(File.dirname(__FILE__) + '/actor')
-require File.expand_path(File.dirname(__FILE__) + '/subject')
+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')
-    @@http = Net::HTTP::Post.new(@@uri.path)
+    @@post = Net::HTTP::Post.new(@@uri.path)
     @@api_key = api_key
   end
   
-  def self.register_event(actor, action, subject)
+  def self.register_event(actor, action, subject = {})
     api_key = { "event[app_id]" => @@api_key }
     action = { "event[action]" => action }
-    # TODO what if user don't send hash? 
-    to_post = api_key.merge(actor).merge(action).merge(subject)
-    @@http.set_form_data(to_post)
+    actor = { "event[actor]" => actor }
     
-    Net::HTTP.new(@@uri.host, @@uri.port).start { |http| http.request(@@http) }
+    subject.each { |key, value| subject["event[subject][#{key.to_s}]"] = value.to_s }
+    
+    event = api_key.merge(actor).merge(action).merge(subject)
+    @@post.set_form_data(event)
+    Net::HTTP.new(@@uri.host, @@uri.port).start.request(@@post)
   end
   
 end

data/lib/eotb_actor.rb

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

data/lib/eotb_subject.rb

@@ -0,0 +1,22 @@
+class EotbSubject
+  
+  attr_reader :subject
+  
+  def initialize(object)
+    @subject = {}
+    @subject.merge(object).each { |key, value| subject[key] = value.inspect }
+  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,11 +1,15 @@
 class Object
   
   def to_actor
-    Actor.new(self).actor
+    EotbActor.new(self).actor
   end
   
+end
+
+class Hash
+  
   def to_subject
-    Subject.new(self).subject
+    EotbSubject.new(self).subject
   end
   
 end

data/spec/eotb_spec.rb

@@ -2,6 +2,33 @@ require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
 describe Eotb do
   
+  before(:each) do
+    @response = "302"
+    Eotb.configure("4c30fc21b3dfae0b18000078")
+  end
   
+  it "should register only two arguments" do
+    Eotb.register_event("actor_string", "action_string").code.should == @response
+  end
+  
+  it "should register default arguments (strings)" do
+    Eotb.register_event("actor_string", "action_string", {: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
+  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
+  end
+  
+  it "should generate JSON from subject" do
+    {:username => "John"}.to_subject.to_json.should == JSON.generate({:username => "String"})
+  end
+  
+  # it "should parse JSON from subject" do
+  #   {:username => "John"}.to_subject.to_json.to_hash.should == JSON.generate({:username => "String"})
+  # end
   
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: eotb
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 23
   prerelease: false
   segments: 
   - 0
-  - 1
-  - 5
-  version: 0.1.5
+  - 2
+  - 0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Ragnarson
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-04 00:00:00 +02:00
+date: 2010-07-05 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -69,10 +69,10 @@ files:
 - Rakefile
 - VERSION
 - eotb.gemspec
-- lib/actor.rb
 - lib/eotb.rb
+- lib/eotb_actor.rb
+- lib/eotb_subject.rb
 - lib/object.rb
-- lib/subject.rb
 - spec/eotb_spec.rb
 - spec/spec_helper.rb
 has_rdoc: true

data/lib/actor.rb

@@ -1,22 +0,0 @@
-class Actor
-  
-  attr_reader :actor
-  
-  def initialize(object)
-    @actor = { "event[actor][type]" => object.to_s }
-  end
-  
-  def to_json
-    @actor = JSON.generate(@actor)
-  end
-  
-  # TODO
-  # def to_hash
-  #   @actor = JSON.parse(@actor)
-  # end
-  
-  def inspect
-    @actor.inspect
-  end
-  
-end

data/lib/subject.rb

@@ -1,27 +0,0 @@
-class Subject
-  
-  attr_reader :subject
-  
-  # FIXME subject is not a hash
-  
-  def initialize(object)
-    @subject = {}
-    object.each do |key, value|
-       @subject["event[subject][#{key.to_s}]"] = value.to_s
-    end
-    @subject
-  end
-  
-  def inspect
-    @subject.inspect
-  end
-
-  # TODO def to_hash
-  #   @subject = JSON.parse(@subject)  
-  # end
-  
-  def to_json
-    @subject = JSON.generate(@subject)    
-  end
-  
-end