oauth2 0.9.2 → 0.9.3

data/spec/oauth2/response_spec.rb

@@ -1,12 +1,12 @@
 require 'helper'
 
 describe OAuth2::Response do
-  describe "#initialize" do
-    let(:status) {200}
-    let(:headers) {{'foo' => 'bar'}}
-    let(:body) {'foo'}
+  describe '#initialize' do
+    let(:status) { 200 }
+    let(:headers) { {'foo' => 'bar'} }
+    let(:body) { 'foo' }
 
-    it "returns the status, headers and body" do
+    it 'returns the status, headers and body' do
       response = double('response', :headers => headers,
                                     :status  => status,
                                     :body    => body)
@@ -17,30 +17,30 @@ describe OAuth2::Response do
     end
   end
 
-  describe ".register_parser" do
-    let(:response) {
+  describe '.register_parser' do
+    let(:response) do
       double('response', :headers => {'Content-Type' => 'application/foo-bar'},
                          :status => 200,
                          :body => 'baz')
-    }
+    end
     before do
       OAuth2::Response.register_parser(:foobar, 'application/foo-bar') do |body|
         "foobar #{body}"
       end
     end
 
-    it "adds to the content types and parsers" do
+    it 'adds to the content types and parsers' do
       expect(OAuth2::Response::PARSERS.keys).to include(:foobar)
       expect(OAuth2::Response::CONTENT_TYPES.keys).to include('application/foo-bar')
     end
 
-    it "is able to parse that content type automatically" do
+    it 'is able to parse that content type automatically' do
       expect(OAuth2::Response.new(response).parsed).to eq('foobar baz')
     end
   end
 
-  describe "#parsed" do
-    it "parses application/x-www-form-urlencoded body" do
+  describe '#parsed' do
+    it 'parses application/x-www-form-urlencoded body' do
       headers = {'Content-Type' => 'application/x-www-form-urlencoded'}
       body = 'foo=bar&answer=42'
       response = double('response', :headers => headers, :body => body)
@@ -50,7 +50,7 @@ describe OAuth2::Response do
       expect(subject.parsed['answer']).to eq('42')
     end
 
-    it "parses application/json body" do
+    it 'parses application/json body' do
       headers = {'Content-Type' => 'application/json'}
       body = MultiJson.encode(:foo => 'bar', :answer => 42)
       response = double('response', :headers => headers, :body => body)
@@ -66,26 +66,26 @@ describe OAuth2::Response do
 
       response = double('response', :headers => headers, :body => body)
 
-      MultiJson.should_not_receive(:decode)
-      MultiJson.should_not_receive(:load)
-      Rack::Utils.should_not_receive(:parse_query)
+      expect(MultiJson).not_to receive(:decode)
+      expect(MultiJson).not_to receive(:load)
+      expect(Rack::Utils).not_to receive(:parse_query)
 
       subject = Response.new(response)
       expect(subject.parsed).to be_nil
     end
   end
 
-  context "xml parser registration" do
-    it "tries to load multi_xml and use it" do
+  context 'xml parser registration' do
+    it 'tries to load multi_xml and use it' do
       expect(OAuth2::Response::PARSERS[:xml]).not_to be_nil
     end
 
-    it "is able to parse xml" do
+    it 'is able to parse xml' do
       headers = {'Content-Type' => 'text/xml'}
       body = '<?xml version="1.0" standalone="yes" ?><foo><bar>baz</bar></foo>'
 
       response = double('response', :headers => headers, :body => body)
-      expect(OAuth2::Response.new(response).parsed).to eq({"foo" => {"bar" => "baz"}})
+      expect(OAuth2::Response.new(response).parsed).to eq('foo' => {'bar' => 'baz'})
     end
   end
 end

data/spec/oauth2/strategy/assertion_spec.rb

@@ -7,10 +7,10 @@ describe OAuth2::Strategy::Assertion do
       b.adapter :test do |stub|
         stub.post('/oauth/token') do |env|
           case @mode
-            when "formencoded"
-              [200, {'Content-Type' => 'application/x-www-form-urlencoded'}, 'expires_in=600&access_token=salmon&refresh_token=trout']
-            when "json"
-              [200, {'Content-Type' => 'application/json'}, '{"expires_in":600,"access_token":"salmon","refresh_token":"trout"}']
+          when 'formencoded'
+            [200, {'Content-Type' => 'application/x-www-form-urlencoded'}, 'expires_in=600&access_token=salmon&refresh_token=trout']
+          when 'json'
+            [200, {'Content-Type' => 'application/json'}, '{"expires_in":600,"access_token":"salmon","refresh_token":"trout"}']
           end
         end
       end
