restforce 1.5.3 → 2.0.0

data/lib/restforce/middleware/authentication/password.rb

@@ -1,20 +1,16 @@
 module Restforce
-
   # Authentication middleware used if username and password flow is used
   class Middleware::Authentication::Password < Restforce::Middleware::Authentication
-
     def params
-      { :grant_type    => 'password',
-        :client_id     => @options[:client_id],
-        :client_secret => @options[:client_secret],
-        :username      => @options[:username],
-        :password      => password }
+      { grant_type: 'password',
+        client_id: @options[:client_id],
+        client_secret: @options[:client_secret],
+        username: @options[:username],
+        password: password }
     end
 
     def password
       "#{@options[:password]}#{@options[:security_token]}"
     end
-  
   end
-
 end

data/lib/restforce/middleware/authentication/token.rb

@@ -1,15 +1,11 @@
 module Restforce
-
   # Authentication middleware used if oauth_token and refresh_token are set
   class Middleware::Authentication::Token < Restforce::Middleware::Authentication
-
     def params
-      { :grant_type    => 'refresh_token',
-        :refresh_token => @options[:refresh_token],
-        :client_id     => @options[:client_id],
-        :client_secret => @options[:client_secret] }
+      { grant_type: 'refresh_token',
+        refresh_token: @options[:refresh_token],
+        client_id: @options[:client_id],
+        client_secret: @options[:client_secret] }
     end
-  
   end
-
 end

data/lib/restforce/middleware/authorization.rb

@@ -1,5 +1,4 @@
 module Restforce
-
   # Piece of middleware that simply injects the OAuth token into the request
   # headers.
   class Middleware::Authorization < Restforce::Middleware
@@ -13,7 +12,5 @@ module Restforce
     def token
       @options[:oauth_token]
     end
-  
   end
-
 end

data/lib/restforce/middleware/caching.rb

@@ -1,6 +1,5 @@
 module Restforce
   class Middleware::Caching < FaradayMiddleware::Caching
-
     def call(env)
       expire(cache_key(env)) unless use_cache?
       super
@@ -13,12 +12,13 @@ module Restforce
     # We don't want to cache requests for different clients, so append the
     # oauth token to the cache key.
     def cache_key(env)
-      super(env) + env[:request_headers][Restforce::Middleware::Authorization::AUTH_HEADER].gsub(/\s/, '')
+      super(env) +
+        env[:request_headers][Restforce::Middleware::Authorization::AUTH_HEADER].
+          gsub(/\s/, '')
     end
 
     def use_cache?
-      !@options.has_key?(:use_cache) || @options[:use_cache]
+      !@options.key?(:use_cache) || @options[:use_cache]
     end
-
   end
 end

data/lib/restforce/middleware/instance_url.rb

@@ -1,18 +1,16 @@
 module Restforce
-
   # Middleware which asserts that the instance_url is always set
   class Middleware::InstanceURL < Restforce::Middleware
-
     def call(env)
       # If the connection url_prefix isn't set, we must not be authenticated.
-      raise Restforce::UnauthorizedError, 'Connection prefix not set' unless url_prefix_set?
+      raise Restforce::UnauthorizedError,
+            'Connection prefix not set' unless url_prefix_set?
+
       @app.call(env)
     end
 
     def url_prefix_set?
       !!(connection.url_prefix && connection.url_prefix.host)
     end
-  
   end
-
 end

data/lib/restforce/middleware/logger.rb

@@ -17,19 +17,19 @@ module Restforce
 
     def call(env)
       debug('request') do
-        dump :url => env[:url].to_s,
-          :method => env[:method],
-          :headers => env[:request_headers],
-          :body => env[:body]
+        dump url: env[:url].to_s,
+          method: env[:method],
+          headers: env[:request_headers],
+          body: env[:body]
       end
       super
     end
 
     def on_complete(env)
       debug('response') do
-        dump :status => env[:status].to_s,
-          :headers => env[:response_headers],
-          :body => env[:body]
+        dump status: env[:status].to_s,
+          headers: env[:response_headers],
+          body: env[:body]
       end
     end
 

data/lib/restforce/middleware/mashify.rb

