✅ Retain compatibility with old omniauth & ruby

Author: pboling

.rubocop_gradual.lock

@@ -14,29 +14,29 @@
     [54, 27, 3, "Style/AndOr: Use `&&` instead of `and`.", 193409806],
     [71, 7, 970, "Style/ClassMethodsDefinitions: Use `class << self` to define a class method.", 3995669691]
   ],
-  "omniauth-ldap.gemspec:2957894489": [
+  "omniauth-ldap.gemspec:587429113": [
     [100, 3, 31, "Gemspec/DependencyVersion: Dependency version specification is required.", 1863578069],
     [101, 3, 26, "Gemspec/DependencyVersion: Dependency version specification is required.", 1276340125],
     [104, 3, 31, "Gemspec/DependencyVersion: Dependency version specification is required.", 2110985977],
     [105, 3, 32, "Gemspec/DependencyVersion: Dependency version specification is required.", 3005951394]
   ],
-  "spec/omniauth-ldap/adaptor_spec.rb:3932937965": [
-    [71, 7, 26, "RSpec/StubbedMock: Prefer `allow` over `expect` when configuring a response.", 1924417310],
+  "spec/omniauth-ldap/adaptor_spec.rb:3490841684": [
     [72, 7, 26, "RSpec/StubbedMock: Prefer `allow` over `expect` when configuring a response.", 1924417310],
     [73, 7, 26, "RSpec/StubbedMock: Prefer `allow` over `expect` when configuring a response.", 1924417310],
-    [79, 7, 26, "RSpec/StubbedMock: Prefer `allow` over `expect` when configuring a response.", 1924417310],
+    [74, 7, 26, "RSpec/StubbedMock: Prefer `allow` over `expect` when configuring a response.", 1924417310],
     [80, 7, 26, "RSpec/StubbedMock: Prefer `allow` over `expect` when configuring a response.", 1924417310],
-    [81, 7, 26, "RSpec/StubbedMock: Prefer `allow` over `expect` when configuring a response.", 1924417310]
+    [81, 7, 26, "RSpec/StubbedMock: Prefer `allow` over `expect` when configuring a response.", 1924417310],
+    [82, 7, 26, "RSpec/StubbedMock: Prefer `allow` over `expect` when configuring a response.", 1924417310]
   ],
-  "spec/omniauth/strategies/ldap_spec.rb:438668078": [
-    [12, 3, 54, "RSpec/LeakyConstantDeclaration: Stub class constant instead of declaring explicitly.", 2419068710],
-    [68, 13, 9, "RSpec/ContextWording: Context description should match /^when\\b/, /^with\\b/, or /^without\\b/.", 1130140517],
-    [93, 17, 28, "RSpec/ContextWording: Context description should match /^when\\b/, /^with\\b/, or /^without\\b/.", 3444838747],
-    [102, 17, 23, "RSpec/ContextWording: Context description should match /^when\\b/, /^with\\b/, or /^without\\b/.", 1584148894],
-    [113, 17, 32, "RSpec/ContextWording: Context description should match /^when\\b/, /^with\\b/, or /^without\\b/.", 1515076977],
-    [121, 19, 19, "RSpec/ContextWording: Context description should match /^when\\b/, /^with\\b/, or /^without\\b/.", 2526348694],
-    [133, 17, 56, "RSpec/ContextWording: Context description should match /^when\\b/, /^with\\b/, or /^without\\b/.", 2413495789],
-    [148, 13, 9, "RSpec/ContextWording: Context description should match /^when\\b/, /^with\\b/, or /^without\\b/.", 3182939526],
-    [181, 15, 19, "RSpec/ContextWording: Context description should match /^when\\b/, /^with\\b/, or /^without\\b/.", 2526348694]
+  "spec/omniauth/strategies/ldap_spec.rb:3993817175": [
+    [13, 3, 54, "RSpec/LeakyConstantDeclaration: Stub class constant instead of declaring explicitly.", 2419068710],
+    [69, 13, 9, "RSpec/ContextWording: Context description should match /^when\\b/, /^with\\b/, or /^without\\b/.", 1130140517],
+    [94, 17, 28, "RSpec/ContextWording: Context description should match /^when\\b/, /^with\\b/, or /^without\\b/.", 3444838747],
+    [103, 17, 23, "RSpec/ContextWording: Context description should match /^when\\b/, /^with\\b/, or /^without\\b/.", 1584148894],
+    [114, 17, 32, "RSpec/ContextWording: Context description should match /^when\\b/, /^with\\b/, or /^without\\b/.", 1515076977],
+    [122, 19, 19, "RSpec/ContextWording: Context description should match /^when\\b/, /^with\\b/, or /^without\\b/.", 2526348694],
+    [134, 17, 56, "RSpec/ContextWording: Context description should match /^when\\b/, /^with\\b/, or /^without\\b/.", 2413495789],
+    [149, 13, 9, "RSpec/ContextWording: Context description should match /^when\\b/, /^with\\b/, or /^without\\b/.", 3182939526],
+    [182, 15, 19, "RSpec/ContextWording: Context description should match /^when\\b/, /^with\\b/, or /^without\\b/.", 2526348694]
   ]
 }

Appraisals

@@ -54,7 +54,7 @@ appraise "dep-heads" do
 end
 
 appraise "ruby-2-3" do
-  eval_gemfile "modular/omniauth/r2/v1.0.gemfile"
+  eval_gemfile "modular/omniauth/r2/v1.1.gemfile"
   eval_gemfile "modular/rack/r2.1/v1.6.gemfile"
   eval_gemfile "modular/x_std_libs/r2.3/libs.gemfile"
 end

gemfiles/modular/logger/vHEAD.gemfile

@@ -1,2 +1,2 @@
 # Ruby >= 2.5 (dependency of omniauth)
-gem "logger", github: "ruby/logger", branch: "master"
+gem "logger", :github => "ruby/logger", :branch => "master"

gemfiles/ruby_2_3.gemfile

@@ -4,7 +4,7 @@ source "https://gem.coop"
 
 gemspec :path => "../"
 
-eval_gemfile("modular/omniauth/r2/v1.0.gemfile")
+eval_gemfile("modular/omniauth/r2/v1.1.gemfile")
 
 eval_gemfile("modular/rack/r2.1/v1.6.gemfile")
 

spec/config/debug.rb

@@ -1,4 +1,4 @@
-load_debugger = ENV.fetch("DEBUG", "false").casecmp?("true")
+load_debugger = ENV.fetch("DEBUG", "false").casecmp("true").zero?
 puts "LOADING DEBUGGER: #{load_debugger}" if load_debugger
 
 require "debug" if load_debugger

spec/spec_helper.rb

@@ -22,7 +22,8 @@
 
 TEST_LOGGER = Logger.new(StringIO.new)
 OmniAuth.config.logger = TEST_LOGGER
-OmniAuth.config.request_validation_phase = proc {}
+# New config for OmniAuth 2.0+
+OmniAuth.config.request_validation_phase = proc {} if OmniAuth.config.respond_to?(:request_validation_phase=)
 
 RSpec.configure do |config|
   config.include Rack::Test::Methods