contextio 1.5.0 → 1.6.0

data/lib/contextio/message.rb

@@ -10,11 +10,12 @@ class ContextIO
     belongs_to :account
     has_many :sources
     has_many :body_parts
+    has_many :files
 
     lazy_attributes :date, :folders, :addresses, :subject, :list_help,
                     :list_unsubscribe, :message_id, :email_message_id,
                     :gmail_message_id, :gmail_thread_id, :person_info,
-                    :date_received, :date_indexed
+                    :date_received, :date_indexed, :in_reply_to
     private :date_received, :date_indexed
 
     def received_at

data/lib/contextio/source.rb

@@ -27,16 +27,6 @@ class ContextIO
     #   provider_token_secret, provider_consumer_key. See the Context.IO docs
     #   for more details on these fields.
     def update(options={})
-      updatable_attrs = %w(status sync_period service_level password
-                           provider_token provider_token_secret
-                           provider_consumer_key)
-
-      options.keep_if do |key, value|
-        updatable_attrs.include?(key.to_s)
-      end
-
-      return nil if options.empty?
-
       it_worked = api.request(:post, resource_url, options)['success']
 
       if it_worked

data/lib/contextio/source_collection.rb

@@ -24,12 +24,12 @@ class ContextIO
     #   required and what's optional.
     def create(email, server, username, use_ssl, port, type, options={})
       api_args = options.merge(
-        'email' => email,
-        'server' => server,
-        'username' => username,
-        'use_ssl' => use_ssl ? '1' : '0',
-        'port' => port.to_s,
-        'type' => type
+        :email => email,
+        :server => server,
+        :username => username,
+        :use_ssl => use_ssl ? '1' : '0',
+        :port => port.to_s,
+        :type => type
       )
 
       result_hash = api.request(:post, resource_url, api_args)

data/lib/contextio/version.rb

@@ -1,6 +1,6 @@
 class ContextIO
   # @private
-  VERSION = "1.5.0"
+  VERSION = "1.6.0"
 
   # The gem version.
   #

data/spec/spec_helper.rb

@@ -12,6 +12,10 @@ RSpec.configure do |rspec|
   rspec.expect_with :rspec do |expectations|
     expectations.syntax = :expect
   end
+
+  rspec.mock_with :rspec do |mocks|
+    mocks.syntax = :expect
+  end
 end
 
 FakeWeb.allow_net_connect = false

data/spec/unit/contextio/account_collection_spec.rb

@@ -8,7 +8,7 @@ describe ContextIO::AccountCollection 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,
         'id'           => '1234',
         'resource_url' => 'resource_url'
@@ -21,7 +21,7 @@ describe ContextIO::AccountCollection do
       end
 
       it "posts to the api" do
-        api.should_receive(:request).with(
+        expect(api).to receive(:request).with(
           :post,
           'url from api',
           hash_including(email: 'hello@email.com')
@@ -31,7 +31,7 @@ describe ContextIO::AccountCollection 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(email: 'hello@email.com')
       end
@@ -41,7 +41,7 @@ describe ContextIO::AccountCollection 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')
@@ -51,7 +51,7 @@ describe ContextIO::AccountCollection 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')
@@ -65,11 +65,11 @@ describe ContextIO::AccountCollection do
       subject { ContextIO::AccountCollection.new(api).where(email: 'hello@email.com')}
 
       it "allows a missing email address" do
-        expect { subject.create(first_name: 'Bruno') }.to_not raise_error(ArgumentError)
+        expect { subject.create(first_name: 'Bruno') }.to_not raise_error
       end
 
       it "uses the email address from the where constraints" do
-        api.should_receive(:request).with(anything, anything, hash_including(email: 'hello@email.com'))
+        expect(api).to receive(:request).with(anything, anything, hash_including(email: 'hello@email.com'))
 
         subject.create(first_name: 'Bruno')
       end

data/spec/unit/contextio/account_spec.rb

@@ -22,13 +22,13 @@ describe ContextIO::Account 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::Account.new(api, id: '1234', first_name: 'old first name') }
 
     it "posts to the api" do
-      api.should_receive(:request).with(
+      expect(api).to receive(:request).with(
         :post,
         'url from api',
         first_name: 'new first name'
@@ -44,7 +44,7 @@ describe ContextIO::Account 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(first_name: 'new first name')
     end

data/spec/unit/contextio/api/resource_collection_spec.rb

@@ -88,7 +88,7 @@ describe ContextIO::API::ResourceCollection do
     end
 
     it "limits the scope of subsequent #each calls" do
-      api.should_receive(:request).with(anything, anything, foo: 'bar').and_return([])
+      expect(api).to receive(:request).with(anything, anything, foo: 'bar').and_return([])
 
       subject.where(foo: 'bar').each { }
     end
@@ -129,7 +129,7 @@ describe ContextIO::API::ResourceCollection do
       end
 
       before do
-        api.stub(:request).and_return([{key: 'value 1'}, {key: 'value 2'}])
+        allow(api).to receive(:request).and_return([{key: 'value 1'}, {key: 'value 2'}])
       end
 
       it "yields instances of the singular resource class" do
@@ -139,20 +139,20 @@ describe ContextIO::API::ResourceCollection do
       end
 
       it "gets attributes for the resources from the api" do
-        api.should_receive(:request).exactly(:once).with(:get, 'url from api', {})
+        expect(api).to receive(:request).exactly(:once).with(:get, 'url from api', {})
 
         subject.each { }
       end
 
       it "passes the api to the singular resource instances" do
-        SingularHelper.should_receive(:new).exactly(:twice).with(api, anything)
+        expect(SingularHelper).to receive(:new).exactly(:twice).with(api, anything)
 
         subject.each { }
       end
 
       it "passes attributes to the singular resource instances" do
-        SingularHelper.should_receive(:new).exactly(:once).with(anything, key: 'value 1')
-        SingularHelper.should_receive(:new).exactly(:once).with(anything, key: 'value 2')
+        expect(SingularHelper).to receive(:new).exactly(:once).with(anything, key: 'value 1')
+        expect(SingularHelper).to receive(:new).exactly(:once).with(anything, key: 'value 2')
 
         subject.each { }
       end
@@ -175,7 +175,7 @@ describe ContextIO::API::ResourceCollection do
         end
 
         it "passes the belonged-to resource to the singular resource instances" do
-          SingularHelper.should_receive(:new).exactly(:twice).with(
+          expect(SingularHelper).to receive(:new).exactly(:twice).with(
             anything,
             hash_including(owner: owner)
           )
@@ -197,20 +197,20 @@ describe ContextIO::API::ResourceCollection do
       end
 
       it "doesn't hit the API" do
-        api.should_not_receive(:request)
+        expect(api).to_not receive(:request)
 
         subject.each { }
       end
 
       it "passes the api to the singular resource instances" do
-        SingularHelper.should_receive(:new).exactly(:twice).with(api, anything)
+        expect(SingularHelper).to receive(:new).exactly(:twice).with(api, anything)
 
         subject.each { }
       end
 
       it "passes attributes to the singular resource instances" do
-        SingularHelper.should_receive(:new).exactly(:once).with(anything, foo: 'bar')
-        SingularHelper.should_receive(:new).exactly(:once).with(anything, foo: 'baz')
+        expect(SingularHelper).to receive(:new).exactly(:once).with(anything, foo: 'bar')
+        expect(SingularHelper).to receive(:new).exactly(:once).with(anything, foo: 'baz')
 
         subject.each { }
       end
@@ -237,7 +237,7 @@ describe ContextIO::API::ResourceCollection do
         end
 
         it "passes the belonged-to resource to the singular resource instances" do
-          SingularHelper.should_receive(:new).exactly(:twice).with(
+          expect(SingularHelper).to receive(:new).exactly(:twice).with(
             anything,
             hash_including(owner: owner)
           )
@@ -266,19 +266,19 @@ describe ContextIO::API::ResourceCollection do
     end
 
     it "feeds the given key to the resource class" do
-      SingularHelper.should_receive(:new).with(anything, 'token' => 1234)
+      expect(SingularHelper).to receive(:new).with(anything, 'token' => 1234)
 
       subject[1234]
     end
 
     it "feeds the api to the resource class" do
-      SingularHelper.should_receive(:new).with(api, anything)
+      expect(SingularHelper).to receive(:new).with(api, anything)
 
       subject[1234]
     end
 
     it "doesn't hit the API" do
-      api.should_not_receive(:request)
+      expect(api).to_not receive(:request)
 
       subject[1234]
     end
@@ -294,7 +294,7 @@ describe ContextIO::API::ResourceCollection do
       end
 
       it "doesn't pass a nil association to the resouce class" do
-        SingularHelper.should_receive(:new).with(api, 'token' => 1234)
+        expect(SingularHelper).to receive(:new).with(api, 'token' => 1234)
 
         subject[1234]
       end

data/spec/unit/contextio/api/resource_spec.rb

@@ -122,7 +122,7 @@ describe ContextIO::API::Resource do
       end
 
       it "doesn't try to fetch from the API" do
-        subject.should_not_receive(:fetch_attributes)
+        expect(subject).to_not receive(:fetch_attributes)
 
         subject.foo
       end
@@ -134,7 +134,7 @@ describe ContextIO::API::Resource do
 
     context "when the attributes is not set at creation" do
       it "tries to fetch from the API" do
-        api.should_receive(:request).with(:get, 'resource_url').
+        expect(api).to receive(:request).with(:get, 'resource_url').
           and_return({'foo' => 'set from API', 'longer-name' => 'bar'})
 
         subject.foo
@@ -164,7 +164,7 @@ describe ContextIO::API::Resource do
         subject { helper_class.new(api, resource_url: 'resource_url') }
 
         before do
-          api.stub(:request).and_return(
+          allow(api).to receive(:request).and_return(
             {
               'resource' => {
                 'resource_url' => 'relation_url'
@@ -178,7 +178,7 @@ describe ContextIO::API::Resource do
         end
 
         it "passes keys from the api response to the new object" do
-          Resource.should_receive(:new).with(api, 'resource_url' => 'relation_url')
+          expect(Resource).to receive(:new).with(api, 'resource_url' => 'relation_url')
 
           subject.resource
         end
@@ -192,7 +192,7 @@ describe ContextIO::API::Resource do
         subject { helper_class.new(api, resource_url: 'resource_url') }
 
         before do
-          api.stub(:request).and_return({ })
+          allow(api).to receive(:request).and_return({ })
         end
 
         it "makes the resource nil" do
@@ -204,7 +204,7 @@ describe ContextIO::API::Resource do
         subject { helper_class.new(api, resource_url: 'resource_url') }
 
         before do
-          api.stub(:request).and_return(
+          allow(api).to receive(:request).and_return(
             {
               'resource' => { }
             }
@@ -220,7 +220,7 @@ describe ContextIO::API::Resource do
         subject { helper_class.new(api, resource_url: 'resource_url') }
 
         before do
-          api.stub(:request).and_return(
+          allow(api).to receive(:request).and_return(
             {
               'resource' => [ ]
             }
@@ -243,7 +243,7 @@ describe ContextIO::API::Resource do
       end
 
       it "doesn't make any API calls" do
-        api.should_not_receive(:request)
+        expect(api).to_not receive(:request)
 
         subject.resource
       end
@@ -265,7 +265,7 @@ describe ContextIO::API::Resource do
         subject { helper_class.new(api, resource_url: 'resource_url') }
 
         before do
-          api.stub(:request).and_return(
+          allow(api).to receive(:request).and_return(
             {
               'resources' => [{
                 'resource_url' => 'relation_url'
@@ -279,7 +279,7 @@ describe ContextIO::API::Resource do
         end
 
         it "passes keys from the api response to the new object" do
-          ResourceCollection.should_receive(:new).with(api, hash_including(attribute_hashes: [{'resource_url' => 'relation_url'}]))
+          expect(ResourceCollection).to receive(:new).with(api, hash_including(attribute_hashes: [{'resource_url' => 'relation_url'}]))
 
           subject.resources
         end
@@ -289,7 +289,7 @@ describe ContextIO::API::Resource do
         end
 
         it "passes its self to the new collection" do
-          ResourceCollection.should_receive(:new).with(anything, hash_including(:helper_class => subject))
+          expect(ResourceCollection).to receive(:new).with(anything, hash_including(:helper_class => subject))
 
           subject.resources
         end
@@ -299,11 +299,11 @@ describe ContextIO::API::Resource do
         subject { helper_class.new(api, resource_url: 'resource_url') }
 
         before do
-          api.stub(:request).and_return({ 'foo' => 'bar' })
+          allow(api).to receive(:request).and_return({ 'foo' => 'bar' })
         end
 
         it "tries the API only once" do
-          api.should_receive(:request).exactly(:once).and_return({ 'foo' => 'bar' })
+          expect(api).to receive(:request).exactly(:once).and_return({ 'foo' => 'bar' })
 
           subject.resources
           subject.resources
@@ -314,7 +314,7 @@ describe ContextIO::API::Resource do
         end
 
         it "passes its self to the new collection" do
-          ResourceCollection.should_receive(:new).with(anything, hash_including(:helper_class => subject))
+          expect(ResourceCollection).to receive(:new).with(anything, hash_including(:helper_class => subject))
 
           subject.resources
         end
@@ -331,7 +331,7 @@ describe ContextIO::API::Resource do
       end
 
       it "doesn't make any API calls" do
-        api.should_not_receive(:request)
+        expect(api).to_not receive(:request)
 
         subject.resources
       end
@@ -350,13 +350,13 @@ describe ContextIO::API::Resource do
     end
 
     it "makes a request to the API" do
-      subject.api.should_receive(:request).with(:get, 'resource_url').and_return({})
+      expect(subject.api).to receive(:request).with(:get, 'resource_url').and_return({})
 
       subject.send(:fetch_attributes)
     end
 
     it "defines getter methods for new attributes returned" do
-      subject.api.stub(:request).and_return(foo: 'bar')
+      allow(subject.api).to receive(:request).and_return(foo: 'bar')
 
       subject.send(:fetch_attributes)
 
@@ -368,7 +368,7 @@ describe ContextIO::API::Resource do
         'hard coded value'
       end
 
-      subject.api.stub(:request).and_return(foo: 'bar')
+      allow(subject.api).to receive(:request).and_return(foo: 'bar')
 
       subject.send(:fetch_attributes)
 
@@ -376,7 +376,7 @@ describe ContextIO::API::Resource do
     end
 
     it "stores the response hash" do
-      subject.api.stub(:request).and_return('foo' => 'bar')
+      allow(subject.api).to receive(:request).and_return('foo' => 'bar')
 
       subject.send(:fetch_attributes)
 
@@ -400,7 +400,7 @@ describe ContextIO::API::Resource do
     end
 
     it "hits the API only on first call" do
-      api.should_receive(:request).exactly(:once)
+      expect(api).to receive(:request).exactly(:once)
 
       subject.api_attributes
       subject.api_attributes
@@ -436,7 +436,7 @@ describe ContextIO::API::Resource do
       end
 
       it "delegates URL construction to the api" do
-        api.should_receive(:url_for).with(subject).and_return('helpers/33f1')
+        expect(api).to receive(:url_for).with(subject).and_return('helpers/33f1')
 
         expect(subject.resource_url).to eq('helpers/33f1')
       end
@@ -455,7 +455,7 @@ describe ContextIO::API::Resource do
     end
 
     it "makes a request to the API" do
-      subject.api.should_receive(:request).with(:delete, 'resource_url')
+      expect(subject.api).to receive(:request).with(:delete, 'resource_url')
 
       subject.delete
     end