mixpanel_client 4.0.1 → 4.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5db50334f0523f186df3366c7e79565ea7eca601
-  data.tar.gz: e28c9cf521c8d160a6d3b6ef1086bf7de6efb4a5
+  metadata.gz: 2064a32d2001e146ea1f47b5b9ac83744c683a60
+  data.tar.gz: 3033df250915740f19205d9c2864773b61acfc65
 SHA512:
-  metadata.gz: 4b07b4bdc7b798cc10fda6e61502ed858a0530b24b9404a9ac5fc266c130c0e3829c0c19de28b694f8de2f8eab174bac186a80d97a28e5e0d3d8243272869d39
-  data.tar.gz: 28924015e8b5fc7f5b1404821e54ba9c474ce94edc84c8b12d18bfb628931c1ff1a768b36f43c4775abcec021c8fdc12024e5bec8b61d7507f8d10df0d8d3f92
+  metadata.gz: ab6d79cdf8270ad2a721c95d690cc28bfb83562fc1519752c4e70206132bcb69f770a0eab04e2c490949272c01c504d7076a7f0079d3e3a8eaa5a9e2240d3552
+  data.tar.gz: 34ea6268f37da906c193476b089bfa810dd1cd1bbcdd7d4659abd8120efee99b1086fc83990f6422c2622412e518f13bc55162103daf8f847ea88fa3f5241d51

data/changelog.md

@@ -1,3 +1,8 @@
+### v4.1.0
+ * Drop support for config keys to be strings. Use symbols instead
+ * Fixed some rubocop offences
+ * Require Typhoeus when used
+
 ### v4.0.1
  * Raise ConfigurationError if api_key or api_secret are not present
 

data/lib/mixpanel/client.rb

@@ -9,8 +9,8 @@
 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'
+    BASE_URI   = 'https://mixpanel.com/api/2.0'
+    DATA_URI   = 'https://data.mixpanel.com/api/2.0'
     IMPORT_URI = 'https://api.mixpanel.com'
 
     attr_reader   :uri
@@ -24,9 +24,9 @@ module Mixpanel
     #
     # @param [Hash] config consisting of an 'api_key' and an 'api_secret'
     def initialize(config)
-      @api_key    = config[:api_key]    || config['api_key']
-      @api_secret = config[:api_secret] || config['api_secret']
-      @parallel   = config[:parallel]   || config['parallel']   || false
+      @api_key    = config[:api_key]
+      @api_secret = config[:api_secret]
+      @parallel   = config[:parallel]   || false
 
       fail ConfigurationError if @api_key.nil? || @api_secret.nil?
     end
@@ -56,6 +56,7 @@ module Mixpanel
     end
 
     def make_parallel_request
+      require 'typhoeus'
       parallel_request = prepare_parallel_request
       hydra.queue parallel_request
       parallel_request
@@ -105,10 +106,10 @@ module Mixpanel
         elsif response.timed_out?
           fail TimeoutError
         elsif response.code == 0
-          # Could not get an http response, something's wrong.
+          # Could not get an http response, something's wrong
           fail HTTPError, response.curl_error_message
         else
-          # Received a non-successful http response.
+          # Received a non-successful http response
           if response.body && response.body != ''
             error_message = JSON.parse(response.body)['error']
           else
@@ -139,11 +140,21 @@ module Mixpanel
     #         signature
     def normalize_options(options)
       normalized_options = options.dup
-      normalized_options.merge!(
-        format: @format,
-        api_key: @api_key,
-        expire: options[:expire] ? options[:expire].to_i : Time.now.to_i + 600
-      ).merge!(sig: Utils.generate_signature(normalized_options, @api_secret))
+
+      normalized_options
+        .merge!(
+          format:  @format,
+          api_key: @api_key,
+          expire:  request_expires_at(normalized_options)
+        )
+        .merge!(
+          sig: Utils.generate_signature(normalized_options, @api_secret)
+        )
+    end
+
+    def request_expires_at(options)
+      ten_minutes_from_now = Time.now.to_i + 600
+      options[:expire] ? options[:expire].to_i : ten_minutes_from_now
     end
 
     def self.base_uri_for_resource(resource)

data/lib/mixpanel/version.rb

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

data/readme.md

@@ -9,7 +9,7 @@ Ruby access to the [Mixpanel](http://mixpanel.com/) web analytics tool.
 ## Installation
 
     gem install mixpanel_client
-    
+
 or if you use a Gemfile
 
     gem 'mixpanel_client'
@@ -50,8 +50,7 @@ or if you use a Gemfile
       limit:    5
     )
 
-
-    # use the import API, which allows one to specify a time in the past, unlike the track API.
+    # Use the import API, which allows one to specify a time in the past, unlike the track API.
     # note that you need to include your api token in the data. More details at:
     # https://mixpanel.com/docs/api-documentation/importing-events-older-than-31-days
     data_to_import = {'event' => 'firstLogin', 'properties' => {'distinct_id' => guid, 'time' => time_as_integer_seconds_since_epoch, 'token' => api_token}}

data/spec/mixpanel_client/mixpanel_client_spec.rb

@@ -11,13 +11,6 @@ describe Mixpanel::Client do
   end
 
   context 'when initializing a new Mixpanel::Client' do
-    it 'should not raise an exception if a hash is given' do
-      Mixpanel::Client.new(
-        'api_key' => 'test_key',
-        'api_secret' => 'test_secret'
-      ).should_not { raise_error }
-    end
-
     it 'should set a parallel option as false by default' do
       Mixpanel::Client.new(
         api_key: 'test_key',

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mixpanel_client
 version: !ruby/object:Gem::Version
-  version: 4.0.1
+  version: 4.1.0
 platform: ruby
 authors:
 - Keolo Keagy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-16 00:00:00.000000000 Z
+date: 2014-04-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: typhoeus