diff --git a/.ruby-version b/.ruby-version index be94e6f5..15a27998 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -3.2.2 +3.3.0 diff --git a/Gemfile.lock b/Gemfile.lock index a5a2a3f4..22f08018 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -33,36 +33,37 @@ GEM remote: https://rubygems.org/ specs: RedCloth (4.3.3) - actioncable (7.1.1) - actionpack (= 7.1.1) - activesupport (= 7.1.1) + actioncable (7.1.2) + actionpack (= 7.1.2) + activesupport (= 7.1.2) nio4r (~> 2.0) websocket-driver (>= 0.6.1) zeitwerk (~> 2.6) - actionmailbox (7.1.1) - actionpack (= 7.1.1) - activejob (= 7.1.1) - activerecord (= 7.1.1) - activestorage (= 7.1.1) - activesupport (= 7.1.1) + actionmailbox (7.1.2) + actionpack (= 7.1.2) + activejob (= 7.1.2) + activerecord (= 7.1.2) + activestorage (= 7.1.2) + activesupport (= 7.1.2) mail (>= 2.7.1) net-imap net-pop net-smtp - actionmailer (7.1.1) - actionpack (= 7.1.1) - actionview (= 7.1.1) - activejob (= 7.1.1) - activesupport (= 7.1.1) + actionmailer (7.1.2) + actionpack (= 7.1.2) + actionview (= 7.1.2) + activejob (= 7.1.2) + activesupport (= 7.1.2) mail (~> 2.5, >= 2.5.4) net-imap net-pop net-smtp rails-dom-testing (~> 2.2) - actionpack (7.1.1) - actionview (= 7.1.1) - activesupport (= 7.1.1) + actionpack (7.1.2) + actionview (= 7.1.2) + activesupport (= 7.1.2) nokogiri (>= 1.8.5) + racc rack (>= 2.2.4) rack-session (>= 1.0.1) rack-test (>= 0.6.3) @@ -70,35 +71,35 @@ GEM rails-html-sanitizer (~> 1.6) actionpack-page_caching (1.2.4) actionpack (>= 4.0.0) - actiontext (7.1.1) - actionpack (= 7.1.1) - activerecord (= 7.1.1) - activestorage (= 7.1.1) - activesupport (= 7.1.1) + actiontext (7.1.2) + actionpack (= 7.1.2) + activerecord (= 7.1.2) + activestorage (= 7.1.2) + activesupport (= 7.1.2) globalid (>= 0.6.0) nokogiri (>= 1.8.5) - actionview (7.1.1) - activesupport (= 7.1.1) + actionview (7.1.2) + activesupport (= 7.1.2) builder (~> 3.1) erubi (~> 1.11) rails-dom-testing (~> 2.2) rails-html-sanitizer (~> 1.6) - activejob (7.1.1) - activesupport (= 7.1.1) + activejob (7.1.2) + activesupport (= 7.1.2) globalid (>= 0.3.6) - activemodel (7.1.1) - activesupport (= 7.1.1) - activerecord (7.1.1) - activemodel (= 7.1.1) - activesupport (= 7.1.1) + activemodel (7.1.2) + activesupport (= 7.1.2) + activerecord (7.1.2) + activemodel (= 7.1.2) + activesupport (= 7.1.2) timeout (>= 0.4.0) - activestorage (7.1.1) - actionpack (= 7.1.1) - activejob (= 7.1.1) - activerecord (= 7.1.1) - activesupport (= 7.1.1) + activestorage (7.1.2) + actionpack (= 7.1.2) + activejob (= 7.1.2) + activerecord (= 7.1.2) + activesupport (= 7.1.2) marcel (~> 1.0) - activesupport (7.1.1) + activesupport (7.1.2) base64 bigdecimal concurrent-ruby (~> 1.0, >= 1.0.2) @@ -110,7 +111,7 @@ GEM tzinfo (~> 2.0) acts_as_list (0.9.19) activerecord (>= 3.0) - addressable (2.8.5) + addressable (2.8.6) public_suffix (>= 2.0.2, < 6.0) alba (1.3.0) ast (2.4.2) @@ -118,9 +119,9 @@ GEM babel-transpiler (0.7.0) babel-source (>= 4.0, < 6) execjs (~> 2.0) - base64 (0.1.1) - bcrypt (3.1.19) - bigdecimal (3.1.4) + base64 (0.2.0) + bcrypt (3.1.20) + bigdecimal (3.1.5) binding_of_caller (1.0.0) debug_inspector (>= 0.0.1) builder (3.2.4) @@ -136,14 +137,14 @@ GEM coderay (1.1.3) concurrent-ruby (1.2.2) connection_pool (2.4.1) - countries (5.7.0) + countries (5.7.1) unaccent (~> 0.3) country_select (8.0.3) countries (~> 5.0) crass (1.0.6) daemons (1.2.6) - date (3.3.3) - debug_inspector (1.1.0) + date (3.3.4) + debug_inspector (1.2.0) delayed_job (4.1.11) activesupport (>= 3.0, < 8.0) delayed_job_active_record (4.1.8) @@ -156,7 +157,7 @@ GEM pmap (~> 1.1.0) rails (> 5.0) docile (1.4.0) - drb (2.1.1) + drb (2.2.0) ruby2_keywords dynamic_image (3.0.2) dis (~> 1.1, >= 1.1.11) @@ -166,9 +167,9 @@ GEM erubi (1.12.0) ethon (0.16.0) ffi (>= 1.15.0) - excon (0.104.0) + excon (0.108.0) execjs (2.9.1) - factory_bot (6.3.0) + factory_bot (6.4.3) activesupport (>= 5.0.0) ffi (1.16.3) fog-core (2.1.2) @@ -185,14 +186,14 @@ GEM i18n (1.14.1) concurrent-ruby (~> 1.0) interception (0.5) - io-console (0.6.0) - irb (1.8.3) + io-console (0.7.1) + irb (1.11.0) rdoc reline (>= 0.3.8) jbuilder (2.11.5) actionview (>= 5.0.0) activesupport (>= 5.0.0) - json (2.6.3) + json (2.7.1) language_server-protocol (3.17.0.3) localizable_model (0.6.4) rails (> 5.0) @@ -201,7 +202,7 @@ GEM activesupport (>= 4) railties (>= 4) request_store (~> 1.0) - loofah (2.21.4) + loofah (2.22.0) crass (~> 1.0.2) nokogiri (>= 1.12.0) mail (2.8.1) @@ -214,28 +215,26 @@ GEM method_source (1.0.0) mime-types (3.5.1) mime-types-data (~> 3.2015) - mime-types-data (3.2023.1003) + mime-types-data (3.2023.1205) mini_mime (1.1.5) + mini_portile2 (2.8.5) minitest (5.20.0) - mutex_m (0.1.2) - net-imap (0.4.3) + mutex_m (0.2.0) + net-imap (0.4.9) date net-protocol net-pop (0.1.2) net-protocol - net-protocol (0.2.1) + net-protocol (0.2.2) timeout net-smtp (0.4.0) net-protocol - nio4r (2.5.9) - nokogiri (1.15.4-arm64-darwin) - racc (~> 1.4) - nokogiri (1.15.4-x86_64-darwin) - racc (~> 1.4) - nokogiri (1.15.4-x86_64-linux) + nio4r (2.7.0) + nokogiri (1.15.5) + mini_portile2 (~> 2.8.2) racc (~> 1.4) options (2.3.2) - parallel (1.23.0) + parallel (1.24.0) parser (3.2.2.4) ast (~> 2.4.1) racc @@ -258,10 +257,10 @@ GEM pry-stack_explorer (0.6.1) binding_of_caller (~> 1.0) pry (~> 0.13) - psych (5.1.1.1) + psych (5.1.2) stringio - public_suffix (5.0.3) - racc (1.7.2) + public_suffix (5.0.4) + racc (1.7.3) rack (3.0.8) rack-session (2.0.0) rack (>= 3.0.0) @@ -270,20 +269,20 @@ GEM rackup (2.1.0) rack (>= 3) webrick (~> 1.8) - rails (7.1.1) - actioncable (= 7.1.1) - actionmailbox (= 7.1.1) - actionmailer (= 7.1.1) - actionpack (= 7.1.1) - actiontext (= 7.1.1) - actionview (= 7.1.1) - activejob (= 7.1.1) - activemodel (= 7.1.1) - activerecord (= 7.1.1) - activestorage (= 7.1.1) - activesupport (= 7.1.1) + rails (7.1.2) + actioncable (= 7.1.2) + actionmailbox (= 7.1.2) + actionmailer (= 7.1.2) + actionpack (= 7.1.2) + actiontext (= 7.1.2) + actionview (= 7.1.2) + activejob (= 7.1.2) + activemodel (= 7.1.2) + activerecord (= 7.1.2) + activestorage (= 7.1.2) + activesupport (= 7.1.2) bundler (>= 1.15.0) - railties (= 7.1.1) + railties (= 7.1.2) rails-controller-testing (1.0.5) actionpack (>= 5.0.1.rc1) actionview (>= 5.0.1.rc1) @@ -300,9 +299,9 @@ GEM rails-i18n (7.0.8) i18n (>= 0.7, < 2) railties (>= 6.0.0, < 8) - railties (7.1.1) - actionpack (= 7.1.1) - activesupport (= 7.1.1) + railties (7.1.2) + actionpack (= 7.1.2) + activesupport (= 7.1.2) irb rackup (>= 1.0.0) rake (>= 12.2) @@ -310,7 +309,7 @@ GEM zeitwerk (~> 2.6) rainbow (3.1.1) rake (13.1.0) - rdoc (6.5.0) + rdoc (6.6.2) psych (>= 4.0.0) react-rails (2.7.1) babel-transpiler (>= 0.7.0) @@ -318,8 +317,8 @@ GEM execjs railties (>= 3.2) tilt - regexp_parser (2.8.2) - reline (0.3.9) + regexp_parser (2.8.3) + reline (0.4.1) io-console (~> 0.5) request_store (1.5.1) rack (>= 1.4) @@ -332,7 +331,7 @@ GEM rspec-mocks (3.12.6) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.12.0) - rspec-rails (6.0.3) + rspec-rails (6.1.0) actionpack (>= 6.1) activesupport (>= 6.1) railties (>= 6.1) @@ -343,7 +342,7 @@ GEM rspec-support (3.12.1) rspec_junit_formatter (0.6.0) rspec-core (>= 2, < 4, != 2.12.0) - rubocop (1.57.2) + rubocop (1.59.0) json (~> 2.3) language_server-protocol (>= 3.17.0) parallel (~> 1.10) @@ -351,7 +350,7 @@ GEM 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.30.0) @@ -360,10 +359,11 @@ GEM rubocop (~> 1.41) rubocop-factory_bot (2.24.0) rubocop (~> 1.33) - rubocop-rails (2.22.1) + rubocop-rails (2.23.1) activesupport (>= 4.2.0) rack (>= 1.1) rubocop (>= 1.33.0, < 2.0) + rubocop-ast (>= 1.30.0, < 2.0) rubocop-rspec (2.25.0) rubocop (~> 1.40) rubocop-capybara (~> 2.17) @@ -383,7 +383,7 @@ GEM sprockets-rails tilt semantic (1.6.1) - shoulda-matchers (5.3.0) + shoulda-matchers (6.0.0) activesupport (>= 5.2.0) simplecov (0.17.1) docile (~> 1.1) @@ -397,7 +397,7 @@ GEM actionpack (>= 5.2) activesupport (>= 5.2) sprockets (>= 3.0.0) - stringio (3.0.8) + stringio (3.1.0) strings (0.2.1) strings-ansi (~> 0.2) unicode-display_width (>= 1.5, < 3.0) @@ -406,14 +406,14 @@ GEM thor (1.3.0) tilt (2.3.0) timecop (0.9.8) - timeout (0.4.0) + timeout (0.4.1) tty-color (0.6.0) - tty-screen (0.8.1) + tty-screen (0.8.2) tty-table (0.12.0) pastel (~> 0.8) strings (~> 0.2.0) tty-screen (~> 0.8) - typhoeus (1.4.0) + typhoeus (1.4.1) ethon (>= 0.9.0) tzinfo (2.0.6) concurrent-ruby (~> 1.0) @@ -432,6 +432,7 @@ GEM PLATFORMS arm64-darwin-22 + arm64-darwin-23 x86_64-darwin-21 x86_64-linux @@ -458,4 +459,4 @@ DEPENDENCIES timecop BUNDLED WITH - 2.4.10 + 2.5.3 diff --git a/app/helpers/pages_core/admin/form_builder.rb b/app/helpers/pages_core/admin/form_builder.rb index 1cfb0269..fa136ff9 100644 --- a/app/helpers/pages_core/admin/form_builder.rb +++ b/app/helpers/pages_core/admin/form_builder.rb @@ -38,7 +38,7 @@ def labelled_image_uploader(attribute, label_text = nil, options = {}) def foreign_key(attr) object.class.reflections[attr.to_s].options[:foreign_key] || - "#{attr}_id".to_sym + :"#{attr}_id" end end end diff --git a/app/helpers/pages_core/admin/labelled_field_helper.rb b/app/helpers/pages_core/admin/labelled_field_helper.rb index 5f1da064..62bca2fb 100644 --- a/app/helpers/pages_core/admin/labelled_field_helper.rb +++ b/app/helpers/pages_core/admin/labelled_field_helper.rb @@ -24,7 +24,7 @@ def labelled_field(field, label, options = {}) [labelled_field_label(label, options), labelled_field_description(options[:description]), field, - (options[:check_box_description] || "")] + options[:check_box_description] || ""] ) end end diff --git a/app/helpers/pages_core/page_path_helper.rb b/app/helpers/pages_core/page_path_helper.rb index 5cca8441..6aca4d23 100644 --- a/app/helpers/pages_core/page_path_helper.rb +++ b/app/helpers/pages_core/page_path_helper.rb @@ -54,7 +54,7 @@ def page_url_locale_and_page(page_or_locale, page, opts) ActiveSupport::Deprecation.warn( "Calling page_url without locale is deprecated" ) - [(opts[:locale] || content_locale), page_or_locale] + [opts[:locale] || content_locale, page_or_locale] end def paginated_section(opts) diff --git a/app/models/page_exporter.rb b/app/models/page_exporter.rb index 467a755f..a56a245f 100644 --- a/app/models/page_exporter.rb +++ b/app/models/page_exporter.rb @@ -88,7 +88,7 @@ def page_path_segment(page) def text_page(page) PagesCore::Templates::TemplateConfiguration .all_blocks - .select { |attr| page.send("#{attr}?".to_sym) } + .select { |attr| page.send(:"#{attr}?") } .map { |attr| ["-- #{attr}: --", page.send(attr).strip].join("\n\n") } .join("\n\n\n") end