mix_tape 0.0.3 → 0.0.4

data/lib/mix_tape/builder.rb

@@ -17,7 +17,9 @@ module MixTape
       @@mix_tape << [name, desc]
 
       MixTape.define_singleton_method("track_#{name}") do |*args|
-        MixTape.client.track name.to_s, yield(*args)
+        data = yield(*args)
+        distinct_id = data.delete(:distinct_id)
+        MixTape.client.track distinct_id, name.to_s, data
       end
 
       MixTape.define_singleton_method("set_#{name}") do |id, *args|

data/lib/mix_tape/client.rb

@@ -9,7 +9,7 @@ module MixTape
     end
 
     def config(&block)
-      instance_eval &block
+      instance_eval(&block)
     end
 
     private
@@ -18,18 +18,8 @@ module MixTape
       if !!fake
         FakeTracker.new(console_logging)
       else
-        Mixpanel::Tracker.new(token, async: true, env: @request ? env : {})
+        Mixpanel::Tracker.new(token)
       end
     end
-
-    def env
-      e = @request.is_a?(Hash) ? @request : @request.env
-      {
-        'REMOTE_ADDR' => e['REMOTE_ADDR'],
-        'HTTP_X_FORWARDED_FOR' => e['HTTP_X_FORWARDED_FOR'],
-        'rack.session' => e['rack.session'],
-        'mixpanel_events' => e['mixpanel_events']
-      }
-    end
   end
 end

data/lib/mix_tape/version.rb

@@ -1,3 +1,3 @@
 module MixTape
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/lib/mix_tape.rb

@@ -1,4 +1,4 @@
-require "mixpanel"
+require "mixpanel-ruby"
 require "mix_tape/client"
 require "mix_tape/version"
 require "mix_tape/builder"

data/mix_tape.gemspec

@@ -22,5 +22,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rake"
   spec.add_development_dependency 'rspec'
 
-  spec.add_dependency 'mixpanel'
+  spec.add_dependency 'mixpanel-ruby'
 end

data/spec/lib/mix_tape/builder_spec.rb

@@ -30,9 +30,9 @@ describe "Triggering Events" do
   end
 
   it "tracks" do
-    expected_properties =  { user_name: "Zeus", distinct_id: "1", button_id: "2", button_page: "homepage" }
+    expected_properties =  { user_name: "Zeus", button_id: "2", button_page: "homepage" }
 
-    client.should_receive(:track).with("button_click", expected_properties)
+    client.should_receive(:track).with("1", "button_click", expected_properties)
     MixTape.track_button_click(user, button)
   end
 

data/spec/lib/mix_tape/config_spec.rb

@@ -33,15 +33,7 @@ describe 'Configuraton' do
     MixTape.config{ |config| config.token = '1234'; config.fake = false }
     MixTape.request = double(:http_request, env: { 'REMOTE_ADDR' => '127.0.0.1' })
 
-    Mixpanel::Tracker.should_receive(:new).with('1234', {
-        async: true,
-        env: {
-            'REMOTE_ADDR' => '127.0.0.1',
-            'HTTP_X_FORWARDED_FOR' => nil,
-            'rack.session' => nil,
-            'mixpanel_events' => nil
-        }
-    })
+    Mixpanel::Tracker.should_receive(:new).with('1234')
 
     MixTape.client
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mix_tape
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-21 00:00:00.000000000 Z
+date: 2013-10-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -60,7 +60,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: mixpanel
+  name: mixpanel-ruby
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements: