Add forwardable module and upgrade rubocop

mongoid · Apr 4, 2020 · 62ce76b · 62ce76b
1 parent 1a3e793
commit 62ce76b
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 14 deletions.
diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
@@ -1,6 +1,6 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2019-10-23 10:17:29 -0400 using RuboCop version 0.75.1.
+# on 2020-04-04 15:42:00 +0300 using RuboCop version 0.81.0.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
@@ -14,6 +14,7 @@ Bundler/DuplicatedGem:
     - 'Gemfile'
 
 # Offense count: 4
+# Configuration parameters: IgnoredMethods.
 Metrics/AbcSize:
   Max: 21
 
@@ -42,10 +43,10 @@ Naming/FileName:
     - 'spec/mongoid-locker_spec.rb'
 
 # Offense count: 1
-# Configuration parameters: NamePrefix, NamePrefixBlacklist, NameWhitelist, MethodDefinitionMacros.
+# Configuration parameters: NamePrefix, ForbiddenPrefixes, AllowedMethods, MethodDefinitionMacros.
 # NamePrefix: is_, has_, have_
-# NamePrefixBlacklist: is_, has_, have_
-# NameWhitelist: is_a?
+# ForbiddenPrefixes: is_, has_, have_
+# AllowedMethods: is_a?
 # MethodDefinitionMacros: define_method, define_singleton_method
 Naming/PredicateName:
   Exclude:
@@ -89,6 +90,11 @@ RSpec/MessageSpies:
 RSpec/MultipleExpectations:
   Max: 3
 
+# Offense count: 1
+RSpec/SubjectStub:
+  Exclude:
+    - 'spec/support/delegated_methods_shared_examples.rb'
+
 # Offense count: 2
 Style/Documentation:
   Exclude:
@@ -109,5 +115,5 @@ Style/NumericPredicate:
 # Cop supports --auto-correct.
 # Configuration parameters: AutoCorrect, AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, IgnoredPatterns.
 # URISchemes: http, https
-Metrics/LineLength:
+Layout/LineLength:
   Max: 250
diff --git a/.travis.yml b/.travis.yml
@@ -10,9 +10,9 @@ script:
 
 rvm:
   - 2.3.8
-  - 2.4.5
-  - 2.5.4
-  - 2.6.2
+  - 2.4.7
+  - 2.5.7
+  - 2.6.6
   - jruby-9.1.17.0
   - jruby-9.2.6.0
 
@@ -23,7 +23,7 @@ env:
 
 matrix:
   include:
-    - rvm: 2.6.2
+    - rvm: 2.6.6
       env:
         - MONGOID_VERSION=7
         - COVERAGE=true

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,9 @@
 
 ### 2.0.1 (Next)
 
+* [#86](https://github.com/mongoid/mongoid-locker/pull/86): Upgraded to RuboCop 0.81.0 - [@dks17](https://github.com/dks17).
+* [#86](https://github.com/mongoid/mongoid-locker/pull/86): Fixed issue with `ruby` `delegate` method - [@dks17](https://github.com/dks17).
+* [#86](https://github.com/mongoid/mongoid-locker/pull/86): Update Ruby versions for Travis config - [@dks17](https://github.com/dks17).
 * Your contribution here.
 
 ### 2.0.0 (2019-10-23)

diff --git a/Gemfile b/Gemfile
@@ -24,8 +24,8 @@ group :development, :test do
   gem 'pry-byebug', platforms: :mri
 
   gem 'mongoid-danger', '~> 0.1.1'
-  gem 'rspec', '~> 3.8'
-  gem 'rubocop', '0.75.1'
-  gem 'rubocop-rspec'
+  gem 'rspec', '~> 3.9'
+  gem 'rubocop', '0.81.0'
+  gem 'rubocop-rspec', '1.38.1'
   gem 'simplecov', require: false
 end
diff --git a/lib/mongoid/locker.rb b/lib/mongoid/locker.rb
@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require 'forwardable'
 require 'securerandom'
 
 module Mongoid
@@ -103,6 +104,8 @@ def reset!
 
       # @api private
       def included(klass)
+        klass.extend(Forwardable) unless klass.ancestors.include?(Forwardable)
+
         klass.extend ClassMethods
         klass.singleton_class.instance_eval { attr_accessor(*MODULE_METHODS) }
 
@@ -114,7 +117,7 @@ def included(klass)
         klass.backoff_algorithm = backoff_algorithm
         klass.locking_name_generator = locking_name_generator
 
-        klass.delegate(*MODULE_METHODS, to: :class)
+        klass.def_delegators(klass, *MODULE_METHODS)
         klass.singleton_class.delegate(*(methods(false) - MODULE_METHODS.flat_map { |method| [method, "#{method}=".to_sym] } - %i[included reset! configure]), to: self)
       end
     end

diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
@@ -14,7 +14,7 @@
 require 'mongoid-locker'
 Mongoid.load! File.join(File.dirname(__FILE__), 'database.yml')
 
-Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each { |f| require f }
+Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].sort.each { |f| require f }
 
 RSpec.configure do |config|
   config.include LockerHelpers