mixpanel 4.0.3 → 4.0.4

data/README.md

@@ -511,10 +511,11 @@ MixPanel.track("Front Page Load", {
 
 ## Supported Ruby Platforms
 
-- 1.8.7
+- 1.8.7 [Not supported anymore]
 - 1.9.2
 - 1.9.3
 - JRuby 1.8 Mode
+- JRuby 1.9 Mode
 
 ## Deprecation Notes
 

data/lib/mixpanel/middleware.rb

@@ -53,7 +53,8 @@ module Mixpanel
             end
           end
         elsif is_turbolink_request? && is_html_response?
-          part.insert(part.index('</body'), render_event_tracking_scripts) unless queue.empty?
+          insert_at = part.index('</body')
+          part.insert(insert_at, render_event_tracking_scripts) unless insert_at.nil? or 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?

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 = "4.0.3"
+  s.version = "4.0.4"
   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/middleware_spec.rb

@@ -8,7 +8,6 @@ def exec_default_appends_on(mixpanel)
 end
 
 def check_for_default_appends_on(txt)
-
   txt.should =~ /mixpanel\.track\("Visit",\s?\{.*"article":1/
   txt.should =~ /mixpanel\.track\("Sign in",\s?\{.*"time":.*\}/
   txt.should =~ /mixpanel\.people\.set\(.*\);\nmixpanel.people.increment\(\"sign_in_rate\",\s?1\);/
@@ -21,7 +20,7 @@ end
 
 describe Mixpanel::Middleware do
   include Rack::Test::Methods
-  
+
   describe "Dummy apps, no text/html" do
     before do
       setup_rack_application(DummyApp, :body => html_document, :headers => {})
@@ -32,17 +31,17 @@ describe Mixpanel::Middleware do
       last_response.body.should == html_document
     end
   end
-  
+
   describe "Dummy app, handles skip requests properly" do
     before do
       setup_rack_application(DummyApp, {:body => html_document, :headers => {"Content-Type" => "text/html"}})
     end
-    
+
     it "should not append mixpanel scripts with skip request" do
       get "/", {}, {"HTTP_SKIP_MIXPANEL_MIDDLEWARE" => true}
       Nokogiri::HTML(last_response.body).search('script').should be_empty
     end
-    
+
     it "should append mixpanel scripts without skip request" do
       get "/"
       Nokogiri::HTML(last_response.body).search('script').size.should == 1
@@ -66,7 +65,7 @@ describe Mixpanel::Middleware do
 
     end
   end
-    
+
   describe "Appending async mixpanel scripts" do
     describe "With ajax requests" do
       before do
@@ -293,6 +292,21 @@ describe Mixpanel::Middleware do
         last_request.env.has_key?("mixpanel_events").should == false
       end
     end
+
+    describe "With turbolinks" do
+      before do
+        setup_rack_application(DummyApp, {
+          :body => ['',html_document],
+          :headers => {'Content-Type' => 'text/html'}
+        }, {:insert_js_last => true})
+        get '/', {}, {'HTTP_X_XHR_REFERER' => '/', 'mixpanel_events' => @mixpanel.queue}
+      end
+
+      it "should append mixpanel scripts to end of body element" do
+        Nokogiri::HTML(last_response.body).search('head script').should be_empty
+        Nokogiri::HTML(last_response.body).search('body script').should_not be_empty
+      end
+    end
   end
 
   describe "Tracking appended events" do

data/spec/support/rack_apps.rb

@@ -18,11 +18,22 @@ class DummyApp
     @response_with = {}
     @response_with[:status] = options[:status] || "200"
     @response_with[:headers] = options[:headers] || {}
-    @response_with[:body] = options[:body] || ""
+    @response_with[:body] = wrap(options[:body] || '')
   end
 
   def call(env)
-    [@response_with[:status], @response_with[:headers], [@response_with[:body]]]
+    [@response_with[:status], @response_with[:headers], @response_with[:body]]
+  end
+
+  private
+  def wrap(object)
+    if object.nil?
+      []
+    elsif object.respond_to?(:to_ary)
+      object.to_ary || [object]
+    else
+      [object]
+    end
   end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mixpanel
 version: !ruby/object:Gem::Version
-  version: 4.0.3
+  version: 4.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-01 00:00:00.000000000Z
+date: 2013-08-17 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &2153703060 !ruby/object:Gem::Requirement
+  requirement: &2153530540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2153703060
+  version_requirements: *2153530540
 - !ruby/object:Gem::Dependency
   name: rack
-  requirement: &2153702620 !ruby/object:Gem::Requirement
+  requirement: &2153530100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2153702620
+  version_requirements: *2153530100
 - !ruby/object:Gem::Dependency
   name: escape
-  requirement: &2153702200 !ruby/object:Gem::Requirement
+  requirement: &2153529680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2153702200
+  version_requirements: *2153529680
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2153701780 !ruby/object:Gem::Requirement
+  requirement: &2153529260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2153701780
+  version_requirements: *2153529260
 - !ruby/object:Gem::Dependency
   name: rack-test
-  requirement: &2153701360 !ruby/object:Gem::Requirement
+  requirement: &2153555180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2153701360
+  version_requirements: *2153555180
 - !ruby/object:Gem::Dependency
   name: fakeweb
-  requirement: &2153700940 !ruby/object:Gem::Requirement
+  requirement: &2153554760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2153700940
+  version_requirements: *2153554760
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &2153700520 !ruby/object:Gem::Requirement
+  requirement: &2153554340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2153700520
+  version_requirements: *2153554340
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2153700100 !ruby/object:Gem::Requirement
+  requirement: &2153553920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,7 +98,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2153700100
+  version_requirements: *2153553920
 description: Simple lib to track events in Mixpanel service. It can be used in any
   rack based framework.
 email: zevarito@gmail.com