From c0e9b839e258e36dc502c069d67a3b07c2672b1f Mon Sep 17 00:00:00 2001
From: Domizio Demichelis
Date: Wed, 3 Jan 2024 11:08:15 +0700
Subject: [PATCH] Updated Gemfile and fixed new rubocop complaints
---
Gemfile.lock | 74 +++++++++++++++++++-------------
lib/pagy/exceptions.rb | 2 +-
tasks/test.rake | 2 +-
test/mock_helpers/meilisearch.rb | 2 +-
4 files changed, 46 insertions(+), 34 deletions(-)
diff --git a/Gemfile.lock b/Gemfile.lock
index b40a9138f..a9c466d60 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,24 +1,33 @@
GEM
remote: https://rubygems.org/
specs:
- activesupport (7.0.8)
+ activesupport (7.1.2)
+ base64
+ bigdecimal
concurrent-ruby (~> 1.0, >= 1.0.2)
+ connection_pool (>= 2.2.5)
+ drb
i18n (>= 1.6, < 2)
minitest (>= 5.1)
+ mutex_m
tzinfo (~> 2.0)
ansi (1.5.0)
ast (2.4.2)
- base64 (0.1.1)
- benchmark-ips (2.12.0)
+ base64 (0.2.0)
+ benchmark-ips (2.13.0)
+ bigdecimal (3.1.5)
builder (3.2.4)
codecov (0.6.0)
simplecov (>= 0.15, < 0.22)
concurrent-ruby (1.2.2)
+ connection_pool (2.4.1)
docile (1.4.0)
- ffi (1.16.2)
+ drb (2.2.0)
+ ruby2_keywords
+ ffi (1.16.3)
i18n (1.14.1)
concurrent-ruby (~> 1.0)
- json (2.6.3)
+ json (2.7.1)
kalibera (0.1.2)
memoist (~> 0.16)
rbzip2 (~> 0.3)
@@ -37,51 +46,54 @@ GEM
multi_json (1.15.0)
mustermann (3.0.0)
ruby2_keywords (~> 0.0.1)
- nio4r (2.5.9)
- oj (3.16.1)
- parallel (1.23.0)
- parser (3.2.2.3)
+ mutex_m (0.2.0)
+ nio4r (2.7.0)
+ oj (3.16.3)
+ bigdecimal (>= 3.0)
+ parallel (1.24.0)
+ parser (3.2.2.4)
ast (~> 2.4.1)
racc
- puma (6.4.0)
+ puma (6.4.1)
nio4r (~> 2.0)
- racc (1.7.1)
+ racc (1.7.3)
rack (2.2.8)
- rack-protection (3.1.0)
+ rack-protection (3.2.0)
+ base64 (>= 0.1.0)
rack (~> 2.2, >= 2.2.4)
rainbow (3.1.1)
- rake (13.0.6)
+ rake (13.1.0)
rake-manifest (0.2.3)
rb-fsevent (0.11.2)
rb-inotify (0.10.1)
ffi (~> 1.0)
rbzip2 (0.3.0)
- regexp_parser (2.8.1)
+ regexp_parser (2.8.3)
rematch (1.4.2)
rerun (0.14.0)
listen (~> 3.0)
rexml (3.2.6)
- rubocop (1.56.3)
- base64 (~> 0.1.1)
+ rubocop (1.59.0)
json (~> 2.3)
language_server-protocol (>= 3.17.0)
parallel (~> 1.10)
- parser (>= 3.2.2.3)
+ parser (>= 3.2.2.4)
rainbow (>= 2.2.2, < 4.0)
regexp_parser (>= 1.8, < 3.0)
rexml (>= 3.2.5, < 4.0)
- rubocop-ast (>= 1.28.1, < 2.0)
+ rubocop-ast (>= 1.30.0, < 2.0)
ruby-progressbar (~> 1.7)
unicode-display_width (>= 2.4.0, < 3.0)
- rubocop-ast (1.29.0)
+ rubocop-ast (1.30.0)
parser (>= 3.2.1.0)
- rubocop-minitest (0.32.2)
+ rubocop-minitest (0.34.3)
rubocop (>= 1.39, < 2.0)
+ rubocop-ast (>= 1.30.0, < 2.0)
rubocop-packaging (0.5.2)
rubocop (>= 1.33, < 2.0)
- rubocop-performance (1.19.1)
- rubocop (>= 1.7.0, < 2.0)
- rubocop-ast (>= 0.4.0)
+ rubocop-performance (1.20.1)
+ rubocop (>= 1.48.1, < 2.0)
+ rubocop-ast (>= 1.30.0, < 2.0)
rubocop-rake (0.6.0)
rubocop (~> 1.0)
ruby-progressbar (1.13.0)
@@ -92,21 +104,21 @@ GEM
simplecov_json_formatter (~> 0.1)
simplecov-html (0.12.3)
simplecov_json_formatter (0.1.4)
- sinatra (3.1.0)
+ sinatra (3.2.0)
mustermann (~> 3.0)
rack (~> 2.2, >= 2.2.4)
- rack-protection (= 3.1.0)
+ rack-protection (= 3.2.0)
tilt (~> 2.0)
- sinatra-contrib (3.1.0)
- multi_json
+ sinatra-contrib (3.2.0)
+ multi_json (>= 0.0.2)
mustermann (~> 3.0)
- rack-protection (= 3.1.0)
- sinatra (= 3.1.0)
+ rack-protection (= 3.2.0)
+ sinatra (= 3.2.0)
tilt (~> 2.0)
tilt (2.3.0)
tzinfo (2.0.6)
concurrent-ruby (~> 1.0)
- unicode-display_width (2.4.2)
+ unicode-display_width (2.5.0)
PLATFORMS
x86_64-linux
@@ -137,4 +149,4 @@ DEPENDENCIES
sinatra-contrib
BUNDLED WITH
- 2.4.10
+ 2.5.3
diff --git a/lib/pagy/exceptions.rb b/lib/pagy/exceptions.rb
index b897ed89c..d35a14de4 100644
--- a/lib/pagy/exceptions.rb
+++ b/lib/pagy/exceptions.rb
@@ -10,7 +10,7 @@ def initialize(pagy, variable, description, value)
@pagy = pagy
@variable = variable
@value = value
- super "expected :#{@variable} #{description}; got #{@value.inspect}"
+ super("expected :#{@variable} #{description}; got #{@value.inspect}")
end
end
diff --git a/tasks/test.rake b/tasks/test.rake
index ca701a730..5e5d89f69 100644
--- a/tasks/test.rake
+++ b/tasks/test.rake
@@ -14,7 +14,7 @@ require 'rake/testtask'
names = []
FileList.new.include('test/**/*_test.rb').each do |path|
- name = "test_#{path[0..-9].split('/').last}".to_sym
+ name = "test_#{path[0..-9].split('/').last}"
names << name
Rake::TestTask.new(name) do |t|
t.test_files = [path]
diff --git a/test/mock_helpers/meilisearch.rb b/test/mock_helpers/meilisearch.rb
index 8c10b3928..8cf879e1e 100644
--- a/test/mock_helpers/meilisearch.rb
+++ b/test/mock_helpers/meilisearch.rb
@@ -11,7 +11,7 @@ def initialize(query, params = {})
@query = query
@params = { page: 1, hits_per_page: 10 }.merge(params)
- super RESULTS[@query].slice(@params[:hits_per_page] * (@params[:page] - 1), @params[:hits_per_page]) || []
+ super(RESULTS[@query].slice(@params[:hits_per_page] * (@params[:page] - 1), @params[:hits_per_page]) || [])
end
def raw_answer