@@ -18,13 +18,13 @@ describe OAuth2::Strategy::Assertion do
     cli
   end
 
-  let(:params) { {:hmac_secret => 'foo'}}
+  let(:params) { {:hmac_secret => 'foo'} }
 
-  subject {client.assertion}
+  subject { client.assertion }
 
-  describe "#authorize_url" do
-    it "raises NotImplementedError" do
-      expect{subject.authorize_url}.to raise_error(NotImplementedError)
+  describe '#authorize_url' do
+    it 'raises NotImplementedError' do
+      expect { subject.authorize_url }.to raise_error(NotImplementedError)
     end
   end
 
@@ -35,23 +35,22 @@ describe OAuth2::Strategy::Assertion do
         @access = subject.get_token(params)
       end
 
-      it "returns AccessToken with same Client" do
+      it 'returns AccessToken with same Client' do
         expect(@access.client).to eq(client)
       end
 
-      it "returns AccessToken with #token" do
+      it 'returns AccessToken with #token' do
         expect(@access.token).to eq('salmon')
       end
 
-      it "returns AccessToken with #expires_in" do
+      it 'returns AccessToken with #expires_in' do
         expect(@access.expires_in).to eq(600)
       end
 
-      it "returns AccessToken with #expires_at" do
+      it 'returns AccessToken with #expires_at' do
         expect(@access.expires_at).not_to be_nil
       end
     end
   end
 
 end
-

data/spec/oauth2/strategy/auth_code_spec.rb

@@ -1,31 +1,31 @@
 require 'helper'
 
 describe OAuth2::Strategy::AuthCode do
-  let(:code) {'sushi'}
-  let(:kvform_token) {'expires_in=600&access_token=salmon&refresh_token=trout&extra_param=steve'}
-  let(:facebook_token) {kvform_token.gsub('_in', '')}
-  let(:json_token) {MultiJson.encode(:expires_in => 600, :access_token => 'salmon', :refresh_token => 'trout', :extra_param => 'steve')}
+  let(:code) { 'sushi' }
+  let(:kvform_token) { 'expires_in=600&access_token=salmon&refresh_token=trout&extra_param=steve' }
+  let(:facebook_token) { kvform_token.gsub('_in', '') }
+  let(:json_token) { MultiJson.encode(:expires_in => 600, :access_token => 'salmon', :refresh_token => 'trout', :extra_param => 'steve') }
 
   let(:client) do
     OAuth2::Client.new('abc', 'def', :site => 'http://api.example.com') do |builder|
       builder.adapter :test do |stub|
         stub.get("/oauth/token?client_id=abc&client_secret=def&code=#{code}&grant_type=authorization_code") do |env|
           case @mode
-          when "formencoded"
+          when 'formencoded'
             [200, {'Content-Type' => 'application/x-www-form-urlencoded'}, kvform_token]
-          when "json"
+          when 'json'
             [200, {'Content-Type' => 'application/json'}, json_token]
-          when "from_facebook"
+          when 'from_facebook'
             [200, {'Content-Type' => 'application/x-www-form-urlencoded'}, facebook_token]
           end
         end
-        stub.post('/oauth/token', {'client_id' => 'abc', 'client_secret' => 'def', 'code' => 'sushi', 'grant_type' => 'authorization_code'}) do |env|
+        stub.post('/oauth/token', 'client_id' => 'abc', 'client_secret' => 'def', 'code' => 'sushi', 'grant_type' => 'authorization_code') do |env|
           case @mode
-          when "formencoded"
+          when 'formencoded'
             [200, {'Content-Type' => 'application/x-www-form-urlencoded'}, kvform_token]
-          when "json"
+          when 'json'
             [200, {'Content-Type' => 'application/json'}, json_token]
-          when "from_facebook"
+          when 'from_facebook'
             [200, {'Content-Type' => 'application/x-www-form-urlencoded'}, facebook_token]
           end
         end
@@ -33,18 +33,18 @@ describe OAuth2::Strategy::AuthCode do
     end
   end
 
-  subject {client.auth_code}
+  subject { client.auth_code }
 
-  describe "#authorize_url" do
-    it "includes the client_id" do
+  describe '#authorize_url' do
+    it 'includes the client_id' do
       expect(subject.authorize_url).to include('client_id=abc')
     end
 
-    it "includes the type" do
+    it 'includes the type' do
       expect(subject.authorize_url).to include('response_type=code')
     end
 
-    it "includes passed in options" do
+    it 'includes passed in options' do
       cb = 'http://myserver.local/oauth/callback'
       expect(subject.authorize_url(:redirect_uri => cb)).to include("redirect_uri=#{Rack::Utils.escape(cb)}")
     end
@@ -59,27 +59,27 @@ describe OAuth2::Strategy::AuthCode do
           @access = subject.get_token(code)
         end
 
-        it "returns AccessToken with same Client" do
+        it 'returns AccessToken with same Client' do
           expect(@access.client).to eq(client)
         end
 
-        it "returns AccessToken with #token" do
+        it 'returns AccessToken with #token' do
           expect(@access.token).to eq('salmon')
         end
 
-        it "returns AccessToken with #refresh_token" do
+        it 'returns AccessToken with #refresh_token' do
           expect(@access.refresh_token).to eq('trout')
         end
 
-        it "returns AccessToken with #expires_in" do
+        it 'returns AccessToken with #expires_in' do
           expect(@access.expires_in).to eq(600)
         end
 
-        it "returns AccessToken with #expires_at" do
+        it 'returns AccessToken with #expires_at' do
           expect(@access.expires_at).to be_kind_of(Integer)
         end
 
-        it "returns AccessToken with params accessible via []" do
+        it 'returns AccessToken with params accessible via []' do
           expect(@access['extra_param']).to eq('steve')
         end
       end

data/spec/oauth2/strategy/base_spec.rb

@@ -1,7 +1,7 @@
 require 'helper'
 
 describe OAuth2::Strategy::Base do
-  it "initializes with a Client" do
-    expect{OAuth2::Strategy::Base.new(OAuth2::Client.new('abc', 'def'))}.not_to raise_error
+  it 'initializes with a Client' do
+    expect { OAuth2::Strategy::Base.new(OAuth2::Client.new('abc', 'def')) }.not_to raise_error
   end
 end

data/spec/oauth2/strategy/client_credentials_spec.rb

@@ -7,21 +7,21 @@ describe OAuth2::Strategy::ClientCredentials do
   let(:client) do
     OAuth2::Client.new('abc', 'def', :site => 'http://api.example.com') do |builder|
       builder.adapter :test do |stub|
-        stub.post('/oauth/token', {'grant_type' => 'client_credentials'}) do |env|
-          client_id, client_secret = HTTPAuth::Basic.unpack_authorization(env[:request_headers]['Authorization'])
-          client_id == 'abc' && client_secret == 'def' or raise Faraday::Adapter::Test::Stubs::NotFound.new
+        stub.post('/oauth/token', 'grant_type' => 'client_credentials') do |env|
+          client_id, client_secret = Base64.decode64(env[:request_headers]['Authorization'].split(' ', 2)[1]).split(':', 2)
+          client_id == 'abc' && client_secret == 'def' || fail(Faraday::Adapter::Test::Stubs::NotFound)
           case @mode
-          when "formencoded"
+          when 'formencoded'
             [200, {'Content-Type' => 'application/x-www-form-urlencoded'}, kvform_token]
-          when "json"
+          when 'json'
             [200, {'Content-Type' => 'application/json'}, json_token]
           end
         end
-        stub.post('/oauth/token', {'client_id' => 'abc', 'client_secret' => 'def', 'grant_type' => 'client_credentials'}) do |env|
+        stub.post('/oauth/token', 'client_id' => 'abc', 'client_secret' => 'def', 'grant_type' => 'client_credentials') do |env|
           case @mode
-          when "formencoded"
+          when 'formencoded'
             [200, {'Content-Type' => 'application/x-www-form-urlencoded'}, kvform_token]
-          when "json"
+          when 'json'
             [200, {'Content-Type' => 'application/json'}, json_token]
           end
         end
@@ -29,11 +29,22 @@ describe OAuth2::Strategy::ClientCredentials do
     end
   end
 
-  subject {client.client_credentials}
+  subject { client.client_credentials }
 
-  describe "#authorize_url" do
-    it "raises NotImplementedError" do
-      expect{subject.authorize_url}.to raise_error(NotImplementedError)
+  describe '#authorize_url' do
+    it 'raises NotImplementedError' do
+      expect { subject.authorize_url }.to raise_error(NotImplementedError)
+    end
+  end
+
+  describe '#authorization' do
+    it 'generates an Authorization header value for HTTP Basic Authentication' do
+      [
+        ['abc', 'def', 'Basic YWJjOmRlZg=='],
+        ['xxx', 'secret', 'Basic eHh4OnNlY3JldA==']
+      ].each do |client_id, client_secret, expected|
+        expect(subject.authorization(client_id, client_secret)).to eq(expected)
+      end
     end
   end
 
@@ -45,23 +56,23 @@ describe OAuth2::Strategy::ClientCredentials do
           @access = subject.get_token({}, auth_scheme == 'default' ? {} : {'auth_scheme' => auth_scheme})
         end
 
-        it "returns AccessToken with same Client" do
+        it 'returns AccessToken with same Client' do
           expect(@access.client).to eq(client)
         end
 
-        it "returns AccessToken with #token" do
+        it 'returns AccessToken with #token' do
           expect(@access.token).to eq('salmon')
         end
 
-        it "returns AccessToken without #refresh_token" do
+        it 'returns AccessToken without #refresh_token' do
           expect(@access.refresh_token).to be_nil
         end
 
-        it "returns AccessToken with #expires_in" do
+        it 'returns AccessToken with #expires_in' do
           expect(@access.expires_in).to eq(600)
         end
 
-        it "returns AccessToken with #expires_at" do
+        it 'returns AccessToken with #expires_at' do
           expect(@access.expires_at).not_to be_nil
         end
       end

data/spec/oauth2/strategy/implicit_spec.rb

@@ -3,26 +3,26 @@ require 'helper'
 describe OAuth2::Strategy::Implicit do
   let(:client) { OAuth2::Client.new('abc', 'def', :site => 'http://api.example.com') }
 
-  subject {client.implicit}
+  subject { client.implicit }
 
-  describe "#authorize_url" do
-    it "includes the client_id" do
+  describe '#authorize_url' do
+    it 'includes the client_id' do
       expect(subject.authorize_url).to include('client_id=abc')
     end
 
-    it "includes the type" do
+    it 'includes the type' do
       expect(subject.authorize_url).to include('response_type=token')
     end
 
-    it "includes passed in options" do
+    it 'includes passed in options' do
       cb = 'http://myserver.local/oauth/callback'
       expect(subject.authorize_url(:redirect_uri => cb)).to include("redirect_uri=#{Rack::Utils.escape(cb)}")
     end
   end
 
-  describe "#get_token" do
-    it "raises NotImplementedError" do
-      expect{subject.get_token}.to raise_error(NotImplementedError)
+  describe '#get_token' do
+    it 'raises NotImplementedError' do
+      expect { subject.get_token }.to raise_error(NotImplementedError)
     end
   end
 end

data/spec/oauth2/strategy/password_spec.rb

@@ -7,21 +7,21 @@ describe OAuth2::Strategy::Password do
       b.adapter :test do |stub|
         stub.post('/oauth/token') do |env|
           case @mode
-            when "formencoded"
-              [200, {'Content-Type' => 'application/x-www-form-urlencoded'}, 'expires_in=600&access_token=salmon&refresh_token=trout']
-            when "json"
-              [200, {'Content-Type' => 'application/json'}, '{"expires_in":600,"access_token":"salmon","refresh_token":"trout"}']
+          when 'formencoded'
+            [200, {'Content-Type' => 'application/x-www-form-urlencoded'}, 'expires_in=600&access_token=salmon&refresh_token=trout']
+          when 'json'
+            [200, {'Content-Type' => 'application/json'}, '{"expires_in":600,"access_token":"salmon","refresh_token":"trout"}']
           end
         end
       end
     end
     cli
   end
-  subject {client.password}
+  subject { client.password }
 
-  describe "#authorize_url" do
-    it "raises NotImplementedError" do
-      expect{subject.authorize_url}.to raise_error(NotImplementedError)
+  describe '#authorize_url' do
+    it 'raises NotImplementedError' do
+      expect { subject.authorize_url }.to raise_error(NotImplementedError)
     end
   end
 
@@ -32,23 +32,23 @@ describe OAuth2::Strategy::Password do
         @access = subject.get_token('username', 'password')
       end
 
-      it "returns AccessToken with same Client" do
+      it 'returns AccessToken with same Client' do
         expect(@access.client).to eq(client)
       end
 
-      it "returns AccessToken with #token" do
+      it 'returns AccessToken with #token' do
         expect(@access.token).to eq('salmon')
       end
 
-      it "returns AccessToken with #refresh_token" do
+      it 'returns AccessToken with #refresh_token' do
         expect(@access.refresh_token).to eq('trout')
       end
 
-      it "returns AccessToken with #expires_in" do
+      it 'returns AccessToken with #expires_in' do
         expect(@access.expires_in).to eq(600)
       end
 
-      it "returns AccessToken with #expires_at" do
+      it 'returns AccessToken with #expires_at' do
         expect(@access.expires_at).not_to be_nil
       end
     end