oauth2 0.8.1 → 0.9.0

data.tar.gz.sig

@@ -0,0 +1,3 @@
+,(
�L��pW�����#0s)�z�)n��6�pR��=X�}4�	�=ti?����*�=������
j��Ң�8�L4�ھ
+&�����^�5QP�Bɏ��TK)��
+12�yHΨ�%��s���;�Fr�� �ψ�/��

data/CONTRIBUTING.md

@@ -0,0 +1,15 @@
+## Submitting a Pull Request
+1. [Fork the repository.][fork]
+2. [Create a topic branch.][branch]
+3. Add specs for your unimplemented feature or bug fix.
+4. Run `bundle exec rake spec`. If your specs pass, return to step 3.
+5. Implement your feature or bug fix.
+6. Run `bundle exec rake spec`. If your specs fail, return to step 5.
+7. Run `open coverage/index.html`. If your changes are not completely covered
+   by your tests, return to step 3.
+8. Add, commit, and push your changes.
+9. [Submit a pull request.][pr]
+
+[fork]: http://help.github.com/fork-a-repo/
+[branch]: http://learn.github.com/p/branching.html
+[pr]: http://help.github.com/send-pull-requests/

data/README.md

@@ -86,22 +86,6 @@ request, add a 'headers' hash under 'params':
 You can always use the #request method on the OAuth2::Client instance to make
 requests for tokens for any Authentication grant type.
 
-## Submitting a Pull Request
-1. [Fork the repository.][fork]
-2. [Create a topic branch.][branch]
-3. Add specs for your unimplemented feature or bug fix.
-4. Run `bundle exec rake spec`. If your specs pass, return to step 3.
-5. Implement your feature or bug fix.
-6. Run `bundle exec rake spec`. If your specs fail, return to step 5.
-7. Run `open coverage/index.html`. If your changes are not completely covered
-   by your tests, return to step 3.
-8. Add, commit, and push your changes.
-9. [Submit a pull request.][pr]
-
-[fork]: http://help.github.com/fork-a-repo/
-[branch]: http://learn.github.com/p/branching.html
-[pr]: http://help.github.com/send-pull-requests/
-
 ## Supported Ruby Versions
 This library aims to support and is [tested against][travis] the following Ruby
 implementations:
@@ -109,14 +93,14 @@ implementations:
 * Ruby 1.8.7
 * Ruby 1.9.2
 * Ruby 1.9.3
+* Ruby 2.0.0
 * [JRuby][]
 * [Rubinius][]
 
-[jruby]: http://www.jruby.org/
+[jruby]: http://jruby.org/
 [rubinius]: http://rubini.us/
 
-If something doesn't work on one of these interpreters, it should be considered
-a bug.
+If something doesn't work on one of these interpreters, it's a bug.
 
 This library may inadvertently work (or seem to work) on other Ruby
 implementations, however support will only be provided for the versions listed
@@ -125,11 +109,11 @@ above.
 If you would like this library to support another Ruby version, you may
 volunteer to be a maintainer. Being a maintainer entails making sure all tests
 run and pass on that implementation. When something breaks on your
-implementation, you will be personally responsible for providing patches in a
-timely fashion. If critical issues for a particular implementation exist at the
-time of a major release, support for that Ruby version may be dropped.
+implementation, you will be responsible for providing patches in a timely
+fashion. If critical issues for a particular implementation exist at the time
+of a major release, support for that Ruby version may be dropped.
 
 ## Copyright
 Copyright (c) 2011 Intridea, Inc. and Michael Bleigh.
 See [LICENSE][] for details.
-[license]: https://github.com/intridea/oauth2/blob/master/LICENSE.md
+[license]: LICENSE.md

data/lib/oauth2/access_token.rb

@@ -1,7 +1,7 @@
 module OAuth2
   class AccessToken
-    attr_reader :client, :token, :refresh_token, :expires_in, :expires_at, :params
-    attr_accessor :options
+    attr_reader :client, :token, :expires_in, :expires_at, :params
+    attr_accessor :options, :refresh_token
 
     class << self
       # Initializes an AccessToken from a Hash
@@ -34,7 +34,7 @@ module OAuth2
     # @option opts [Symbol] :mode (:header) the transmission mode of the Access Token parameter value
     #    one of :header, :body or :query
     # @option opts [String] :header_format ('Bearer %s') the string format to use for the Authorization header
-    # @option opts [String] :param_name ('bearer_token') the parameter name to use for transmission of the
+    # @option opts [String] :param_name ('access_token') the parameter name to use for transmission of the
     #    Access Token value in :body or :query transmission mode
     def initialize(client, token, opts={})
       @client = client
@@ -44,11 +44,10 @@ module OAuth2
       end
       @expires_in ||= opts.delete('expires')
       @expires_in &&= @expires_in.to_i
-      @expires_at &&= @expires_at.to_i
       @expires_at ||= Time.now.to_i + @expires_in if @expires_in
       @options = {:mode          => opts.delete(:mode) || :header,
                   :header_format => opts.delete(:header_format) || 'Bearer %s',
-                  :param_name    => opts.delete(:param_name) || 'bearer_token'}
+                  :param_name    => opts.delete(:param_name) || 'access_token'}
       @params = opts
     end
 
@@ -85,6 +84,7 @@ module OAuth2
                     :refresh_token  => refresh_token)
       new_token = @client.get_token(params)
       new_token.options = options
+      new_token.refresh_token = refresh_token unless new_token.refresh_token
       new_token
     end
 
@@ -120,6 +120,13 @@ module OAuth2
       request(:put, path, opts, &block)
     end
 
+    # Make a PATCH request with the Access Token
+    #
+    # @see AccessToken#request
+    def patch(path, opts={}, &block)
+      request(:patch, path, opts, &block)
+    end
+
     # Make a DELETE request with the Access Token
     #
     # @see AccessToken#request

data/lib/oauth2/client.rb

@@ -3,8 +3,9 @@ require 'faraday'
 module OAuth2
   # The OAuth2::Client class
   class Client
-    attr_reader :id, :secret
-    attr_accessor :site, :connection, :options
+    attr_reader :id, :secret, :site
+    attr_accessor :options
+    attr_writer :connection
 
     # Instantiate a new OAuth 2.0 client using the
     # Client ID and Client Secret registered to your

data/lib/oauth2/version.rb

@@ -1,8 +1,8 @@
 module OAuth2
   class Version
     MAJOR = 0 unless defined? MAJOR
-    MINOR = 8 unless defined? MINOR
-    PATCH = 1 unless defined? PATCH
+    MINOR = 9 unless defined? MINOR
+    PATCH = 0 unless defined? PATCH
     PRE = nil unless defined? PRE
 
     class << self

data/oauth2.gemspec

