omniauth-scalingo 2.0.0 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9d4a96aa3d0b5f12d5a58c8ae4d420a3c5ec46ac029a1d53e49da20d428aa92a
-  data.tar.gz: 9182e414b03518a06e999ed5dedb9f251a2faade96c650f5a624aa8131703754
+  metadata.gz: 5a4c50f2ee1e680e06c657f4955ebc84019cc97426c0ff2324826ad1263baee6
+  data.tar.gz: 1b8bf87c938f2d3b634f65048a736ccda2268dfa7292afa2d9d655de1a12bf39
 SHA512:
-  metadata.gz: 4232df838bd8fd4f771b50265def26244a7ad10ffe1b7bf8b82dd4d453a5863a72a0aa441ddbd0df5a77e977a4542dceb2858e5eeec94aa87522a4b3d2d53e20
-  data.tar.gz: 5673499fd12c0614ae860cdf97a80fabcb05de8d71051b20c046b0f52d2470b407892249e2b52fa9c037ecfc1ac67f2bf6d0f4c9cdbad228b45cd63cb296edac
+  metadata.gz: 237deaba9192449384673211be0f8f562cf7f157f1eb8c22d2722785b8e87d3bffa3bbfad35d2175e27a96e0d555060290ca3e1c3b1221dafa4dc28d08d14647
+  data.tar.gz: e9c4ad3763c56dd7b8cdc27abcfe7705f9948d72b15832c520e801d6c277f2f0e7fb895eec03a27d1fc379b4fc17a60c24c7c3f84662787bc3a591a8c3000717

data/.github/workflows/publish.yml

@@ -10,7 +10,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
     - name: Set up Ruby
       uses: ruby/setup-ruby@v1
       with:

data/.github/workflows/tests.yml

@@ -11,10 +11,10 @@ jobs:
   lint:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
     - uses: ruby/setup-ruby@v1
       with:
-        ruby-version: 3.0
+        ruby-version: 2.7
         bundler-cache: true
     - name: RuboCop checks
       run: bundle exec rubocop
@@ -23,9 +23,9 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        ruby-version: ['2.7', '3.0', '3.1']
+        ruby-version: ['2.7', '3.0', '3.1', '3.2']
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
     - uses: ruby/setup-ruby@v1
       with:
         ruby-version: ${{ matrix.ruby-version }}

data/.rubocop.yml

@@ -0,0 +1,15 @@
+require:
+  - standard
+  - standard-custom
+  - standard-performance
+  - rubocop-performance
+
+inherit_gem:
+  standard: config/base.yml
+  standard-custom: config/base.yml
+  standard-performance: config/base.yml
+
+AllCops:
+  TargetRubyVersion: 2.7
+  SuggestExtensions: false
+  NewCops: enable

data/CHANGELOG.md

@@ -0,0 +1,12 @@
+### Unreleased
+
+### 2.1.0
+
+* chore: added ruby 3.2 to the matrix of supported versions
+* chore: linted the codebase with https://github.com/standardrb/standard
+* tests: restored CI to a working state
+* bugfix: fixed handling of `script_name` following the bump to omniauth 2.0
+
+### 2.0.0
+
+* Major change: bumps omniauth from 1.5 to 2.0 due to https://github.com/advisories/GHSA-ww4x-rwq6-qpgf

data/Gemfile

@@ -1,13 +1,14 @@
-source 'https://rubygems.org'
+source "https://rubygems.org"
 
 # Specify your gem's dependencies in omniauth-scalingo.gemspec
 gemspec
 
 group :development, :test do
-  gem 'guard'
-  gem 'guard-rspec'
-  gem 'guard-bundler'
-  gem 'rb-fsevent'
-  gem 'growl'
-  gem 'rake'
+  gem "guard"
+  gem "guard-rspec"
+  gem "guard-bundler"
+  gem "rb-fsevent"
+  gem "growl"
+  gem "rake"
+  gem "standard", "~> 1.31"
 end

data/Guardfile

@@ -1,10 +1,10 @@
-guard 'rspec', :version => 2 do
+guard "rspec", version: 2 do
   watch(%r{^spec/.+_spec\.rb$})
-  watch(%r{^lib/(.+)\.rb$})     { |m| "spec/#{m[1]}_spec.rb" }
-  watch('spec/spec_helper.rb')  { "spec" }
+  watch(%r{^lib/(.+)\.rb$}) { |m| "spec/#{m[1]}_spec.rb" }
+  watch("spec/spec_helper.rb") { "spec" }
 end
 
-guard 'bundler' do
-  watch('Gemfile')
-  watch('omniauth-scalingo.gemspec')
+guard "bundler" do
+  watch("Gemfile")
+  watch("omniauth-scalingo.gemspec")
 end

data/Rakefile

@@ -1,8 +1,8 @@
 #!/usr/bin/env rake
 require "bundler/gem_tasks"
