eotb 0.4.1 → 0.4.2

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.4.0.gem
+	$ gem install ./pkg/eotb-0.4.2.gem
 
 === Bundler
 

data/VERSION

@@ -1 +1 @@
-0.4.1
+0.4.2

data/eotb.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{eotb}
-  s.version = "0.4.1"
+  s.version = "0.4.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ragnarson"]
-  s.date = %q{2010-07-09}
+  s.date = %q{2010-07-14}
   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 = [

data/lib/eotb.rb

@@ -12,25 +12,51 @@ class Eotb
   end
   
   def self.register_event(actor, action, 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)
-    
+    action = { "event[action]" => action.to_s }    
+    event = @@api_key.merge(hash_format(actor, :actor)).merge(action).merge(hash_format(subject, :subject))
     @@post.set_form_data(event)
     Net::HTTP.new(@@uri.host, @@uri.port).start.request(@@post)
   end
   
-  def self.format(object)
-    if object.respond_to? :to_json
+  def self.value_format(object)
+    if object.respond_to? :to_actor
+      object.to_actor
+    elsif object.respond_to? :to_subject
+      object.to_subject
+    elsif object.respond_to? :to_json
       object.to_json
     elsif object.respond_to? :to_hash
-        object.to_hash.to_json
+      object.to_hash
     else
       object.inspect
     end
   end
   
+  def self.hash_flatten(hash)
+    hash.inject({}) do |h, (k, v)|
+      if v.is_a?(Hash)
+        hash_flatten(v).each do |sk, sv|
+          h[[k] + sk] = sv
+        end
+      else
+        k = k ? [k] : []
+        h[k] = v
+      end
+      h
+    end
+  end
+
+  def self.hash_format(hash, type)
+    if hash.is_a?(Hash)
+      a = hash_flatten(hash).map do |k, v|
+        key = k.map{ |e| "[#{e}]" }.join
+        "\"event[#{type}]#{key}\" => #{value_format(v)}"
+      end
+      a.join(', ')
+    else
+      a = "\"event[#{type}]\" => #{value_format(hash)}"
+    end
+    eval '{' + a + '}'
+  end
+  
 end

data/spec/eotb_spec.rb

@@ -2,11 +2,23 @@ require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
 describe Eotb do
   
-  before(:each) do
+  before(:all) do
     @response = "200"
     Eotb.configure("0"*24)
   end
   
+  it "should format actor in string" do
+    Eotb.hash_format("actor", :actor).should == {"event[actor]" => "actor"}
+  end
+  
+  it "should format actor in hash" do
+    Eotb.hash_format({:type => "User"}, :actor).should == {"event[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"}
+  end
+  
   it "should register two arguments" do
     Eotb.register_event("actor", "action").code.should == @response
   end
@@ -20,15 +32,19 @@ describe Eotb do
   end
   
   it "should register objects" do
-     Eotb.register_event(Object.new, :action, {:username => Object.new}).code.should == @response
+    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 => {:first_name => "John"}}).code.should == @response
+    Eotb.register_event({:type => "User"}, :action, {:username => {:first_name => "John"}}).code.should == @response
+  end
+  
+  it "should register nested hashes" do
+    Eotb.register_event({:type => { :account => "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
+    Eotb.register_event([2,3,4], :action, {:username => ["John", "Josh"]}).code.should == @response
   end
   
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: eotb
 version: !ruby/object:Gem::Version 
-  hash: 13
+  hash: 11
   prerelease: false
   segments: 
   - 0
   - 4
-  - 1
-  version: 0.4.1
+  - 2
+  version: 0.4.2
 platform: ruby
 authors: 
 - Ragnarson
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-09 00:00:00 +02:00
+date: 2010-07-14 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency