update to newer version of ruby and fix cops

Author: yads

.github/workflows/rubocop.yml

@@ -8,6 +8,6 @@ jobs:
       - name: Set up Ruby
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: 2.7
+          ruby-version: '3.0'
           bundler-cache: true
       - run: bundle exec rubocop

.github/workflows/test.yml

@@ -9,15 +9,15 @@ jobs:
       fail-fast: false
       matrix:
         entry:
-          - { ruby: '2.7.1', mongo: 'mongo:4.4', mongoid: '6' }
-          - { ruby: '3.0.5', mongo: 'mongo:4.4', mongoid: '6' }
-          - { ruby: '3.1.3', mongo: 'mongo:4.4', mongoid: '6' }
-          - { ruby: '2.7.1', mongo: 'mongo:4.4', mongoid: '7' }
-          - { ruby: '3.0.5', mongo: 'mongo:4.4', mongoid: '7' }
-          - { ruby: '3.1.3', mongo: 'mongo:4.4', mongoid: '7' }
-          - { ruby: '2.7.1', mongo: 'mongo:4.4', mongoid: '8' }
-          - { ruby: '3.0.5', mongo: 'mongo:4.4', mongoid: '8' }
-          - { ruby: '3.1.3', mongo: 'mongo:4.4', mongoid: '8' }
+          - { ruby: '3.0.7', mongo: 'mongo:4.4', mongoid: '6' }
+          - { ruby: '3.1.7', mongo: 'mongo:4.4', mongoid: '6' }
+          - { ruby: '3.2.10', mongo: 'mongo:4.4', mongoid: '6' }
+          - { ruby: '3.0.7', mongo: 'mongo:4.4', mongoid: '7' }
+          - { ruby: '3.1.7', mongo: 'mongo:4.4', mongoid: '7' }
+          - { ruby: '3.2.10', mongo: 'mongo:4.4', mongoid: '7' }
+          - { ruby: '3.0.7', mongo: 'mongo:4.4', mongoid: '8' }
+          - { ruby: '3.1.7', mongo: 'mongo:4.4', mongoid: '8' }
+          - { ruby: '3.2.10', mongo: 'mongo:4.4', mongoid: '8' }
         experimental: [false]
 
     name: test (ruby=${{ matrix.entry.ruby }}, mongo=${{ matrix.entry.mongo }}, mongoid=${{ matrix.entry.mongoid }})

.rubocop.yml

@@ -1,5 +1,6 @@
 AllCops:
-  TargetRubyVersion: 2.7
+  TargetRubyVersion: 3.0
+  NewCops: enable
   Exclude:
     - vendor/**/*
 -Metrics/BlockLength:

Gemfile

@@ -18,7 +18,10 @@ else
 end
 
 group :development do
+  gem 'database_cleaner-mongoid', '>= 2.0.0'
+  gem 'mongoid-compatibility'
   gem 'rake', '>= 12.3.3'
+  gem 'rspec', '~> 3.1'
   gem 'rubocop', '1.56.0'
   gem 'simplecov'
 end

lib/mongoid_search/mongoid_search.rb

@@ -94,7 +94,7 @@ def search_without_relevance(query, options)
     end
 
     def search_relevant(query, options)
-      results_with_relevance(query, options).sort { |o| o['value'] }.map do |r|
+      results_with_relevance(query, options).sort_by { |o| o['value'] }.map do |r|
         new(r['_id'].merge(relevance: r['value'])) do |o|
           # Need to match the actual object
           o.instance_variable_set('@new_record', false)

lib/mongoid_search/tasks/mongoid_search.rake

@@ -3,12 +3,12 @@
 namespace :mongoid_search do
   desc 'Goes through all documents with search enabled and indexes the keywords.'
   task index: :environment do
-    ::Rails.application.eager_load!
+    Rails.application.eager_load!
     if Mongoid::Search.classes.blank?
       Mongoid::Search::Log.log "No model to index keywords.\n"
     else
       Mongoid::Search.classes.each do |klass|
-        Mongoid::Search::Log.silent = ENV['SILENT']
+        Mongoid::Search::Log.silent = ENV.fetch('SILENT', nil)
         Mongoid::Search::Log.log "\nIndexing documents for #{klass.name}:\n"
         klass.index_keywords!
       end

lib/mongoid_search/util.rb

@@ -46,8 +46,8 @@ def self.normalize_keywords(text)
                .to_s
                .gsub(strip_symbols, ' ') # strip symbols
                .gsub(strip_accents, '')  # strip accents
-               .gsub(/[#{ligatures.keys.join('')}]/) { |c| ligatures[c] }
-               .split(' ')
+               .gsub(/[#{ligatures.keys.join}]/) { |c| ligatures[c] }
+               .split
                .reject { |word| word.size < Mongoid::Search.minimum_word_size }
     text = text.reject { |word| ignore_list.include?(word) } unless ignore_list.blank?
     text = text.map(&stem_proc) if stem_keywords

mongoid_search.gemspec

@@ -14,18 +14,14 @@ Gem::Specification.new do |s|
   s.license = 'MIT'
 
   s.required_rubygems_version = '>= 1.3.6'
-  s.required_ruby_version = '>= 2.7'
+  s.required_ruby_version = '>= 3.0'
 
   s.platform = 'ruby'
 
   s.add_dependency('fast-stemmer', ['~> 1.0.0'])
-  s.add_dependency('mongoid', ['>= 5.0.0'])
-  s.add_development_dependency('database_cleaner-mongoid', ['>= 2.0.0'])
-  s.add_development_dependency('mongoid-compatibility')
-  s.add_development_dependency('rake', ['>= 12.3.3'])
-  s.add_development_dependency('rspec', ['~> 3.1'])
+  s.add_dependency('mongoid', ['>= 6.0.0'])
 
   s.require_path = 'lib'
   s.files = Dir['lib/**/*', 'tasks/*.rake'] + %w[LICENSE README.md Rakefile]
-  s.test_files = Dir.glob('spec/**/*')
+  s.metadata['rubygems_mfa_required'] = 'true'
 end

spec/spec_helper.rb

@@ -16,7 +16,7 @@
   config.connect_to 'mongoid_search_test'
 end
 
-Dir["#{File.dirname(__FILE__)}/models/*.rb"].sort.each { |file| require file }
+Dir["#{File.dirname(__FILE__)}/models/*.rb"].each { |file| require file }
 
 RSpec.configure do |config|
   config.before(:all) do