googleauth 0.8.0 → 0.8.1

data/spec/googleauth/web_user_authorizer_spec.rb

@@ -27,140 +27,140 @@
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-spec_dir = File.expand_path(File.join(File.dirname(__FILE__)))
-$LOAD_PATH.unshift(spec_dir)
+spec_dir = File.expand_path File.join(File.dirname(__FILE__))
+$LOAD_PATH.unshift spec_dir
 $LOAD_PATH.uniq!
 
-require 'googleauth'
-require 'googleauth/web_user_authorizer'
-require 'uri'
-require 'multi_json'
-require 'spec_helper'
-require 'rack'
+require "googleauth"
+require "googleauth/web_user_authorizer"
+require "uri"
+require "multi_json"
+require "spec_helper"
+require "rack"
 
 describe Google::Auth::WebUserAuthorizer do
   include TestHelpers
 
-  let(:client_id) { Google::Auth::ClientId.new('testclient', 'notasecret') }
-  let(:scope) { %w(email profile) }
+  let(:client_id) { Google::Auth::ClientId.new "testclient", "notasecret" }
+  let(:scope) { %w[email profile] }
   let(:token_store) { DummyTokenStore.new }
-  let(:authorizer) do
-    Google::Auth::WebUserAuthorizer.new(client_id, scope, token_store)
+  let :authorizer do
+    Google::Auth::WebUserAuthorizer.new client_id, scope, token_store
   end
 
-  describe '#get_authorization_url' do
-    let(:env) do
+  describe "#get_authorization_url" do
+    let :env do
       Rack::MockRequest.env_for(
-        'http://example.com:8080/test',
-        'REMOTE_ADDR' => '10.10.10.10'
+        "http://example.com:8080/test",
+        "REMOTE_ADDR" => "10.10.10.10"
       )
     end
