rack-oauth2 0.4.2 → 0.4.3

data/VERSION

@@ -1 +1 @@
-0.4.2
+0.4.3

data/lib/rack/oauth2/client.rb

@@ -3,20 +3,11 @@ module Rack
     class Client
       include AttrRequired, AttrOptional
       attr_required :identifier
-      attr_optional :secret, :redirect_uri, :scheme, :host, :response_type, :authorization_endpoint, :token_endpoint
-
-      class Exception < StandardError
-        attr_accessor :status, :response
-        def initialize(status, response)
-          @status = status
-          @response = response
-          super response[:error_description]
-        end
-      end
+      attr_optional :secret, :redirect_uri, :scheme, :host, :authorization_endpoint, :token_endpoint
 
       def initialize(attributes = {})
         (required_attributes + optional_attributes).each do |key|
-          self.send "#{key}=", attributes[key]
+          self.send :"#{key}=", attributes[key]
         end
         @grant = Grant::ClientCredentials.new
         @authorization_endpoint ||= '/oauth2/authorize'
@@ -24,11 +15,12 @@ module Rack
         attr_missing!
       end
 
-      def authorization_url(response_type = :code, params = {})
-        Util.redirect_uri absolute_url_for(authorization_endpoint), :query, params.merge(
+      def authorization_uri(params = {})
+        params[:response_type] ||= :code
+        params[:scope] = Array(params[:scope]).join(' ')
+        Util.redirect_uri absolute_uri_for(authorization_endpoint), :query, params.merge(
           :client_id => self.identifier,
-          :redirect_uri => self.redirect_uri,
-          :response_type => response_type
+          :redirect_uri => self.redirect_uri
         )
       end
 
@@ -53,13 +45,13 @@ module Rack
           :client_secret => self.secret
         )
         handle_response do
-          RestClient.post absolute_url_for(token_endpoint), Util.compact_hash(params)
+          RestClient.post absolute_uri_for(token_endpoint), Util.compact_hash(params)
         end
       end
 
       private
 
-      def absolute_url_for(endpoint)
+      def absolute_uri_for(endpoint)
         _endpoint_ = Util.parse_uri endpoint
         _endpoint_.scheme ||= self.scheme || 'https'
         _endpoint_.host ||= self.host
@@ -70,15 +62,12 @@ module Rack
         response = yield
         JSON.parse(response.body).with_indifferent_access
       rescue RestClient::Exception => e
-        error = if e.http_body
-          JSON.parse(e.http_body).with_indifferent_access
-        else
-          {}
-        end
-        raise Exception.new(e.http_code, error)
+        error = JSON.parse(e.http_body).with_indifferent_access
+        raise Error.new(e.http_code, error)
       end
     end
   end
 end
 
+require 'rack/oauth2/client/error'
 require 'rack/oauth2/client/grant'

data/lib/rack/oauth2/client/error.rb

@@ -0,0 +1,14 @@
+module Rack
+  module OAuth2
+    class Client
+      class Error < StandardError
+        attr_accessor :status, :response
+        def initialize(status, response)
+          @status = status
+          @response = response
+          super response[:error_description]
+        end
+      end
+    end
+  end
+end

data/rack-oauth2.gemspec

@@ -22,4 +22,5 @@ Gem::Specification.new do |s|
   s.add_development_dependency "rake", ">= 0.8"
   s.add_development_dependency "rcov", ">= 0.9"
   s.add_development_dependency "rspec", ">= 2"
+  s.add_development_dependency "fakeweb", ">= 1.3"
 end

data/spec/fake_response/invalid_request.json

@@ -0,0 +1,4 @@
+{
+  "error":"invalid_request",
+  "error_description":"error description"
+}

data/spec/fake_response/token.json

@@ -0,0 +1,4 @@
+{
+  "access_token":"access_token",
+  "expires_in":3600
+}

data/spec/rack/oauth2/client/error_spec.rb

@@ -0,0 +1,18 @@
+require 'spec_helper.rb'
+
+describe Rack::OAuth2::Client::Error do
+  let :error do
+    {
+      :error => :invalid_request,
+      :error_description => 'Include invalid parameters',
+      :error_uri => 'http://server.example.com/error/invalid_request'
+    }
+  end
+  subject do
+    Rack::OAuth2::Client::Error.new 400, error
+  end
+
+  its(:status)   { should == 400 }
+  its(:message)  { should == error[:error_description] }
+  its(:response) { should == error }
+end

data/spec/rack/oauth2/client_spec.rb

@@ -0,0 +1,102 @@
+require 'spec_helper.rb'
+
+describe Rack::OAuth2::Client do
+  let :client do
+    Rack::OAuth2::Client.new(
+      :identifier => 'client_id',
+      :secret => 'client_secret',
+      :host => 'server.example.com',
+      :redirect_uri => 'https://client.example.com/callback'
+    )
+  end
+  subject { client }
+
+  its(:identifier) { should == 'client_id' }
+  its(:secret)     { should == 'client_secret' }
+  its(:authorization_endpoint) { should == '/oauth2/authorize' }
+  its(:token_endpoint)         { should == '/oauth2/token' }
+
+  context 'when identifier is missing' do
+    it do
+      lambda do
+        Rack::OAuth2::Client.new
+      end.should raise_error AttrRequired::AttrMissing
+    end
+  end
+
+  describe '#authorization_uri' do
+    subject { client.authorization_uri }
+    it { should include 'https://server.example.com/oauth2/authorize' }
+    it { should include 'client_id=client_id' }
+    it { should include 'redirect_uri=https%3A%2F%2Fclient.example.com%2Fcallback' }
+    it { should include 'response_type=code' }
+
+    context 'when endpoints are absolute URIs' do
+      before do
+        client.authorization_endpoint = 'https://server2.example.com/oauth/authorize'
+        client.token_endpoint = 'https://server2.example.com/oauth/token'
+      end
+      it { should include 'https://server2.example.com/oauth/authorize' }
+    end
+
+    context 'when scheme is specified' do
+      before { client.scheme = 'http' }
+      it { should include 'http://server.example.com/oauth2/authorize' }
+    end
+
+    context 'when response_type is token' do
+      subject { client.authorization_uri(:response_type => :token) }
+      it { should include 'response_type=token' }
+    end
+
+    context 'when scope is given' do
+      subject { client.authorization_uri(:scope => [:scope1, :scope2]) }
+      it { should include 'scope=scope1+scope2' }
+    end
+  end
+
+  describe '#authorization_code=' do
+    before  { client.authorization_code = 'code' }
+    subject { client.instance_variable_get('@grant') }
+    it { should be_instance_of Rack::OAuth2::Client::Grant::AuthorizationCode }
+  end
+
+  describe '#resource_owner_credentials=' do
+    before  { client.resource_owner_credentials = 'username', 'password' }
+    subject { client.instance_variable_get('@grant') }
+    it { should be_instance_of Rack::OAuth2::Client::Grant::Password }
+  end
+
+  describe '#access_token!' do
+    before  do
+      client.authorization_code = 'code'
+      fake_response(
+        :post,
+        'https://server.example.com/oauth2/token',
+        'token.json'
+      )
+    end
+    it do
+      client.access_token!.should == {
+        'access_token' => 'access_token',
+        'expires_in' => 3600
+      }
+    end
+
+    context 'when error response is given' do
+      before do
+        fake_response(
+          :post,
+          'https://server.example.com/oauth2/token',
+          'invalid_request.json',
+          :status => 400
+        )
+      end
+      it do
+        lambda do
+          client.access_token!
+        end.should raise_error Rack::OAuth2::Client::Error
+      end
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -3,9 +3,23 @@ $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 
 require 'rack/oauth2'
 require 'rspec'
+require 'fakeweb'
 
 def simple_app
   lambda do |env|
     [ 200, {'Content-Type' => 'text/plain'}, ["HELLO"] ]
   end
-end
+end
+
+def fake_response(method, endpoint, file_path, options = {})
+  FakeWeb.register_uri(
+    method,
+    endpoint,
+    options.merge(
+      :body => File.read(
+        File.join(File.dirname(__FILE__), 'fake_response', file_path)
+      )
+    )
+  )
+end
+FakeWeb.allow_net_connect = false

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rack-oauth2
 version: !ruby/object:Gem::Version 
-  hash: 11
+  hash: 9
   prerelease: 
   segments: 
   - 0
   - 4
-  - 2
-  version: 0.4.2
+  - 3
+  version: 0.4.3
 platform: ruby
 authors: 
 - nov matake
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-10 00:00:00 +09:00
+date: 2011-03-21 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -153,6 +153,21 @@ dependencies:
         version: "2"
   type: :development
   version_requirements: *id009
+- !ruby/object:Gem::Dependency 
+  name: fakeweb
+  prerelease: false
+  requirement: &id010 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 9
+        segments: 
+        - 1
+        - 3
+        version: "1.3"
+  type: :development
+  version_requirements: *id010
 description: Rack Middleware for OAuth2 server. Experimental OAuth2 client library is also included.
 email: nov@matake.jp
 executables: []
@@ -173,6 +188,7 @@ files:
 - VERSION
 - lib/rack/oauth2.rb
 - lib/rack/oauth2/client.rb
+- lib/rack/oauth2/client/error.rb
 - lib/rack/oauth2/client/grant.rb
 - lib/rack/oauth2/client/grant/authorization_code.rb
 - lib/rack/oauth2/client/grant/client_credentials.rb
@@ -197,6 +213,10 @@ files:
 - lib/rack/oauth2/server/token/refresh_token.rb
 - lib/rack/oauth2/util.rb
 - rack-oauth2.gemspec
+- spec/fake_response/invalid_request.json
+- spec/fake_response/token.json
+- spec/rack/oauth2/client/error_spec.rb
+- spec/rack/oauth2/client_spec.rb
 - spec/rack/oauth2/server/abstract/error_spec.rb
 - spec/rack/oauth2/server/authorize/code_spec.rb
 - spec/rack/oauth2/server/authorize/error_spec.rb
@@ -248,6 +268,10 @@ signing_key:
 specification_version: 3
 summary: Rack Middleware for OAuth2 server
 test_files: 
+- spec/fake_response/invalid_request.json
+- spec/fake_response/token.json
+- spec/rack/oauth2/client/error_spec.rb
+- spec/rack/oauth2/client_spec.rb
 - spec/rack/oauth2/server/abstract/error_spec.rb
 - spec/rack/oauth2/server/authorize/code_spec.rb
 - spec/rack/oauth2/server/authorize/error_spec.rb