contextio 1.5.0 → 1.6.0

data/spec/unit/contextio/api_spec.rb

@@ -10,6 +10,25 @@ describe ContextIO::API do
     end
   end
 
+  describe "#version" do
+    context "without version change" do
+      subject { ContextIO::API.new(nil, nil) }
+
+      it "uses API version 2.0" do
+        expect(subject.version).to eq('2.0')
+      end
+    end
+
+    context "with version change" do
+      subject { ContextIO::API.new(nil, nil) }
+
+      it "changes the API version used" do
+        subject.version = '1.1'
+        expect(subject.version).to eq('1.1')
+      end
+    end
+  end
+
   describe ".base_url" do
     subject { ContextIO::API }
 
@@ -18,6 +37,25 @@ describe ContextIO::API do
     end
   end
 
+  describe "#base_url" do
+    context "without base_url change" do
+      subject { ContextIO::API.new(nil, nil) }
+
+      it "is https://api.context.io" do
+        expect(subject.base_url).to eq('https://api.context.io')
+      end
+    end
+
+    context "with base_url change" do
+      subject { ContextIO::API.new(nil, nil) }
+
+      it "changes the base_url" do
+        subject.base_url = 'https://api.example.com'
+        expect(subject.base_url).to eq('https://api.example.com')
+      end
+    end
+  end
+
   describe ".new" do
     subject { ContextIO::API.new('test_key', 'test_secret', {a:'b'}) }
 
@@ -35,7 +73,7 @@ describe ContextIO::API do
   end
 
   describe "#path" do
-    context "without params" do
+    context "without params and default version" do
       subject { ContextIO::API.new(nil, nil).path('test_command') }
 
       it "puts the command in the path" do
@@ -43,6 +81,15 @@ describe ContextIO::API do
       end
     end
 
+    context "without params and version change" do
+      subject { ContextIO::API.new(nil, nil) }
+
+      it "puts the command in the path" do
+        subject.version = '2.5'
+        expect(subject.path('test_command')).to eq('/2.5/test_command')
+      end
+    end
+
     context "with params" do
       subject { ContextIO::API.new(nil, nil).path('test_command', foo: 1, bar: %w(a b c)) }
 
@@ -58,6 +105,16 @@ describe ContextIO::API do
         expect(subject).to eq('/2.0/test_command')
       end
     end
+
+    context "with a full URL and version and base_url change" do
+      subject { ContextIO::API.new(nil, nil) }
+
+      it "strips out the command" do
+        subject.version = '2.5'
+        subject.base_url = 'https://api.example.com'
+        expect(subject.path('https://api.example.com/2.5/test_command')).to eq('/2.5/test_command')
+      end
+    end
   end
 
   describe "#request" do
@@ -109,7 +166,7 @@ describe ContextIO::API do
 
   describe ".url_for" do
     it "delegates to ContextIO::API::URLBuilder" do
-      ContextIO::API::URLBuilder.should_receive(:url_for).with('foo')
+      expect(ContextIO::API::URLBuilder).to receive(:url_for).with('foo')
 
       ContextIO::API.url_for('foo')
     end
@@ -119,7 +176,7 @@ describe ContextIO::API do
     subject { ContextIO::API.new('test_key', 'test_secret') }
 
     it "delegates to the class" do
-      ContextIO::API.should_receive(:url_for).with('foo')
+      expect(ContextIO::API).to receive(:url_for).with('foo')
 
       subject.url_for('foo')
     end

data/spec/unit/contextio/connect_token_collection_spec.rb

@@ -8,11 +8,11 @@ describe ContextIO::ConnectTokenCollection do
 
   describe "#create" do
     before do
-      api.stub(:request).with(:post, anything, anything).and_return({ token: '1234' })
+      allow(api).to receive(:request).with(:post, anything, anything).and_return({ token: '1234' })
     end
 
     it "posts to the api" do
