mixpanel_client 1.0.0 → 1.0.1

data/README.md

@@ -28,8 +28,13 @@ Ruby access to the [Mixpanel](http://mixpanel.com/) web analytics tool.
 
 ## Changelog
 
+### 1.0.1
+ * Minor housekeeping and organizing
+ * Refactored specs
+
 ### 1.0.0
- * Changed "Mixpanel" class name to "MixpanelClient" to prevent naming collision in other libraries. [a710a84e8ba4b6f018b7](https://github.com/keolo/mixpanel_client/commit/a710a84e8ba4b6f018b7404ab9fabc8f08b4a4f3)
+ * Changed "Mixpanel" class name to "MixpanelClient" to prevent naming collision in other 
+   libraries. [a710a84e8ba4b6f018b7](https://github.com/keolo/mixpanel_client/commit/a710a84e8ba4b6f018b7404ab9fabc8f08b4a4f3)
 
 ## Collaborators and Maintainers
 [Keolo Keagy](http://github.com/keolo) (Author)  

data/Rakefile

@@ -24,25 +24,12 @@ RSpec::Core::RakeTask.new(:rcov) do |spec|
   spec.rcov = true
 end
 
-task :spec #=> :check_dependencies
-
-begin
-  require 'cucumber/rake/task'
-  Cucumber::Rake::Task.new(:features)
-
-  task :features #=> :check_dependencies
-rescue LoadError
-  task :features do
-    abort 'Cucumber is not available. In order to run features, you must: sudo gem install cucumber'
-  end
-end
-
+task :spec 
 task :default => :spec
 
 require 'rake/rdoctask'
 Rake::RDocTask.new do |rdoc|
   version = File.exist?('VERSION') ? File.read('VERSION') : ''
-
   rdoc.rdoc_dir = 'rdoc'
   rdoc.title = "mixpanel_client #{version}"
   rdoc.rdoc_files.include('README*')

data/lib/mixpanel_client/version.rb

@@ -1,3 +1,3 @@
 class MixpanelClient
-  VERSION = '1.0.0'
+  VERSION = '1.0.1'
 end

data/lib/mixpanel_client.rb

@@ -1,2 +1,2 @@
 require "#{File.dirname(__FILE__)}/mixpanel_client/mixpanel_client"
-require "#{File.dirname(__FILE__)}/mixpanel_client/mixpanel_client_uri"
+require "#{File.dirname(__FILE__)}/mixpanel_client/uri"

data/mixpanel_client.gemspec

@@ -19,7 +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_development_dependency('rspec')
-  s.add_development_dependency('webmock')
-  s.add_development_dependency('metric_fu')
+  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')
 end

data/spec/{events_externalspec.rb → mixpanel_client/events_externalspec.rb}

@@ -1,16 +1,15 @@
-require 'rubygems'
-require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 
 WebMock.allow_net_connect!
 
 describe 'External calls to mixpanel' do
   before :all do
-    config = YAML.load_file(File.dirname(__FILE__) + '/../config/mixpanel.yml')
+    config = YAML.load_file(File.dirname(__FILE__) + '/../../config/mixpanel.yml')
     config.should_not be_nil
     @client = MixpanelClient.new(config)
   end
 
-  describe 'Events' do
+  context 'when requesting events' do
     it 'should raise an error for bad requests' do
       data = lambda {
         @client.request do

data/spec/{mixpanel_client_spec.rb → mixpanel_client/mixpanel_client_spec.rb}

@@ -1,6 +1,4 @@
-# coding: utf-8
-require 'rubygems'
-require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 
 describe MixpanelClient do
   before :all do
@@ -9,7 +7,7 @@ describe MixpanelClient do
     @uri = Regexp.escape(MixpanelClient::BASE_URI)
   end
 
-  describe '#request' do
+  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
       stub_request(:get, /^#{@uri}.*/).to_return(:body => '{"legend_size": 0, "data": {"series": [], "values": {}}}')
@@ -19,12 +17,11 @@ describe MixpanelClient do
         :unit     => 'hour',
         :interval =>  24
       })}
-
       data.should raise_error(ArgumentError)
     end
   end
 
-  describe 'block form' do
+  context 'when making a valid request' do
     it 'should work without an endpoint' do
       # Stub Mixpanel request
       stub_request(:get, /^#{@uri}.*/).to_return(:body => '{"legend_size": 0, "data": {"series": [], "values": {}}}')
@@ -67,20 +64,20 @@ describe MixpanelClient do
 
   describe '#hash_args' do
     it 'should return a hashed string alpha sorted by key names.' do
-      args              = {:c => 'see', :a => 'aye', :d => 'dee', :b => 'bee'}
-      args_alpha_sorted = {:a => 'aye', :b => 'bee', :c => 'see', :d => 'dee'}
+      args              = {:c => 'see', :a => 'ey', :d => 'dee', :b => 'bee'}
+      args_alpha_sorted = {:a => 'ey', :b => 'bee', :c => 'see', :d => 'dee'}
       @client.generate_signature(args).should == @client.generate_signature(args_alpha_sorted)
     end
   end
 
   describe '#to_hash' do
     it 'should return a ruby hash given json as a string' do
-      @client.to_hash('{"a" : "aye", "b" : "bee"}').should == {'a' => 'aye', 'b' => 'bee'}
+      @client.to_hash('{"a" : "ey", "b" : "bee"}').should == {'a' => 'ey', 'b' => 'bee'}
     end
   end
 
-  describe 'resetting options' do
-    it 'options should be reset before each request' do
+  context 'when resetting options for each request' do
+    it 'should reset options before each request' do
       # Stub Mixpanel request
       stub_request(:get, /^#{@uri}.*/).to_return(:body => '{"events": [], "type": "general"}')
 
@@ -111,30 +108,3 @@ describe MixpanelClient do
     end
   end
 end
-
-describe MixpanelClient::URI do
-  describe '.mixpanel' do
-    it 'should return a properly formatted mixpanel uri as a string (without an endpoint)' do
-      resource, params  = ['events', {:c => 'see', :a => 'aye'}]
-      MixpanelClient::URI.mixpanel(resource, params).should == 'http://mixpanel.com/api/2.0/events?a=aye&c=see'
-    end
-    it 'should return a properly formatted mixpanel uri as a string (with an endpoint)' do
-      resource, params  = ['events/top', {:c => 'see', :a => 'aye'}]
-      MixpanelClient::URI.mixpanel(resource, params).should == 'http://mixpanel.com/api/2.0/events/top?a=aye&c=see'
-    end
-  end
-
-  describe '.encode' do
-    it 'should return a string with url encoded values.' do
-      params = {:hey => '!@#$%^&*()\/"Ü', :soo => "hëllö?"}
-      MixpanelClient::URI.encode(params).should == 'hey=%21%40%23%24%25%5E%26%2A%28%29%5C%2F%22%C3%9C&soo=h%C3%ABll%C3%B6%3F'
-    end
-  end
-
-  describe '.get' do
-    it 'should return a string response' do
-      stub_request(:get, 'http://example.com').to_return(:body => 'something')
-      MixpanelClient::URI.get('http://example.com').should == 'something'
-    end
-  end
-end

data/spec/mixpanel_client/uri_spec.rb

@@ -0,0 +1,29 @@
+# coding: utf-8
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+
+describe MixpanelClient::URI do
+  describe '.mixpanel' do
+    it 'should return a properly formatted mixpanel uri as a string (without an endpoint)' do
+      resource, params  = ['events', {:c => 'see', :a => 'ey'}]
+      MixpanelClient::URI.mixpanel(resource, params).should == 'http://mixpanel.com/api/2.0/events?a=ey&c=see'
+    end
+    it 'should return a properly formatted mixpanel uri as a string (with an endpoint)' do
+      resource, params  = ['events/top', {:c => 'see', :a => 'ey'}]
+      MixpanelClient::URI.mixpanel(resource, params).should == 'http://mixpanel.com/api/2.0/events/top?a=ey&c=see'
+    end
+  end
+
+  describe '.encode' do
+    it 'should return a string with url encoded values.' do
+      params = {:hey => '!@#$%^&*()\/"Ü', :soo => "hëllö?"}
+      MixpanelClient::URI.encode(params).should == 'hey=%21%40%23%24%25%5E%26%2A%28%29%5C%2F%22%C3%9C&soo=h%C3%ABll%C3%B6%3F'
+    end
+  end
+
+  describe '.get' do
+    it 'should return a string response' do
+      stub_request(:get, 'http://example.com').to_return(:body => 'something')
+      MixpanelClient::URI.get('http://example.com').should == 'something'
+    end
+  end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: mixpanel_client
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: 
   segments: 
   - 1
   - 0
-  - 0
-  version: 1.0.0
+  - 1
+  version: 1.0.1
 platform: ruby
 authors: 
 - Keolo Keagy
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-12 00:00:00 -08:00
+date: 2011-03-14 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -26,10 +26,12 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 27
         segments: 
+        - 2
+        - 5
         - 0
-        version: "0"
+        version: 2.5.0
   type: :development
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -40,10 +42,12 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 11
         segments: 
-        - 0
-        version: "0"
+        - 1
+        - 6
+        - 2
+        version: 1.6.2
   type: :development
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
@@ -54,10 +58,12 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 9
         segments: 
-        - 0
-        version: "0"
+        - 2
+        - 1
+        - 1
+        version: 2.1.1
   type: :development
   version_requirements: *id003
 description: Simple ruby client interface to the Mixpanel API.
@@ -80,11 +86,12 @@ files:
 - config/mixpanel.template.yml
 - lib/mixpanel_client.rb
 - lib/mixpanel_client/mixpanel_client.rb
-- lib/mixpanel_client/mixpanel_client_uri.rb
+- lib/mixpanel_client/uri.rb
 - lib/mixpanel_client/version.rb
 - mixpanel_client.gemspec
-- spec/events_externalspec.rb
-- spec/mixpanel_client_spec.rb
+- spec/mixpanel_client/events_externalspec.rb
+- spec/mixpanel_client/mixpanel_client_spec.rb
+- spec/mixpanel_client/uri_spec.rb
 - spec/spec_helper.rb
 has_rdoc: true
 homepage: http://github.com/keolo/mixpanel_client
@@ -121,6 +128,7 @@ signing_key:
 specification_version: 3
 summary: Ruby Mixpanel API Client Library
 test_files: 
-- spec/events_externalspec.rb
-- spec/mixpanel_client_spec.rb
+- spec/mixpanel_client/events_externalspec.rb
+- spec/mixpanel_client/mixpanel_client_spec.rb
+- spec/mixpanel_client/uri_spec.rb
 - spec/spec_helper.rb