mixpanel_client 2.2.0 → 2.2.1

data/README.md

@@ -74,6 +74,13 @@ Create tag v2.0.2 and build and push mixpanel_client-2.0.2.gem to Rubygems
 
 ## Changelog
 
+### v.2.2.1
+ * 	Added support for the raw data export API.
+
+### v2.2.0
+  * BASE_URI is now https.
+  * Changed funnel to funnel_id.
+
 ### v2.1.0
  * Updated json dependency to 1.6.
 
@@ -105,6 +112,8 @@ Create tag v2.0.2 and build and push mixpanel_client-2.0.2.gem to Rubygems
    libraries. [a710a84e8ba4b6f018b7](https://github.com/keolo/mixpanel_client/commit/a710a84e8ba4b6f018b7404ab9fabc8f08b4a4f3)
 
 ## Collaborators and Maintainers
+Feel free to add your name and link here.
+
 [Keolo Keagy](http://github.com/keolo) (Author)  
 [Jason Logsdon](https://github.com/jasonlogsdon)  
 [James R](https://github.com/Cev)  

data/lib/mixpanel/client.rb

@@ -10,11 +10,12 @@ module Mixpanel
   # Return metrics from Mixpanel Data API
   class Client
     BASE_URI = 'https://mixpanel.com/api/2.0'
+    DATA_URI = 'https://data.mixpanel.com/api/2.0'
 
     attr_reader   :uri
     attr_accessor :api_key, :api_secret
 
-    # Availalbe options for a Mixpanel API request
+    # Available options for a Mixpanel API request
     OPTIONS = [:resource, :event, :funnel_id, :name, :type, :unit, :interval, :limit, :format, :bucket,
                :values, :from_date, :to_date, :on, :where, :buckets, :timezone]
 
@@ -61,6 +62,7 @@ module Mixpanel
       instance_eval(&options)
       @uri = URI.mixpanel(resource, normalize_params(params))
       response = URI.get(@uri)
+      response = %Q|[#{response.split("\n").join(',')}]| if resource == 'export'
       Utils.to_hash(response, @format)
     end
 
@@ -94,5 +96,9 @@ module Mixpanel
         :expire  => Time.now.to_i + 600 # Grant this request 10 minutes
       ).merge!(:sig => Utils.generate_signature(params, @api_secret))
     end
+    
+    def self.base_uri_for_resource(resource)
+      resource == 'export' ? DATA_URI : BASE_URI
+    end
   end
 end

data/lib/mixpanel/uri.rb

@@ -10,7 +10,8 @@ module Mixpanel
   # Utilities to assist generating and requesting URIs
   class URI
     def self.mixpanel(resource, params)
-      "#{File.join([Mixpanel::Client::BASE_URI, resource.to_s])}?#{self.encode(params)}"
+      base = Mixpanel::Client.base_uri_for_resource(resource)
+      "#{File.join([base, resource.to_s])}?#{self.encode(params)}"
     end
 
     def self.encode(params)

data/lib/mixpanel/version.rb

@@ -10,6 +10,6 @@ module Mixpanel
   # Return metrics from Mixpanel Data API
   class Client
     # Mixpanel::Client library version
-    VERSION = '2.2.0'
+    VERSION = '2.2.1'
   end
 end

data/spec/mixpanel_client/uri_spec.rb

@@ -11,6 +11,10 @@ describe Mixpanel::URI do
       resource, params  = ['events/top', {:c => 'see', :a => 'ey'}]
       Mixpanel::URI.mixpanel(resource, params).should == "#{Mixpanel::Client::BASE_URI}/events/top?a=ey&c=see"
     end
+    it 'should return a uri with a different endpoint when doing a raw data export' do
+      resource, params  = ['export', {:c => 'see', :a => 'ey'}]
+      Mixpanel::URI.mixpanel(resource, params).should == "#{Mixpanel::Client::DATA_URI}/export?a=ey&c=see"
+    end
   end
 
   describe '.encode' do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: mixpanel_client
 version: !ruby/object:Gem::Version 
-  hash: 7
+  hash: 5
   prerelease: 
   segments: 
   - 2
   - 2
-  - 0
-  version: 2.2.0
+  - 1
+  version: 2.2.1
 platform: ruby
 authors: 
 - Keolo Keagy