signet 0.7.2 → 0.7.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ec4912c2e8dee5bddbb079ad27efb8d99654abaf
-  data.tar.gz: 3e9118048022e46c0e50a25256e2448283ace5df
+  metadata.gz: fe41f18e201f3ff8052e35418010f84ea01ff4e7
+  data.tar.gz: 963c6a9098d23b2d675a7dfa7c085dc53f5d0376
 SHA512:
-  metadata.gz: 48faf986e4169b761eabc7b03268e427417ce2cb7aa575dd6364e4e3883a74492b6b554c3ea950455229af51dcaab31b6fdddcdee8836f1b5361ad8c1408daf1
-  data.tar.gz: 6689401b7e31bf871e4264e8d12810aea2821220c05d9afb962e875b61104b085c1275e12a9c3279988f215982647918461af0a5c6108e964c2eb754c7d65618
+  metadata.gz: b31a6ba85a206b28b9341949c19aae39ba6a027a6a2fb6bf3994a6705353d987c2283b93e8138675ce4ca66efb18a02d0f113a079c4b20f05cefb04c72116c3b
+  data.tar.gz: 68db4243e27964341dc75f25d1232c36b73df79f84ccb1e4c0d60652b2660e760649dbe4980286000acc65190b148fe9d72ae77b632e51d5a680358f491959a5

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+# 0.7.3
+
+* Fix timestamp parsing on 32-bit systems
+* Fix expiration check when issue/expiry times are nil
+
+
 # 0.7.2
 
 * Don't assume Faraday form encoding middleware is present

data/lib/signet/oauth_2/client.rb

@@ -801,7 +801,7 @@ module Signet
       # @return [TrueClass, FalseClass]
       #   The expiration state of the access token.
       def expires_within?(sec)
-        return self.expires_at != nil && Time.now >= (self.expires_at - sec)
+        return self.expires_at.nil? || Time.now >= (self.expires_at - sec)
       end
 
       ##
@@ -1177,7 +1177,7 @@ module Signet
           time
         when String
           Time.parse(time)
-        when Fixnum
+        when Fixnum, Bignum
           Time.at(time)
         else
           fail "Invalid time value #{time}"

data/lib/signet/version.rb

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

data/spec/signet/oauth_1/client_spec.rb

@@ -11,13 +11,8 @@
 #    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 #    See the License for the specific language governing permissions and
 #    limitations under the License.
-
-spec_dir = File.expand_path(File.join(File.dirname(__FILE__), "../.."))
-$:.unshift(spec_dir)
-$:.uniq!
-
 require 'spec_helper'
-
+require 'multi_json'
 require 'signet/oauth_1/client'
 require 'addressable/uri'
 require 'stringio'

data/spec/signet/oauth_1/credential_spec.rb

@@ -11,13 +11,7 @@
 #    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 #    See the License for the specific language governing permissions and
 #    limitations under the License.
-
-spec_dir = File.expand_path(File.join(File.dirname(__FILE__), "../.."))
-$:.unshift(spec_dir)
-$:.uniq!
-
 require 'spec_helper'
-
 require 'signet/oauth_1/credential'
 
 describe Signet::OAuth1::Credential, 'with a Hash for initialization' do

data/spec/signet/oauth_1/server_spec.rb

@@ -11,13 +11,7 @@
 #    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 #    See the License for the specific language governing permissions and
 #    limitations under the License.
-
-spec_dir = File.expand_path(File.join(File.dirname(__FILE__), "../.."))
-$:.unshift(spec_dir)
-$:.uniq!
-
 require 'spec_helper'
-
 require 'signet/oauth_1/server'
 require 'signet/oauth_1/client'
 require 'addressable/uri'

data/spec/signet/oauth_1/signature_methods/hmac_sha1_spec.rb

@@ -11,14 +11,9 @@
 #    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 #    See the License for the specific language governing permissions and
 #    limitations under the License.
