Skip to content

Commit 17c0def

Browse files
chore(deps): update all non-major bundler dependencies (#1071)
* chore(deps): update all non-major bundler dependencies * Update Gemfile * UPdated Gemfile * fix wkhtmltopdf depraction * fix lint * Update user.rb * update lint * Update order_screen.js --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: lodewiges <[email protected]> Co-authored-by: Lodewiges <[email protected]>
1 parent 63207e6 commit 17c0def

File tree

8 files changed

+66
-69
lines changed

8 files changed

+66
-69
lines changed

Gemfile

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ gem 'bootsnap', '~> 1.18.6'
55
gem 'browser', '~> 6.2.0'
66
gem 'devise', '~>4.9.4'
77
gem 'devise-i18n', '~>1.13.0'
8-
gem 'factory_bot_rails', '~> 6.4.4'
8+
gem 'factory_bot_rails', '~> 6.5.0'
99
gem 'faker', '~> 3.5.1'
1010
gem 'font-awesome-rails', '~> 4.7.0.9'
11-
gem 'http', '~> 5.2.0'
11+
gem 'http', '~> 5.3.1'
1212
gem 'jbuilder', '~> 2.13.0'
1313
gem 'jquery-rails', '~> 4.6.0'
1414
gem 'kaminari', '~> 1.2.2'
@@ -30,10 +30,10 @@ gem 'rails-i18n', '~> 7.0.10'
3030
gem 'redis-rails', '~> 5.0.2'
3131
gem 'rest-client', '~> 2.1.0'
3232
gem 'sassc-rails', '~> 2.1.2'
33-
gem 'sentry-rails', '~> 5.24'
34-
gem 'sentry-ruby', '~> 5.24'
35-
gem 'sentry-sidekiq', '~> 5.24'
36-
gem 'sidekiq', '~> 8.0.3'
33+
gem 'sentry-rails', '~> 5.25'
34+
gem 'sentry-ruby', '~> 5.25'
35+
gem 'sentry-sidekiq', '~> 5.25'
36+
gem 'sidekiq', '~> 8.0.4'
3737
gem 'sidekiq-scheduler', '~> 6.0.1'
3838
gem 'simple_form', '~> 5.3.1'
3939
gem 'turbolinks', '~> 5.2.1'
@@ -72,7 +72,7 @@ end
7272

7373
group :test do
7474
gem 'rails-controller-testing', '~> 1.0.5'
75-
gem 'rubocop', '~> 1.75.8', require: false
75+
gem 'rubocop', '~> 1.76.1', require: false
7676
gem 'rubocop-factory_bot', '~> 2.27.1', require: false
7777
gem 'rubocop-performance', '~> 1.25', require: false
7878
gem 'rubocop-rails', '~> 2.32', require: false

Gemfile.lock

Lines changed: 45 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -78,20 +78,20 @@ GEM
7878
mutex_m
7979
securerandom (>= 0.3)
8080
tzinfo (~> 2.0)
81-
addressable (2.8.0)
82-
public_suffix (>= 2.0.2, < 5.0)
81+
addressable (2.8.7)
82+
public_suffix (>= 2.0.2, < 7.0)
8383
airbrussh (1.5.3)
8484
sshkit (>= 1.6.1, != 1.7.0)
8585
ast (2.4.3)
8686
awesome_print (1.9.2)
8787
base64 (0.3.0)
8888
bcrypt (3.1.20)
89-
benchmark (0.4.0)
89+
benchmark (0.4.1)
9090
better_errors (2.10.1)
9191
erubi (>= 1.0.0)
9292
rack (>= 0.9.0)
9393
rouge (>= 1.0.0)
94-
bigdecimal (3.1.9)
94+
bigdecimal (3.2.2)
9595
bindex (0.8.1)
9696
bootsnap (1.18.6)
9797
msgpack (~> 1.2)
@@ -132,35 +132,36 @@ GEM
132132
rails-i18n
133133
diff-lcs (1.5.0)
134134
docile (1.4.0)
135-
domain_name (0.5.20190701)
136-
unf (>= 0.0.5, < 1.0.0)
135+
domain_name (0.6.20240107)
137136
dotenv (3.1.8)
138137
dotenv-rails (3.1.8)
139138
dotenv (= 3.1.8)
140139
railties (>= 6.1)
141-
drb (2.2.1)
140+
drb (2.2.3)
142141
em-websocket (0.5.3)
143142
eventmachine (>= 0.12.9)
144143
http_parser.rb (~> 0)
144+
erb (5.0.1)
145145
erubi (1.13.1)
146146
et-orbi (1.2.11)
147147
tzinfo
148148
eventmachine (1.2.7)
149149
execjs (2.8.1)
150-
factory_bot (6.5.0)
151-
activesupport (>= 5.0.0)
152-
factory_bot_rails (6.4.4)
150+
factory_bot (6.5.4)
151+
activesupport (>= 6.1.0)
152+
factory_bot_rails (6.5.0)
153153
factory_bot (~> 6.5)
154-
railties (>= 5.0.0)
154+
railties (>= 6.1.0)
155155
faker (3.5.1)
156156
i18n (>= 1.8.11, < 2)
157157
faraday (2.3.0)
158158
faraday-net_http (~> 2.0)
159159
ruby2_keywords (>= 0.0.4)
160160
faraday-net_http (2.0.3)
161-
ffi (1.15.5)
162-
ffi-compiler (1.0.1)
163-
ffi (>= 1.0.0)
161+
ffi (1.17.2)
162+
ffi (1.17.2-x86_64-linux-gnu)
163+
ffi-compiler (1.3.2)
164+
ffi (>= 1.15.5)
164165
rake
165166
font-awesome-rails (4.7.0.9)
166167
railties (>= 3.2, < 9.0)
@@ -191,14 +192,13 @@ GEM
191192
guard-compat (~> 1.1)
192193
rspec (>= 2.99.0, < 4.0)
193194
hashie (5.0.0)
194-
http (5.2.0)
195+
http (5.3.1)
195196
addressable (~> 2.8)
196-
base64 (~> 0.1)
197197
http-cookie (~> 1.0)
198198
http-form_data (~> 2.2)
199199
llhttp-ffi (~> 0.5.0)
200200
http-accept (1.7.0)
201-
http-cookie (1.0.5)
201+
http-cookie (1.0.8)
202202
domain_name (~> 0.5)
203203
http-form_data (2.3.0)
204204
http_parser.rb (0.8.0)
@@ -216,7 +216,7 @@ GEM
216216
rails-dom-testing (>= 1, < 3)
217217
railties (>= 4.2.0)
218218
thor (>= 0.14, < 2.0)
219-
json (2.11.3)
219+
json (2.12.2)
220220
jwt (2.4.1)
221221
kaminari (1.2.2)
222222
activesupport (>= 4.1.0)
@@ -230,16 +230,16 @@ GEM
230230
activerecord
231231
kaminari-core (= 1.2.2)
232232
kaminari-core (1.2.2)
233-
language_server-protocol (3.17.0.4)
233+
language_server-protocol (3.17.0.5)
234234
lint_roller (1.1.0)
235235
listen (3.9.0)
236236
rb-fsevent (~> 0.10, >= 0.10.3)
237237
rb-inotify (~> 0.9, >= 0.9.10)
238-
llhttp-ffi (0.5.0)
238+
llhttp-ffi (0.5.1)
239239
ffi-compiler (~> 1.0)
240240
rake (~> 13.0)
241241
logger (1.7.0)
242-
loofah (2.24.0)
242+
loofah (2.24.1)
243243
crass (~> 1.0.2)
244244
nokogiri (>= 1.12.0)
245245
lumberjack (1.2.8)
@@ -256,7 +256,7 @@ GEM
256256
mina (1.2.5)
257257
rake
258258
mini_mime (1.1.5)
259-
mini_portile2 (2.8.8)
259+
mini_portile2 (2.8.9)
260260
minitest (5.25.5)
261261
mollie-api-ruby (4.17.0)
262262
bigdecimal (~> 3.1, >= 3.1.8)
@@ -333,7 +333,7 @@ GEM
333333
pry (>= 0.13, < 0.16)
334334
pry-rails (0.3.11)
335335
pry (>= 0.13.0)
336-
psych (5.2.5)
336+
psych (5.2.6)
337337
date
338338
stringio
339339
public_suffix (4.0.7)
@@ -343,7 +343,7 @@ GEM
343343
activesupport (>= 3.0.0)
344344
raabro (1.4.0)
345345
racc (1.8.1)
346-
rack (3.1.14)
346+
rack (3.1.16)
347347
rack-attack (6.7.0)
348348
rack (>= 1.0, < 4)
349349
rack-protection (3.0.6)
@@ -375,7 +375,7 @@ GEM
375375
actionpack (>= 5.0.1.rc1)
376376
actionview (>= 5.0.1.rc1)
377377
activesupport (>= 5.0.1.rc1)
378-
rails-dom-testing (2.2.0)
378+
rails-dom-testing (2.3.0)
379379
activesupport (>= 5.0.0)
380380
minitest
381381
nokogiri (>= 1.6)
@@ -399,7 +399,8 @@ GEM
399399
rb-inotify (0.10.1)
400400
ffi (~> 1.0)
401401
rb-readline (0.5.5)
402-
rdoc (6.13.1)
402+
rdoc (6.14.0)
403+
erb
403404
psych (>= 4.0.0)
404405
redis (4.8.1)
405406
redis-actionpack (5.5.0)
@@ -455,18 +456,18 @@ GEM
455456
rspec-mocks (~> 3.13)
456457
rspec-support (~> 3.13)
457458
rspec-support (3.13.4)
458-
rubocop (1.75.8)
459+
rubocop (1.76.1)
459460
json (~> 2.3)
460461
language_server-protocol (~> 3.17.0.2)
461462
lint_roller (~> 1.1.0)
462463
parallel (~> 1.10)
463464
parser (>= 3.3.0.2)
464465
rainbow (>= 2.2.2, < 4.0)
465466
regexp_parser (>= 2.9.3, < 3.0)
466-
rubocop-ast (>= 1.44.0, < 2.0)
467+
rubocop-ast (>= 1.45.0, < 2.0)
467468
ruby-progressbar (~> 1.7)
468469
unicode-display_width (>= 2.4.0, < 4.0)
469-
rubocop-ast (1.44.1)
470+
rubocop-ast (1.45.1)
470471
parser (>= 3.3.7.2)
471472
prism (~> 1.4)
472473
rubocop-factory_bot (2.27.1)
@@ -503,17 +504,17 @@ GEM
503504
tilt
504505
securerandom (0.4.1)
505506
semantic_range (3.0.0)
506-
sentry-rails (5.24.0)
507+
sentry-rails (5.25.0)
507508
railties (>= 5.0)
508-
sentry-ruby (~> 5.24.0)
509-
sentry-ruby (5.24.0)
509+
sentry-ruby (~> 5.25.0)
510+
sentry-ruby (5.25.0)
510511
bigdecimal
511512
concurrent-ruby (~> 1.0, >= 1.0.2)
512-
sentry-sidekiq (5.24.0)
513-
sentry-ruby (~> 5.24.0)
513+
sentry-sidekiq (5.25.0)
514+
sentry-ruby (~> 5.25.0)
514515
sidekiq (>= 3.0)
515516
shellany (0.0.1)
516-
sidekiq (8.0.3)
517+
sidekiq (8.0.4)
517518
connection_pool (>= 2.5.0)
518519
json (>= 2.9.0)
519520
logger (>= 1.6.2)
@@ -570,9 +571,6 @@ GEM
570571
concurrent-ruby (~> 1.0)
571572
uglifier (4.2.1)
572573
execjs (>= 0.3.0, < 3)
573-
unf (0.1.4)
574-
unf_ext
575-
unf_ext (0.0.8.2)
576574
unicode-display_width (3.1.4)
577575
unicode-emoji (~> 4.0, >= 4.0.4)
578576
unicode-emoji (4.0.4)
@@ -593,15 +591,15 @@ GEM
593591
rack-proxy (>= 0.6.1)
594592
railties (>= 5.2)
595593
semantic_range (>= 2.3.0)
596-
websocket-driver (0.7.7)
594+
websocket-driver (0.8.0)
597595
base64
598596
websocket-extensions (>= 0.1.0)
599597
websocket-extensions (0.1.5)
600598
wicked_pdf (2.8.2)
601599
activesupport
602600
ostruct
603601
wkhtmltopdf-binary (0.12.6.9)
604-
zeitwerk (2.7.2)
602+
zeitwerk (2.7.3)
605603

606604
PLATFORMS
607605
ruby
@@ -621,13 +619,13 @@ DEPENDENCIES
621619
devise (~> 4.9.4)
622620
devise-i18n (~> 1.13.0)
623621
dotenv-rails (~> 3.1.8)
624-
factory_bot_rails (~> 6.4.4)
622+
factory_bot_rails (~> 6.5.0)
625623
faker (~> 3.5.1)
626624
font-awesome-rails (~> 4.7.0.9)
627625
foreman (~> 0.88.1)
628626
guard-livereload (~> 2.5.2)
629627
guard-rspec (~> 4.7.3)
630-
http (~> 5.2.0)
628+
http (~> 5.3.1)
631629
jbuilder (~> 2.13.0)
632630
jquery-rails (~> 4.6.0)
633631
kaminari (~> 1.2.2)
@@ -655,17 +653,17 @@ DEPENDENCIES
655653
redis-rails (~> 5.0.2)
656654
rest-client (~> 2.1.0)
657655
rspec-rails (~> 6.1.5)
658-
rubocop (~> 1.75.8)
656+
rubocop (~> 1.76.1)
659657
rubocop-factory_bot (~> 2.27.1)
660658
rubocop-performance (~> 1.25)
661659
rubocop-rails (~> 2.32)
662660
rubocop-rspec (~> 3.6)
663661
rubocop-rspec_rails (~> 2.31)
664662
sassc-rails (~> 2.1.2)
665-
sentry-rails (~> 5.24)
666-
sentry-ruby (~> 5.24)
667-
sentry-sidekiq (~> 5.24)
668-
sidekiq (~> 8.0.3)
663+
sentry-rails (~> 5.25)
664+
sentry-ruby (~> 5.25)
665+
sentry-sidekiq (~> 5.25)
666+
sidekiq (~> 8.0.4)
669667
sidekiq-scheduler (~> 6.0.1)
670668
simple_form (~> 5.3.1)
671669
simplecov (~> 0.22.0)

app/controllers/activities_controller.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,7 @@ def users_hash
168168
users_credits = User.calculate_credits
169169
User.active.order(:name).map do |user|
170170
user.current_activity = @activity
171-
user.as_json(methods: %i[avatar_thumb_or_default_url minor insufficient_credit can_order])
171+
user.as_json(methods: %i[avatar_thumb_or_default_url minor? insufficient_credit can_order])
172172
.merge(credit: users_credits.fetch(user.id, 0))
173173
end
174174
end

app/models/user.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ def age
3838
age
3939
end
4040

41-
def minor
41+
def minor?
4242
return false unless age
4343

4444
age < 18
@@ -126,7 +126,7 @@ def self.calculate_spendings(from: '01-01-1970', to: Time.zone.now)
126126
end
127127

128128
def self.orderscreen_json_includes
129-
%i[credit avatar_thumb_or_default_url minor insufficient_credit can_order]
129+
%i[credit avatar_thumb_or_default_url minor? insufficient_credit can_order]
130130
end
131131

132132
private

app/views/activities/order_screen.html.erb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -162,9 +162,9 @@
162162
</div>
163163
<div class="product-grid" v-if="selectedUser || payWithCash || payWithPin">
164164
<div @click="selectProduct(productPrice)" class="product-grid-product"
165-
:class="{ 'product-requires-age' : (selectedUser && selectedUser.minor && productPrice.product.requires_age) }"
165+
:class="{ 'product-requires-age' : (selectedUser && selectedUser.minor? && productPrice.product.requires_age) }"
166166
v-for="productPrice in productPrices">
167-
<span class="product-grid-product-requires-age mb-2 fa-stack" v-if="selectedUser && selectedUser.minor && productPrice.product.requires_age">
167+
<span class="product-grid-product-requires-age mb-2 fa-stack" v-if="selectedUser && selectedUser.minor? && productPrice.product.requires_age">
168168
<i class="fa fa-circle fa-circle-lighter fa-stack-2x">
169169
</i>
170170
<span class="fa fa-stack-1x fa-inverse fa-plus18">

app/views/layouts/application.html.erb

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@
3131
environment: '<%= Rails.env %>',
3232
release: '<%= ENV['BUILD_HASH'] %>'
3333
});
34-
3534
Sentry.configureScope(scope => {
3635
scope.setUser({ id: <%= current_user&.id || 'null' %> });
3736
});

config/initializers/wicked_pdf.rb

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,14 @@
88
#
99
# https://github.com/mileszs/wicked_pdf/blob/master/README.md
1010

11-
WickedPdf.config = {
11+
WickedPdf.configure do |config|
1212
# Path to the wkhtmltopdf executable: This usually isn't needed if using
1313
# one of the wkhtmltopdf-binary family of gems.
14-
# exe_path: '/usr/local/bin/wkhtmltopdf',
14+
# config.exe_path = '/usr/local/bin/wkhtmltopdf'
1515
# or
16-
# exe_path: Gem.bin_path('wkhtmltopdf-binary', 'wkhtmltopdf')
16+
# config.exe_path = Gem.bin_path('wkhtmltopdf-binary', 'wkhtmltopdf')
1717

1818
# Layout file to be used for all PDFs
1919
# (but can be overridden in `render :pdf` calls)
20-
layout: 'pdf.html.erb'
21-
}
20+
config.layout = 'pdf.html.erb'
21+
end

0 commit comments

Comments
 (0)