-      api.should_receive(:request).with(
+      expect(api).to receive(:request).with(
         :post,
         'url from api',
         hash_including(callback_url: 'http://callback.com')
@@ -22,7 +22,7 @@ describe ContextIO::ConnectTokenCollection do
     end
 
     it "doesn't make any more API calls than it needs to" do
-      api.should_not_receive(:request).with(:get, anything, anything)
+      expect(api).to_not receive(:request).with(:get, anything, anything)
 
       subject.create('http://callback.com')
     end
@@ -32,7 +32,7 @@ describe ContextIO::ConnectTokenCollection do
     end
 
     it "takes an optional service level" do
-      api.should_receive(:request).with(
+      expect(api).to receive(:request).with(
         anything,
         anything,
         hash_including(service_level: 'PRO')
@@ -42,7 +42,7 @@ describe ContextIO::ConnectTokenCollection do
     end
 
     it "takes an optional email" do
-      api.should_receive(:request).with(
+      expect(api).to receive(:request).with(
         anything,
         anything,
         hash_including(email: 'person@email.com')
@@ -52,7 +52,7 @@ describe ContextIO::ConnectTokenCollection do
     end
 
     it "takes an optional first name" do
-      api.should_receive(:request).with(
+      expect(api).to receive(:request).with(
         anything,
         anything,
         hash_including(first_name: 'Bruno')
@@ -62,7 +62,7 @@ describe ContextIO::ConnectTokenCollection do
     end
 
     it "takes an optional last name" do
-      api.should_receive(:request).with(
+      expect(api).to receive(:request).with(
         anything,
         anything,
         hash_including(last_name: 'Morency')

data/spec/unit/contextio/connect_token_spec.rb

@@ -34,7 +34,7 @@ describe ContextIO::ConnectToken do
       subject { ContextIO::ConnectToken.new(api, token: '1234') }
 
       it "uses the input key" do
-        api.should_not_receive(:request)
+        expect(api).to_not receive(:request)
 
         expect(subject.token).to eq('1234')
       end
@@ -44,7 +44,7 @@ describe ContextIO::ConnectToken do
       subject { ContextIO::ConnectToken.new(api, resource_url: 'http://example.com/hitme') }
 
       it "loads it from the API" do
-        api.should_receive(:request).with(
+        expect(api).to receive(:request).with(
           :get,
           'http://example.com/hitme'
         ).and_return({

data/spec/unit/contextio/email_settings_spec.rb

@@ -38,63 +38,63 @@ describe ContextIO::EmailSettings do
 
   describe "#documentation" do
     it "fetches it from the api" do
-      api.should_receive(:request).with(:get, anything, anything).and_return({ 'documentation' => ['foo', 'bar'] })
+      expect(api).to receive(:request).with(:get, anything, anything).and_return({ 'documentation' => ['foo', 'bar'] })
       expect(subject.documentation).to eq(['foo', 'bar'])
     end
   end
 
   describe "#found?" do
     it "fetches it from the api" do
-      api.should_receive(:request).with(:get, anything, anything).and_return({ 'found' => true })
+      expect(api).to receive(:request).with(:get, anything, anything).and_return({ 'found' => true })
       expect(subject).to be_found
     end
   end
 
   describe "#type" do
     it "fetches it from the api" do
-      api.should_receive(:request).with(:get, anything, anything).and_return({ 'type' => 'gmail' })
+      expect(api).to receive(:request).with(:get, anything, anything).and_return({ 'type' => 'gmail' })
       expect(subject.type).to eq('gmail')
     end
   end
 
   describe "#server" do
     it "fetches it from the api" do
-      api.should_receive(:request).with(:get, anything, anything).and_return({ 'imap' => { 'server' => 'imap.gmail.com' }})
+      expect(api).to receive(:request).with(:get, anything, anything).and_return({ 'imap' => { 'server' => 'imap.gmail.com' }})
       expect(subject.server).to eq('imap.gmail.com')
     end
   end
 
   describe "#username" do
     it "fetches it from the api" do
-      api.should_receive(:request).with(:get, anything, anything).and_return({ 'imap' => { 'username' => 'ben' }})
+      expect(api).to receive(:request).with(:get, anything, anything).and_return({ 'imap' => { 'username' => 'ben' }})
       expect(subject.username).to eq('ben')
     end
   end
 
   describe "#port" do
     it "fetches it from the api" do
-      api.should_receive(:request).with(:get, anything, anything).and_return({ 'imap' => { 'port' => 993 }})
+      expect(api).to receive(:request).with(:get, anything, anything).and_return({ 'imap' => { 'port' => 993 }})
       expect(subject.port).to eq(993)
     end
   end
 
   describe "#oauth?" do
     it "fetches it from the api" do
-      api.should_receive(:request).with(:get, anything, anything).and_return({ 'imap' => { 'oauth' => false }})
+      expect(api).to receive(:request).with(:get, anything, anything).and_return({ 'imap' => { 'oauth' => false }})
       expect(subject).to_not be_oauth
     end
   end
 
   describe "#use_ssl?" do
     it "fetches it from the api" do
-      api.should_receive(:request).with(:get, anything, anything).and_return({ 'imap' => { 'use_ssl' => false }})
+      expect(api).to receive(:request).with(:get, anything, anything).and_return({ 'imap' => { 'use_ssl' => false }})
       expect(subject).to_not be_use_ssl
     end
   end
 
   describe "#fetch_attributes" do
     before do
-      api.stub(:request).with(:get, anything, anything).and_return({ 'foo' => 'bar' })
+      allow(api).to receive(:request).with(:get, anything, anything).and_return({ 'foo' => 'bar' })
     end
 
     it "defines a getter if one doesn't already exist" do
@@ -104,7 +104,7 @@ describe ContextIO::EmailSettings do
     end
 
     it "hits the right URL" do
-      api.should_receive(:request).with(:get, 'discovery', 'email' => 'email@email.com', 'source_type' => 'IMAP')
+      expect(api).to receive(:request).with(:get, 'discovery', 'email' => 'email@email.com', 'source_type' => 'IMAP')
 
       subject.send(:fetch_attributes)
     end

data/spec/unit/contextio/oauth_provider_collection_spec.rb

@@ -8,11 +8,11 @@ describe ContextIO::OAuthProviderCollection do
 
   describe "#create" do
     before do
-      api.stub(:request).with(:post, anything, anything).and_return({ provider_consumer_key: 'test_key' })
+      allow(api).to receive(:request).with(:post, anything, anything).and_return({ provider_consumer_key: 'test_key' })
     end
 
     it "posts to the api" do
-      api.should_receive(:request).with(
+      expect(api).to receive(:request).with(
         :post,
         'url from api',
         type: 'GMAIL',
@@ -24,7 +24,7 @@ describe ContextIO::OAuthProviderCollection do
     end
 
     it "doesn't make any more API requests than it needs to" do
-      api.should_receive(:request).exactly(:once)
+      expect(api).to receive(:request).exactly(:once)
 
       subject.create('GMAIL', 'test_key', 'test_secret')
     end

data/spec/unit/contextio/oauth_provider_spec.rb

@@ -42,7 +42,7 @@ describe ContextIO::OAuthProvider do
       subject { ContextIO::OAuthProvider.new(api, provider_consumer_key: '1234') }
 
       it "asks the api for a URL" do
-        api.should_receive(:url_for).with(subject)
+        expect(api).to receive(:url_for).with(subject)
 
         subject.resource_url
       end
@@ -54,7 +54,7 @@ describe ContextIO::OAuthProvider do
       subject { ContextIO::OAuthProvider.new(api, provider_consumer_key: '1234') }
 
       it "uses the input key" do
-        api.should_not_receive(:request)
+        expect(api).to_not receive(:request)
 
         expect(subject.provider_consumer_key).to eq('1234')
       end
@@ -64,7 +64,7 @@ describe ContextIO::OAuthProvider do
       subject { ContextIO::OAuthProvider.new(api, resource_url: 'http://example.com/hitme') }
 
       it "loads it from the API" do
-        api.should_receive(:request).with(
+        expect(api).to receive(:request).with(
           :get,
           'http://example.com/hitme'
         ).and_return({
@@ -81,7 +81,7 @@ describe ContextIO::OAuthProvider do
       subject { ContextIO::OAuthProvider.new(api, provider_consumer_key: '1234', provider_consumer_secret: '0987') }
 
       it "uses the input provider_consumer_secret" do
-        api.should_not_receive(:request)
+        expect(api).to_not receive(:request)
 
         expect(subject.provider_consumer_secret).to eq('0987')
       end
@@ -91,7 +91,7 @@ describe ContextIO::OAuthProvider do
       subject { ContextIO::OAuthProvider.new(api, provider_consumer_key: '1234') }
 
       it "loads it from the API" do
-        api.should_receive(:request).with(:get, anything).and_return({ 'provider_consumer_secret' => '1029' })
+        expect(api).to receive(:request).with(:get, anything).and_return({ 'provider_consumer_secret' => '1029' })
         expect(subject.provider_consumer_secret).to eq('1029')
       end
     end
@@ -102,7 +102,7 @@ describe ContextIO::OAuthProvider do
       subject { ContextIO::OAuthProvider.new(api, provider_consumer_key: '1234', type: 'GMAIL') }
 
       it "uses the input type" do
-        api.should_not_receive(:request)
+        expect(api).to_not receive(:request)
 
         expect(subject.type).to eq('GMAIL')
       end
@@ -112,7 +112,7 @@ describe ContextIO::OAuthProvider do
       subject { ContextIO::OAuthProvider.new(api, provider_consumer_key: '1234') }
 
       it "loads it from the API" do
-        api.should_receive(:request).with(:get, anything).and_return({ 'type' => 'GOOGLEAPPSMARKETPLACE' })
+        expect(api).to receive(:request).with(:get, anything).and_return({ 'type' => 'GOOGLEAPPSMARKETPLACE' })
         expect(subject.type).to eq('GOOGLEAPPSMARKETPLACE')
       end
     end

data/spec/unit/contextio/source_collection_spec.rb

@@ -8,14 +8,14 @@ describe ContextIO::SourceCollection do
 
   describe "#create" do
     before do
-      api.stub(:request).with(:post, anything, anything).and_return(
+      allow(api).to receive(:request).with(:post, anything, anything).and_return(
         'success'      => true,
         'resource_url' => 'resource_url'
       )
     end
 
     it "posts to the api" do
-      api.should_receive(:request).with(
+      expect(api).to receive(:request).with(
         :post,
         'url from api',
         anything
@@ -25,27 +25,27 @@ describe ContextIO::SourceCollection do
     end
 
     it "converts boolean to number string for ssl" do
-      api.should_receive(:request).with(
+      expect(api).to receive(:request).with(
         anything,
         anything,
-        hash_including('use_ssl' => '1')
+        hash_including(:use_ssl => '1')
       )
 
       subject.create('hello@gmail.com', 'imap.email.com', 'hello', true, 993, 'IMAP')
     end
 
     it "converts integer to number string for port" do
-      api.should_receive(:request).with(
+      expect(api).to receive(:request).with(
         anything,
         anything,
-        hash_including('port' => '993')
+        hash_including(:port => '993')
       )
 
       subject.create('hello@gmail.com', 'imap.email.com', 'hello', true, 993, 'IMAP')
     end
 
     it "doesn't make any more API calls than it needs to" do
-      api.should_not_receive(:request).with(:get, anything, anything)
+      expect(api).to_not receive(:request).with(:get, anything, anything)
 
       subject.create('hello@gmail.com', 'imap.email.com', 'hello', true, 993, 'IMAP')
     end

data/spec/unit/contextio/source_spec.rb

@@ -22,13 +22,13 @@ describe ContextIO::Source do
 
   describe "#update" do
     before do
-      api.stub(:request).and_return({'success' => true})
+      allow(api).to receive(:request).and_return({'success' => true})
     end
 
     subject { ContextIO::Source.new(api, resource_url: 'resource_url', sync_period: '1h') }
 
     it "posts to the api" do
-      api.should_receive(:request).with(
+      expect(api).to receive(:request).with(
         :post,
         'resource_url',
         sync_period: '4h'
@@ -44,21 +44,27 @@ describe ContextIO::Source do
     end
 
     it "doesn't make any more API calls than it needs to" do
-      api.should_not_receive(:request).with(:get, anything, anything)
+      expect(api).to_not receive(:request).with(:get, anything, anything)
 
       subject.update(sync_period: '4h')
     end
+
+    it "allows you to send arbitrary arguments to the API" do
+      expect(api).to receive(:request).with(:post, anything, {foo: 'bar'})
+
+      subject.update(foo: 'bar')
+    end
   end
 
   describe ".sync!" do
     before do
-      api.stub(:request).and_return({'success' => true})
+      allow(api).to receive(:request).and_return({'success' => true})
     end
 
     subject { ContextIO::Source.new(api, resource_url: 'resource_url', sync_period: '1h') }
 
     it "syncs to the api" do
-      api.should_receive(:request).with(
+      expect(api).to receive(:request).with(
         :post,
         'resource_url/sync',
         {}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: contextio
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.6.0
 platform: ruby
 authors:
 - Ben Hamill
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-10 00:00:00.000000000 Z
+date: 2013-08-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oauth
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.4'
+        version: '2.14'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.4'
+        version: '2.14'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement