mixpanel_client 2.0.0.beta1 → 2.0.0.beta2

data/README.md

@@ -30,6 +30,9 @@ Ruby access to the [Mixpanel](http://mixpanel.com/) web analytics tool.
 
 ## Changelog
 
+### 2.0.0.beta2
+ * Added JSON to gemspec for ruby versions less than 1.9.
+
 ### 2.0.0.beta1
  * Reverted to namespacing via module name because it's a better practice.
    I.e. Use `Mixpanel::Client` instead of `MixpanelClient`.
@@ -46,6 +49,8 @@ Ruby access to the [Mixpanel](http://mixpanel.com/) web analytics tool.
 
 ## Collaborators and Maintainers
 [Keolo Keagy](http://github.com/keolo) (Author)  
+[Mike Ferrier](http://github.com/mferrier)  
+[Railwaymen](http://github.com/railwaymen)  
 [Nathan Chong](http://github.com/paramaw)  
 [Paul McMahon](http://github.com/pwim)  
 [Chad Etzel](http://github.com/jazzychad)

data/lib/mixpanel/uri.rb

@@ -9,18 +9,20 @@
 # http://mixpanel.com/api/docs/guides/api/
 
 # URI related helpers
-class Mixpanel::URI
-  def self.mixpanel(resource, params)
-    File.join([Mixpanel::Client::BASE_URI, Mixpanel::Client::API_VERSION, resource.to_s]) + "?#{self.encode(params)}"
-  end
+module Mixpanel
+  class URI
+    def self.mixpanel(resource, params)
+      File.join([Mixpanel::Client::BASE_URI, Mixpanel::Client::API_VERSION, resource.to_s]) + "?#{self.encode(params)}"
+    end
 
-  def self.encode(params)
-    params.map{|key,val| "#{key}=#{CGI.escape(val.to_s)}"}.sort.join('&')
-  end
+    def self.encode(params)
+      params.map{|key,val| "#{key}=#{CGI.escape(val.to_s)}"}.sort.join('&')
+    end
 
-  def self.get(uri)
-    ::URI.parse(uri).read
-  rescue OpenURI::HTTPError => error
-    raise HTTPError, JSON.parse(error.io.read)['error']
+    def self.get(uri)
+      ::URI.parse(uri).read
+    rescue OpenURI::HTTPError => error
+      raise HTTPError, JSON.parse(error.io.read)['error']
+    end
   end
 end

data/lib/mixpanel/version.rb

@@ -1,6 +1,6 @@
 # Set version number for mixpanel_client
 module Mixpanel
   class Client
-    VERSION = '2.0.0.beta1'
+    VERSION = '2.0.0.beta2'
   end
 end

data/mixpanel_client.gemspec

@@ -19,6 +19,7 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ['lib']
 
+  s.add_dependency('json', '~> 1.5.1') if RUBY_VERSION < '1.9'
   s.add_development_dependency('rspec',     '>=2.5.0')
   s.add_development_dependency('webmock',   '>=1.6.2')
   s.add_development_dependency('metric_fu', '>=2.1.1')

data/spec/mixpanel_client/mixpanel_client_spec.rb

@@ -2,11 +2,16 @@ require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 
 describe Mixpanel::Client do
   before :all do
-    config = {'api_key' => 'test', 'api_secret' => 'test'}
-    @client = Mixpanel::Client.new(config)
+    @client = Mixpanel::Client.new('api_key' => 'test_key', 'api_secret' => 'test_secret')
     @uri = Regexp.escape(Mixpanel::Client::BASE_URI)
   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(ArgumentError)
+    end
+  end
+
   context 'when making an invalid request' do
     it 'should return an argument error "Wrong number of arguments" if using the deprecated usage' do
       # Stub Mixpanel request

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: mixpanel_client
 version: !ruby/object:Gem::Version 
-  hash: 62196449
+  hash: 62196455
   prerelease: 6
   segments: 
   - 2
   - 0
   - 0
   - beta
-  - 1
-  version: 2.0.0.beta1
+  - 2
+  version: 2.0.0.beta2
 platform: ruby
 authors: 
 - Keolo Keagy
@@ -17,13 +17,29 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-18 00:00:00 -07:00
+date: 2011-06-01 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: rspec
+  name: json
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 1
+        segments: 
+        - 1
+        - 5
+        - 1
+        version: 1.5.1
+  type: :runtime
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -35,11 +51,11 @@ dependencies:
         - 0
         version: 2.5.0
   type: :development
-  version_requirements: *id001
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: webmock
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -51,11 +67,11 @@ dependencies:
         - 2
         version: 1.6.2
   type: :development
-  version_requirements: *id002
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: metric_fu
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -67,7 +83,7 @@ dependencies:
         - 1
         version: 2.1.1
   type: :development
-  version_requirements: *id003
+  version_requirements: *id004
 description: Simple ruby client interface to the Mixpanel API.
 email: 
 - keolo@dreampointmedia.com