mixpanel 3.4.0 → 3.5.0

data/README.md

@@ -259,7 +259,7 @@ Example using `distinct_id` to identify the user:
 Example using request properties, telling mixpanel to [ignore the time](https://groups.google.com/forum/#!msg/mp-dev/Ao4f8D0IKms/6MVhQqFDzL8J):
 
 ```ruby
-@mixpanel.set { :distinct_id => 'john-doe', :ignore_time => true }, { :age => 31, :email => 'john@doe.com' }
+@mixpanel.set({ :distinct_id => 'john-doe', :ignore_time => true }, { :age => 31, :email => 'john@doe.com' })
 ```
 
 ### Increment Person Attributes Directly
@@ -277,6 +277,26 @@ Example:
 @mixpanel.increment 'john-doe', { :tokens => 5, :coins => -4 }
 ```
 
+### Track Charges for Revenue Directly
+
+```ruby
+@mixpanel.track_charge distinct_id, amount, time, options
+```
+
+This allows you to use the Revenue tab in your mixpanel dashboard.
+
+Example:
+
+```ruby
+@mixpanel.track_charge 'john-doe', 20.00
+```
+
+If you need to remove accidental charges for a person, you can use:
+
+```ruby
+@mixpanel.reset_charges distinct_id
+```
+
 ### Append Events To Be Tracked With Javascript
 
 *Note*: You should setup the [Rack Middleware](#rack-middleware).
@@ -413,3 +433,5 @@ end
 * [Ahmed Belal](https://github.com/AhmedBelal)
 * [Esteban Pastorino](https://github.com/kitop)
 * [Jeffrey Chu](https://github.com/jochu)
+* [Jon Pospischil] (https://github.com/pospischil)
+* [Tom Brown] (https://github.com/nottombrown)

data/lib/mixpanel/middleware.rb

@@ -38,6 +38,8 @@ module Mixpanel
             part.insert(insert_at, render_event_tracking_scripts) unless queue.empty?
             part.insert(insert_at, render_mixpanel_scripts) #This will insert the mixpanel initialization code before the queue of tracking events.
           end
+        elsif is_turbolink_request? && is_html_response?
+          part.insert(part.index('</body'), render_event_tracking_scripts) unless queue.empty?
         elsif is_ajax_request? && is_html_response?
           part.insert(0, render_event_tracking_scripts) unless queue.empty?
         elsif is_ajax_request? && is_javascript_response?
@@ -53,7 +55,11 @@ module Mixpanel
     end
 
     def is_regular_request?
-      !is_ajax_request?
+      !is_ajax_request? && !is_turbolink_request?
+    end
+
+    def is_turbolink_request?
+      @env.has_key?("HTTP_X_XHR_REFERER")
     end
 
     def is_ajax_request?
@@ -133,7 +139,7 @@ module Mixpanel
       return "" if queue.empty?
 
       output = queue.map {|type, arguments| %(mixpanel.#{type}(#{arguments.join(', ')});) }.join("\n")
-      output = "try {#{output}} catch(err) {}"
+      output = "try {#{output}} catch(err) {};"
 
       include_script_tag ? "<script type='text/javascript'>#{output}</script>" : output
     end

data/lib/mixpanel/person.rb

@@ -11,6 +11,20 @@ module Mixpanel::Person
     engage :add, distinct_id, properties, options
   end
 
+  def track_charge(distinct_id, amount, time=Time.now, options={})
+    charge_properties = {
+      '$transactions' => {
+        '$amount' => amount,
+        '$time' => time,
+        }
+      }
+    engage :append, distinct_id, charge_properties, options
+  end
+
+  def reset_charges(distinct_id, options={})
+    engage :set, distinct_id, { '$transactions' => [] }, options
+  end
+
   def append_set(properties={})
     append 'people.set', properties_hash(properties, PERSON_PROPERTIES)
   end

data/mixpanel.gemspec

@@ -2,7 +2,7 @@ files = ['README.md', 'LICENSE', 'Rakefile', 'mixpanel.gemspec', '{spec,lib}/**/
 
 spec = Gem::Specification.new do |s|
   s.name = "mixpanel"
-  s.version = "3.4.0"
+  s.version = "3.5.0"
   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

@@ -63,6 +63,14 @@ describe Mixpanel::Tracker do
       it "should increment attributes" do
         @mixpanel.increment('person-a', { :tokens => 3, :money => -1 }).should == true
       end
+
+      it "should track charges" do
+        @mixpanel.track_charge('person-a', 20.0).should == true
+      end
+
+      it "should reset charges" do
+        @mixpanel.reset_charges('person-a').should == true
+      end
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mixpanel
 version: !ruby/object:Gem::Version
-  version: 3.4.0
+  version: 3.5.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-23 00:00:00.000000000Z
+date: 2013-01-18 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &2153080840 !ruby/object:Gem::Requirement
+  requirement: &2153110960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2153080840
+  version_requirements: *2153110960
 - !ruby/object:Gem::Dependency
   name: rack
-  requirement: &2153080400 !ruby/object:Gem::Requirement
+  requirement: &2153110520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2153080400
+  version_requirements: *2153110520
 - !ruby/object:Gem::Dependency
   name: escape
-  requirement: &2153079980 !ruby/object:Gem::Requirement
+  requirement: &2153110100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2153079980
+  version_requirements: *2153110100
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2153079560 !ruby/object:Gem::Requirement
+  requirement: &2153109680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2153079560
+  version_requirements: *2153109680
 - !ruby/object:Gem::Dependency
   name: rack-test
-  requirement: &2153079140 !ruby/object:Gem::Requirement
+  requirement: &2153109260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2153079140
+  version_requirements: *2153109260
 - !ruby/object:Gem::Dependency
   name: fakeweb
-  requirement: &2153078720 !ruby/object:Gem::Requirement
+  requirement: &2153108840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2153078720
+  version_requirements: *2153108840
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &2153078300 !ruby/object:Gem::Requirement
+  requirement: &2153108420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2153078300
+  version_requirements: *2153108420
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2153104240 !ruby/object:Gem::Requirement
+  requirement: &2153108000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,7 +98,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2153104240
+  version_requirements: *2153108000
 description: Simple lib to track events in Mixpanel service. It can be used in any
   rack based framework.
 email: zevarito@gmail.com