oauth2-aptible 0.9.5 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c6b1926148110d013c74ebf7d9ecbc0fd41d00bb
-  data.tar.gz: 5ba394061da8dbeca872b4678f76f7de8167fe8e
+  metadata.gz: c846a8652ef877ec30ecf1c39d791dafa4426ee8
+  data.tar.gz: 60ad59f81d91f0940029ecf6b4b0ab96989af3cf
 SHA512:
-  metadata.gz: 61335618b62de6ce94a1bd14dfd1d74b11124bfd7a447c3bee6e4e54346e7c62b4fffe56bf5c31c26a71833ef18369b70b3698c075d08c8f01ac847c94d417a2
-  data.tar.gz: 28f32435318e5b48a0d47c5bd6836e3d2a930e06926c3050e153bb1b24c7e07af152cf2f0cc55cc4aa7ac488c070a0147c840b78d88dbe46e19c75a5eee8b3b3
+  metadata.gz: 613be9e21be059631092e7a8da50399243a67ab35563cb0948abfb4e15ea9f0d4d0bb4cf9aebafccb41177366a4236759592c87aa16c05370360f1914a5b2dac
+  data.tar.gz: 0a595db7f64a61c2a5090ab445ca4fc21bac691ea54e4b783ae13beaa99ccd95a1621f4eb8d3dcea33f003f462d1f00361ef23721fc40719a7c2af68d1cef2f0

data/lib/oauth2/access_token.rb

@@ -1,3 +1,5 @@
+require 'time'
+
 module OAuth2
   class AccessToken
     attr_reader :client, :token, :expires_in, :expires_at, :params
@@ -30,7 +32,7 @@ module OAuth2
     # @param [Hash] opts the options to create the Access Token with
     # @option opts [String] :refresh_token (nil) the refresh_token value
     # @option opts [FixNum, String] :expires_in (nil) the number of seconds in which the AccessToken will expire
-    # @option opts [FixNum, String] :expires_at (nil) the epoch time in seconds in which AccessToken will expire
+    # @option opts [FixNum, String] :expires_at (nil) the time (epoch time in seconds or iso8601-formatted date) when the token will expire
     # @option opts [Symbol] :mode (:header) the transmission mode of the Access Token parameter value
     #    one of :header, :body or :query
     # @option opts [String] :header_format ('Bearer %s') the string format to use for the Authorization header
@@ -44,8 +46,16 @@ module OAuth2
       end
       @expires_in ||= opts.delete('expires')
       @expires_in &&= @expires_in.to_i
-      @expires_at &&= @expires_at.to_i
-      @expires_at ||= Time.now.to_i + @expires_in if @expires_in
+      @expires_at &&= begin
+                        Time.iso8601(@expires_at)
+                      rescue ArgumentError, TypeError
+                        begin
+                          Time.at(Integer(@expires_at))
+                        rescue ArgumentError
+                          nil
+                        end
+                      end unless @expires_at.is_a?(Time)
+      @expires_at ||= Time.at(Time.now.to_i + @expires_in) if @expires_in
       @options = {:mode          => opts.delete(:mode) || :header,
                   :header_format => opts.delete(:header_format) || 'Bearer %s',
                   :param_name    => opts.delete(:param_name) || 'access_token'}
@@ -70,7 +80,7 @@ module OAuth2
     #
     # @return [Boolean]
     def expired?
-      expires? && (expires_at < Time.now.to_i)
+      expires? && (expires_at < Time.now)
     end
 
     # Refreshes the current Access Token

data/lib/oauth2/version.rb

@@ -1,8 +1,8 @@
 module OAuth2
   class Version
     MAJOR = 0
-    MINOR = 9
-    PATCH = 5
+    MINOR = 10
+    PATCH = 0
 
     class << self
       # @return [String]

data/spec/oauth2/access_token_spec.rb

@@ -60,11 +60,35 @@ describe AccessToken do
       expect(target.options[:mode]).to eq(:body)
     end
 
-    it 'initializes with a string expires_at' do
+    it 'initializes with a string expires_at epoch' do
       hash = {:access_token => token, :expires_at => '1361396829', 'foo' => 'bar'}
       target = AccessToken.from_hash(client, hash)
       assert_initialized_token(target)
-      expect(target.expires_at).to be_a(Integer)
+      expect(target.expires_at).to be_a(Time)
+      expect(target.expires_at.to_i).to eq(1361396829)
+    end
+
+    it 'initializes with a string expires_at time' do
+      hash = {:access_token => token, :expires_at => '2016-05-06T17:37:59.128Z', 'foo' => 'bar'}
+      target = AccessToken.from_hash(client, hash)
+      assert_initialized_token(target)
+      expect(target.expires_at).to be_a(Time)
+      expect(target.expires_at.to_i).to eq(1462556279)
+    end
+
+    it 'sets a Time for expires_at via expires_in' do
+      hash = {:access_token => token, :expires_in => '100', 'foo' => 'bar'}
+      target = AccessToken.from_hash(client, hash)
+      assert_initialized_token(target)
+      expect(target.expires_at).to be_a(Time)
+    end
+
+    it 'passes through a Time for expires_at' do
+      t = Time.now
+      hash = {:access_token => token, :expires_at => t, 'foo' => 'bar'}
+      target = AccessToken.from_hash(client, hash)
+      assert_initialized_token(target)
+      expect(target.expires_at).to eq(t)
     end
   end
 
@@ -164,7 +188,12 @@ describe AccessToken do
 
   describe '#to_hash' do
     it 'return a hash equals to the hash used to initialize access token' do
-      hash = {:access_token => token, :refresh_token => 'foobar', :expires_at => Time.now.to_i + 200, 'foo' => 'bar'}
+      t = Time.now + 200
+      hash = { :access_token => token,
+               :refresh_token => 'foobar',
+               :expires_at => t,
+               'foo' => 'bar'
+      }
       access_token = AccessToken.from_hash(client, hash.clone)
       expect(access_token.to_hash).to eq(hash)
     end

data/spec/oauth2/strategy/auth_code_spec.rb

@@ -76,7 +76,7 @@ describe OAuth2::Strategy::AuthCode do
         end
 
         it 'returns AccessToken with #expires_at' do
-          expect(@access.expires_at).to be_kind_of(Integer)
+          expect(@access.expires_at).to be_kind_of(Time)
         end
 
         it 'returns AccessToken with params accessible via []' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: oauth2-aptible
 version: !ruby/object:Gem::Version
-  version: 0.9.5
+  version: 0.10.0
 platform: ruby
 authors:
 - Frank Macreery
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-08 00:00:00.000000000 Z
+date: 2016-06-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -158,7 +158,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.5
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.6.4
 signing_key: 
 specification_version: 4
 summary: A Ruby wrapper for the OAuth 2.0 protocol.