-require 'rspec/core/rake_task'
+require "rspec/core/rake_task"
 
 RSpec::Core::RakeTask.new
 
-desc 'Run specs'
-task :default => :spec
+desc "Run specs"
+task default: :spec

data/lib/omniauth/strategies/scalingo.rb

@@ -1,12 +1,12 @@
-require 'omniauth-oauth2'
+require "omniauth-oauth2"
 
 module OmniAuth
   module Strategies
     class Scalingo < OmniAuth::Strategies::OAuth2
       option :client_options, {
-        :site => 'https://auth.scalingo.com',
-        :authorize_url => 'https://auth.scalingo.com/oauth/authorize',
-        :token_url => 'https://auth.scalingo.com/oauth/token'
+        site: "https://auth.scalingo.com",
+        authorize_url: "https://auth.scalingo.com/oauth/authorize",
+        token_url: "https://auth.scalingo.com/oauth/token"
       }
 
       def request_phase
@@ -23,32 +23,32 @@ module OmniAuth
         end
       end
 
-      uid { raw_info['id'].to_s }
+      uid { raw_info["id"].to_s }
 
       info do
         {
-          'uuid'       => raw_info['id'],
-          'username'   => raw_info['username'],
-          'email'      => raw_info['email'],
-          'first_name' => raw_info['first_name'],
-          'last_name'  => raw_info['last_name'],
-          'flags'      => raw_info['flags'],
+          "uuid" => raw_info["id"],
+          "username" => raw_info["username"],
+          "email" => raw_info["email"],
+          "first_name" => raw_info["first_name"],
+          "last_name" => raw_info["last_name"],
+          "flags" => raw_info["flags"]
         }
       end
 
       extra do
-        {:raw_info => raw_info}
+        {raw_info: raw_info}
       end
 
       def raw_info
-        @raw_info ||= access_token.get('/v1/users/self').parsed['user']
+        @raw_info ||= access_token.get("/v1/users/self").parsed["user"]
       end
 
       def callback_url
-        full_host + script_name + callback_path
+        full_host + callback_path
       end
     end
   end
 end
 
-OmniAuth.config.add_camelization 'scalingo', 'Scalingo'
+OmniAuth.config.add_camelization "scalingo", "Scalingo"

data/lib/omniauth-scalingo/version.rb

@@ -1,5 +1,5 @@
 module OmniAuth
   module Scalingo
-    VERSION = "2.0.0"
+    VERSION = "2.1.0"
   end
 end

data/lib/omniauth-scalingo.rb

@@ -1,2 +1,2 @@
 require "omniauth-scalingo/version"
-require 'omniauth/strategies/scalingo'
+require "omniauth/strategies/scalingo"

data/omniauth-scalingo.gemspec

@@ -1,32 +1,30 @@
-# -*- encoding: utf-8 -*-
-require File.expand_path('../lib/omniauth-scalingo/version', __FILE__)
+require File.expand_path("../lib/omniauth-scalingo/version", __FILE__)
 
 Gem::Specification.new do |gem|
-  gem.authors       = ["Léo Unbekandt", "Kevin Soltysiak"]
-  gem.email         = ["leo@scalingo.com", "kevin@scalingo.com"]
-  gem.description   = %q{Official OmniAuth strategy for Scalingo.}
-  gem.summary       = %q{Official OmniAuth strategy for Scalingo.}
-  gem.homepage      = "https://github.com/Scalingo/omniauth-scalingo"
-  gem.license       = "MIT"
+  gem.authors = ["Léo Unbekandt", "Kevin Soltysiak"]
+  gem.email = ["leo@scalingo.com", "kevin@scalingo.com"]
+  gem.description = "Official OmniAuth strategy for Scalingo."
+  gem.summary = "Official OmniAuth strategy for Scalingo."
+  gem.homepage = "https://github.com/Scalingo/omniauth-scalingo"
+  gem.license = "MIT"
 
   gem.metadata = {
     "bug_tracker_uri" => "https://github.com/Scalingo/omniauth-scalingo/issues",
     "documentation_uri" => "https://github.com/Scalingo/omniauth-scalingo",
     "homepage_uri" => "https://github.com/Scalingo/omniauth-scalingo",
-    "source_code_uri" => "https://github.com/Scalingo/omniauth-scalingo",
+    "source_code_uri" => "https://github.com/Scalingo/omniauth-scalingo"
   }
 
-  gem.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
-  gem.files         = `git ls-files`.split("\n")
-  gem.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
-  gem.name          = "omniauth-scalingo"
+  gem.executables = `git ls-files -- bin/*`.split("\n").map { |f| File.basename(f) }
+  gem.files = `git ls-files`.split("\n")
+  gem.name = "omniauth-scalingo"
   gem.require_paths = ["lib"]
-  gem.version       = OmniAuth::Scalingo::VERSION
+  gem.version = OmniAuth::Scalingo::VERSION
 
