rack-oauth2 0.4.5 → 0.4.6

data/README.rdoc

@@ -26,8 +26,15 @@ http://github.com/nov/rack-oauth2-sample
 
 == Sample Client
 
+Authorization Request (request_type: 'code' and 'token')
 https://gist.github.com/862393
 
+Token Request (grant_type: 'client_credentials', 'password' and 'authorization_code')
+https://gist.github.com/883541
+
+Resource Request (request both for resource owner resource and for client resource)
+https://gist.github.com/883575
+
 == Note on Patches/Pull Requests
  
 * Fork the project.

data/VERSION

@@ -1 +1 @@
-0.4.5
+0.4.6

data/lib/rack/oauth2/client.rb

@@ -3,7 +3,7 @@ module Rack
     class Client
       include AttrRequired, AttrOptional
       attr_required :identifier
-      attr_optional :secret, :redirect_uri, :scheme, :host, :authorization_endpoint, :token_endpoint
+      attr_optional :secret, :redirect_uri, :scheme, :host, :port, :authorization_endpoint, :token_endpoint
 
       def initialize(attributes = {})
         (required_attributes + optional_attributes).each do |key|
@@ -38,6 +38,12 @@ module Rack
         )
       end
 
+      def refresh_token=(token)
+        @grant = Grant::RefreshToken.new(
+          :refresh_token => token
+        )
+      end
+
       def access_token!
         params = @grant.to_hash
         params.merge!(
@@ -55,6 +61,7 @@ module Rack
         _endpoint_ = Util.parse_uri endpoint
         _endpoint_.scheme ||= self.scheme || 'https'
         _endpoint_.host ||= self.host
+        _endpoint_.port ||= self.port
         _endpoint_.to_s
       end
 

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

@@ -25,4 +25,5 @@ end
 
 require 'rack/oauth2/client/grant/authorization_code'
 require 'rack/oauth2/client/grant/password'
-require 'rack/oauth2/client/grant/client_credentials'
+require 'rack/oauth2/client/grant/client_credentials'
+require 'rack/oauth2/client/grant/refresh_token'

data/lib/rack/oauth2/client/grant/refresh_token.rb

@@ -0,0 +1,11 @@
+module Rack
+  module OAuth2
+    class Client
+      class Grant
+        class RefreshToken < Grant
+          attr_required :refresh_token
+        end
+      end
+    end
+  end
+end

data/lib/rack/oauth2/server/token.rb

@@ -47,11 +47,12 @@ module Rack
 
         class Response < Abstract::Response
           attr_required :access_token, :token_type
-          attr_optional :expires_in, :refresh_token, :scope
+          attr_optional :refresh_token, :expires_in, :scope
 
           def protocol_params
             {
               :access_token => access_token,
+              :refresh_token => refresh_token,
               :token_type => token_type,
               :expires_in => expires_in,
               :scope => Array(scope).join(' ')

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rack-oauth2
 version: !ruby/object:Gem::Version 
-  hash: 5
+  hash: 3
   prerelease: 
   segments: 
   - 0
   - 4
-  - 5
-  version: 0.4.5
+  - 6
+  version: 0.4.6
 platform: ruby
 authors: 
 - nov matake
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-24 00:00:00 +09:00
+date: 2011-03-26 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -192,6 +192,7 @@ files:
 - lib/rack/oauth2/client/grant/authorization_code.rb
 - lib/rack/oauth2/client/grant/client_credentials.rb
 - lib/rack/oauth2/client/grant/password.rb
+- lib/rack/oauth2/client/grant/refresh_token.rb
 - lib/rack/oauth2/server.rb
 - lib/rack/oauth2/server/abstract.rb
 - lib/rack/oauth2/server/abstract/error.rb