Merge pull request #65 from intercom/user-events-user-object-accepts-email-identifier

add user.email

Author: josler

lib/intercom/user_event.rb

@@ -76,19 +76,23 @@ def save
     # Save a list of User Events, with an optional base_user
     def self.save_batch_events(events, base_user=nil)
       hash = { :type => 'event.list', :data => []}
-      hash[:user] = { :user_id => base_user.user_id } if base_user
+      hash[:user] = user_hash(base_user) if base_user
       events.each do |event|
         hash[:data] << event.event_hash
       end
       post_to_intercom(hash)
     end
+    
+    def self.user_hash(user)
+      user.user_id ? { :user_id => user.user_id } : { :email => user.email }
+    end
 
     def self.post_to_intercom(hash)
       Intercom.post('/events', hash)
     end
 
     def user_hash
-      { :user_id => user.user_id }
+      UserEvent.user_hash(user)
     end
 
     def event_hash

lib/intercom/version.rb

@@ -1,3 +1,3 @@
 module Intercom #:nodoc:
-  VERSION = "0.2.1"
+  VERSION = "0.2.2"
 end

spec/unit/intercom/user_event_spec.rb

@@ -9,10 +9,10 @@
     Intercom.expects(:post).with("/events",
                                  { :type => 'event.list',
                                    :data => [ {:event_name => "signup", :created => created_time.to_i, :type => 'event', 
-                                      :user => { :user_id => user.user_id}, :metadata => {:some => "data"}
+                                      :user => { :user_id => user.user_id},
                                     }]}).returns(:status => 200)
 
-    Intercom::UserEvent.create({ :event_name => "signup", :user => user, :created_at => created_time, :metadata => {:some => "data"} })
+    Intercom::UserEvent.create({ :event_name => "signup", :user => user, :created_at => created_time })
   end
 
   it 'automatically adds a created time upon creation' do
@@ -39,6 +39,17 @@
     proc { user_event.save }.must_raise ArgumentError, "Missing User"
   end
 
+  it 'uses the user.email if no user.id found' do
+    user2 = Intercom::User.new("email" => "[email protected]", :created_at => Time.now, :name => "Jim Bob")
+    Intercom.expects(:post).with("/events",
+                                 { :type => 'event.list',
+                                   :data => [ {:event_name => "signup", :created => created_time.to_i, :type => 'event', 
+                                      :user => { :email => user2.email}
+                                    }]}).returns(:status => 200)
+
+    Intercom::UserEvent.create({ :event_name => "signup", :user => user2, :created_at => created_time })
+  end
+  
   describe 'while batching events' do
 
     let (:event1) do