-
-spec_dir = File.expand_path(File.join(File.dirname(__FILE__), "../../.."))
-$:.unshift(spec_dir)
-$:.uniq!
-
 require 'spec_helper'
-
 require 'signet'
+require 'signet/oauth_1'
 require 'signet/oauth_1/signature_methods/hmac_sha1'
 
 describe Signet::OAuth1::HMACSHA1 do

data/spec/signet/oauth_1/signature_methods/plaintext_spec.rb

@@ -11,14 +11,9 @@
 #    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 #    See the License for the specific language governing permissions and
 #    limitations under the License.
-
-spec_dir = File.expand_path(File.join(File.dirname(__FILE__), "../../.."))
-$:.unshift(spec_dir)
-$:.uniq!
-
 require 'spec_helper'
-
 require 'signet'
+require 'signet/oauth_1'
 require 'signet/oauth_1/signature_methods/plaintext'
 
 describe Signet::OAuth1::PLAINTEXT do

data/spec/signet/oauth_1/signature_methods/rsa_sha1_spec.rb

@@ -11,14 +11,9 @@
 #    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 #    See the License for the specific language governing permissions and
 #    limitations under the License.
-
-spec_dir = File.expand_path(File.join(File.dirname(__FILE__), "../../.."))
-$:.unshift(spec_dir)
-$:.uniq!
-
 require 'spec_helper'
-
 require 'signet'
+require 'signet/oauth_1'
 require 'signet/oauth_1/signature_methods/rsa_sha1'
 
 describe Signet::OAuth1::RSASHA1 do

data/spec/signet/oauth_1_spec.rb

@@ -11,13 +11,7 @@
 #    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 #    See the License for the specific language governing permissions and
 #    limitations under the License.
-
-spec_dir = File.expand_path(File.join(File.dirname(__FILE__), ".."))
-$:.unshift(spec_dir)
-$:.uniq!
-
 require 'spec_helper'
-
 require 'signet/oauth_1'
 require 'signet/oauth_1/client'
 require 'signet/oauth_1/credential'

data/spec/signet/oauth_2/client_spec.rb

@@ -11,13 +11,7 @@
 #    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 #    See the License for the specific language governing permissions and
 #    limitations under the License.
-
-spec_dir = File.expand_path(File.join(File.dirname(__FILE__), "../.."))
-$:.unshift(spec_dir)
-$:.uniq!
-
 require 'spec_helper'
-
 require 'signet/oauth_2/client'
 require 'openssl'
 require 'jwt'
@@ -441,6 +435,21 @@ describe Signet::OAuth2::Client, 'configured for Google userinfo API' do
     expect(@client).to_not be_expired
   end
 
+  it 'should indicate the token is expired if expired_at nil' do
+    @client.expires_at = nil
+    expect(@client.expires_within?(60)).to be true
+  end
+
+  it 'should indicate the token is not expiring when expiry beyond window' do
+    @client.expires_at = Time.now+100
+    expect(@client.expires_within?(60)).to be false
+  end
+
+  it 'should indicate the token is expiring soon when expiry within window' do
+    @client.expires_at = Time.now+30
+    expect(@client.expires_within?(60)).to be true
+  end
+
   it 'should raise an error if the authorization endpoint is not secure' do
     @client.client_id = 'client-12345'
     @client.client_secret = 'secret-12345'
@@ -888,7 +897,7 @@ xwIDAQAB
 -----END PUBLIC KEY-----
 PUBKEY
       @client.decoded_id_token(pubkey)
-    end).to raise_error(JWT::VerificationError)
+    end).to raise_error
     stubs.verify_stubbed_calls
   end
 end

data/spec/signet/oauth_2_spec.rb

@@ -11,13 +11,8 @@
 #    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 #    See the License for the specific language governing permissions and
 #    limitations under the License.
-
-spec_dir = File.expand_path(File.join(File.dirname(__FILE__), ".."))
-$:.unshift(spec_dir)
-$:.uniq!
-
 require 'spec_helper'
-
+require 'signet/errors'
 require 'signet/oauth_2'
 
 describe Signet::OAuth2 do

data/spec/signet_spec.rb

@@ -11,13 +11,7 @@
 #    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 #    See the License for the specific language governing permissions and
 #    limitations under the License.
-
-spec_dir = File.expand_path(File.join(File.dirname(__FILE__)))
-$:.unshift(spec_dir)
-$:.uniq!
-
 require 'spec_helper'
-
 require 'signet/oauth_2'
 
 describe Signet do

data/spec/spec_helper.rb

@@ -1,10 +1,5 @@
-spec_dir = File.expand_path(File.dirname(__FILE__))
-root_dir = File.expand_path(File.join(spec_dir, ".."))
-lib_dir = File.expand_path(File.join(root_dir, "lib"))
-compat_dir = File.expand_path(File.join(spec_dir, "force_compat"))
+compat_dir = File.expand_path(File.join('..', 'force_compat'))
 
-$:.unshift(spec_dir)
-$:.unshift(lib_dir)
 $:.unshift(compat_dir)
 $:.uniq!
 

data/spec/spec_helper_spec.rb

@@ -0,0 +1,17 @@
+RSpec.describe 'spec_helper.rb' do
+  let(:spec_dir) { File.expand_path(File.dirname(__FILE__)) }
+  let(:root_dir) { File.expand_path(File.join(spec_dir, '..')) }
+  let(:lib_dir) { File.expand_path(File.join(root_dir, 'lib')) }
+
+  describe 'spec_dir' do
+    it 'is already in $LOAD_PATH' do
+      expect($LOAD_PATH).to include spec_dir
+    end
+  end
+
+  describe 'lib_dir' do
+    it 'is already in $LOAD_PATH' do
+      expect($LOAD_PATH).to include lib_dir
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: signet
 version: !ruby/object:Gem::Version
-  version: 0.7.2
+  version: 0.7.3
 platform: ruby
 authors:
 - Bob Aman
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-21 00:00:00.000000000 Z
+date: 2016-06-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -186,7 +186,6 @@ files:
 - spec/signet/oauth_1/client_spec.rb
 - spec/signet/oauth_1/credential_spec.rb
 - spec/signet/oauth_1/server_spec.rb
-- spec/signet/oauth_1/services/google_spec.rb
 - spec/signet/oauth_1/signature_methods/hmac_sha1_spec.rb
 - spec/signet/oauth_1/signature_methods/plaintext_spec.rb
 - spec/signet/oauth_1/signature_methods/rsa_sha1_spec.rb
@@ -196,6 +195,7 @@ files:
 - spec/signet_spec.rb
 - spec/spec.opts
 - spec/spec_helper.rb
+- spec/spec_helper_spec.rb
 - tasks/clobber.rake
 - tasks/gem.rake
 - tasks/git.rake

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

