mixpanel_client 0.2.2 → 0.2.3

data/VERSION

@@ -1 +1 @@
-0.2.2
+0.2.3

data/lib/mixpanel_client.rb

@@ -15,7 +15,7 @@ require 'open-uri'
 
 module Mixpanel
   class Client
-    attr_accessor :api_key, :api_secret
+    attr_accessor :api_key, :api_secret, :format
 
     BASE_URI = 'http://mixpanel.com/api'
     VERSION  = '1.0'
@@ -23,12 +23,14 @@ module Mixpanel
     def initialize(config)
       @api_key    = config[:api_key]
       @api_secret = config[:api_secret]
+      @format   ||= :json
     end
 
     def request(endpoint, meth, params)
-      params[:api_key] = api_key
-      params[:expire]  = Time.now.to_i + 600 # Grant this request 10 minutes
-      params[:sig]     = hash_args(params)
+      params[:api_key]  = api_key
+      params[:expire]   = Time.now.to_i + 600 # Grant this request 10 minutes
+      params[:sig]      = hash_args(params)
+      params[:format] ||= @format
 
       @format = params[:format]
 
@@ -54,9 +56,10 @@ module Mixpanel
 
     def to_hash(data)
       case @format
-      when :xml
-        # TODO: xml parsing
-      else :json
+      when :placeholder
+        # This is just a placeholder in case Mixpanel supports alternate
+        # formats. Mixpanel at this time (v1.0) only supports JSON.
+      else # The default response is JSON
         require 'json' unless defined?(JSON)
         JSON.parse(data)
       end

data/mixpanel_client.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{mixpanel_client}
-  s.version = "0.2.2"
+  s.version = "0.2.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Keolo Keagy"]
-  s.date = %q{2010-01-13}
+  s.date = %q{2010-01-19}
   s.description = %q{Simple ruby client interface to the Mixpanel API.}
   s.email = %q{keolo@dreampointmedia.com}
   s.extra_rdoc_files = [

data/spec/mixpanel_client_spec.rb

@@ -8,6 +8,10 @@ describe 'Mixpanel::Client' do
     @api = Mixpanel::Client.new(config)
   end
 
+  it 'should have a format attribute that defaults to :json' do
+    @api.format.should == :json
+  end
+
   describe '#request' do
     it 'should return json and convert to a ruby hash' do
       # Stub Mixpanel web service

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mixpanel_client
 version: !ruby/object:Gem::Version 
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors: 
 - Keolo Keagy
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-13 00:00:00 -08:00
+date: 2010-01-19 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency