mixpanel 4.0.6 → 4.0.7

data/lib/mixpanel/event.rb

@@ -36,8 +36,8 @@ module Mixpanel::Event
   def track_event(event, properties, options, default_url)
     default = {:url => default_url, :async => @async, :api_key => @api_key}
     options = default.merge(options)
-    url = build_url(event, properties, options)
-    parse_response request(url, options[:async])
+    data = build_data(event, properties, options)
+    parse_response post_request(options[:url], data, options[:async])
   end
 
   def track_properties(properties, include_token=true)
@@ -52,6 +52,16 @@ module Mixpanel::Event
     { :event => event, :properties => properties_hash(properties, EVENT_PROPERTIES) }
   end
 
+  def build_data event, properties, options
+    params = {}
+    data = build_event event, track_properties(properties)
+    params[:data] = encoded_data(data)
+    params[:api_key] = options[:api_key] if options.fetch(:api_key, nil)
+    params[:img] = 1 if options[:img]
+    params[:test] = 1 if options[:test]
+    params
+  end
+
   def build_url event, properties, options
     data = build_event event, track_properties(properties)
     url = "#{options[:url]}?data=#{encoded_data(data)}"

data/lib/mixpanel/person.rb

@@ -81,8 +81,7 @@ module Mixpanel::Person
       data = build_person action, request_properties, properties
     end
 
-    url = "#{options[:url]}?data=#{encoded_data(data)}"
-    parse_response request(url, options[:async])
+    parse_response post_request(options[:url], { data: encoded_data(data) }, options[:async])
   end
 
   def person_request_properties(request_properties_or_distinct_id)

data/lib/mixpanel/subprocess.rb

@@ -1,5 +1,7 @@
-require 'open-uri'
 require 'thread'
+require "uri"
+require "net/http"
+require 'json'
 
 module Mixpanel
   class Subprocess
@@ -7,20 +9,23 @@ module Mixpanel
     ENDMARKER = Object.new
 
     Thread.abort_on_exception = true
-    producer = Thread.new do 
-      STDIN.each_line() do |url|
-        STDERR.puts("Dropped: #{url}") && next if Q.length > 10000
-        Q << url
+    producer = Thread.new do
+      STDIN.each_line() do |data|
+        STDERR.puts("Dropped: #{data}") && next if Q.length > 10000
+        Q << data
       end
       Q << ENDMARKER
     end
 
     loop do
-      url = Q.pop
-      break if(url == ENDMARKER)
-      url.chomp!
-      next if(url.empty?) #for testing
-      open(url).read
+      data = Q.pop
+      break if(data == ENDMARKER)
+      data.chomp!
+      data_hash = JSON.load(data)
+      if data_hash.is_a?(Hash) && data_hash['_mixpanel_url']
+        url = data_hash.delete('_mixpanel_url')
+        Net::HTTP.post_form(URI.parse(url), data_hash)
+      end
     end
     producer.join
   end

data/lib/mixpanel/tracker.rb

@@ -1,7 +1,8 @@
-require "open-uri"
-require 'base64'
+require "uri"
+require "net/http"
 require 'json'
 require 'thread'
+require 'base64'
 
 module Mixpanel
   class Tracker
@@ -58,19 +59,23 @@ module Mixpanel
       Base64.encode64(JSON.generate(parameters)).gsub(/\n/,'')
     end
 
-    def request(url, async)
-      async ? send_async(url) : open(url).read
+    def post_request(url, data, async)
+      if async
+        send_async(url, data)
+      else
+        Net::HTTP.post_form(URI.parse(url), data)
+      end
     end
 
     def parse_response(response)
-      response.to_i == 1
+      response.body.to_i == 1
     end
 
-    def send_async(url)
+    def send_async(url, data)
       w = Mixpanel::Tracker.worker
       begin
         url << "\n"
-        w.write url
+        w.write JSON.dump(data.merge(_mixpanel_url: url))
         1
       rescue Errno::EPIPE => e
         Mixpanel::Tracker.dispose_worker w

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.6"
+  s.version = "4.0.7"
   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

@@ -188,7 +188,7 @@ describe Mixpanel::Tracker do
       #On most systems this will exceed the pipe buffer size
       8.times do
         9000.times do
-          w.write("\n")
+          w.write("")
         end
         sleep 0.1
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mixpanel
 version: !ruby/object:Gem::Version
-  version: 4.0.6
+  version: 4.0.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-05 00:00:00.000000000Z
+date: 2013-09-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &2153726180 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2153726180
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rack
-  requirement: &2153725740 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +37,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2153725740
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: escape
-  requirement: &2153725320 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +53,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2153725320
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2153724900 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +69,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2153724900
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rack-test
-  requirement: &2153724480 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +85,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2153724480
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: fakeweb
-  requirement: &2153724060 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +101,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2153724060
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &2153723640 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +117,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2153723640
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2153723220 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,7 +133,12 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2153723220
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Simple lib to track events in Mixpanel service. It can be used in any
   rack based framework.
 email: zevarito@gmail.com
@@ -142,7 +182,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: mixpanel
-rubygems_version: 1.8.15
+rubygems_version: 1.8.21
 signing_key: 
 specification_version: 3
 summary: Supports direct request api and javascript requests through a middleware.