mixpanel 1.1.1 → 1.1.2

data/README.rdoc

@@ -112,3 +112,4 @@ All collaborations are welcome to this project, please fork and make a pull requ
 * {Logan Bowers}[https://github.com/loganb]
 * {jakemack}[https://github.com/jakemack]
 * {James Ferguson}[https://github.com/JamesFerguson]
+* {Brad Wilson}[https://github.com/bradx3]

data/lib/mixpanel/tracker.rb

@@ -29,7 +29,13 @@ module Mixpanel
     end
 
     def ip
-      @env.has_key?("REMOTE_ADDR") ? @env["REMOTE_ADDR"] : ""
+      if @env.has_key?("HTTP_X_FORWARDED_FOR")
+        @env["HTTP_X_FORWARDED_FOR"].split(",").last
+      elsif @env.has_key?("REMOTE_ADDR")
+        @env["REMOTE_ADDR"]
+      else
+        ""
+      end
     end
 
     def queue

data/mixpanel.gemspec

@@ -2,7 +2,7 @@ files = ['README.rdoc', 'LICENSE', 'Rakefile', 'mixpanel.gemspec', '{spec,lib}/*
 
 spec = Gem::Specification.new do |s|
   s.name = "mixpanel"
-  s.version = "1.1.1"
+  s.version = "1.1.2"
   s.rubyforge_project = "mixpanel"
   s.description = "Simple lib to track events in Mixpanel service. It can be used in any rack based framework."
   s.author = "Alvaro Gil"

data/spec/mixpanel/tracker_spec.rb

@@ -26,12 +26,21 @@ describe Mixpanel::Tracker do
         @mixpanel.track_event("Sign up").should == true
       end
 
-      it "should call request method with token and time value" do
+      it "should call request method with token, time value and ip address" do
         params = {:event => "Sign up", :properties => {:token => MIX_PANEL_TOKEN, :time => Time.now.utc.to_i, :ip => "127.0.0.1"}}
 
         @mixpanel.should_receive(:request).with(params).and_return("1")
         @mixpanel.track_event("Sign up").should == true
       end
+
+      it "should call request method with token, and send ip address from HTTP_X_FORWARDED_FOR" do
+        @mixpanel = Mixpanel::Tracker.new(MIX_PANEL_TOKEN, @env = {"HTTP_X_FORWARDED_FOR" => "10.1.0.2"})
+
+        params = {:event => "Sign up", :properties => {:token => MIX_PANEL_TOKEN, :time => Time.now.utc.to_i, :ip => "10.1.0.2"}}
+
+        @mixpanel.should_receive(:request).with(params).and_return("1")
+        @mixpanel.track_event("Sign up")
+      end
     end
   end
 

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 1
-  - 1
-  version: 1.1.1
+  - 2
+  version: 1.1.2
 platform: ruby
 authors: 
 - Alvaro Gil
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-11-23 00:00:00 -02:00
+date: 2012-01-09 00:00:00 -02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency