From c06723ee715512c2033c7786c48f15674585b56b Mon Sep 17 00:00:00 2001 From: erdgeist Date: Fri, 26 Jun 2026 01:59:57 +0200 Subject: Stage 4: Rails 5.2 -> 6.1 on Ruby 2.7.2 - routing-filter 0.6.3 -> 0.7.0 (Rails 6.1 compatibility) - RSS named routes rss_xml/rss_rdf added - RouteWithParams workarounds: will_paginate_patch, content_path shim, safe_path helper - Paperclip removed, replaced with FileAttachment concern (preserves URL scheme) - Assets resource moved to /admin/assets (Sprockets middleware conflict) - ApplicationRecord base class added, all models migrated - Strong parameters added to Assets, Occurrences, Events, MenuItems controllers - update_attributes -> update throughout - render :nothing -> head :ok/:not_found throughout - language_selector rewritten (removes :overwrite_params) - Environment files updated for Rails 6.1 (eager_load, public_file_server, ActionMailer) - Arel::Visitors::DepthFirst and Integer/Float duration patches removed from test_helper - AssetsController tests added (10 tests covering upload, variants, destroy, auth) - ImageMagick geometry: 460x250! for headline crop (not # which is invalid in IM6) 129 runs, 311 assertions, 5 failures (all pre-existing), 0 errors --- config/initializers/arel_patch.rb | 12 ------------ config/initializers/will_paginate_patch.rb | 13 +++++++++++++ 2 files changed, 13 insertions(+), 12 deletions(-) delete mode 100644 config/initializers/arel_patch.rb create mode 100644 config/initializers/will_paginate_patch.rb (limited to 'config/initializers') diff --git a/config/initializers/arel_patch.rb b/config/initializers/arel_patch.rb deleted file mode 100644 index 753a72b0..00000000 --- a/config/initializers/arel_patch.rb +++ /dev/null @@ -1,12 +0,0 @@ -require 'arel' -module Arel - module Visitors - [ToSql, DepthFirst].each do |visitor| - visitor.class_eval do - def visit_Integer(o, collector = nil) - collector ? collector << o.to_s : o.to_s - end - end - end - end -end diff --git a/config/initializers/will_paginate_patch.rb b/config/initializers/will_paginate_patch.rb new file mode 100644 index 00000000..d03c8828 --- /dev/null +++ b/config/initializers/will_paginate_patch.rb @@ -0,0 +1,13 @@ +require 'will_paginate/view_helpers/action_view' + +WillPaginate::ActionView::LinkRenderer.class_eval do + def url(page) + path = @template.request.path + page_param = WillPaginate::PageNumber(page) + if page_param == 1 + path + else + "#{path}?#{@options[:param_name]}=#{page}" + end + end +end -- cgit v1.3