-  gem.add_dependency 'omniauth', '~> 2.0'
-  gem.add_dependency 'omniauth-oauth2', '>= 1.4.0', '< 2.0'
-  gem.add_development_dependency 'rspec', '~> 3.5'
-  gem.add_development_dependency 'rack-test'
-  gem.add_development_dependency 'simplecov'
-  gem.add_development_dependency 'webmock'
+  gem.add_dependency "omniauth", "~> 2.0"
+  gem.add_dependency "omniauth-oauth2", ">= 1.4.0", "< 2.0"
+  gem.add_development_dependency "rspec", "~> 3.5"
+  gem.add_development_dependency "rack-test"
+  gem.add_development_dependency "simplecov"
+  gem.add_development_dependency "webmock"
 end

data/spec/omniauth/strategies/scalingo_spec.rb

@@ -1,9 +1,9 @@
-require 'spec_helper'
+require "spec_helper"
 
 describe OmniAuth::Strategies::Scalingo do
-  let(:access_token) { instance_double('AccessToken', :options => {}) }
-  let(:parsed_response) { instance_double('ParsedResponse') }
-  let(:response) { instance_double('Response', :parsed => parsed_response) }
+  let(:access_token) { instance_double("AccessToken", options: {}) }
+  let(:parsed_response) { instance_spy("ParsedResponse") }
+  let(:response) { instance_double("Response", parsed: parsed_response) }
 
   subject do
     OmniAuth::Strategies::Scalingo.new({})
@@ -13,33 +13,33 @@ describe OmniAuth::Strategies::Scalingo do
     allow(subject).to receive(:access_token).and_return(access_token)
   end
 
-  context 'client options' do
-    it 'should have correct site' do
-      expect(subject.options.client_options.site).to eq('https://auth.scalingo.com')
+  context "client options" do
+    it "should have correct site" do
+      expect(subject.options.client_options.site).to eq("https://auth.scalingo.com")
     end
 
-    it 'should have correct authorize url' do
-      expect(subject.options.client_options.authorize_url).to eq('https://auth.scalingo.com/oauth/authorize')
+    it "should have correct authorize url" do
+      expect(subject.options.client_options.authorize_url).to eq("https://auth.scalingo.com/oauth/authorize")
     end
 
-    it 'should have correct token url' do
-      expect(subject.options.client_options.token_url).to eq('https://auth.scalingo.com/oauth/token')
+    it "should have correct token url" do
+      expect(subject.options.client_options.token_url).to eq("https://auth.scalingo.com/oauth/token")
     end
   end
 
-  context '#raw_info' do
-    it 'should use relative paths' do
-      expect(access_token).to receive(:get).with('user').and_return(response)
+  context "#raw_info" do
+    it "should use relative paths" do
+      expect(access_token).to receive(:get).with("/v1/users/self").and_return(response)
       expect(subject.raw_info).to eq(parsed_response)
     end
   end
 
-  describe '#callback_url' do
-    it 'is a combination of host, script name, and callback path' do
-      allow(subject).to receive(:full_host).and_return('https://example.com')
-      allow(subject).to receive(:script_name).and_return('/sub_uri')
+  describe "#callback_url" do
+    it "is a combination of host, script name, and callback path" do
+      allow(subject).to receive(:full_host).and_return("https://example.com")
+      allow(subject).to receive(:script_name).and_return("/sub_uri")
 
-      expect(subject.callback_url).to eq('https://example.com/sub_uri/auth/scalingo/callback')
+      expect(subject.callback_url).to eq("https://example.com/sub_uri/auth/scalingo/callback")
     end
   end
 end

data/spec/spec_helper.rb

@@ -1,16 +1,15 @@
-$:.unshift File.expand_path('..', __FILE__)
-$:.unshift File.expand_path('../../lib', __FILE__)
-require 'simplecov'
+$:.unshift File.expand_path("..", __FILE__)
+$:.unshift File.expand_path("../../lib", __FILE__)
+require "simplecov"
 SimpleCov.start
-require 'rspec'
-require 'rack/test'
-require 'webmock/rspec'
-require 'omniauth'
-require 'omniauth-scalingo'
+require "rspec"
+require "rack/test"
+require "webmock/rspec"
+require "omniauth"
+require "omniauth-scalingo"
 
 RSpec.configure do |config|
   config.include WebMock::API
   config.include Rack::Test::Methods
-  config.extend  OmniAuth::Test::StrategyMacros, :type => :strategy
+  config.extend OmniAuth::Test::StrategyMacros, type: :strategy
 end
-

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: omniauth-scalingo
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.1.0
 platform: ruby
 authors:
 - Léo Unbekandt
@@ -114,6 +114,8 @@ files:
 - ".github/workflows/tests.yml"
 - ".gitignore"
 - ".rspec"
+- ".rubocop.yml"
+- CHANGELOG.md
 - Gemfile
 - Guardfile
 - LICENSE.txt