signet 0.4.4 → 0.4.5

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+# 0.4.5
+
+* Minor documentation fixes
+* Allow postmessage as a valid redirect_uri in OAuth 2
+
 # 0.4.4
 
 * Add support for assertion profile

data/Gemfile

@@ -10,9 +10,10 @@ gem 'jruby-openssl', :platforms => :jruby
 group :development do
   gem 'launchy', '>= 2.1.1'
   gem 'yard'
-  gem 'redcarpet'
+  gem 'kramdown'
 end
 
+
 group :test, :development do
   gem 'rake', '>= 0.9.0'
   gem 'rspec', '>= 2.11.0'

data/Gemfile.lock

@@ -0,0 +1,53 @@
+GEM
+  remote: http://rubygems.org/
+  specs:
+    addressable (2.3.2)
+    bouncy-castle-java (1.5.0146.1)
+    diff-lcs (1.1.3)
+    extlib (0.9.16)
+    faraday (0.8.4)
+      multipart-post (~> 1.1)
+    ffi (1.1.5-java)
+    jruby-openssl (0.8.2)
+      bouncy-castle-java (>= 1.5.0146.1)
+    jwt (0.1.5)
+      multi_json (>= 1.0)
+    kramdown (0.14.1)
+    launchy (2.1.2)
+      addressable (~> 2.3)
+    launchy (2.1.2-java)
+      addressable (~> 2.3)
+      ffi (~> 1.1.1)
+      spoon (~> 0.0.1)
+    multi_json (1.5.0)
+    multipart-post (1.1.5)
+    rake (10.0.3)
+    rcov (1.0.0)
+    rspec (2.12.0)
+      rspec-core (~> 2.12.0)
+      rspec-expectations (~> 2.12.0)
+      rspec-mocks (~> 2.12.0)
+    rspec-core (2.12.2)
+    rspec-expectations (2.12.1)
+      diff-lcs (~> 1.1.3)
+    rspec-mocks (2.12.1)
+    spoon (0.0.1)
+    yard (0.8.3)
+
+PLATFORMS
+  java
+  ruby
+
+DEPENDENCIES
+  addressable (>= 2.3.1)
+  extlib (>= 0.9.15)
+  faraday (~> 0.8.1)
+  jruby-openssl
+  jwt (>= 0.1.5)
+  kramdown
+  launchy (>= 2.1.1)
+  multi_json (>= 1.0.0)
+  rake (>= 0.9.0)
+  rcov (>= 0.9.9)
+  rspec (>= 2.11.0)
+  yard

data/lib/signet.rb

@@ -19,12 +19,12 @@ module Signet #:nodoc:
     # Production rules from:
     # http://tools.ietf.org/html/draft-ietf-httpbis-p1-messaging-12
     token = /[-!#$\%&'*+.^_`|~0-9a-zA-Z]+/
-    d_qdtext = /[\s\x21\x23-\x5B\x5D-\x7E\x80-\xFF]/
-    d_quoted_pair = /\\[\s\x21-\x7E\x80-\xFF]/
+    d_qdtext = /[\s\x21\x23-\x5B\x5D-\x7E\x80-\xFF]/n
+    d_quoted_pair = /\\[\s\x21-\x7E\x80-\xFF]/n
     d_qs = /"(?:#{d_qdtext}|#{d_quoted_pair})*"/
     # Production rules that allow for more liberal parsing, i.e. single quotes
-    s_qdtext = /[\s\x21-\x26\x28-\x5B\x5D-\x7E\x80-\xFF]/
-    s_quoted_pair = /\\[\s\x21-\x7E\x80-\xFF]/
+    s_qdtext = /[\s\x21-\x26\x28-\x5B\x5D-\x7E\x80-\xFF]/n
+    s_quoted_pair = /\\[\s\x21-\x7E\x80-\xFF]/n
     s_qs = /'(?:#{s_qdtext}|#{s_quoted_pair})*'/
     # Combine the above production rules to find valid auth-param pairs.
     auth_param = /((?:#{token})\s*=\s*(?:#{d_qs}|#{s_qs}|#{token}))/

data/lib/signet/errors.rb

@@ -43,16 +43,16 @@ module Signet
     #   A message describing the error.
     # @param [Hash] options
     #   The configuration parameters for the request.
-    #   - <code>:request</code> —
+    #   - <code>:request</code> -
     #     A Faraday::Request object.  Optional.
-    #   - <code>:response</code> —
+    #   - <code>:response</code> -
     #     A Faraday::Response object.  Optional.
-    #   - <code>:code</code> —
+    #   - <code>:code</code> -
     #     An error code.
-    #   - <code>:description</code> —
+    #   - <code>:description</code> -
     #     Human-readable text intended to be used to assist in resolving the
     #     error condition.
-    #   - <code>:uri</code> —
+    #   - <code>:uri</code> -
     #     A URI identifying a human-readable web page with additional
     #     information about the error, indended for the resource owner.
     def initialize(message, options={})

data/lib/signet/oauth_1.rb

@@ -169,7 +169,7 @@ module Signet #:nodoc:
     # '&' characters.
     #
     # @param [String] method The HTTP method.
-    # @param [Addressable::URI, String, #to_str] The URI.
+    # @param [Addressable::URI, String, #to_str] uri The URI.
     # @param [Enumerable] parameters The OAuth parameter list.
     #
     # @return [String] The signature base string.
@@ -274,7 +274,7 @@ module Signet #:nodoc:
     # <code>NotImplementedError</code> exception being raised.
     #
     # @param [String] method The HTTP method.
-    # @param [Addressable::URI, String, #to_str] The URI.
+    # @param [Addressable::URI, String, #to_str] uri The URI.
     # @param [Enumerable] parameters The OAuth parameter list.
     # @param [String] client_credential_secret The client credential secret.
     # @param [String] token_credential_secret
@@ -307,13 +307,13 @@ module Signet #:nodoc:
     #
     # @param [Hash] options
     #   The configuration parameters for the request.
-    #   - <code>:client_credential_key</code> —
+    #   - <code>:client_credential_key</code> -
     #     The client credential key.
-    #   - <code>:callback</code> —
+    #   - <code>:callback</code> -
     #     The OAuth callback.  Defaults to {Signet::OAuth1::OUT_OF_BAND}.
-    #   - <code>:signature_method</code> —
+    #   - <code>:signature_method</code> -
     #     The signature method.  Defaults to <code>'HMAC-SHA1'</code>.
-    #   - <code>:additional_parameters</code> —
+    #   - <code>:additional_parameters</code> -
     #     Non-standard additional parameters.
     #
     # @return [Array]
@@ -382,13 +382,13 @@ module Signet #:nodoc:
     #
     # @param [Hash] options
     #   The configuration parameters for the request.
-    #   - <code>:client_credential_key</code> —
+    #   - <code>:client_credential_key</code> -
     #     The client credential key.
-    #   - <code>:temporary_credential_key</code> —
+    #   - <code>:temporary_credential_key</code> -
     #     The temporary credential key.
-    #   - <code>:verifier</code> —
+    #   - <code>:verifier</code> -
     #     The OAuth verifier.
-    #   - <code>:signature_method</code> —
+    #   - <code>:signature_method</code> -
     #     The signature method.  Defaults to <code>'HMAC-SHA1'</code>.
     #
     # @return [Array]
@@ -430,13 +430,13 @@ module Signet #:nodoc:
     #
     # @param [Hash] options
     #   The configuration parameters for the request.
-    #   - <code>:client_credential_key</code> —
+    #   - <code>:client_credential_key</code> -
     #     The client credential key.
-    #   - <code>:token_credential_key</code> —
+    #   - <code>:token_credential_key</code> -
     #     The token credential key.
-    #   - <code>:signature_method</code> —
+    #   - <code>:signature_method</code> -
     #     The signature method.  Defaults to <code>'HMAC-SHA1'</code>.
-    #   - <code>:two_legged</code> —
+    #   - <code>:two_legged</code> -
     #     A switch for two-legged OAuth.  Defaults to <code>false</code>.
     #
     # @return [Array]

data/lib/signet/oauth_1/client.rb

@@ -31,17 +31,17 @@ module Signet
       #
       # @param [Hash] options
       #   The configuration parameters for the client.
-      #   - <code>:temporary_credential_uri</code> —
+      #   - <code>:temporary_credential_uri</code> -
       #     The OAuth temporary credentials URI.
-      #   - <code>:authorization_uri</code> —
+      #   - <code>:authorization_uri</code> -
       #     The OAuth authorization URI.
-      #   - <code>:token_credential_uri</code> —
+      #   - <code>:token_credential_uri</code> -
       #     The OAuth token credentials URI.
-      #   - <code>:client_credential_key</code> —
+      #   - <code>:client_credential_key</code> -
       #     The OAuth client credential key.
-      #   - <code>:client_credential_secret</code> —
+      #   - <code>:client_credential_secret</code> -
       #     The OAuth client credential secret.
-      #   - <code>:callback</code> —  The OAuth callback.  Defaults to 'oob'.
+      #   - <code>:callback</code> -  The OAuth callback.  Defaults to 'oob'.
       #
       # @example
       #   client = Signet::OAuth1::Client.new(
@@ -515,11 +515,11 @@ module Signet
       #
       # @param [Hash] options
       #   The configuration parameters for the request.
-      #   - <code>:signature_method</code> —
+      #   - <code>:signature_method</code> -
       #     The signature method.  Defaults to <code>'HMAC-SHA1'</code>.
-      #   - <code>:additional_parameters</code> —
+      #   - <code>:additional_parameters</code> -
       #     Non-standard additional parameters.
-      #   - <code>:realm</code> —
+      #   - <code>:realm</code> -
       #     The Authorization realm.  See RFC 2617.
       #
       # @return [Array] The request object.
@@ -584,13 +584,13 @@ module Signet
       #
       # @param [Hash] options
       #   The configuration parameters for the request.
-      #   - <code>:signature_method</code> —
+      #   - <code>:signature_method</code> -
       #     The signature method.  Defaults to <code>'HMAC-SHA1'</code>.
-      #   - <code>:additional_parameters</code> —
+      #   - <code>:additional_parameters</code> -
       #     Non-standard additional parameters.
-      #   - <code>:realm</code> —
+      #   - <code>:realm</code> -
       #     The Authorization realm.  See RFC 2617.
-      #   - <code>:connection</code> —
+      #   - <code>:connection</code> -
       #     The HTTP connection to use.
       #     Must be of type <code>Faraday::Connection</code>.
       #
@@ -639,13 +639,13 @@ module Signet
       #
       # @param [Hash] options
       #   The configuration parameters for the request.
-      #   - <code>:signature_method</code> —
+      #   - <code>:signature_method</code> -
       #     The signature method.  Defaults to <code>'HMAC-SHA1'</code>.
-      #   - <code>:additional_parameters</code> —
+      #   - <code>:additional_parameters</code> -
       #     Non-standard additional parameters.
-      #   - <code>:realm</code> —
+      #   - <code>:realm</code> -
       #     The Authorization realm.  See RFC 2617.
-      #   - <code>:connection</code> —
+      #   - <code>:connection</code> -
       #     The HTTP connection to use.
       #     Must be of type <code>Faraday::Connection</code>.
       #
@@ -669,11 +669,11 @@ module Signet
       #
       # @param [Hash] options
       #   The configuration parameters for the request.
-      #   - <code>:verifier</code> —
+      #   - <code>:verifier</code> -
       #     The OAuth verifier provided by the server.  Required.
-      #   - <code>:signature_method</code> —
+      #   - <code>:signature_method</code> -
       #     The signature method.  Defaults to <code>'HMAC-SHA1'</code>.
-      #   - <code>:realm</code> —
+      #   - <code>:realm</code> -
       #     The Authorization realm.  See RFC 2617.
       #
       # @return [Array] The request object.
@@ -741,13 +741,13 @@ module Signet
       #
       # @param [Hash] options
       #   The configuration parameters for the request.
-      #   - <code>:verifier</code> —
+      #   - <code>:verifier</code> -
       #     The OAuth verifier provided by the server.  Required.
-      #   - <code>:signature_method</code> —
+      #   - <code>:signature_method</code> -
       #     The signature method.  Defaults to <code>'HMAC-SHA1'</code>.
-      #   - <code>:realm</code> —
+      #   - <code>:realm</code> -
       #     The Authorization realm.  See RFC 2617.
-      #   - <code>:connection</code> —
+      #   - <code>:connection</code> -
       #     The HTTP connection to use.
       #     Must be of type <code>Faraday::Connection</code>.
       #
@@ -794,13 +794,13 @@ module Signet
       #
       # @param [Hash] options
       #   The configuration parameters for the request.
-      #   - <code>:signature_method</code> —
+      #   - <code>:signature_method</code> -
       #     The signature method.  Defaults to <code>'HMAC-SHA1'</code>.
-      #   - <code>:additional_parameters</code> —
+      #   - <code>:additional_parameters</code> -
       #     Non-standard additional parameters.
-      #   - <code>:realm</code> —
+      #   - <code>:realm</code> -
       #     The Authorization realm.  See RFC 2617.
-      #   - <code>:connection</code> —
+      #   - <code>:connection</code> -
       #     The HTTP connection to use.
       #     Must be of type <code>Faraday::Connection</code>.
       #
@@ -822,19 +822,19 @@ module Signet
       #
       # @param [Hash] options
       #   The configuration parameters for the request.
-      #   - <code>:request</code> —
+      #   - <code>:request</code> -
       #     A pre-constructed request to sign.
-      #   - <code>:method</code> —
+      #   - <code>:method</code> -
       #     The HTTP method for the request.  Defaults to :get.
-      #   - <code>:uri</code> —
+      #   - <code>:uri</code> -
       #     The URI for the request.
-      #   - <code>:headers</code> —
+      #   - <code>:headers</code> -
       #     The HTTP headers for the request.
-      #   - <code>:body</code> —
+      #   - <code>:body</code> -
       #     The HTTP body for the request.
-      #   - <code>:signature_method</code> —
+      #   - <code>:signature_method</code> -
       #     The signature method.  Defaults to <code>'HMAC-SHA1'</code>.
-      #   - <code>:realm</code> —
+      #   - <code>:realm</code> -
       #     The Authorization realm.  See RFC 2617.
       #
       # @return [Array] The request object.
@@ -947,21 +947,21 @@ module Signet
       #
       # @param [Hash] options
       #   The configuration parameters for the request.
-      #   - <code>:request</code> —
+      #   - <code>:request</code> -
       #     A pre-constructed request to sign.
-      #   - <code>:method</code> —
+      #   - <code>:method</code> -
       #     The HTTP method for the request.  Defaults to :get.
-      #   - <code>:uri</code> —
+      #   - <code>:uri</code> -
       #     The URI for the request.
-      #   - <code>:headers</code> —
+      #   - <code>:headers</code> -
       #     The HTTP headers for the request.
-      #   - <code>:body</code> —
+      #   - <code>:body</code> -
       #     The HTTP body for the request.
-      #   - <code>:signature_method</code> —
+      #   - <code>:signature_method</code> -
       #     The signature method.  Defaults to <code>'HMAC-SHA1'</code>.
-      #   - <code>:realm</code> —
+      #   - <code>:realm</code> -
       #     The Authorization realm.  See RFC 2617.
-      #   - <code>:connection</code> —
+      #   - <code>:connection</code> -
       #     The HTTP connection to use.
       #     Must be of type <code>Faraday::Connection</code>.
       #

data/lib/signet/oauth_1/server.rb

@@ -126,7 +126,7 @@ module Signet
       ##
       #  Determine if the verifier is valid by calling the Proc in {#verifier}.
       #
-      # @param [String] Key provided to the {#verifier} Proc.
+      # @param [String] verifier Key provided to the {#verifier} Proc.
       # @return [Boolean] if the verifier Proc returns anything other than
       #   <code>nil</code> or <code>false</code>.
       def find_verifier(verifier)

data/lib/signet/oauth_2.rb

@@ -103,13 +103,12 @@ module Signet #:nodoc:
     end
 
     ##
-    # Generates a Basic Authorization header from a client identifier and a
-    # client password.
+    # Generates an authorization header for an access token
     #
-    # @param [String] client_id
-    #   The client identifier.
-    # @param [String] client_password
-    #   The client password.
+    # @param [String] access_token
+    #   The access token.
+    # @param [Hash] auth_params
+    #   Additonal parameters to be encoded in the header
     #
     # @return [String]
     #   The value for the HTTP Basic Authorization header.

data/lib/signet/oauth_2/client.rb

@@ -33,47 +33,47 @@ module Signet
       #
       # @param [Hash] options
       #   The configuration parameters for the client.
-      #   - <code>:authorization_uri</code> —
+      #   - <code>:authorization_uri</code> -
       #     The authorization server's HTTP endpoint capable of
       #     authenticating the end-user and obtaining authorization.
-      #   - <code>:token_credential_uri</code> —
+      #   - <code>:token_credential_uri</code> -
       #     The authorization server's HTTP endpoint capable of issuing
       #     tokens and refreshing expired tokens.
-      #   - <code>:client_id</code> —
+      #   - <code>:client_id</code> -
       #     A unique identifier issued to the client to identify itself to the
       #     authorization server.
-      #   - <code>:client_secret</code> —
+      #   - <code>:client_secret</code> -
       #     A shared symmetric secret issued by the authorization server,
       #     which is used to authenticate the client.
-      #   - <code>:scope</code> —
+      #   - <code>:scope</code> -
       #     The scope of the access request, expressed either as an Array
       #     or as a space-delimited String.
-      #   - <code>:state</code> —
+      #   - <code>:state</code> -
       #     An arbitrary string designed to allow the client to maintain state.
-      #   - <code>:code</code> —
+      #   - <code>:code</code> -
       #     The authorization code received from the authorization server.
-      #   - <code>:redirect_uri</code> —
+      #   - <code>:redirect_uri</code> -
       #     The redirection URI used in the initial request.
-      #   - <code>:username</code> —
+      #   - <code>:username</code> -
       #     The resource owner's username.
-      #   - <code>:password</code> —
+      #   - <code>:password</code> -
       #     The resource owner's password.
-      #   - <code>:issuer</code> —
+      #   - <code>:issuer</code> -
       #     Issuer ID when using assertion profile
       #   - <code>:person</code> -
       #     Target user for assertions
       #   - <code>:expiry</code> -
       #     Number of seconds assertions are valid for
-      #   - <code>:signing_key</code> —
+      #   - <code>:signing_key</code> -
       #     Signing key when using assertion profile
-      #   - <code>:refresh_token</code> —
+      #   - <code>:refresh_token</code> -
       #     The refresh token associated with the access token
       #     to be refreshed.
-      #   - <code>:access_token</code> —
+      #   - <code>:access_token</code> -
       #     The current access token for this client.
-      #   - <code>:id_token</code> —
+      #   - <code>:id_token</code> -
       #     The current ID token for this client.
-      #   - <code>:extension_parameters</code> —
+      #   - <code>:extension_parameters</code> -
       #     When using an extension grant type, this the set of parameters used
       #     by that extension.
       #
@@ -99,49 +99,49 @@ module Signet
       #
       # @param [Hash] options
       #   The configuration parameters for the client.
-      #   - <code>:authorization_uri</code> —
+      #   - <code>:authorization_uri</code> -
       #     The authorization server's HTTP endpoint capable of
       #     authenticating the end-user and obtaining authorization.
-      #   - <code>:token_credential_uri</code> —
+      #   - <code>:token_credential_uri</code> -
       #     The authorization server's HTTP endpoint capable of issuing
       #     tokens and refreshing expired tokens.
-      #   - <code>:client_id</code> —
+      #   - <code>:client_id</code> -
       #     A unique identifier issued to the client to identify itself to the
       #     authorization server.
-      #   - <code>:client_secret</code> —
+      #   - <code>:client_secret</code> -
       #     A shared symmetric secret issued by the authorization server,
       #     which is used to authenticate the client.
-      #   - <code>:scope</code> —
+      #   - <code>:scope</code> -
       #     The scope of the access request, expressed either as an Array
       #     or as a space-delimited String.
-      #   - <code>:state</code> —
+      #   - <code>:state</code> -
       #     An arbitrary string designed to allow the client to maintain state.
-      #   - <code>:code</code> —
+      #   - <code>:code</code> -
       #     The authorization code received from the authorization server.
-      #   - <code>:redirect_uri</code> —
+      #   - <code>:redirect_uri</code> -
       #     The redirection URI used in the initial request.
-      #   - <code>:username</code> —
+      #   - <code>:username</code> -
       #     The resource owner's username.
-      #   - <code>:password</code> —
+      #   - <code>:password</code> -
       #     The resource owner's password.
-      #   - <code>:issuer</code> —
+      #   - <code>:issuer</code> -
       #     Issuer ID when using assertion profile
-      #   - <code>:audience</code> —
+      #   - <code>:audience</code> -
       #     Target audience for assertions
       #   - <code>:person</code> -
       #     Target user for assertions
       #   - <code>:expiry</code> -
       #     Number of seconds assertions are valid for
-      #   - <code>:signing_key</code> —
+      #   - <code>:signing_key</code> -
       #     Signing key when using assertion profile
-      #   - <code>:refresh_token</code> —
+      #   - <code>:refresh_token</code> -
       #     The refresh token associated with the access token
       #     to be refreshed.
-      #   - <code>:access_token</code> —
+      #   - <code>:access_token</code> -
       #     The current access token for this client.
-      #   - <code>:id_token</code> —
+      #   - <code>:id_token</code> -
       #     The current ID token for this client.
-      #   - <code>:extension_parameters</code> —
+      #   - <code>:extension_parameters</code> -
       #     When using an extension grant type, this the set of parameters used
       #     by that extension.
       #
@@ -182,16 +182,16 @@ module Signet
       #
       # @param [Hash] options
       #   The configuration parameters related to the token.
-      #   - <code>:refresh_token</code> —
+      #   - <code>:refresh_token</code> -
       #     The refresh token associated with the access token
       #     to be refreshed.
-      #   - <code>:access_token</code> —
+      #   - <code>:access_token</code> -
       #     The current access token for this client.
-      #   - <code>:id_token</code> —
+      #   - <code>:id_token</code> -
       #     The current ID token for this client.
-      #   - <code>:expires_in</code> —
+      #   - <code>:expires_in</code> -
       #     The time in seconds until access token expiration.
-      #   - <code>:issued_at</code> —
+      #   - <code>:issued_at</code> -
       #     The timestamp that the token was issued at.
       #
       # @example
@@ -429,7 +429,8 @@ module Signet
       #   The redirect URI.
       def redirect_uri=(new_redirect_uri)
         new_redirect_uri = Addressable::URI.parse(new_redirect_uri)
-        if new_redirect_uri == nil || new_redirect_uri.absolute?
+        #TODO - Better solution to allow google postmessage flow. For now, make an exception to the spec. 
+        if new_redirect_uri == nil|| new_redirect_uri.absolute? || uri_is_postmessage?(new_redirect_uri)
           @redirect_uri = new_redirect_uri
         else
           raise ArgumentError, "Redirect URI must be an absolute URI."
@@ -506,7 +507,7 @@ module Signet
       # Sets the target audience ID when issuing assertions.
       # Used only by the assertion grant type.
       #
-      # @param [String] new_issuer
+      # @param [String] new_audience
       #   Target audience ID
       def audience=(new_audience)
         @audience = new_audience
@@ -517,8 +518,8 @@ module Signet
       # Used only by the assertion grant type.
       #
       # @return [String] Target user for impersonation.
-      def person
-        return @person
+      def principal
+        return @principal
       end
 
       ##
@@ -527,10 +528,13 @@ module Signet
       #
       # @param [String] new_person
       #   Target user for impersonation
-      def person=(new_person)
-        @person = new_person
+      def principal=(new_person)
+        @principal = new_person
       end
       
+      alias_method :person, :principal
+      alias_method :person=, :principal=
+      
       ##
       # Returns the number of seconds assertions are valid for
       # Used only by the assertion grant type.
@@ -732,6 +736,7 @@ module Signet
         return self.expires_at != nil && Time.now >= self.expires_at
       end
       
+      
       ##
       # Removes all credentials from the client.
       def clear_credentials!
@@ -745,6 +750,7 @@ module Signet
         @expires_in = nil
       end
 
+
       ##
       # Returns the inferred grant type, based on the current state of the
       # client object.  Returns `"none"` if the client has insufficient
@@ -803,7 +809,7 @@ module Signet
       #
       # @param [Hash] options
       #   The configuration parameters for the request.
-      #   - <code>:code</code> —
+      #   - <code>:code</code> -
       #     The authorization code.
       #
       # @return [Array] The request object.
@@ -902,19 +908,19 @@ module Signet
       #
       # @param [Hash] options
       #   The configuration parameters for the request.
-      #   - <code>:request</code> —
+      #   - <code>:request</code> -
       #     A pre-constructed request.  An OAuth 2 Authorization header
       #     will be added to it, as well as an explicit Cache-Control
       #     `no-store` directive.
-      #   - <code>:method</code> —
+      #   - <code>:method</code> -
       #     The HTTP method for the request.  Defaults to 'GET'.
-      #   - <code>:uri</code> —
+      #   - <code>:uri</code> -
       #     The URI for the request.
-      #   - <code>:headers</code> —
+      #   - <code>:headers</code> -
       #     The HTTP headers for the request.
-      #   - <code>:body</code> —
+      #   - <code>:body</code> -
       #     The HTTP body for the request.
-      #   - <code>:realm</code> —
+      #   - <code>:realm</code> -
       #     The Authorization realm.  See RFC 2617.
       #
       # @return [Faraday::Request] The request object.
@@ -971,21 +977,21 @@ module Signet
       #
       # @param [Hash] options
       #   The configuration parameters for the request.
-      #   - <code>:request</code> —
+      #   - <code>:request</code> -
       #     A pre-constructed request.  An OAuth 2 Authorization header
       #     will be added to it, as well as an explicit Cache-Control
       #     `no-store` directive.
-      #   - <code>:method</code> —
+      #   - <code>:method</code> -
       #     The HTTP method for the request.  Defaults to 'GET'.
-      #   - <code>:uri</code> —
+      #   - <code>:uri</code> -
       #     The URI for the request.
-      #   - <code>:headers</code> —
+      #   - <code>:headers</code> -
       #     The HTTP headers for the request.
-      #   - <code>:body</code> —
+      #   - <code>:body</code> -
       #     The HTTP body for the request.
-      #   - <code>:realm</code> —
+      #   - <code>:realm</code> -
       #     The Authorization realm.  See RFC 2617.
-      #   - <code>:connection</code> —
+      #   - <code>:connection</code> -
       #     The HTTP connection to use.
       #     Must be of type <code>Faraday::Connection</code>.
       #
@@ -1026,6 +1032,16 @@ module Signet
           return response
         end
       end
+      
+      private
+      
+      ##
+      # Check if URI is Google's postmessage flow (not a valid redirect_uri by spec, but allowed)
+      # @private
+      def uri_is_postmessage?(uri)
+        return uri.to_s.casecmp('postmessage') == 0
+      end
+      
     end
   end
 end

data/lib/signet/version.rb

@@ -18,7 +18,7 @@ unless defined? Signet::VERSION
     module VERSION
       MAJOR = 0
       MINOR = 4
-      TINY  = 4
+      TINY  = 5
 
       STRING = [MAJOR, MINOR, TINY].join('.')
     end

data/spec/signet/oauth_1/services/google_spec.rb

@@ -100,7 +100,7 @@ describe Signet::OAuth1::Client, 'configured for standard Google APIs' do
       @client.token_credential_secret = '12345'
       @client.fetch_protected_resource(
         :uri =>
-          'http://www-opensocial.googleusercontent.com/api/people/@me/@self'
+          'https://www.google.com/m8/feeds/'
       )
     end).should raise_error(Signet::AuthorizationError)
   end
@@ -232,7 +232,7 @@ describe Signet::OAuth1::Client, 'configured for two-legged OAuth' do
     (lambda do
       @client.fetch_protected_resource(
         :uri =>
-          'http://www-opensocial.googleusercontent.com/api/people/@me/@self'
+          'https://www.google.com/m8/feeds/'
       )
     end).should raise_error(Signet::AuthorizationError)
   end

data/spec/signet/oauth_2/client_spec.rb

@@ -71,7 +71,14 @@ describe Signet::OAuth2::Client, 'unconfigured' do
       @client = Signet::OAuth2::Client.new(:redirect_uri => '/relative/path')
     end).should raise_error(ArgumentError)
   end
-
+  
+  it 'should allow "postmessage" as a redirect URI (Google hack)' do
+    @client.authorization_uri = 'https://example.com/authorize'
+    @client.client_id = 's6BhdRkqt3'
+    @client.redirect_uri = 'postmessage'
+    @client.authorization_uri.query_values['redirect_uri'].should == 'postmessage'
+  end
+  
   it 'should have no authorization_uri' do
     @client.authorization_uri.should == nil
   end
@@ -165,6 +172,19 @@ describe Signet::OAuth2::Client, 'configured for assertions profile' do
     end
 
     it 'should generate valid JWTs for impersonation' do
+      @client.principal = 'user@example.com'
+      jwt = @client.to_jwt
+      jwt.should_not == nil
+
+      claim = JWT.decode(jwt, @key.public_key, true)
+      claim["iss"].should == 'app@example.com'
+      claim["prn"].should == 'user@example.com'
+      claim["scope"].should == 'https://www.googleapis.com/auth/userinfo.profile'
+      claim["aud"].should == 'https://accounts.google.com/o/oauth2/token'
+    end
+
+
+    it 'should generate valid JWTs for impersonation using deprecated person attribute' do
       @client.person = 'user@example.com'
       jwt = @client.to_jwt
       jwt.should_not == nil

data/tasks/yard.rake

@@ -11,7 +11,8 @@ namespace :doc do
     yardoc.name = 'yard'
     yardoc.options = ['--verbose', '--markup', 'markdown']
     yardoc.files = [
-      'lib/**/*.rb', 'ext/**/*.c', 'README.md', 'CHANGELOG.md', 'LICENSE'
+      'lib/**/*.rb', 'ext/**/*.c', '-',
+      'README.md', 'CHANGELOG.md', 'LICENSE'
     ]
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: signet
 version: !ruby/object:Gem::Version
-  version: 0.4.4
+  version: 0.4.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-08 00:00:00.000000000Z
+date: 2013-01-18 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
-  requirement: &70335622285100 !ruby/object:Gem::Requirement
+  requirement: &70325836933680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 2.2.3
   type: :runtime
   prerelease: false
-  version_requirements: *70335622285100
+  version_requirements: *70325836933680
 - !ruby/object:Gem::Dependency
   name: faraday
-  requirement: &70335622284080 !ruby/object:Gem::Requirement
+  requirement: &70325836932980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 0.8.1
   type: :runtime
   prerelease: false
-  version_requirements: *70335622284080
+  version_requirements: *70325836932980
 - !ruby/object:Gem::Dependency
   name: multi_json
-  requirement: &70335622283520 !ruby/object:Gem::Requirement
+  requirement: &70325836931580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: 1.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70335622283520
+  version_requirements: *70325836931580
 - !ruby/object:Gem::Dependency
   name: jwt
-  requirement: &70335622282880 !ruby/object:Gem::Requirement
+  requirement: &70325836928460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: 0.1.5
   type: :runtime
   prerelease: false
-  version_requirements: *70335622282880
+  version_requirements: *70325836928460
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70335622281960 !ruby/object:Gem::Requirement
+  requirement: &70325836921580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: 0.9.0
   type: :development
   prerelease: false
-  version_requirements: *70335622281960
+  version_requirements: *70325836921580
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70335622281020 !ruby/object:Gem::Requirement
+  requirement: &70325836921000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: 2.11.0
   type: :development
   prerelease: false
-  version_requirements: *70335622281020
+  version_requirements: *70325836921000
 - !ruby/object:Gem::Dependency
   name: launchy
-  requirement: &70335622273940 !ruby/object:Gem::Requirement
+  requirement: &70325836920220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,7 +87,7 @@ dependencies:
         version: 2.1.1
   type: :development
   prerelease: false
-  version_requirements: *70335622273940
+  version_requirements: *70325836920220
 description: ! 'Signet is an OAuth 1.0 / OAuth 2.0 implementation.
 
 '
@@ -100,17 +100,17 @@ files:
 - lib/compat/digest/hmac.rb
 - lib/compat/multi_json.rb
 - lib/compat/securerandom.rb
+- lib/signet.rb
 - lib/signet/errors.rb
+- lib/signet/oauth_1.rb
 - lib/signet/oauth_1/client.rb
 - lib/signet/oauth_1/credential.rb
 - lib/signet/oauth_1/server.rb
 - lib/signet/oauth_1/signature_methods/hmac_sha1.rb
-- lib/signet/oauth_1.rb
-- lib/signet/oauth_2/client.rb
 - lib/signet/oauth_2.rb
+- lib/signet/oauth_2/client.rb
 - lib/signet/ssl_config.rb
 - lib/signet/version.rb
-- lib/signet.rb
 - spec/force_compat/digest/hmac.rb
 - spec/force_compat/securerandom.rb
 - spec/signet/oauth_1/client_spec.rb
@@ -134,9 +134,10 @@ files:
 - website/index.html
 - CHANGELOG.md
 - Gemfile
+- Gemfile.lock
 - LICENSE
-- Rakefile
 - README.md
+- Rakefile
 homepage: http://code.google.com/p/oauth-signet/
 licenses: []
 post_install_message: