mixpanel-ruby 0.3.2 → 1.0.0

data/Readme.rdoc

@@ -11,12 +11,12 @@ get started sending your first events and updates:
 == Getting Started
 
     require 'mixpanel-ruby'
-    
+
     tracker = Mixpanel::Tracker.new(YOUR_TOKEN)
-    
+
     # Track an event on behalf of user "User1"
     tracker.track('User1', 'A Mixpanel Event')
-    
+
     # Send an update to User1's profile
     tracker.people.set('User1', {
         '$first_name' => 'David',
@@ -34,5 +34,11 @@ For more information please visit:
 
 * Our Ruby API Integration page[https://mixpanel.com/help/reference/ruby#introduction]
 * The usage demo[https://github.com/mixpanel/mixpanel-ruby/tree/master/demo]
-* The docuemntation[http://mixpanel.github.io/mixpanel-ruby/]
+* The documentation[http://mixpanel.github.io/mixpanel-ruby/]
+
+== Changes
 
+=== 1.0.0 (Proposed)
+* tracker#import added
+* Change to internal tracking message format. Messages written
+  by earlier versions of the library will not work with 1.0.0 consumer classes.

data/lib/mixpanel-ruby/consumer.rb

@@ -34,7 +34,7 @@ module Mixpanel
   # the tracker, or just passing a block to Mixpanel::Tracker.new
   #
   #    tracker = Mixpanel::Tracker.new(MY_TOKEN) do |type, message|
-  #        # type will be one of :event or :profile_update
+  #        # type will be one of :event, :profile_update or :import
   #        @kestrel.set(ANALYTICS_QUEUE, [ type, message ].to_json)
   #    end
   #
@@ -56,13 +56,14 @@ module Mixpanel
     # they will be used instead of the default Mixpanel endpoints.
     # This can be useful for proxying, debugging, or if you prefer
     # not to use SSL for your events.
-    def initialize(events_endpoint=nil, update_endpoint=nil)
+    def initialize(events_endpoint=nil, update_endpoint=nil, import_endpoint=nil)
       @events_endpoint = events_endpoint || 'https://api.mixpanel.com/track'
       @update_endpoint = update_endpoint || 'https://api.mixpanel.com/engage'
+      @import_endpoint = import_endpoint || 'https://api.mixpanel.com/import'
     end
 
     # Send the given string message to Mixpanel. Type should be
-    # one of :event or :profile_update, which will determine the endpoint.
+    # one of :event, :profile_update or :import, which will determine the endpoint.
     #
     # Mixpanel::Consumer#send sends messages to Mixpanel immediately on
     # each call. To reduce the overall bandwidth you use when communicating
@@ -72,16 +73,22 @@ module Mixpanel
       endpoint = {
         :event => @events_endpoint,
         :profile_update => @update_endpoint,
+        :import => @import_endpoint
       }[ type ]
-      data = Base64.strict_encode64(message)
+
+      decoded_message = JSON.load(message)
+      api_key = decoded_message["api_key"]
+      data = Base64.strict_encode64(decoded_message["data"].to_json)
       uri = URI(endpoint)
 
       client = Net::HTTP.new(uri.host, uri.port)
       client.use_ssl = true
       Mixpanel.with_http(client)
 
+      form_data = { "data" => data }
+      form_data.merge!("api_key" => api_key) if api_key
       request = Net::HTTP::Post.new(uri.request_uri)
-      request.set_form_data({"data" => data })
+      request.set_form_data(form_data)
       response = client.request(request)
 
       if response.code == '200' and response.body == '1'
@@ -124,9 +131,9 @@ module Mixpanel
     # consumer automatically sends its buffered events. The Mixpanel
     # endpoints have a limit of 50 events per HTTP request, but
     # you can lower the limit if your individual events are very large.
-    def initialize(events_endpoint=nil, update_endpoint=nil, max_buffer_length=MAX_LENGTH)
+    def initialize(events_endpoint=nil, update_endpoint=nil, import_endpoint=nil, max_buffer_length=MAX_LENGTH)
       @max_length = [ max_buffer_length, MAX_LENGTH ].min
-      @consumer = Consumer.new(events_endpoint, update_endpoint)
+      @consumer = Consumer.new(events_endpoint, update_endpoint, import_endpoint)
       @buffers = {
         :event => [],
         :profile_update => [],
@@ -136,11 +143,18 @@ module Mixpanel
     # Stores a message for Mixpanel in memory. When the buffer
     # hits a maximum length, the consumer will flush automatically.
     # Flushes are synchronous when they occur.
+    #
+    # Currently, only :event and :profile_update messages are buffered,
+    # :import messages will be send immediately on call.
     def send(type, message)
       type = type.to_sym
-      @buffers[type] << message
-      if @buffers[type].length >= @max_length
-        flush_type(type)
+      if @buffers.has_key? type
+        @buffers[type] << message
+        if @buffers[type].length >= @max_length
+          flush_type(type)
+        end
+      else
+        @consumer.send(type, message)
       end
     end
 
@@ -155,8 +169,8 @@ module Mixpanel
 
     def flush_type(type)
       @buffers[type].each_slice(@max_length) do |chunk|
-        message = "[ #{chunk.join(',')} ]"
-        @consumer.send(type, message)
+        data = chunk.map {|message| JSON.load(message)['data'] }
+        @consumer.send(type, {'data' => data}.to_json)
       end
       @buffers[type] = []
     end

data/lib/mixpanel-ruby/events.rb

@@ -59,12 +59,58 @@ module Mixpanel
         properties['ip'] = ip
       end
 
+      data = {
+        'event' => event,
+        'properties' => properties
+      }
+
       message = {
-          'event' => event,
-          'properties' => properties
+        'data' => data
       }
 
       @sink.call(:event, message.to_json)
     end
+
+    # Imports an event that has occurred in the past, along with a distinct_id
+    # representing the source of that event (for example, a user id),
+    # an event name describing the event and a set of properties
+    # describing that event. Properties are provided as a Hash with
+    # string keys and strings, numbers or booleans as values.
+    #
+    #     tracker = Mixpanel::Tracker.new
+    #
+    #     # Track that user "12345"'s credit card was declined
+    #     tracker.import("API_KEY", "12345", "Credit Card Declined")
+    #
+    #     # Properties describe the circumstances of the event,
+    #     # or aspects of the source or user associated with the event
+    #     tracker.import("API_KEY", "12345", "Welcome Email Sent", {
+    #         'Email Template' => 'Pretty Pink Welcome',
+    #         'User Sign-up Cohort' => 'July 2013'
+    #     })
+    def import(api_key, distinct_id, event, properties={}, ip=nil)
+      properties = {
+        'distinct_id' => distinct_id,
+        'token' => @token,
+        'time' => Time.now.to_i,
+        'mp_lib' => 'ruby',
+        '$lib_version' => Mixpanel::VERSION
+      }.merge(properties)
+      if ip
+        properties['ip'] = ip
+      end
+
+      data = {
+        'event' => event,
+        'properties' => properties
+      }
+
+      message = {
+        'data' => data,
+        'api_key' => api_key
+      }
+
+      @sink.call(:import, message.to_json)
+    end
   end
 end

data/lib/mixpanel-ruby/people.rb

@@ -22,6 +22,7 @@ module Mixpanel
     #
     def initialize(token, &block)
       @token = token
+
       if block
         @sink = block
       else
@@ -44,12 +45,12 @@ module Mixpanel
     #
     # If you provide an ip argument, \Mixpanel will use that
     # ip address for geolocation (rather than the ip of your server)
-    def set(distinct_id, properties, ip=nil)
+    def set(distinct_id, properties, ip=nil, optional_params={})
       properties = fix_property_dates(properties)
       message = {
           '$distinct_id' => distinct_id,
           '$set' => properties,
-      }
+      }.merge(optional_params)
 
       if ip
         message['$ip'] = ip
@@ -68,12 +69,12 @@ module Mixpanel
     #        'First Login Date': DateTime.now
     #    });
     #
-    def set_once(distinct_id, properties, ip=nil)
+    def set_once(distinct_id, properties, ip=nil, optional_params={})
       properties = fix_property_dates(properties)
       message = {
           '$distinct_id' => distinct_id,
           '$set_once' => properties,
-      }
+      }.merge(optional_params)
 
       if ip
         message['$ip'] = ip
@@ -94,12 +95,12 @@ module Mixpanel
     #        'Coins Earned' => -7, # Use a negative number to subtract
     #    });
     #
-    def increment(distinct_id, properties, ip=nil)
+    def increment(distinct_id, properties, ip=nil, optional_params={})
       properties = fix_property_dates(properties)
       message = {
           '$distinct_id' => distinct_id,
           '$add' => properties,
-      }
+      }.merge(optional_params)
 
       if ip
         message['$ip'] = ip
@@ -129,12 +130,12 @@ module Mixpanel
     #        'Alter Ego Names' => 'Ziggy Stardust'
     #    });
     #
-    def append(distinct_id, properties, ip=nil)
+    def append(distinct_id, properties, ip=nil, optional_params={})
       properties = fix_property_dates(properties)
       message = {
           '$distinct_id' => distinct_id,
           '$append' => properties,
-      }
+      }.merge(optional_params)
 
       if ip
         message['$ip'] = ip
@@ -143,20 +144,23 @@ module Mixpanel
       update(message)
     end
 
-    # Appends a value to the end of list-valued properties,
-    # only if the given value is not already present in the list.
+    # Set union on list valued properties.
+    # Associates a list containing all elements of a given list,
+    # and all elements currently in a list associated with the given
+    # property. After a union, every element in the list associated
+    # with a property will be unique.
     #
     #    tracker = Mixpanel::Tracker.new
     #    tracker.people.union("12345", {
-    #        'Levels Completed' => 'Suffragette City'
+    #        'Levels Completed' => ['Suffragette City']
     #    });
     #
-    def union(distinct_id, properties, ip=nil)
+    def union(distinct_id, properties, ip=nil, optional_params={})
       properties = fix_property_dates(properties)
       message = {
           '$distinct_id' => distinct_id,
           '$union' => properties,
-      }
+      }.merge(optional_params)
 
       if ip
         message['$ip'] = ip
@@ -190,10 +194,10 @@ module Mixpanel
     #        '$time' => DateTime.parse("Jan 2 2013")
     #    })
     #
-    def track_charge(distinct_id, amount, properties={}, ip=nil)
+    def track_charge(distinct_id, amount, properties={}, ip=nil, optional_params={})
       properties = fix_property_dates(properties)
       charge_properties = properties.merge({ '$amount' => amount })
-      append(distinct_id, { '$transactions' => charge_properties }, ip)
+      append(distinct_id, { '$transactions' => charge_properties }, ip, optional_params)
     end
 
     # Clear all charges from a \Mixpanel people profile
@@ -218,10 +222,15 @@ module Mixpanel
     # The \Mixpanel HTTP tracking API is documented at
     # https://mixpanel.com/help/reference/http
     def update(message)
-      message = {
-          '$token' => @token,
-          '$time' =>  ((Time.now.to_f) * 1000.0).to_i
+      data = {
+        '$token' => @token,
+        '$time' =>  ((Time.now.to_f) * 1000.0).to_i
       }.merge(message)
+
+      message = {
+        'data' => data
+      }
+
       @sink.call(:profile_update, message.to_json)
     end
 

data/lib/mixpanel-ruby/tracker.rb

@@ -72,6 +72,33 @@ module Mixpanel
       super
     end
 
+    # A call to #import is to import an event occurred in the past. #import
+    # takes a distinct_id representing the source of that event (for
+    # example, a user id), an event name describing the event, and a
+    # set of properties describing that event. Properties are provided
+    # as a Hash with string keys and strings, numbers or booleans as
+    # values.
+    #
+    #     tracker = Mixpanel::Tracker.new
+    #
+    #     # Import event that user "12345"'s credit card was declined
+    #     tracker.import("12345", "Credit Card Declined", {
+    #       'time' => 1310111365
+    #     })
+    #
+    #     # Properties describe the circumstances of the event,
+    #     # or aspects of the source or user associated with the event
+    #     tracker.import("API_KEY", "12345", "Welcome Email Sent", {
+    #         'Email Template' => 'Pretty Pink Welcome',
+    #         'User Sign-up Cohort' => 'July 2013',
+    #         'time' => 1310111365
+    #     })
+    def import(api_key, distinct_id, event, properties={}, ip=nil)
+      # This is here strictly to allow rdoc to include the relevant
+      # documentation
+      super
+    end
+
     # Creates a distinct_id alias. \Events and updates with an alias
     # will be considered by mixpanel to have the same source, and
     # refer to the same profile.
@@ -84,14 +111,20 @@ module Mixpanel
     # the \Mixpanel service, regardless of how the tracker is configured.
     def alias(alias_id, real_id, events_endpoint=nil)
       consumer = Mixpanel::Consumer.new(events_endpoint)
-      message = {
+      data = {
         'event' => '$create_alias',
         'properties' => {
           'distinct_id' => real_id,
-          'token' => @token,
+          'alias' => alias_id,
+          'token' => @token
         }
-      }.to_json
-      consumer.send(:event, message)
+      }
+
+      message = {
+        'data' => data
+      }
+
+      consumer.send(:event, message.to_json)
     end
   end
 end

data/lib/mixpanel-ruby/version.rb

@@ -1,3 +1,3 @@
 module Mixpanel
-  VERSION = '0.3.2'
+  VERSION = '1.0.0'
 end

data/spec/mixpanel-ruby/consumer_spec.rb

@@ -11,16 +11,23 @@ describe Mixpanel::Consumer do
 
   it 'should send a request to api.mixpanel.com/track on events' do
     stub_request(:any, 'https://api.mixpanel.com/track').to_return({ :body => "1" })
-    @consumer.send(:event, 'TEST EVENT MESSAGE')
+    @consumer.send(:event, {'data' => 'TEST EVENT MESSAGE'}.to_json)
     WebMock.should have_requested(:post, 'https://api.mixpanel.com/track').
-      with(:body => {'data' => 'VEVTVCBFVkVOVCBNRVNTQUdF' })
+      with(:body => {'data' => 'IlRFU1QgRVZFTlQgTUVTU0FHRSI=' })
   end
 
   it 'should send a request to api.mixpanel.com/people on profile updates' do
     stub_request(:any, 'https://api.mixpanel.com/engage').to_return({ :body => "1" })
-    @consumer.send(:profile_update, 'TEST EVENT MESSAGE')
+    @consumer.send(:profile_update, {'data' => 'TEST EVENT MESSAGE'}.to_json)
     WebMock.should have_requested(:post, 'https://api.mixpanel.com/engage').
-      with(:body => {'data' => 'VEVTVCBFVkVOVCBNRVNTQUdF' })
+      with(:body => {'data' => 'IlRFU1QgRVZFTlQgTUVTU0FHRSI=' })
+  end
+
+  it 'should send a request to api.mixpanel.com/import on event imports' do
+    stub_request(:any, 'https://api.mixpanel.com/import').to_return({ :body => "1" })
+    @consumer.send(:import, {'data' => 'TEST EVENT MESSAGE', 'api_key' => 'API_KEY'}.to_json)
+    WebMock.should have_requested(:post, 'https://api.mixpanel.com/import').
+      with(:body => {'data' => 'IlRFU1QgRVZFTlQgTUVTU0FHRSI=', 'api_key' => 'API_KEY' })
   end
 end
 
@@ -28,27 +35,42 @@ describe Mixpanel::BufferedConsumer do
   before(:each) do
     WebMock.reset!
     @max_length = 10
-    @consumer = Mixpanel::BufferedConsumer.new(nil, nil, @max_length)
+    @consumer = Mixpanel::BufferedConsumer.new(nil, nil, nil, @max_length)
   end
 
   it 'should not send a request for a single message until flush is called' do
     stub_request(:any, 'https://api.mixpanel.com/track').to_return({ :body => "1" })
-    @consumer.send(:event, 'TEST EVENT 1')
+    @consumer.send(:event, {'data' => 'TEST EVENT 1'}.to_json)
     WebMock.should have_not_requested(:post, 'https://api.mixpanel.com/track')
 
     @consumer.flush()
     WebMock.should have_requested(:post, 'https://api.mixpanel.com/track').
-      with(:body => {'data' => 'WyBURVNUIEVWRU5UIDEgXQ==' })
+      with(:body => {'data' => 'WyJURVNUIEVWRU5UIDEiXQ==' })
   end
 
   it 'should send one message when max_length events are tracked' do
     stub_request(:any, 'https://api.mixpanel.com/track').to_return({ :body => "1" })
 
     @max_length.times do |i|
-      @consumer.send(:event, "x #{i}")
+      @consumer.send(:event, {'data' => "x #{i}"}.to_json)
     end
 
     WebMock.should have_requested(:post, 'https://api.mixpanel.com/track').
-      with(:body => {'data' => 'WyB4IDAseCAxLHggMix4IDMseCA0LHggNSx4IDYseCA3LHggOCx4IDkgXQ==' })
+      with(:body => {'data' => 'WyJ4IDAiLCJ4IDEiLCJ4IDIiLCJ4IDMiLCJ4IDQiLCJ4IDUiLCJ4IDYiLCJ4IDciLCJ4IDgiLCJ4IDkiXQ==' })
+  end
+
+  it 'should send one message per api key on import' do
+    stub_request(:any, 'https://api.mixpanel.com/import').to_return({ :body => "1" })
+    @consumer.send(:import, {'data' => 'TEST EVENT 1', 'api_key' => 'KEY 1'}.to_json)
+    @consumer.send(:import, {'data' => 'TEST EVENT 1', 'api_key' => 'KEY 2'}.to_json)
+    @consumer.send(:import, {'data' => 'TEST EVENT 2', 'api_key' => 'KEY 1'}.to_json)
+    @consumer.send(:import, {'data' => 'TEST EVENT 2', 'api_key' => 'KEY 2'}.to_json)
+    @consumer.flush
+
+    WebMock.should have_requested(:post, 'https://api.mixpanel.com/import').
+      with(:body => {'data' => 'IlRFU1QgRVZFTlQgMSI=', 'api_key' => 'KEY 1' })
+
+    WebMock.should have_requested(:post, 'https://api.mixpanel.com/import').
+      with(:body => {'data' => 'IlRFU1QgRVZFTlQgMSI=', 'api_key' => 'KEY 2' })
   end
 end

data/spec/mixpanel-ruby/events_spec.rb

@@ -18,7 +18,7 @@ describe Mixpanel::Events do
     @events.track('TEST ID', 'Test Event', {
         'Circumstances' => 'During a test'
     })
-    @log.should eq([[ :event, {
+    @log.should eq([[ :event, 'data' => {
         'event' => 'Test Event',
         'properties' => {
             'Circumstances' => 'During a test',
@@ -26,9 +26,29 @@ describe Mixpanel::Events do
             'mp_lib' => 'ruby',
             '$lib_version' => Mixpanel::VERSION,
             'token' => 'TEST TOKEN',
-            'time' => 76695784
+            'time' => @time_now.to_i
         }
     }]])
   end
+
+  it 'should send a well formed import/ message' do
+    @events.import('API_KEY', 'TEST ID', 'Test Event', {
+        'Circumstances' => 'During a test'
+    })
+    @log.should eq([[ :import, {
+        'api_key' => 'API_KEY',
+        'data' => {
+            'event' => 'Test Event',
+            'properties' => {
+                'Circumstances' => 'During a test',
+                'distinct_id' => 'TEST ID',
+                'mp_lib' => 'ruby',
+                '$lib_version' => Mixpanel::VERSION,
+                'token' => 'TEST TOKEN',
+                'time' => @time_now.to_i
+            }
+        }
+    } ]])
+  end
 end
 

data/spec/mixpanel-ruby/people_spec.rb

@@ -19,10 +19,10 @@ describe Mixpanel::People do
         '$firstname' => 'David',
         '$lastname' => 'Bowie',
     })
-    @log.should eq([[ :profile_update, {
+    @log.should eq([[ :profile_update, 'data' => {
         '$token' => 'TEST TOKEN',
         '$distinct_id' => 'TEST ID',
-        '$time' => 76695784000,
+        '$time' => @time_now.to_i * 1000,
         '$set' => {
             '$firstname' => 'David',
             '$lastname' => 'Bowie'
@@ -35,10 +35,10 @@ describe Mixpanel::People do
         '$firstname' => 'David',
         '$lastname' => 'Bowie',
     })
-    @log.should eq([[ :profile_update, {
+    @log.should eq([[ :profile_update, 'data' => {
         '$token' => 'TEST TOKEN',
         '$distinct_id' => 'TEST ID',
-        '$time' => 76695784000,
+        '$time' => @time_now.to_i * 1000,
         '$set_once' => {
             '$firstname' => 'David',
             '$lastname' => 'Bowie'
@@ -48,10 +48,10 @@ describe Mixpanel::People do
 
   it 'should send a well formed engage/add message' do
     @people.increment("TEST ID", { 'Albums Released' => 10 })
-    @log.should eq([[ :profile_update, {
+    @log.should eq([[ :profile_update, 'data' => {
         '$token' => 'TEST TOKEN',
         '$distinct_id' => 'TEST ID',
-        '$time' => 76695784000,
+        '$time' => @time_now.to_i * 1000,
         '$add' => {
             'Albums Released' => 10
         }
@@ -60,7 +60,7 @@ describe Mixpanel::People do
 
   it 'should send an engage/add message with a value of 1' do
     @people.plus_one("TEST ID", 'Albums Released')
-    @log.should eq([[ :profile_update, {
+    @log.should eq([[ :profile_update, 'data' => {
         '$token' => 'TEST TOKEN',
         '$distinct_id' => 'TEST ID',
         '$time' => 76695784000,
@@ -72,10 +72,10 @@ describe Mixpanel::People do
 
   it 'should send a well formed engage/append message' do
     @people.append("TEST ID", { 'Albums' => 'Diamond Dogs' })
-    @log.should eq([[ :profile_update, {
+    @log.should eq([[ :profile_update, 'data' => {
         '$token' => 'TEST TOKEN',
         '$distinct_id' => 'TEST ID',
-        '$time' => 76695784000,
+        '$time' => @time_now.to_i * 1000,
         '$append' => {
             'Albums' => 'Diamond Dogs'
         }
@@ -83,23 +83,23 @@ describe Mixpanel::People do
   end
 
   it 'should send a well formed engage/union message' do
-    @people.union("TEST ID", { 'Albums' => 'Diamond Dogs' })
-    @log.should eq([[ :profile_update, {
+    @people.union("TEST ID", { 'Albums' => ['Diamond Dogs'] })
+    @log.should eq([[ :profile_update, 'data' => {
         '$token' => 'TEST TOKEN',
         '$distinct_id' => 'TEST ID',
-        '$time' => 76695784000,
+        '$time' => @time_now.to_i * 1000,
         '$union' => {
-            'Albums' => 'Diamond Dogs'
+            'Albums' => ['Diamond Dogs']
         }
     }]])
   end
 
   it 'should send a well formed unset message' do
     @people.unset('TEST ID', 'Albums')
-    @log.should eq([[ :profile_update, {
+    @log.should eq([[ :profile_update, 'data' => {
         '$token' => 'TEST TOKEN',
         '$distinct_id' => 'TEST ID',
-        '$time' => 76695784000,
+        '$time' => @time_now.to_i * 1000,
         '$unset' => [ 'Albums' ]
     }]])
   end
@@ -109,10 +109,10 @@ describe Mixpanel::People do
         '$time' => DateTime.new(1999,12,24,14, 02, 53),
         'SKU' => '1234567'
     })
-    @log.should eq([[ :profile_update, {
+    @log.should eq([[ :profile_update, 'data' => {
         '$token' => 'TEST TOKEN',
         '$distinct_id' => 'TEST ID',
-        '$time' => 76695784000,
+        '$time' => @time_now.to_i * 1000,
         '$append' => {
             '$transactions' => {
                 '$time' => '1999-12-24T14:02:53',
@@ -125,20 +125,20 @@ describe Mixpanel::People do
 
   it 'should send a well formed engage/unset message for $transaction' do
     @people.clear_charges("TEST ID")
-    @log.should eq([[ :profile_update, {
+    @log.should eq([[ :profile_update, 'data' => {
         '$token' => 'TEST TOKEN',
         '$distinct_id' => 'TEST ID',
-        '$time' => 76695784000,
+        '$time' => @time_now.to_i * 1000,
         '$unset' => [ '$transactions' ]
     }]])
   end
 
   it 'should send a well formed engage/delete message' do
     @people.delete_user("TEST ID")
-    @log.should eq([[ :profile_update, {
+    @log.should eq([[ :profile_update, 'data' => {
         '$token' => 'TEST TOKEN',
         '$distinct_id' => 'TEST ID',
-        '$time' => 76695784000,
+        '$time' => @time_now.to_i * 1000,
         '$delete' => ''
     }]])
   end

data/spec/mixpanel-ruby/tracker_spec.rb

@@ -16,7 +16,7 @@ describe Mixpanel::Tracker do
     mixpanel.alias('TEST ALIAS', 'TEST ID')
 
     WebMock.should have_requested(:post, 'https://api.mixpanel.com/track').
-      with(:body => { :data => 'eyJldmVudCI6IiRjcmVhdGVfYWxpYXMiLCJwcm9wZXJ0aWVzIjp7ImRpc3RpbmN0X2lkIjoiVEVTVCBJRCIsInRva2VuIjoiVEVTVCBUT0tFTiJ9fQ==' })
+      with(:body => { :data => 'eyJldmVudCI6IiRjcmVhdGVfYWxpYXMiLCJwcm9wZXJ0aWVzIjp7ImRpc3RpbmN0X2lkIjoiVEVTVCBJRCIsImFsaWFzIjoiVEVTVCBBTElBUyIsInRva2VuIjoiVEVTVCBUT0tFTiJ9fQ==' })
   end
 
   it 'should send a request to the track api with the default consumer' do
@@ -42,7 +42,7 @@ describe Mixpanel::Tracker do
             'mp_lib' => 'ruby',
             '$lib_version' => Mixpanel::VERSION,
             'token' => 'TEST TOKEN',
-            'time' => 76695784
+            'time' => @time_now.to_i
         }
     })
   end
@@ -53,35 +53,53 @@ describe Mixpanel::Tracker do
       messages << [ type, JSON.load(message) ]
     end
     mixpanel.track('ID', 'Event')
+    mixpanel.import('API_KEY', 'ID', 'Import')
     mixpanel.people.set('ID', { 'k' => 'v' })
     mixpanel.people.append('ID', { 'k' => 'v' })
 
-    messages.should eq([
-        [ :event,
+    expect = [
+        [ :event, 'data' =>
           { 'event' => 'Event',
             'properties' => {
               'distinct_id' => 'ID',
               'mp_lib' => 'ruby',
               '$lib_version' => Mixpanel::VERSION,
               'token' => 'TEST TOKEN',
-              'time' => 76695784
+              'time' => @time_now.to_i
             }
           }
         ],
-        [ :profile_update,
+        [ :import, {
+            'data' => {
+              'event' => 'Import',
+              'properties' => {
+                'distinct_id' => 'ID',
+                'mp_lib' => 'ruby',
+                '$lib_version' => Mixpanel::VERSION,
+                'token' => 'TEST TOKEN',
+                'time' => @time_now.to_i
+              }
+            },
+            'api_key' => 'API_KEY',
+          }
+        ],
+        [ :profile_update, 'data' =>
           { '$token' => 'TEST TOKEN',
             '$distinct_id' => 'ID',
-            '$time' => 76695784000,
+            '$time' => @time_now.to_i * 1000,
             '$set' => { 'k' => 'v' }
           }
         ],
-        [ :profile_update,
+        [ :profile_update, 'data' =>
           { '$token' => 'TEST TOKEN',
             '$distinct_id' => 'ID',
-            '$time' => 76695784000,
+            '$time' => @time_now.to_i * 1000,
             '$append' => { 'k' => 'v' }
           }
         ]
-    ])
+    ]
+    expect.zip(messages).each do |expect, found|
+      expect.should eq(found)
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mixpanel-ruby
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 1.0.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-09 00:00:00.000000000 Z
+date: 2013-07-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake