signet 0.4.5 → 0.5.0

data/Gemfile

@@ -1,7 +1,7 @@
-source :rubygems
+source 'https://rubygems.org'
 
 gem 'addressable', '>= 2.3.1'
-gem 'faraday', '~> 0.8.1'
+gem 'faraday', '>= 0.9.0.rc5'
 gem 'multi_json', '>= 1.0.0'
 gem 'jwt', '>= 0.1.5'
 gem 'extlib', '>= 0.9.15'
@@ -15,6 +15,7 @@ end
 
 
 group :test, :development do
+  gem 'json', '~> 1.7.7'
   gem 'rake', '>= 0.9.0'
   gem 'rspec', '>= 2.11.0'
   gem 'rcov', '>= 0.9.9', :platform => :mri_18

data/Gemfile.lock

@@ -1,48 +1,40 @@
 GEM
-  remote: http://rubygems.org/
+  remote: https://rubygems.org/
   specs:
-    addressable (2.3.2)
-    bouncy-castle-java (1.5.0146.1)
-    diff-lcs (1.1.3)
+    addressable (2.3.4)
+    diff-lcs (1.2.4)
     extlib (0.9.16)
-    faraday (0.8.4)
+    faraday (0.9.0.rc5)
       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)
+    json (1.7.7)
+    jwt (0.1.8)
+      multi_json (>= 1.5)
+    kramdown (1.0.2)
+    launchy (2.3.0)
       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)
+    multi_json (1.7.3)
+    multipart-post (1.2.0)
+    rake (10.0.4)
     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)
+    rspec (2.13.0)
+      rspec-core (~> 2.13.0)
+      rspec-expectations (~> 2.13.0)
+      rspec-mocks (~> 2.13.0)
+    rspec-core (2.13.1)
+    rspec-expectations (2.13.0)
+      diff-lcs (>= 1.1.3, < 2.0)
+    rspec-mocks (2.13.1)
+    yard (0.8.6.1)
 
 PLATFORMS
-  java
   ruby
 
 DEPENDENCIES
   addressable (>= 2.3.1)
   extlib (>= 0.9.15)
-  faraday (~> 0.8.1)
+  faraday (>= 0.9.0.rc5)
   jruby-openssl
+  json (~> 1.7.7)
   jwt (>= 0.1.5)
   kramdown
   launchy (>= 2.1.1)

data/README.md

@@ -25,28 +25,30 @@ Signet is an OAuth 1.0 / OAuth 2.0 implementation.
 
 ## Example Usage for Google
 
-    require 'signet/oauth_1/client'
-    client = Signet::OAuth1::Client.new(
-      :temporary_credential_uri =>
-        'https://www.google.com/accounts/OAuthGetRequestToken',
-      :authorization_uri =>
-        'https://www.google.com/accounts/OAuthAuthorizeToken',
-      :token_credential_uri =>
-        'https://www.google.com/accounts/OAuthGetAccessToken',
-      :client_credential_key => 'anonymous',
-      :client_credential_secret => 'anonymous'
-    )
-    client.fetch_temporary_credential!(:additional_parameters => {
-      :scope => 'https://mail.google.com/mail/feed/atom'
-    })
-    # Send the user to client.authorization_uri, obtain verifier
-    client.fetch_token_credential!(:verifier => '12345')
-    response = client.fetch_protected_resource(
-      :uri => 'https://mail.google.com/mail/feed/atom'
-    )
+``` ruby
+require 'signet/oauth_1/client'
+client = Signet::OAuth1::Client.new(
+  :temporary_credential_uri =>
+    'https://www.google.com/accounts/OAuthGetRequestToken',
+  :authorization_uri =>
+    'https://www.google.com/accounts/OAuthAuthorizeToken',
+  :token_credential_uri =>
+    'https://www.google.com/accounts/OAuthGetAccessToken',
+  :client_credential_key => 'anonymous',
+  :client_credential_secret => 'anonymous'
+)
+client.fetch_temporary_credential!(:additional_parameters => {
+  :scope => 'https://mail.google.com/mail/feed/atom'
+})
+# Send the user to client.authorization_uri, obtain verifier
+client.fetch_token_credential!(:verifier => '12345')
+response = client.fetch_protected_resource(
+  :uri => 'https://mail.google.com/mail/feed/atom'
+)
+```
 
 ## Install
 
-`sudo gem install signet`
+`gem install signet`
 
-Be sure `http://rubygems.org/` is in your gem sources.
+Be sure `https://rubygems.org` is in your gem sources.

data/lib/signet/oauth_1/client.rb

@@ -12,7 +12,6 @@
 #    See the License for the specific language governing permissions and
 #    limitations under the License.
 
-gem 'faraday', '~> 0.8.1'
 require 'faraday'
 #require 'faraday/utils'
 

data/lib/signet/oauth_2/client.rb

@@ -12,7 +12,6 @@
 #    See the License for the specific language governing permissions and
 #    limitations under the License.
 
-gem 'faraday', '~> 0.8.1'
 require 'faraday'
 #require 'faraday/utils'
 
@@ -22,7 +21,6 @@ require 'signet'
 require 'signet/errors'
 require 'signet/oauth_2'
 
-gem 'jwt', '~> 0.1.4'
 require 'jwt'
 
 module Signet
@@ -191,6 +189,8 @@ module Signet
       #     The current ID token for this client.
       #   - <code>:expires_in</code> -
       #     The time in seconds until access token expiration.
+      #   - <code>:expires_at</code> -
+      #     The time as an integer number of seconds since the Epoch
       #   - <code>:issued_at</code> -
       #     The timestamp that the token was issued at.
       #
@@ -209,6 +209,7 @@ module Signet
 
         self.access_token = options["access_token"] if options["access_token"]
         self.expires_in = options["expires_in"] if options["expires_in"]
+        self.expires_at = options["expires_at"] if options["expires_at"]
 
         # The refresh token may not be returned in a token response.
         # In which case, the old one should continue to be used.
@@ -720,13 +721,22 @@ module Signet
       #
       # @return [Integer] The access token lifetime.
       def expires_at
-        if @issued_at && @expires_in
+        if @expires_at
+          @expires_at
+        elsif @issued_at && @expires_in
           return @issued_at + @expires_in
         else
           return nil
         end
       end
 
+      ##
+      # Limits the lifetime of the access token as number of seconds since
+      # the Epoch
+      def expires_at=(new_expires_at)
+        @expires_at = Time.at new_expires_at
+      end
+
       ##
       # Returns true if the access token has expired.
       #

data/lib/signet/version.rb

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

data/spec/signet/oauth_2/client_spec.rb

@@ -20,8 +20,6 @@ require 'spec_helper'
 
 require 'signet/oauth_2/client'
 require 'openssl'
-
-gem 'jwt', '~> 0.1.4'
 require 'jwt'
 
 conn = Faraday.default_connection
@@ -352,6 +350,23 @@ describe Signet::OAuth2::Client, 'configured for Google userinfo API' do
     @client.should_not be_expired
   end
 
+  it 'should allow the expires_at time to be updated' do
+    expires_at = Time.now.round - 100
+    @client.update_token!(
+      :expires_at => expires_at.to_i,
+      :expires_in => nil
+    )
+    @client.expires_at.should == expires_at
+    @client.should be_expired
+  end
+
+  it 'should allow setting expires_at manually' do
+    expires_at = Time.now.round + 100
+    @client.expires_at = expires_at.to_i
+    @client.expires_at.should == expires_at
+    @client.should_not be_expired
+  end
+
   it 'should raise an error if the authorization endpoint is not secure' do
     @client.client_id = 'client-12345'
     @client.client_secret = 'secret-12345'

data/spec/spec_helper.rb

@@ -10,4 +10,7 @@ $:.uniq!
 
 require 'rubygems'
 require 'signet'
-require 'rspec'
+require 'rspec'
+
+require 'faraday'
+Faraday::Adapter.load_middleware(:test)

data/tasks/gem.rake

@@ -22,7 +22,7 @@ namespace :gem do
     s.rdoc_options.concat ["--main",  "README.md"]
 
     s.add_runtime_dependency("addressable", ">= 2.2.3")
-    s.add_runtime_dependency("faraday", "~> 0.8.1")
+    s.add_runtime_dependency("faraday", ">= 0.9.0.rc5")
     s.add_runtime_dependency("multi_json", ">= 1.0.0")
     s.add_runtime_dependency("jwt", ">= 0.1.5")
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: signet
 version: !ruby/object:Gem::Version
-  version: 0.4.5
+  version: 0.5.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-18 00:00:00.000000000Z
+date: 2013-05-31 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
-  requirement: &70325836933680 !ruby/object:Gem::Requirement
+  requirement: &70222590324220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,21 +21,21 @@ dependencies:
         version: 2.2.3
   type: :runtime
   prerelease: false
-  version_requirements: *70325836933680
+  version_requirements: *70222590324220
 - !ruby/object:Gem::Dependency
   name: faraday
-  requirement: &70325836932980 !ruby/object:Gem::Requirement
+  requirement: &70222590323640 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.8.1
+        version: 0.9.0.rc5
   type: :runtime
   prerelease: false
-  version_requirements: *70325836932980
+  version_requirements: *70222590323640
 - !ruby/object:Gem::Dependency
   name: multi_json
-  requirement: &70325836931580 !ruby/object:Gem::Requirement
+  requirement: &70222590323140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: 1.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70325836931580
+  version_requirements: *70222590323140
 - !ruby/object:Gem::Dependency
   name: jwt
-  requirement: &70325836928460 !ruby/object:Gem::Requirement
+  requirement: &70222590322620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: 0.1.5
   type: :runtime
   prerelease: false
-  version_requirements: *70325836928460
+  version_requirements: *70222590322620
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70325836921580 !ruby/object:Gem::Requirement
+  requirement: &70222590322100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: 0.9.0
   type: :development
   prerelease: false
-  version_requirements: *70325836921580
+  version_requirements: *70222590322100
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70325836921000 !ruby/object:Gem::Requirement
+  requirement: &70222590321620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: 2.11.0
   type: :development
   prerelease: false
-  version_requirements: *70325836921000
+  version_requirements: *70222590321620
 - !ruby/object:Gem::Dependency
   name: launchy
-  requirement: &70325836920220 !ruby/object:Gem::Requirement
+  requirement: &70222590321100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,7 +87,7 @@ dependencies:
         version: 2.1.1
   type: :development
   prerelease: false
-  version_requirements: *70325836920220
+  version_requirements: *70222590321100
 description: ! 'Signet is an OAuth 1.0 / OAuth 2.0 implementation.
 
 '