eotb 0.3.1 → 0.4.0

data/README.rdoc

@@ -17,7 +17,7 @@ Install gem from GitHub repository
 	$ git clone git://github.com/Quirke/eotb_rails_plugin.git
 	$ cd eotb_rails_plugin
 	$ rake build
-	$ gem install ./pkg/eotb-0.2.0.gem
+	$ gem install ./pkg/eotb-0.3.1.gem
 
 === Bundler
 
@@ -51,10 +51,9 @@ Register actor and his action
 	
 	Eotb.register_event("user", "registered")
 
-Register subject of event (<b>it must be a Hash or JSON string!</b>)
+Register subject of event (<b>it must be a Hash</b>)
 
 	Eotb.register_event("user", "registered", {:username => "John", :when => "today"})
-	Eotb.register_event("user", "registered", '{"username":"John", "when":"today"}')
 
 Use Symbols instead of Strings
 

data/VERSION

@@ -1 +1 @@
-0.3.1
+0.4.0

data/eotb.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{eotb}
-  s.version = "0.3.1"
+  s.version = "0.4.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ragnarson"]

data/lib/eotb.rb

@@ -12,34 +12,22 @@ class Eotb
   end
   
   def self.register_event(actor, action, subject = {})
-    event = @@api_key.merge(to_actor(actor)).merge(to_action(action)).merge(to_subject(subject))
+    actor = { "event[actor]" => format(actor) }
+    action = { "event[action]" => action.to_s }
+    data = {}
+    subject.each { |key, value| data["event[subject][#{key.to_s}]"] = format(value) }
+    
+    event = @@api_key.merge(actor).merge(action).merge(data)
+    
     @@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
+    if object.respond_to? :to_json
+      object.to_json
     else
-      object_class
+      object.inspect
     end
   end
   

data/spec/eotb_spec.rb

@@ -4,7 +4,7 @@ describe Eotb do
   
   before(:each) do
     @response = "200"
-    Eotb.configure("4c333965b3dfae07bd00000d")
+    Eotb.configure("0"*24)
   end
   
   it "should register two arguments" do
@@ -24,15 +24,11 @@ describe Eotb do
   end
 
   it "should register hashes" do
-     Eotb.register_event({:type => "User"}, :action, {:username => "John"}).code.should == @response
+     Eotb.register_event({:type => "User"}, :action, {:username => {:first_name => "John"}}).code.should == @response
   end
   
   it "should register arrays" do
      Eotb.register_event([2,3,4], :action, {:username => ["John", "Josh"]}).code.should == @response
   end
   
-  it "should register subject in json" do
-     Eotb.register_event(:actor, :action, "{\"username\":\"John\"}").code.should == @response
-  end
-  
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: eotb
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 15
   prerelease: false
   segments: 
   - 0
-  - 3
-  - 1
-  version: 0.3.1
+  - 4
+  - 0
+  version: 0.4.0
 platform: ruby
 authors: 
 - Ragnarson