@@ -1,241 +0,0 @@
-# Copyright (C) 2010 Google Inc.
-#
-#    Licensed under the Apache License, Version 2.0 (the "License");
-#    you may not use this file except in compliance with the License.
-#    You may obtain a copy of the License at
-#
-#        http://www.apache.org/licenses/LICENSE-2.0
-#
-#    Unless required by applicable law or agreed to in writing, software
-#    distributed under the License is distributed on an "AS IS" BASIS,
-#    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#    See the License for the specific language governing permissions and
-#    limitations under the License.
-
-spec_dir = File.expand_path(File.join(File.dirname(__FILE__), "../../.."))
-$:.unshift(spec_dir)
-$:.uniq!
-
-require 'spec_helper'
-
-require 'signet/oauth_1/client'
-require 'faraday'
-require 'stringio'
-
-def merge_body(chunked_body)
-  merged_body = StringIO.new
-  chunked_body.each do |chunk|
-    merged_body.write(chunk)
-  end
-  return merged_body.string
-end
-
-describe Signet::OAuth1::Client, 'configured for standard Google APIs' do
-  before do
-    @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'
-    )
-  end
-
-  it 'should raise an error if scope is omitted' do
-    expect(lambda do
-      @client.fetch_temporary_credential!
-    end).to raise_error(Signet::AuthorizationError)
-  end
-
-  it 'should raise an error if the server gives an unexpected status' do
-    stubs = Faraday::Adapter::Test::Stubs.new do |stub|
-      stub.post('/accounts/OAuthGetRequestToken') do
-        [509, {}, 'Rate limit hit or something.']
-      end
-    end
-    expect(lambda do
-      connection = Faraday.new(:url => 'https://www.google.com') do |builder|
-        builder.adapter(:test, stubs)
-      end
-      @client.fetch_temporary_credential!(
-        :connection => connection,
-        :additional_parameters => {
-          :scope => 'https://www.google.com/m8/feeds/'
-        }
-      )
-    end).to raise_error(Signet::AuthorizationError)
-    stubs.verify_stubbed_calls
-  end
-
-  it 'should be able to obtain temporary credentials for the Contacts API' do
-    @client.fetch_temporary_credential!(:additional_parameters => {
-      :scope => 'https://www.google.com/m8/feeds/'
-    })
-    expect(@client.temporary_credential_key.size).to be > 0
-    expect(@client.temporary_credential_secret.size).to be > 0
-  end
-
-  it 'should have the correct authorization URI' do
-    @client.fetch_temporary_credential!(:additional_parameters => {
-      :scope => 'https://www.google.com/m8/feeds/'
-    })
-    expect(@client.authorization_uri.query_values["oauth_token"]).to eq(
-      @client.temporary_credential_key)
-  end
-
-  it 'should raise an error if the temporary credentials are bogus' do
-    expect(lambda do
-      @client.temporary_credential_key = '12345'
-      @client.temporary_credential_secret = '12345'
-      @client.fetch_token_credential!(:verifier => 'XbVKagBShNsAGBRJWoC4gtFR')
-    end).to raise_error(Signet::AuthorizationError)
-  end
-
-  it 'should raise an error if the token credentials are bogus' do
-    expect do
-      skip 'Need to replace with mocked response as google endpoints no longer use oauth1'
-      @client.token_credential_key = '12345'
-      @client.token_credential_secret = '12345'
-      res = @client.fetch_protected_resource(
-        :uri =>
-          'https://www.google.com/m8/feeds/'
-      )
-      puts "Res = #{res.status}"
-    end.to raise_error(Signet::AuthorizationError)
-  end
-
-  # We have to stub responses for the token credentials
-
-  it 'should be able to obtain token credentials for the Contacts API' do
-    stubs = Faraday::Adapter::Test::Stubs.new do |stub|
-      stub.post('/accounts/OAuthGetAccessToken') do
-        [
-          200,
-          {},
-          'oauth_token=1%2FYFw6UH2Dn7W691-qAbCfsmqEHQrPb7ptIvYx9m6YkUQ&' +
-          'oauth_token_secret=Ew3YHAY4bcBryiOUvbdHGa57'
-        ]
-      end
-    end
-    connection = Faraday.new(:url => 'https://www.google.com') do |builder|
-      builder.adapter(:test, stubs)
-    end
-    @client.temporary_credential_key = '4/oegn2eP-3yswD7HiESnJOB-8oh2i'
-    @client.temporary_credential_secret = '8E1BF0J6ovMva0j87atj/tTG'
-    @client.fetch_token_credential!(
-      :verifier => 'XbVKagBShNsAGBRJWoC4gtFR',
-      :connection => connection,
-      :additional_parameters => {
-        :scope => 'https://www.google.com/m8/feeds/'
-      }
-    )
-    expect(@client.token_credential_key).to eq '1/YFw6UH2Dn7W691-qAbCfsmqEHQrPb7ptIvYx9m6YkUQ'
-    expect(@client.token_credential_secret).to eq 'Ew3YHAY4bcBryiOUvbdHGa57'
-    stubs.verify_stubbed_calls
-  end
-
-  it 'should raise an error if the server gives an unexpected status' do
-    stubs = Faraday::Adapter::Test::Stubs.new do |stub|
-      stub.post('/accounts/OAuthGetAccessToken') do
-        [509, {}, 'Rate limit hit or something.']
-      end
-    end
-    expect(lambda do
-      connection = Faraday.new(:url => 'https://www.google.com') do |builder|
-        builder.adapter(:test, stubs)
-      end
-      @client.temporary_credential_key = '4/oegn2eP-3yswD7HiESnJOB-8oh2i'
-      @client.temporary_credential_secret = '8E1BF0J6ovMva0j87atj/tTG'
-      @client.fetch_token_credential!(
-        :verifier => 'XbVKagBShNsAGBRJWoC4gtFR',
-        :connection => connection,
-        :additional_parameters => {
-          :scope => 'https://www.google.com/m8/feeds/'
-        }
-      )
-    end).to raise_error(Signet::AuthorizationError)
-    stubs.verify_stubbed_calls
-  end
-
-  it 'should correctly fetch the protected resource' do
-    stubs = Faraday::Adapter::Test::Stubs.new do |stub|
-      stub.get('/api/people/@me/@self') do
-        [
-          200,
-          {'Content-Type' => 'application/json'},
-          '{"data":"goes here"}'
-        ]
-      end
-    end
-    connection = Faraday.new(
-      :url => 'http://www-opensocial.googleusercontent.com'
-    ) do |builder|
-      builder.adapter(:test, stubs)
-    end
-    @client.token_credential_key =
-      '1/YFw6UH2Dn7W691-qAbCfsmqEHQrPb7ptIvYx9m6YkUQ'
-    @client.token_credential_secret = 'Ew3YHAY4bcBryiOUvbdHGa57'
-    response = @client.fetch_protected_resource(
-      :connection => connection,
-      :uri =>
-        'http://www-opensocial.googleusercontent.com/api/people/@me/@self'
-    )
-    expect(response.status).to eq 200
-    expect(response.headers['Content-Type']).to eq 'application/json'
-    expect(response.body).to eq '{"data":"goes here"}'
-  end
-
-  it 'should correctly fetch the protected resource' do
-    stubs = Faraday::Adapter::Test::Stubs.new do |stub|
-      stub.get('/api/people/@me/@self') do
-        [
-          200,
-          {'Content-Type' => 'application/json'},
-          '{"data":"goes here"}'
-        ]
-      end
-    end
-    connection = Faraday.new(
-      :url => 'http://www-opensocial.googleusercontent.com'
-    ) do |builder|
-      builder.adapter(:test, stubs)
-    end
-    @client.token_credential_key =
-      '1/YFw6UH2Dn7W691-qAbCfsmqEHQrPb7ptIvYx9m6YkUQ'
-    @client.token_credential_secret = 'Ew3YHAY4bcBryiOUvbdHGa57'
-    response = @client.fetch_protected_resource(
-      :connection => connection,
-      :request => Faraday.default_connection.build_request(:get) do |req|
-        req.url(
-          'http://www-opensocial.googleusercontent.com/api/people/@me/@self'
-        )
-      end
-    )
-    expect(response.status).to eq 200
-    expect(response.headers['Content-Type']).to eq 'application/json'
-    expect(response.body).to eq '{"data":"goes here"}'
-  end
-end
-
-describe Signet::OAuth1::Client, 'configured for two-legged OAuth' do
-  before do
-    @client = Signet::OAuth1::Client.new(
-      :client_credential_key => '12345',
-      :client_credential_secret => '12345',
-      :two_legged => true
-    )
-  end
-
-  it 'should raise an error if the client credentials are bogus' do
-    skip 'Need to replace with mocked response as google endpoints no longer use oauth1'
-    expect(lambda do
-      @client.fetch_protected_resource(
-        :uri =>
-          'https://www.google.com/m8/feeds/'
-      )
-    end).to raise_error(Signet::AuthorizationError)
-  end
-end