@@ -2,10 +2,9 @@ module Restforce
   # Middleware the converts sobject records from JSON into Restforce::SObject objects
   # and collections of records into Restforce::Collection objects.
   class Middleware::Mashify < Restforce::Middleware
-
     def call(env)
-      @app.call(env).on_complete do |env|
-        env[:body] = Restforce::Mash.build(env[:body], client)
+      @app.call(env).on_complete do |completed_env|
+        completed_env[:body] = Restforce::Mash.build(completed_env[:body], client)
       end
     end
   end

data/lib/restforce/middleware/multipart.rb

@@ -2,7 +2,7 @@ module Restforce
   class Middleware::Multipart < Faraday::Request::UrlEncoded
     self.mime_type = 'multipart/form-data'.freeze
     DEFAULT_BOUNDARY  = "--boundary_string".freeze
-    JSON_CONTENT_TYPE = {"Content-Type" => "application/json"}
+    JSON_CONTENT_TYPE = { "Content-Type" => "application/json" }
 
     def call(env)
       match_content_type(env) do |params|
@@ -16,8 +16,8 @@ module Restforce
 
     def process_request?(env)
       type = request_type(env)
-      env[:body].respond_to?(:each_key) and !env[:body].empty? and (
-        (type.empty? and has_multipart?(env[:body])) or
+      env[:body].respond_to?(:each_key) && !env[:body].empty? && (
+        (type.empty? && has_multipart?(env[:body])) ||
         type == self.class.mime_type
       )
     end
@@ -26,7 +26,7 @@ module Restforce
       # string is an enum in 1.8, returning list of itself
       if obj.respond_to?(:each) && !obj.is_a?(String)
         (obj.respond_to?(:values) ? obj.values : obj).each do |val|
-          return true if (val.respond_to?(:content_type) || has_multipart?(val))
+          return true if val.respond_to?(:content_type) || has_multipart?(val)
         end
       end
       false
@@ -37,18 +37,25 @@ module Restforce
       parts = []
 
       # Fields
-      parts << Faraday::Parts::Part.new(boundary, 'entity_content', params.reject { |k,v| v.respond_to? :content_type }.to_json, JSON_CONTENT_TYPE)
+      parts << Faraday::Parts::Part.new(
+        boundary,
+        'entity_content',
+        params.reject { |k, v| v.respond_to? :content_type }.to_json,
+        JSON_CONTENT_TYPE
+      )
 
       # Files
-      params.each do |k,v|
-        parts << Faraday::Parts::Part.new(boundary, k.to_s, v) if v.respond_to? :content_type
+      params.each do |k, v|
+        parts << Faraday::Parts::Part.new(boundary,
+                                          k.to_s,
+                                          v) if v.respond_to? :content_type
       end
 
       parts << Faraday::Parts::EpiloguePart.new(boundary)
 
       body = Faraday::CompositeReadIO.new(parts)
       env[:request_headers]['Content-Length'] = body.length.to_s
-      return body
+      body
     end
   end
 end

data/lib/restforce/middleware/raise_error.rb

@@ -8,7 +8,8 @@ module Restforce
       when 401
         raise Restforce::UnauthorizedError, message
       when 413
-        raise Faraday::Error::ClientError.new("HTTP 413 - Request Entity Too Large", env[:response])
+        raise Faraday::Error::ClientError.new("HTTP 413 - Request Entity Too Large",
+                                              env[:response])
       when 400...600
         raise Faraday::Error::ClientError.new(message, env[:response])
       end

data/lib/restforce/patches/parts.rb

@@ -1,6 +1,5 @@
 module Faraday
   module Parts
-
     module Part
       def self.new(boundary, name, value, headers = {})
         headers ||= {}
@@ -21,8 +20,8 @@ module Faraday
       def build_part(boundary, name, value, headers = {})
         part = ''
         part << "--#{boundary}\r\n"
-        part << "Content-Disposition: form-data; name=\"#{name.to_s}\"\r\n"
-        part << "Content-Type: #{headers["Content-Type"]}\r\n" if headers["Content-Type"]
+        part << "Content-Disposition: form-data; name=\"#{name}\"\r\n"
+        part << "Content-Type: #{headers['Content-Type']}\r\n" if headers["Content-Type"]
         part << "\r\n"
         part << "#{value}\r\n"
       end

data/lib/restforce/signed_request.rb

@@ -28,7 +28,8 @@ module Restforce
       JSON.parse(Base64.decode64(payload))
     end
 
-  private
+    private
+
     attr_reader :client_secret, :signature, :payload
 
     def split_components(signed_request)
@@ -51,6 +52,5 @@ module Restforce
         OpenSSL::Digest
       end
     end
-
   end
 end

data/lib/restforce/sobject.rb

@@ -1,6 +1,5 @@
 module Restforce
   class SObject < Restforce::Mash
-
     def sobject_type
       self.attributes['type']
     end
@@ -58,12 +57,11 @@ module Restforce
       self.Id
     end
 
-  private
+    private
 
     def ensure_id
       return true if self.Id?
       raise ArgumentError, 'You need to query the Id for the record first.'
     end
-
   end
 end

data/lib/restforce/tooling/client.rb

@@ -1,13 +1,11 @@
 module Restforce
   module Tooling
     class Client < AbstractClient
-
       private
 
         def api_path(path)
           super("tooling/#{path}")
         end
-
     end
   end
-end
+end

data/lib/restforce/upload_io.rb

@@ -4,6 +4,4 @@ module Restforce
   UploadIO = Faraday::UploadIO
 end
 
-unless Parts::Part.method(:new).arity.abs == 4
-  require 'restforce/patches/parts'
-end
+require 'restforce/patches/parts' unless Parts::Part.method(:new).arity.abs == 4

data/lib/restforce/version.rb

@@ -1,3 +1,3 @@
 module Restforce
-  VERSION = '1.5.3'
+  VERSION = '2.0.0'
 end

data/restforce.gemspec

@@ -2,10 +2,10 @@
 require File.expand_path('../lib/restforce/version', __FILE__)
 
 Gem::Specification.new do |gem|
-  gem.authors       = ["Eric J. Holmes"]
-  gem.email         = ["eric@ejholmes.net"]
-  gem.description   = %q{A lightweight ruby client for the Salesforce REST api.}
-  gem.summary       = %q{A lightweight ruby client for the Salesforce REST api.}
+  gem.authors       = ["Eric J. Holmes", "Tim Rogers"]
+  gem.email         = ["eric@ejholmes.net", "tim@gocardless.com"]
+  gem.description   = %q{A lightweight ruby client for the Salesforce REST API.}
+  gem.summary       = %q{A lightweight ruby client for the Salesforce REST API.}
   gem.homepage      = "https://github.com/ejholmes/restforce"
 
   gem.files         = `git ls-files`.split($\)
@@ -15,6 +15,8 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
   gem.version       = Restforce::VERSION
 
+  gem.required_ruby_version = '>= 1.9.3'
+
   gem.add_dependency 'faraday', '~> 0.9.0'
   gem.add_dependency 'faraday_middleware', '>= 0.8.8'
   gem.add_dependency 'json', ['>= 1.7.5', '< 1.9.0']
@@ -23,5 +25,6 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency 'rspec', '~> 2.14.0'
   gem.add_development_dependency 'webmock', '~> 1.13.0'
   gem.add_development_dependency 'simplecov', '~> 0.7.1'
+  gem.add_development_dependency 'rubocop', '~> 0.31.0'
   gem.add_development_dependency 'faye' unless RUBY_PLATFORM == 'java'
 end

data/spec/integration/abstract_client_spec.rb

@@ -1,9 +1,8 @@
 require 'spec_helper'
 
 shared_examples_for Restforce::AbstractClient do
-
   describe '.list_sobjects' do
-    requests :sobjects, :fixture => 'sobject/describe_sobjects_success_response'
+    requests :sobjects, fixture: 'sobject/describe_sobjects_success_response'
 
     subject { client.list_sobjects }
     it { should be_an Array }
@@ -12,14 +11,15 @@ shared_examples_for Restforce::AbstractClient do
 
   describe '.describe' do
     context 'with no arguments' do
-      requests :sobjects, :fixture => 'sobject/describe_sobjects_success_response'
+      requests :sobjects, fixture: 'sobject/describe_sobjects_success_response'
 
       subject { client.describe }
       it { should be_an Array }
     end
 
     context 'with an argument' do
-      requests 'sobjects/Whizbang/describe', :fixture => 'sobject/sobject_describe_success_response'
+      requests 'sobjects/Whizbang/describe',
+               fixture: 'sobject/sobject_describe_success_response'
 
       subject { client.describe('Whizbang') }
       its(['name']) { should eq 'Whizbang' }
@@ -27,14 +27,15 @@ shared_examples_for Restforce::AbstractClient do
   end
 
   describe '.query' do
-    requests 'query\?q=SELECT%20some,%20fields%20FROM%20object', :fixture => 'sobject/query_success_response'
+    requests 'query\?q=SELECT%20some,%20fields%20FROM%20object',
+             fixture: 'sobject/query_success_response'
 
     subject { client.query('SELECT some, fields FROM object') }
     it { should be_an Enumerable }
   end
 
   describe '.search' do
-    requests 'search\?q=FIND%20%7Bbar%7D', :fixture => 'sobject/search_success_response'
+    requests 'search\?q=FIND%20%7Bbar%7D', fixture: 'sobject/search_success_response'
 
     subject { client.search('FIND {bar}') }
     it { should be_an Array }
@@ -42,7 +43,8 @@ shared_examples_for Restforce::AbstractClient do
   end
 
   describe '.org_id' do
-    requests 'query\?q=select%20id%20from%20Organization', :fixture => 'sobject/org_query_response'
+    requests 'query\?q=select%20id%20from%20Organization',
+             fixture: 'sobject/org_query_response'
 
     subject { client.org_id }
     it { should eq '00Dx0000000BV7z' }
@@ -51,21 +53,30 @@ shared_examples_for Restforce::AbstractClient do
   describe '.create' do
     context 'without multipart' do
       requests 'sobjects/Account',
-        :method => :post,
-        :with_body => "{\"Name\":\"Foobar\"}",
-        :fixture => 'sobject/create_success_response'
+               method: :post,
+               with_body: "{\"Name\":\"Foobar\"}",
+               fixture: 'sobject/create_success_response'
 
-      subject { client.create('Account', :Name => 'Foobar') }
+      subject { client.create('Account', Name: 'Foobar') }
       it { should eq 'some_id' }
     end
 
     context 'with multipart' do
+      # rubocop:disable Metrics/LineLength
       requests 'sobjects/Account',
-        :method => :post,
-        :with_body => %r(----boundary_string\r\nContent-Disposition: form-data; name=\"entity_content\"\r\nContent-Type: application/json\r\n\r\n{\"Name\":\"Foobar\"}\r\n----boundary_string\r\nContent-Disposition: form-data; name=\"Blob\"; filename=\"blob.jpg\"\r\nContent-Length: 42171\r\nContent-Type: image/jpeg\r\nContent-Transfer-Encoding: binary),
-        :fixture => 'sobject/create_success_response'
+               method: :post,
+               with_body: %r(----boundary_string\r\nContent-Disposition: form-data; name=\"entity_content\"\r\nContent-Type: application/json\r\n\r\n{\"Name\":\"Foobar\"}\r\n----boundary_string\r\nContent-Disposition: form-data; name=\"Blob\"; filename=\"blob.jpg\"\r\nContent-Length: 42171\r\nContent-Type: image/jpeg\r\nContent-Transfer-Encoding: binary),
+               fixture: 'sobject/create_success_response'
+      # rubocop:enable Metrics/LineLength
+
+      subject do
+        client.create('Account', Name: 'Foobar',
+                                 Blob: Restforce::UploadIO.new(
+                                   File.expand_path('../../fixtures/blob.jpg', __FILE__),
+                                   'image/jpeg'
+                                 ))
+      end
 
-      subject { client.create('Account', :Name => 'Foobar', :Blob => Restforce::UploadIO.new(File.expand_path('../../fixtures/blob.jpg', __FILE__), 'image/jpeg')) }
       it { should eq 'some_id' }
     end
   end
@@ -73,41 +84,49 @@ shared_examples_for Restforce::AbstractClient do
   describe '.update!' do
     context 'with invalid Id' do
       requests 'sobjects/Account/001D000000INjVe',
-        :method => :patch,
-        :with_body => "{\"Name\":\"Foobar\"}",
-        :status => 404,
-        :fixture => 'sobject/delete_error_response'
+               method: :patch,
+               with_body: "{\"Name\":\"Foobar\"}",
+               status: 404,
+               fixture: 'sobject/delete_error_response'
+
+      subject do
+        lambda do
+          client.update!('Account', Id: '001D000000INjVe', Name: 'Foobar')
+        end
+      end
 
-      subject { lambda { client.update!('Account', :Id => '001D000000INjVe', :Name => 'Foobar') } }
       it { should raise_error Faraday::Error::ResourceNotFound }
     end
   end
 
   describe '.update' do
     context 'with missing Id' do
-      subject { lambda { client.update('Account', :Name => 'Foobar') } }
+      subject { lambda { client.update('Account', Name: 'Foobar') } }
       it { should raise_error ArgumentError, 'Id field missing from attrs.' }
     end
 
     context 'with invalid Id' do
       requests 'sobjects/Account/001D000000INjVe',
-        :method => :patch,
-        :with_body => "{\"Name\":\"Foobar\"}",
-        :status => 404,
-        :fixture => 'sobject/delete_error_response'
+               method: :patch,
+               with_body: "{\"Name\":\"Foobar\"}",
+               status: 404,
+               fixture: 'sobject/delete_error_response'
 
-      subject { client.update('Account', :Id => '001D000000INjVe', :Name => 'Foobar') }
+      subject { client.update('Account', Id: '001D000000INjVe', Name: 'Foobar') }
       it { should be_false }
     end
 
     context 'with success' do
       requests 'sobjects/Account/001D000000INjVe',
-        :method => :patch,
-        :with_body => "{\"Name\":\"Foobar\"}"
+               method: :patch,
+               with_body: "{\"Name\":\"Foobar\"}"
 
       [:Id, :id, 'Id', 'id'].each do |key|
         context "with #{key.inspect} as the key" do
-          subject { client.update('Account', key => '001D000000INjVe', :Name => 'Foobar') }
+          subject do
+            client.update('Account', key => '001D000000INjVe', :Name => 'Foobar')
+          end
+
           it { should be_true }
         end
       end
@@ -117,29 +136,41 @@ shared_examples_for Restforce::AbstractClient do
   describe '.upsert!' do
     context 'when updated' do
       requests 'sobjects/Account/External__c/foobar',
-        :method => :patch,
-        :with_body => "{\"Name\":\"Foobar\"}"
+               method: :patch,
+               with_body: "{\"Name\":\"Foobar\"}"
 
       context 'with symbol external Id key' do
-        subject { client.upsert!('Account', 'External__c', :External__c => 'foobar', :Name => 'Foobar') }
+        subject do
+          client.upsert!('Account', 'External__c', External__c: 'foobar',
+                                                   Name: 'Foobar')
+        end
+
         it { should be_true }
       end
 
       context 'with string external Id key' do
-        subject { client.upsert!('Account', 'External__c', 'External__c' => 'foobar', 'Name' => 'Foobar') }
+        subject do
+          client.upsert!('Account', 'External__c', 'External__c' => 'foobar',
+                                                   'Name' => 'Foobar')
+        end
+
         it { should be_true }
       end
     end
 
     context 'when created' do
       requests 'sobjects/Account/External__c/foobar',
-        :method => :patch,
-        :with_body => "{\"Name\":\"Foobar\"}",
-        :fixture => 'sobject/upsert_created_success_response'
+               method: :patch,
+               with_body: "{\"Name\":\"Foobar\"}",
+               fixture: 'sobject/upsert_created_success_response'
 
       [:External__c, 'External__c', :external__c, 'external__c'].each do |key|
         context "with #{key.inspect} as the external id" do
-          subject { client.upsert!('Account', 'External__c', key => 'foobar', :Name => 'Foobar') }
+          subject do
+            client.upsert!('Account', 'External__c', key => 'foobar',
+                                                     :Name => 'Foobar')
+          end
+
           it { should eq 'foo' }
         end
       end
@@ -151,16 +182,16 @@ shared_examples_for Restforce::AbstractClient do
 
     context 'with invalid Id' do
       requests 'sobjects/Account/001D000000INjVe',
-        :fixture => 'sobject/delete_error_response',
-        :method => :delete,
-        :status => 404
+               fixture: 'sobject/delete_error_response',
+               method: :delete,
+               status: 404
 
       subject { lambda { destroy! } }
       it { should raise_error Faraday::Error::ResourceNotFound }
     end
 
     context 'with success' do
-      requests 'sobjects/Account/001D000000INjVe', :method => :delete
+      requests 'sobjects/Account/001D000000INjVe', method: :delete
 
       it { should be_true }
     end
@@ -171,15 +202,15 @@ shared_examples_for Restforce::AbstractClient do
 
     context 'with invalid Id' do
       requests 'sobjects/Account/001D000000INjVe',
-        :fixture => 'sobject/delete_error_response',
-        :method => :delete,
-        :status => 404
+               fixture: 'sobject/delete_error_response',
+               method: :delete,
+               status: 404
 
       it { should be_false }
     end
 
     context 'with success' do
-      requests 'sobjects/Account/001D000000INjVe', :method => :delete
+      requests 'sobjects/Account/001D000000INjVe', method: :delete
 
       it { should be_true }
     end
@@ -188,7 +219,7 @@ shared_examples_for Restforce::AbstractClient do
   describe '.find' do
     context 'with no external id passed' do
       requests 'sobjects/Account/001D000000INjVe',
-        :fixture => 'sobject/sobject_find_success_response'
+               fixture: 'sobject/sobject_find_success_response'
 
       subject { client.find('Account', '001D000000INjVe') }
       it { should be_a Hash }
@@ -196,7 +227,7 @@ shared_examples_for Restforce::AbstractClient do
 
     context 'when an external id is passed' do
       requests 'sobjects/Account/External_Field__c/1234',
-        :fixture => 'sobject/sobject_find_success_response'
+               fixture: 'sobject/sobject_find_success_response'
 
       subject { client.find('Account', '1234', 'External_Field__c') }
       it { should be_a Hash }
@@ -207,14 +238,14 @@ shared_examples_for Restforce::AbstractClient do
     context 'when no external id is specified' do
       context 'when no select list is specified' do
         requests 'sobjects/Account/1234',
-        :fixture => 'sobject/sobject_select_success_response'
+                 fixture: 'sobject/sobject_select_success_response'
 
         subject { client.select('Account', '1234', nil, nil) }
         it { should be_a Hash }
       end
       context 'when select list is specified' do
         requests 'sobjects/Account/1234\?fields=External_Field__c',
-        :fixture => 'sobject/sobject_select_success_response'
+                 fixture: 'sobject/sobject_select_success_response'
 
         subject { client.select('Account', '1234', ['External_Field__c']) }
         it { should be_a Hash }
@@ -224,7 +255,7 @@ shared_examples_for Restforce::AbstractClient do
     context 'when an external id is specified' do
       context 'when no select list is specified' do
         requests 'sobjects/Account/External_Field__c/1234',
-        :fixture => 'sobject/sobject_select_success_response'
+                 fixture: 'sobject/sobject_select_success_response'
 
         subject { client.select('Account', '1234', nil, 'External_Field__c') }
         it { should be_a Hash }
@@ -232,9 +263,12 @@ shared_examples_for Restforce::AbstractClient do
 
       context 'when select list is specified' do
         requests 'sobjects/Account/External_Field__c/1234\?fields=External_Field__c',
-        :fixture => 'sobject/sobject_select_success_response'
+                 fixture: 'sobject/sobject_select_success_response'
+
+        subject do
+          client.select('Account', '1234', ['External_Field__c'], 'External_Field__c')
+        end
 
-        subject { client.select('Account', '1234', ['External_Field__c'], 'External_Field__c') }
         it { should be_a Hash }
       end
     end
@@ -245,9 +279,11 @@ shared_examples_for Restforce::AbstractClient do
 
     context 'when successful' do
       before do
-        @request = stub_login_request(:with_body => "grant_type=password&client_id=client_id&client_secret=" \
-          "client_secret&username=foo&password=barsecurity_token").
-          to_return(:status => 200, :body => fixture(:auth_success_response))
+        @request = stub_login_request(
+          with_body: "grant_type=password&client_id=client_id" \
+                        "&client_secret=client_secret&username=foo" \
+                        "&password=barsecurity_token"
+        ).to_return(status: 200, body: fixture(:auth_success_response))
       end
 
       after do
@@ -262,14 +298,16 @@ shared_examples_for Restforce::AbstractClient do
         client.stub(:authentication_middleware).and_return(nil)
       end
 
-      subject { lambda { authenticate! } }
-      it { should raise_error Restforce::AuthenticationError, 'No authentication middleware present'}
+      it "raises an error" do
+        expect { authenticate! }.to raise_error Restforce::AuthenticationError,
+                                                'No authentication middleware present'
+      end
     end
   end
 
   describe '.without_caching' do
     requests 'query\?q=SELECT%20some,%20fields%20FROM%20object',
-      :fixture => 'sobject/query_success_response'
+             fixture: 'sobject/query_success_response'
 
     before do
       cache.should_receive(:delete).and_call_original
@@ -284,12 +322,17 @@ shared_examples_for Restforce::AbstractClient do
   describe 'authentication retries' do
     context 'when retries reaches 0' do
       before do
-        @auth_request = stub_api_request('query\?q=SELECT%20some,%20fields%20FROM%20object',
-          :status => 401,
-          :fixture => 'expired_session_response')
-        @query_request = stub_login_request(:with_body => "grant_type=password&client_id=client_id&client_secret=" \
-          "client_secret&username=foo&password=barsecurity_token").
-          to_return(:status => 200, :body => fixture(:auth_success_response))
+        @auth_request = stub_api_request(
+          'query\?q=SELECT%20some,%20fields%20FROM%20object',
+          status: 401,
+          fixture: 'expired_session_response'
+        )
+
+        @query_request = stub_login_request(
+          with_body: "grant_type=password&client_id=client_id" \
+                        "&client_secret=client_secret&username=foo&" \
+                        "password=barsecurity_token"
+        ).to_return(status: 200, body: fixture(:auth_success_response))
       end
 
       subject { lambda { client.query('SELECT some, fields FROM object') } }
@@ -302,13 +345,18 @@ shared_examples_for Restforce::AbstractClient do
 
     before do
       @query = stub_api_request('query\?q=SELECT%20some,%20fields%20FROM%20object').
-        with(:headers => { 'Authorization' => "OAuth #{oauth_token}" }).
-        to_return(:status => 401, :body => fixture('expired_session_response'), :headers => { 'Content-Type' => 'application/json' }).then.
-        to_return(:status => 200, :body => fixture('sobject/query_success_response'), :headers => { 'Content-Type' => 'application/json' })
-
-      @login = stub_login_request(:with_body => "grant_type=password&client_id=client_id&client_secret=" \
-        "client_secret&username=foo&password=barsecurity_token").
-        to_return(:status => 200, :body => fixture(:auth_success_response))
+        with(headers: { 'Authorization' => "OAuth #{oauth_token}" }).
+        to_return(status: 401,
+                  body: fixture('expired_session_response'),
+                  headers: { 'Content-Type' => 'application/json' }).then.
+        to_return(status: 200,
+                  body: fixture('sobject/query_success_response'),
+                  headers: { 'Content-Type' => 'application/json' })
+
+      @login = stub_login_request(
+        with_body: "grant_type=password&client_id=client_id&client_secret=" \
+                      "client_secret&username=foo&password=barsecurity_token"
+      ).to_return(status: 200, body: fixture(:auth_success_response))
     end
 
     after do
@@ -329,16 +377,16 @@ describe Restforce::AbstractClient do
       context 'with pagination' do
         subject { client.query('SELECT some, fields FROM object').next_page }
 
-        requests 'query\?q', :fixture => 'sobject/query_paginated_first_page_response'
-        requests 'query/01gD', :fixture => 'sobject/query_paginated_last_page_response'
+        requests 'query\?q', fixture: 'sobject/query_paginated_first_page_response'
+        requests 'query/01gD', fixture: 'sobject/query_paginated_last_page_response'
 
         it { should be_a Restforce::Collection }
-        its('first.Text_Label') { should eq 'Last Page'}
+        its('first.Text_Label') { should eq 'Last Page' }
       end
     end
   end
 
-  describe 'without mashify', :mashify => false do
+  describe 'without mashify', mashify: false do
     it_behaves_like Restforce::AbstractClient
   end
 end