-    let(:request) { Rack::Request.new(env) }
-    it 'should include current url in state' do
-      url = authorizer.get_authorization_url(request: request)
+    let(:request) { Rack::Request.new env }
+    it "should include current url in state" do
+      url = authorizer.get_authorization_url request: request
       expect(url).to match(
         %r{%22current_uri%22:%22http://example.com:8080/test%22}
       )
     end
 
-    it 'should include request forgery token in state' do
-      expect(SecureRandom).to receive(:base64).and_return('aGVsbG8=')
-      url = authorizer.get_authorization_url(request: request)
+    it "should include request forgery token in state" do
+      expect(SecureRandom).to receive(:base64).and_return("aGVsbG8=")
+      url = authorizer.get_authorization_url request: request
       expect(url).to match(/%22session_id%22:%22aGVsbG8=%22/)
     end
 
-    it 'should include request forgery token in session' do
-      expect(SecureRandom).to receive(:base64).and_return('aGVsbG8=')
-      authorizer.get_authorization_url(request: request)
-      expect(request.session['g-xsrf-token']).to eq 'aGVsbG8='
+    it "should include request forgery token in session" do
+      expect(SecureRandom).to receive(:base64).and_return("aGVsbG8=")
+      authorizer.get_authorization_url request: request
+      expect(request.session["g-xsrf-token"]).to eq "aGVsbG8="
     end
 
-    it 'should resolve callback against base URL' do
-      url = authorizer.get_authorization_url(request: request)
+    it "should resolve callback against base URL" do
+      url = authorizer.get_authorization_url request: request
       expect(url).to match(
         %r{redirect_uri=http://example.com:8080/oauth2callback}
       )
     end
 
-    it 'should allow overriding the current URL' do
+    it "should allow overriding the current URL" do
       url = authorizer.get_authorization_url(
-        request: request,
-        redirect_to: '/foo'
+        request:     request,
+        redirect_to: "/foo"
       )
       expect(url).to match %r{%22current_uri%22:%22/foo%22}
     end
 
-    it 'should pass through login hint' do
+    it "should pass through login hint" do
       url = authorizer.get_authorization_url(
-        request: request,
-        login_hint: 'user@example.com'
+        request:    request,
+        login_hint: "user@example.com"
       )
       expect(url).to match(/login_hint=user@example.com/)
     end
   end
 
-  shared_examples 'handles callback' do
-    let(:token_json) do
-      MultiJson.dump('access_token' => '1/abc123',
-                     'token_type' => 'Bearer',
-                     'expires_in' => 3600)
+  shared_examples "handles callback" do
+    let :token_json do
+      MultiJson.dump("access_token" => "1/abc123",
+                     "token_type"   => "Bearer",
+                     "expires_in"   => 3600)
     end
 
-    before(:example) do
-      stub_request(:post, 'https://oauth2.googleapis.com/token')
-        .to_return(body: token_json,
-                   status: 200,
-                   headers: { 'Content-Type' => 'application/json' })
+    before :example do
+      stub_request(:post, "https://oauth2.googleapis.com/token")
+        .to_return(body:    token_json,
+                   status:  200,
+                   headers: { "Content-Type" => "application/json" })
     end
 
-    let(:env) do
+    let :env do
       Rack::MockRequest.env_for(
-        'http://example.com:8080/oauth2callback?code=authcode&'\
-        'state=%7B%22current_uri%22%3A%22%2Ffoo%22%2C%22'\
-        'session_id%22%3A%22abc%22%7D',
-        'REMOTE_ADDR' => '10.10.10.10'
+        "http://example.com:8080/oauth2callback?code=authcode&"\
+        "state=%7B%22current_uri%22%3A%22%2Ffoo%22%2C%22"\
+        "session_id%22%3A%22abc%22%7D",
+        "REMOTE_ADDR" => "10.10.10.10"
       )
     end
-    let(:request) { Rack::Request.new(env) }
+    let(:request) { Rack::Request.new env }
 
-    before(:example) do
-      request.session['g-xsrf-token'] = 'abc'
+    before :example do
+      request.session["g-xsrf-token"] = "abc"
     end
 
-    it 'should return credentials when valid code present' do
+    it "should return credentials when valid code present" do
       expect(credentials).to be_instance_of(
         Google::Auth::UserRefreshCredentials
       )
     end
 
-    it 'should return next URL to redirect to' do
-      expect(next_url).to eq '/foo'
+    it "should return next URL to redirect to" do
+      expect(next_url).to eq "/foo"
     end
 
-    it 'should fail if xrsf token in session and does not match request' do
-      request.session['g-xsrf-token'] = '123'
+    it "should fail if xrsf token in session and does not match request" do
+      request.session["g-xsrf-token"] = "123"
       expect { credentials }.to raise_error(Signet::AuthorizationError)
     end
   end
 
-  describe '#handle_auth_callback' do
-    let(:result) { authorizer.handle_auth_callback('user1', request) }
+  describe "#handle_auth_callback" do
+    let(:result) { authorizer.handle_auth_callback "user1", request }
     let(:credentials) { result[0] }
     let(:next_url) { result[1] }
 
-    it_behaves_like 'handles callback'
+    it_behaves_like "handles callback"
   end
 
-  describe '#handle_auth_callback_deferred and #get_credentials' do
-    let(:next_url) do
-      Google::Auth::WebUserAuthorizer.handle_auth_callback_deferred(request)
+  describe "#handle_auth_callback_deferred and #get_credentials" do
+    let :next_url do
+      Google::Auth::WebUserAuthorizer.handle_auth_callback_deferred request
     end
 
-    let(:credentials) do
+    let :credentials do
       next_url
-      authorizer.get_credentials('user1', request)
+      authorizer.get_credentials "user1", request
     end
 
-    it_behaves_like 'handles callback'
+    it_behaves_like "handles callback"
   end
 end

data/spec/spec_helper.rb

@@ -27,17 +27,17 @@
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-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'))
+spec_dir = __dir__
+root_dir = File.expand_path File.join(spec_dir, "..")
+lib_dir = File.expand_path File.join(root_dir, "lib")
 
-$LOAD_PATH.unshift(spec_dir)
-$LOAD_PATH.unshift(lib_dir)
+$LOAD_PATH.unshift spec_dir
+$LOAD_PATH.unshift lib_dir
 $LOAD_PATH.uniq!
 
 # set up coverage
-require 'simplecov'
-require 'coveralls'
+require "simplecov"
+require "coveralls"
 
 SimpleCov.formatters = [
   Coveralls::SimpleCov::Formatter,
@@ -45,18 +45,18 @@ SimpleCov.formatters = [
 ]
 SimpleCov.start
 
-require 'faraday'
-require 'rspec'
-require 'logging'
-require 'rspec/logging_helper'
-require 'webmock/rspec'
-require 'multi_json'
+require "faraday"
+require "rspec"
+require "logging"
+require "rspec/logging_helper"
+require "webmock/rspec"
+require "multi_json"
 
 # Preload adapter to work around Rubinius error with FakeFS
-MultiJson.use(:json_gem)
+MultiJson.use :json_gem
 
 # Allow Faraday to support test stubs
-Faraday::Adapter.load_middleware(:test)
+Faraday::Adapter.load_middleware :test
 
 # Configure RSpec to capture log messages for each test. The output from the
 # logs will be stored in the @log_output variable. It is a StringIO instance.
@@ -78,15 +78,15 @@ class DummyTokenStore
     @tokens = {}
   end
 
-  def load(id)
+  def load id
     @tokens[id]
   end
 
-  def store(id, token)
+  def store id, token
     @tokens[id] = token
   end
 
-  def delete(id)
-    @tokens.delete(id)
+  def delete id
+    @tokens.delete id
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: googleauth
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.8.1
 platform: ruby
 authors:
 - Tim Emiola
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-03 00:00:00.000000000 Z
+date: 2019-03-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -122,7 +122,6 @@ files:
 - ".gitignore"
 - ".kokoro/build.bat"
 - ".kokoro/build.sh"
-- ".kokoro/common.cfg"
 - ".kokoro/continuous/common.cfg"
 - ".kokoro/continuous/linux.cfg"
 - ".kokoro/continuous/osx.cfg"
@@ -132,11 +131,11 @@ files:
 - ".kokoro/presubmit/linux.cfg"
 - ".kokoro/presubmit/osx.cfg"
 - ".kokoro/presubmit/windows.cfg"
+- ".kokoro/release.cfg"
 - ".kokoro/trampoline.sh"
 - ".kokoro/windows.sh"
 - ".rspec"
 - ".rubocop.yml"
-- ".travis.yml"
 - CHANGELOG.md
 - CODE_OF_CONDUCT.md
 - COPYING
@@ -198,8 +197,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Google Auth Library for Ruby

data/.kokoro/common.cfg

@@ -1,22 +0,0 @@
-# Format: //devtools/kokoro/config/proto/build.proto
-
-# Download trampoline resources. These will be in ${KOKORO_GFILE_DIR}
-gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/trampoline"
-
-# All builds use the trampoline script to run in docker.
-build_file: "google-auth-library-ruby/.kokoro/trampoline.sh"
-
-# Download secrets from Cloud Storage.
-gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/google-auth-library-ruby"
-
-# Tell the trampoline which build file to use.
-env_vars: {
-    key: "TRAMPOLINE_BUILD_FILE"
-    value: "github/google-auth-library-ruby/.kokoro/build.sh"
-}
-
-action {
-  define_artifacts {
-    regex: "**/*sponge_log.xml"
-  }
-}

data/.travis.yml

@@ -1,40 +0,0 @@
-sudo: false
-language: ruby
-rvm:
-  - 2.5.1
-  - 2.4.4
-  - 2.3.7
-  - 2.2.10
-  - 2.1.10
-  - 2.0.0
-  - 1.9.3
-  - rbx-2
-  - jruby-9.1.9.0
-matrix:
-  allow_failures:
-    - rvm: rbx-2 # See rubinius/rubinius#3485 - rubocop segfaults
-script: "bundle exec rake"
-addons:
-  apt:
-    packages:
-    - idn
-    - build-essential  # this and below attempt allow rubinius to be setup ok
-    - bison
-    - ruby-dev
-    - rake zlib1g-dev
-    - libyaml-dev
-    - libssl-dev
-    - libreadline-dev
-    - libncurses5-dev
-    - llvm
-    - llvm-dev
-    - libeditline-dev
-    - libedit-dev
-before_install:
- - gem update bundler
-notifications:
-  email:
-    recipients:
-      - ruby-cloud-eng@google.com
-    on_success: change
-    on_failure: change