🚨 Use gemfiles/*.gemfile pattern

 - Different Ruby builds can load different dependencies

Author: pboling

.rubocop_gradual.lock

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require "kettle/soup/cover/config"
 
 SimpleCov.start do

.simplecov

@@ -19,6 +19,8 @@ gem "redcarpet", platform: :mri
 ### Linting
 gem "rubocop-lts", "~> 12.1", ">= 12.1.1"
 gem "rubocop-minitest"
+gem "rubocop-packaging", "~> 0.5", ">= 0.5.2"
+gem "rubocop-rspec", "~> 3.2"
 gem "rubocop-sequel"
 
 ### ORMs

Gemfile

@@ -206,11 +206,15 @@ GEM
     rubocop-minitest (0.36.0)
       rubocop (>= 1.61, < 2.0)
       rubocop-ast (>= 1.31.1, < 2.0)
+    rubocop-packaging (0.5.2)
+      rubocop (>= 1.33, < 2.0)
     rubocop-performance (1.22.1)
       rubocop (>= 1.48.1, < 2.0)
       rubocop-ast (>= 1.31.1, < 2.0)
     rubocop-rake (0.6.0)
       rubocop (~> 1.0)
+    rubocop-rspec (3.2.0)
+      rubocop (~> 1.61)
     rubocop-ruby2_4 (2.0.5)
       rubocop-gradual (~> 0.3, >= 0.3.1)
       rubocop-md (~> 1.2)
@@ -324,9 +328,11 @@ DEPENDENCIES
   rb-fsevent
   redcarpet
   rspec (~> 3)
-  rspec-block_is_expected (~> 1.0)
+  rspec-block_is_expected (~> 1.0, >= 1.0.6)
   rubocop-lts (~> 12.1, >= 12.1.1)
   rubocop-minitest
+  rubocop-packaging (~> 0.5, >= 0.5.2)
+  rubocop-rspec (~> 3.2)
   rubocop-sequel
   sequel (~> 5)
   sqlite3 (~> 1.4)

Gemfile.lock

@@ -1,12 +1,12 @@
 # frozen_string_literal: true
 
-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')
+guard "bundler" do
+  watch("Gemfile")
   watch(/^.+\.gemspec/)
 end

Guardfile

@@ -36,13 +36,13 @@ This gem is compatible with, as of Feb 2021, version 3:
 To acquire the latest release from RubyGems add the following to your `Gemfile`:
 
 ```ruby
-gem 'omniauth-identity'
+gem "omniauth-identity"
 ```
 
 If the git repository has new commits not yet in an official release, simply specify the repo instead:
 
 ```ruby
-gem 'omniauth-identity', git: 'https://github.com/intridea/omniauth-identity.git'
+gem "omniauth-identity", git: "https://github.com/intridea/omniauth-identity.git"
 ```
 
 ## Usage
@@ -57,8 +57,8 @@ Rack middleware. In rails, this would be created by an initializer, such as
 ```ruby
 use OmniAuth::Builder do
   provider :identity,                        #mandatory: tells OA that the Identity strategy is being used
-           model: Identity,                  # optional: specifies the name of the "Identity" model. Defaults to "Identity"
-           fields: %i[email custom1 custom2] # optional: list of custom fields that are in the model's table
+    model: Identity,                  # optional: specifies the name of the "Identity" model. Defaults to "Identity"
+    fields: %i[email custom1 custom2] # optional: list of custom fields that are in the model's table
 end
 ```
 
@@ -221,8 +221,8 @@ fails. In your OmniAuth configuration, specify any valid rack endpoint in the
 ```ruby
 use OmniAuth::Builder do
   provider :identity,
-           fields: [:email],
-           on_failed_registration: UsersController.action(:new)
+    fields: [:email],
+    on_failed_registration: UsersController.action(:new)
 end
 ```
 
@@ -241,7 +241,7 @@ The default value is:
 ```ruby
 use OmniAuth::Builder do
   provider :identity,
-           locate_conditions: ->(req) { { model.auth_key => req.params['auth_key'] } }
+    locate_conditions: ->(req) { {model.auth_key => req.params["auth_key"]} }
     # ...
 end
 ```
@@ -270,7 +270,7 @@ option :on_login, nil               # See #request_phase
 option :on_validation, nil          # See #registration_phase
 option :on_registration, nil        # See #registration_phase
 option :on_failed_registration, nil # See #registration_phase
-option :locate_conditions, ->(req) { { model.auth_key => req.params['auth_key'] } }
+option :locate_conditions, ->(req) { {model.auth_key => req.params["auth_key"]} }
 ```
 
 Please contribute some documentation if you have the gumption!  The maintainer's time is limited, and sometimes the authors of PRs with new options don't update the _this_ readme. 😭

README.md

@@ -12,6 +12,8 @@ gem "activerecord", ">= 6", require: false # rails 6 requires Ruby 2.5 or later
 # Linting
 gem "rubocop-lts", "~> 12.1", ">= 12.1.1"
 gem "rubocop-minitest"
+gem "rubocop-packaging", "~> 0.5", ">= 0.5.2"
+gem "rubocop-rspec", "~> 3.2"
 gem "rubocop-sequel"
 
 gemspec path: "../"

gemfiles/style.gemfile

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 
-require 'omniauth-identity/version'
-require 'omniauth/identity'
+require "omniauth-identity/version"
+require "omniauth/identity"

lib/omniauth-identity.rb

@@ -2,6 +2,6 @@
 
 module OmniAuth
   module Identity
-    VERSION = '3.0.9'
+    VERSION = "3.0.9"
   end
 end

lib/omniauth-identity/version.rb

@@ -1,21 +1,21 @@
 # frozen_string_literal: true
 
-require 'omniauth'
+require "omniauth"
 
 module OmniAuth
   module Strategies
-    autoload :Identity, 'omniauth/strategies/identity'
+    autoload :Identity, "omniauth/strategies/identity"
   end
 
   module Identity
-    autoload :Model,               'omniauth/identity/model'
-    autoload :SecurePassword,      'omniauth/identity/secure_password'
+    autoload :Model, "omniauth/identity/model"
+    autoload :SecurePassword, "omniauth/identity/secure_password"
     module Models
-      autoload :ActiveRecord,      'omniauth/identity/models/active_record'
-      autoload :Mongoid,           'omniauth/identity/models/mongoid'
-      autoload :CouchPotatoModule, 'omniauth/identity/models/couch_potato'
-      autoload :NoBrainer,         'omniauth/identity/models/nobrainer'
-      autoload :Sequel,            'omniauth/identity/models/sequel'
+      autoload :ActiveRecord, "omniauth/identity/models/active_record"
+      autoload :Mongoid, "omniauth/identity/models/mongoid"
+      autoload :CouchPotatoModule, "omniauth/identity/models/couch_potato"
+      autoload :NoBrainer, "omniauth/identity/models/nobrainer"
+      autoload :Sequel, "omniauth/identity/models/sequel"
     end
   end
 end

lib/omniauth/identity.rb

@@ -24,11 +24,11 @@ module Model
       SCHEMA_ATTRIBUTES = %w[name email nickname first_name last_name location description image phone].freeze
 
       def self.included(base)
-        base.extend ClassMethods
-        base.extend ClassCreateApi unless base.respond_to?(:create)
+        base.extend(ClassMethods)
+        base.extend(ClassCreateApi) unless base.respond_to?(:create)
         im = base.instance_methods
-        base.include InstanceSaveApi unless im.include?(:save)
-        base.include InstancePersistedApi unless im.include?(:persisted?)
+        base.include(InstanceSaveApi) unless im.include?(:save)
+        base.include(InstancePersistedApi) unless im.include?(:persisted?)
       end
 
       module ClassMethods
@@ -49,9 +49,9 @@ def authenticate(conditions, password)
         # @return [String] The method name.
         def auth_key(method = false)
           @auth_key = method.to_s unless method == false
-          @auth_key = nil if !defined?(@auth_key) || @auth_key == ''
+          @auth_key = nil if !defined?(@auth_key) || @auth_key == ""
 
-          @auth_key || 'email'
+          @auth_key || "email"
         end
 
         # Locate an identity given its unique login key.
@@ -121,7 +121,7 @@ def authenticate(_password)
       # @return [String] An identifier string unique to this identity.
       def uid
         if respond_to?(:id)
-          return nil if id.nil?
+          return if id.nil?
 
           id.to_s
         else
@@ -172,8 +172,8 @@ def info
         SCHEMA_ATTRIBUTES.each_with_object(info) do |attribute, hash|
           hash[attribute] = send(attribute) if respond_to?(attribute)
         end
-        info['name'] ||= [info['first_name'], info['last_name']].join(' ').strip if info['first_name'] || info['last_name']
-        info['name'] ||= info['nickname']
+        info["name"] ||= [info["first_name"], info["last_name"]].join(" ").strip if info["first_name"] || info["last_name"]
+        info["name"] ||= info["nickname"]
         info
       end
     end

lib/omniauth/identity/model.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'active_record'
+require "active_record"
 
 module OmniAuth
   module Identity
@@ -18,11 +18,11 @@ class ActiveRecord < ::ActiveRecord::Base
 
         def self.auth_key=(key)
           super
-          validates_uniqueness_of key, case_sensitive: false
+          validates_uniqueness_of(key, case_sensitive: false)
         end
 
         def self.locate(search_hash)
-          search_hash = search_hash.reverse_merge!('provider' => 'identity') if column_names.include?('provider')
+          search_hash = search_hash.reverse_merge!("provider" => "identity") if column_names.include?("provider")
           where(search_hash).first
         end
       end

lib/omniauth/identity/models/active_record.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'couch_potato'
+require "couch_potato"
 
 module OmniAuth
   module Identity
@@ -13,15 +13,15 @@ module Models
       module CouchPotatoModule
         def self.included(base)
           base.class_eval do
-            include ::OmniAuth::Identity::Model
-            include ::OmniAuth::Identity::SecurePassword
+            include(::OmniAuth::Identity::Model)
+            include(::OmniAuth::Identity::SecurePassword)
 
             # validations: true (default) incurs a dependency on ActiveModel, but CouchPotato is ActiveModel based.
-            has_secure_password validations: false
+            has_secure_password(validations: false)
 
             def self.auth_key=(key)
               super
-              validates_uniqueness_of key, case_sensitive: false
+              validates_uniqueness_of(key, case_sensitive: false)
             end
 
             def self.locate(search_hash)

lib/omniauth/identity/models/couch_potato.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'mongoid'
+require "mongoid"
 
 module OmniAuth
   module Identity
@@ -11,15 +11,15 @@ module Models
       module Mongoid
         def self.included(base)
           base.class_eval do
-            include ::OmniAuth::Identity::Model
-            include ::OmniAuth::Identity::SecurePassword
+            include(::OmniAuth::Identity::Model)
+            include(::OmniAuth::Identity::SecurePassword)
 
             # validations: true (default) incurs a dependency on ActiveModel, but Mongoid is ActiveModel based.
             has_secure_password
 
             def self.auth_key=(key)
               super
-              validates_uniqueness_of key, case_sensitive: false
+              validates_uniqueness_of(key, case_sensitive: false)
             end
 
             def self.locate(search_hash)

lib/omniauth/identity/models/mongoid.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'nobrainer'
+require "nobrainer"
 
 module OmniAuth
   module Identity
@@ -11,15 +11,15 @@ module Models
       module NoBrainer
         def self.included(base)
           base.class_eval do
-            include ::OmniAuth::Identity::Model
-            include ::OmniAuth::Identity::SecurePassword
+            include(::OmniAuth::Identity::Model)
+            include(::OmniAuth::Identity::SecurePassword)
 
             # validations: true (default) incurs a dependency on ActiveModel, but NoBrainer is ActiveModel based.
             has_secure_password
 
             def self.auth_key=(key)
               super
-              validates_uniqueness_of key, case_sensitive: false
+              validates_uniqueness_of(key, case_sensitive: false)
             end
 
             def self.locate(search_hash)

lib/omniauth/identity/models/nobrainer.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'sequel'
+require "sequel"
 
 module OmniAuth
   module Identity
@@ -17,17 +17,17 @@ def self.included(base)
             # NOTE: Using the deprecated :validations_class_methods because it defines
             #       validates_confirmation_of, while current :validation_helpers does not.
             # plugin :validation_helpers
-            plugin :validation_class_methods
+            plugin(:validation_class_methods)
 
-            include ::OmniAuth::Identity::Model
-            include ::OmniAuth::Identity::SecurePassword
+            include(::OmniAuth::Identity::Model)
+            include(::OmniAuth::Identity::SecurePassword)
 
             # validations: true incurs a dependency on ActiveModel, so we turn it off here.
-            has_secure_password validations: false
+            has_secure_password(validations: false)
 
             def self.auth_key=(key)
               super
-              validates_uniqueness_of :key, case_sensitive: false
+              validates_uniqueness_of(:key, case_sensitive: false)
             end
 
             # @param arguments [any] -