@@ -1,27 +1,30 @@
-# encoding: utf-8
-require File.expand_path('../lib/oauth2/version', __FILE__)
+# coding: utf-8
+lib = File.expand_path('../lib', __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require 'oauth2/version'
 
-Gem::Specification.new do |gem|
-  gem.add_dependency 'faraday', '~> 0.8'
-  gem.add_dependency 'httpauth', '~> 0.1'
-  gem.add_dependency 'multi_json', '~> 1.0'
-  gem.add_dependency 'rack', '~> 1.2'
-  gem.add_dependency 'jwt', '~> 0.1.4'
-  gem.add_development_dependency 'addressable'
-  gem.add_development_dependency 'multi_xml'
-  gem.add_development_dependency 'rake'
-  gem.add_development_dependency 'rdoc'
-  gem.add_development_dependency 'rspec'
-  gem.add_development_dependency 'simplecov'
-  gem.authors = ["Michael Bleigh", "Erik Michaels-Ober"]
-  gem.description = %q{A Ruby wrapper for the OAuth 2.0 protocol built with a similar style to the original OAuth gem.}
-  gem.email = ['michael@intridea.com', 'sferik@gmail.com']
-  gem.files = `git ls-files`.split("\n")
-  gem.homepage = 'http://github.com/intridea/oauth2'
-  gem.name = 'oauth2'
-  gem.require_paths = ['lib']
-  gem.required_rubygems_version = Gem::Requirement.new('>= 1.3.6')
-  gem.summary = %q{A Ruby wrapper for the OAuth 2.0 protocol.}
-  gem.test_files = `git ls-files -- {test,spec,features}/*`.split("\n")
-  gem.version = OAuth2::Version
+Gem::Specification.new do |spec|
+  spec.add_development_dependency 'bundler', '~> 1.0'
+  spec.add_dependency 'faraday', '~> 0.8'
+  spec.add_dependency 'httpauth', '~> 0.1'
+  spec.add_dependency 'multi_json', '~> 1.0'
+  spec.add_dependency 'multi_xml', '~> 0.5'
+  spec.add_dependency 'rack', '~> 1.2'
+  spec.add_dependency 'jwt', '~> 0.1.4'
+  spec.authors       = ["Michael Bleigh", "Erik Michaels-Ober"]
+  spec.cert_chain    = %w(certs/sferik.pem)
+  spec.description   = %q{A Ruby wrapper for the OAuth 2.0 protocol built with a similar style to the original OAuth spec.}
+  spec.email         = ['michael@intridea.com', 'sferik@gmail.com']
+  spec.files         = %w(.document CONTRIBUTING.md LICENSE.md README.md Rakefile oauth2.gemspec)
+  spec.files        += Dir.glob("lib/**/*.rb")
+  spec.files        += Dir.glob("spec/**/*")
+  spec.homepage      = 'http://github.com/intridea/oauth2'
+  spec.licenses      = ['MIT']
+  spec.name          = 'oauth2'
+  spec.require_paths = ['lib']
+  spec.required_rubygems_version = '>= 1.3.6'
+  spec.signing_key   = File.expand_path("~/.gem/private_key.pem") if $0 =~ /gem\z/
+  spec.summary       = %q{A Ruby wrapper for the OAuth 2.0 protocol.}
+  spec.test_files    = Dir.glob("spec/**/*")
+  spec.version       = OAuth2::Version
 end

data/spec/helper.rb

@@ -4,11 +4,18 @@ unless ENV['CI']
     add_filter 'spec'
   end
 end
+
 require 'oauth2'
 require 'addressable/uri'
 require 'rspec'
 require 'rspec/autorun'
 
+RSpec.configure do |config|
+  config.expect_with :rspec do |c|
+    c.syntax = :expect
+  end
+end
+
 Faraday.default_adapter = :test
 
 RSpec.configure do |conf|

data/spec/oauth2/access_token_spec.rb

@@ -12,7 +12,7 @@ describe AccessToken do
       builder.adapter :test do |stub|
         VERBS.each do |verb|
           stub.send(verb, '/token/header') {|env| [200, {}, env[:request_headers]['Authorization']]}
-          stub.send(verb, "/token/query?bearer_token=#{token}") {|env| [200, {}, Addressable::URI.parse(env[:url]).query_values['bearer_token']]}
+          stub.send(verb, "/token/query?access_token=#{token}") {|env| [200, {}, Addressable::URI.parse(env[:url]).query_values['access_token']]}
           stub.send(verb, '/token/body') {|env| [200, {}, env[:body]]}
         end
         stub.post('/oauth/token') {|env| [200, {'Content-Type' => 'application/json'}, refresh_body]}
@@ -22,130 +22,136 @@ describe AccessToken do
 
   subject {AccessToken.new(client, token)}
 
-  describe '#initialize' do
-    it 'assigns client and token' do
-      subject.client.should == client
-      subject.token.should  == token
+  describe "#initialize" do
+    it "assigns client and token" do
+      expect(subject.client).to eq(client)
+      expect(subject.token).to  eq(token)
     end
 
-    it 'assigns extra params' do
+    it "assigns extra params" do
       target = AccessToken.new(client, token, 'foo' => 'bar')
-      target.params.should include('foo')
-      target.params['foo'].should == 'bar'
+      expect(target.params).to include('foo')
+      expect(target.params['foo']).to eq('bar')
     end
 
     def assert_initialized_token(target)
-      target.token.should eq(token)
-      target.should be_expires
-      target.params.keys.should include('foo')
-      target.params['foo'].should == 'bar'
+      expect(target.token).to eq(token)
+      expect(target).to be_expires
+      expect(target.params.keys).to include('foo')
+      expect(target.params['foo']).to eq('bar')
     end
 
-    it 'initializes with a Hash' do
+    it "initializes with a Hash" do
       hash = {:access_token => token, :expires_at => Time.now.to_i + 200, 'foo' => 'bar'}
       target = AccessToken.from_hash(client, hash)
       assert_initialized_token(target)
     end
 
-    it 'initalizes with a form-urlencoded key/value string' do
+    it "initalizes with a form-urlencoded key/value string" do
       kvform = "access_token=#{token}&expires_at=#{Time.now.to_i+200}&foo=bar"
       target = AccessToken.from_kvform(client, kvform)
       assert_initialized_token(target)
     end
 
-    it 'sets options' do
+    it "sets options" do
       target = AccessToken.new(client, token, :param_name => 'foo', :header_format => 'Bearer %', :mode => :body)
-      target.options[:param_name].should == 'foo'
-      target.options[:header_format].should == 'Bearer %'
-      target.options[:mode].should == :body
-    end
-    
-    it "initializes with a string expires_at" do
-      hash = {:access_token => token, :expires_at => '1361396829', 'foo' => 'bar'}
-      target = AccessToken.from_hash(client, hash)
-      assert_initialized_token(target)
-      expect(target.expires_at).to be_a(Integer)
+      expect(target.options[:param_name]).to eq('foo')
+      expect(target.options[:header_format]).to eq('Bearer %')
+      expect(target.options[:mode]).to eq(:body)
     end
   end
 
-  describe '#request' do
-    context ':mode => :header' do
+  describe "#request" do
+    context ":mode => :header" do
       before :all do
         subject.options[:mode] = :header
       end
 
       VERBS.each do |verb|
         it "sends the token in the Authorization header for a #{verb.to_s.upcase} request" do
-          subject.post('/token/header').body.should include(token)
+          expect(subject.post('/token/header').body).to include(token)
         end
       end
     end
 
-    context ':mode => :query' do
+    context ":mode => :query" do
       before :all do
         subject.options[:mode] = :query
       end
 
       VERBS.each do |verb|
         it "sends the token in the Authorization header for a #{verb.to_s.upcase} request" do
-          subject.post('/token/query').body.should == token
+          expect(subject.post('/token/query').body).to eq(token)
         end
       end
     end
 
-    context ':mode => :body' do
+    context ":mode => :body" do
       before :all do
         subject.options[:mode] = :body
       end
 
       VERBS.each do |verb|
         it "sends the token in the Authorization header for a #{verb.to_s.upcase} request" do
-          subject.post('/token/body').body.split('=').last.should == token
+          expect(subject.post('/token/body').body.split('=').last).to eq(token)
         end
       end
     end
   end
 
-  describe '#expires?' do
-    it 'should be false if there is no expires_at' do
-      AccessToken.new(client, token).should_not be_expires
+  describe "#expires?" do
+    it "is false if there is no expires_at" do
+      expect(AccessToken.new(client, token)).not_to be_expires
     end
 
-    it 'should be true if there is an expires_in' do
-      AccessToken.new(client, token, :refresh_token => 'abaca', :expires_in => 600).should be_expires
+    it "is true if there is an expires_in" do
+      expect(AccessToken.new(client, token, :refresh_token => 'abaca', :expires_in => 600)).to be_expires
     end
 
-    it 'should be true if there is an expires_at' do
-      AccessToken.new(client, token, :refresh_token => 'abaca', :expires_in => Time.now.getutc.to_i+600).should be_expires
+    it "is true if there is an expires_at" do
+      expect(AccessToken.new(client, token, :refresh_token => 'abaca', :expires_in => Time.now.getutc.to_i+600)).to be_expires
     end
   end
 
-  describe '#expired?' do
-    it 'should be false if there is no expires_in or expires_at' do
-      AccessToken.new(client, token).should_not be_expired
+  describe "#expired?" do
+    it "is false if there is no expires_in or expires_at" do
+      expect(AccessToken.new(client, token)).not_to be_expired
     end
 
-    it 'should be false if expires_in is in the future' do
-      AccessToken.new(client, token, :refresh_token => 'abaca', :expires_in => 10800).should_not be_expired
+    it "is false if expires_in is in the future" do
+      expect(AccessToken.new(client, token, :refresh_token => 'abaca', :expires_in => 10800)).not_to be_expired
     end
 
-    it 'should be true if expires_at is in the past' do
+    it "is true if expires_at is in the past" do
       access = AccessToken.new(client, token, :refresh_token => 'abaca', :expires_in => 600)
       @now = Time.now + 10800
       Time.stub!(:now).and_return(@now)
-      access.should be_expired
+      expect(access).to be_expired
     end
 
   end
 
-  describe '#refresh!' do
-    it 'returns a refresh token with appropriate values carried over' do
-      access = AccessToken.new(client, token, :refresh_token  => 'abaca',
-                                              :expires_in     => 600,
-                                              :param_name     => 'o_param')
+  describe "#refresh!" do
+    let(:access) {
+      AccessToken.new(client, token, :refresh_token  => 'abaca',
+                                     :expires_in     => 600,
+                                     :param_name     => 'o_param')
+    }
+
+    it "returns a refresh token with appropriate values carried over" do
       refreshed = access.refresh!
-      access.client.should == refreshed.client
-      access.options[:param_name].should == refreshed.options[:param_name]
+      expect(access.client).to eq(refreshed.client)
+      expect(access.options[:param_name]).to eq(refreshed.options[:param_name])
+    end
+
+    context "with a nil refresh_token in the response" do
+      let(:refresh_body) { MultiJson.encode(:access_token => 'refreshed_foo', :expires_in => 600, :refresh_token => nil) }
+
+      it "copies the refresh_token from the original token" do
+        refreshed = access.refresh!
+
+        expect(refreshed.refresh_token).to eq(access.refresh_token)
+      end
     end
   end
 end

data/spec/oauth2/client_spec.rb

@@ -20,25 +20,25 @@ describe OAuth2::Client do
     end
   end
 
-  describe '#initialize' do
-    it 'should assign id and secret' do
-      subject.id.should == 'abc'
-      subject.secret.should == 'def'
+  describe "#initialize" do
+    it "assigns id and secret" do
+      expect(subject.id).to eq('abc')
+      expect(subject.secret).to eq('def')
     end
 
-    it 'should assign site from the options hash' do
-      subject.site.should == 'https://api.example.com'
+    it "assigns site from the options hash" do
+      expect(subject.site).to eq('https://api.example.com')
     end
 
-    it 'should assign Faraday::Connection#host' do
-      subject.connection.host.should == 'api.example.com'
+    it "assigns Faraday::Connection#host" do
+      expect(subject.connection.host).to eq('api.example.com')
     end
 
-    it 'should leave Faraday::Connection#ssl unset' do
-      subject.connection.ssl.should == {}
+    it "leaves Faraday::Connection#ssl unset" do
+      expect(subject.connection.ssl).to eq({})
     end
 
-    it "should be able to pass a block to configure the connection" do
+    it "is able to pass a block to configure the connection" do
       connection = stub('connection')
       session = stub('session', :to_ary => nil)
       builder = stub('builder')
@@ -53,77 +53,77 @@ describe OAuth2::Client do
     end
 
     it "defaults raise_errors to true" do
-      subject.options[:raise_errors].should be_true
+      expect(subject.options[:raise_errors]).to be_true
     end
 
     it "allows true/false for raise_errors option" do
       client = OAuth2::Client.new('abc', 'def', :site => 'https://api.example.com', :raise_errors => false)
-      client.options[:raise_errors].should be_false
+      expect(client.options[:raise_errors]).to be_false
       client = OAuth2::Client.new('abc', 'def', :site => 'https://api.example.com', :raise_errors => true)
-      client.options[:raise_errors].should be_true
+      expect(client.options[:raise_errors]).to be_true
     end
 
     it "allows get/post for access_token_method option" do
       client = OAuth2::Client.new('abc', 'def', :site => 'https://api.example.com', :access_token_method => :get)
-      client.options[:access_token_method].should == :get
+      expect(client.options[:access_token_method]).to eq(:get)
       client = OAuth2::Client.new('abc', 'def', :site => 'https://api.example.com', :access_token_method => :post)
-      client.options[:access_token_method].should == :post
+      expect(client.options[:access_token_method]).to eq(:post)
     end
   end
 
   %w(authorize token).each do |url_type|
     describe ":#{url_type}_url option" do
-      it "should default to a path of /oauth/#{url_type}" do
-        subject.send("#{url_type}_url").should == "https://api.example.com/oauth/#{url_type}"
+      it "defaults to a path of /oauth/#{url_type}" do
+        expect(subject.send("#{url_type}_url")).to eq("https://api.example.com/oauth/#{url_type}")
       end
 
-      it "should be settable via the :#{url_type}_url option" do
+      it "is settable via the :#{url_type}_url option" do
         subject.options[:"#{url_type}_url"] = '/oauth/custom'
-        subject.send("#{url_type}_url").should == 'https://api.example.com/oauth/custom'
+        expect(subject.send("#{url_type}_url")).to eq('https://api.example.com/oauth/custom')
       end
 
       it "allows a different host than the site" do
         subject.options[:"#{url_type}_url"] = 'https://api.foo.com/oauth/custom'
-        subject.send("#{url_type}_url").should == 'https://api.foo.com/oauth/custom'
+        expect(subject.send("#{url_type}_url")).to eq('https://api.foo.com/oauth/custom')
       end
     end
   end
 
   describe "#request" do
     it "works with a null response body" do
-      subject.request(:get, 'empty_get').body.should == ''
+      expect(subject.request(:get, 'empty_get').body).to eq('')
     end
 
     it "returns on a successful response" do
       response = subject.request(:get, '/success')
-      response.body.should == 'yay'
-      response.status.should == 200
-      response.headers.should == {'Content-Type' => 'text/awesome'}
+      expect(response.body).to eq('yay')
+      expect(response.status).to eq(200)
+      expect(response.headers).to eq({'Content-Type' => 'text/awesome'})
     end
 
     it "posts a body" do
       response = subject.request(:post, '/reflect', :body => 'foo=bar')
-      response.body.should == 'foo=bar'
+      expect(response.body).to eq('foo=bar')
     end
 
     it "follows redirects properly" do
       response = subject.request(:get, '/redirect')
-      response.body.should == 'yay'
-      response.status.should == 200
-      response.headers.should == {'Content-Type' => 'text/awesome'}
+      expect(response.body).to eq('yay')
+      expect(response.status).to eq(200)
+      expect(response.headers).to eq({'Content-Type' => 'text/awesome'})
     end
 
     it "redirects using GET on a 303" do
       response = subject.request(:post, '/redirect', :body => 'foo=bar')
-      response.body.should be_empty
-      response.status.should == 200
+      expect(response.body).to be_empty
+      expect(response.status).to eq(200)
     end
 
     it "obeys the :max_redirects option" do
       max_redirects = subject.options[:max_redirects]
       subject.options[:max_redirects] = 0
       response = subject.request(:get, '/redirect')
-      response.status.should == 302
+      expect(response.status).to eq(302)
       subject.options[:max_redirects] = max_redirects
     end
 
@@ -131,25 +131,25 @@ describe OAuth2::Client do
       subject.options[:raise_errors] = false
       response = subject.request(:get, '/unauthorized')
 
-      response.status.should == 401
-      response.headers.should == {'Content-Type' => 'application/json'}
-      response.error.should_not be_nil
+      expect(response.status).to eq(401)
+      expect(response.headers).to eq({'Content-Type' => 'application/json'})
+      expect(response.error).not_to be_nil
     end
 
     %w(/unauthorized /conflict /error).each do |error_path|
       it "raises OAuth2::Error on error response to path #{error_path}" do
-        lambda {subject.request(:get, error_path)}.should raise_error(OAuth2::Error)
+        expect{subject.request(:get, error_path)}.to raise_error(OAuth2::Error)
       end
     end
 
-    it 'parses OAuth2 standard error response' do
+    it "parses OAuth2 standard error response" do
       begin
         subject.request(:get, '/unauthorized')
       rescue Exception => e
-        e.code.should == error_value
-        e.description.should == error_description_value
-        e.to_s.should match(/#{error_value}/)
-        e.to_s.should match(/#{error_description_value}/)
+        expect(e.code).to eq(error_value)
+        expect(e.description).to eq(error_description_value)
+        expect(e.to_s).to match(/#{error_value}/)
+        expect(e.to_s).to match(/#{error_description_value}/)
       end
     end
 
@@ -157,21 +157,21 @@ describe OAuth2::Client do
       begin
         subject.request(:get, '/error')
       rescue Exception => e
-        e.response.should_not be_nil
-        e.to_s.should match(/unknown error/)
+        expect(e.response).not_to be_nil
+        expect(e.to_s).to match(/unknown error/)
       end
     end
   end
 
-  it '#auth_code should instantiate a AuthCode strategy with this client' do
-    subject.auth_code.should be_kind_of(OAuth2::Strategy::AuthCode)
+  it "instantiates an AuthCode strategy with this client" do
+    expect(subject.auth_code).to be_kind_of(OAuth2::Strategy::AuthCode)
   end
 
-  it '#implicit should instantiate a Implicit strategy with this client' do
-    subject.implicit.should be_kind_of(OAuth2::Strategy::Implicit)
+  it "instantiates an Implicit strategy with this client" do
+    expect(subject.implicit).to be_kind_of(OAuth2::Strategy::Implicit)
   end
 
-  context 'with SSL options' do
+  context "with SSL options" do
     subject do
       cli = OAuth2::Client.new('abc', 'def', :site => 'https://api.example.com', :ssl => {:ca_file => 'foo.pem'})
       cli.connection.build do |b|
@@ -180,8 +180,8 @@ describe OAuth2::Client do
       cli
     end
 
-    it 'should pass the SSL options along to Faraday::Connection#ssl' do
-      subject.connection.ssl.should == {:ca_file => 'foo.pem'}
+    it "passes the SSL options along to Faraday::Connection#ssl" do
+      expect(subject.connection.ssl).to eq({:ca_file => 'foo.pem'})
     end
   end
 end