Merge pull request #4697 from manyfold3d/dependabot/bundler/standard-1.51.0

dependabot[bot] · web-flow · commit 780027eea84c · 2025-10-17T11:23:38.000Z
diff --git a/.rubocop.yml b/.rubocop.yml
@@ -45,3 +45,5 @@ RSpec/MultipleMemoizedHelpers:
 RSpec/NoExpectationExample:
   Exclude:
     - spec/system/documentation_screenshots_spec.rb
+Style/ItAssignment:
+  Enabled: false
diff --git a/Gemfile b/Gemfile
@@ -41,7 +41,7 @@ group :development, :test do
   # Call 'byebug' anywhere in the code to stop execution and get a debugger console
   gem "byebug", platforms: [:mri, :mingw, :x64_mingw]
   gem "rspec-rails"
-  gem "standard", "~> 1.50"
+  gem "standard", "~> 1.51"
   gem "factory_bot"
   gem "faker", "~> 3.5"
   gem "guard", "~> 2.19"
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -574,7 +574,7 @@ GEM
     prime (0.1.2)
       forwardable
       singleton
-    prism (1.5.1)
+    prism (1.6.0)
     propshaft (1.3.1)
       actionpack (>= 7.0.0)
       activesupport (>= 7.0.0)
@@ -734,15 +734,15 @@ GEM
     rswag-ui (2.16.0)
       actionpack (>= 5.2, < 8.1)
       railties (>= 5.2, < 8.1)
-    rubocop (1.75.8)
+    rubocop (1.80.2)
       json (~> 2.3)
       language_server-protocol (~> 3.17.0.2)
       lint_roller (~> 1.1.0)
       parallel (~> 1.10)
       parser (>= 3.3.0.2)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 2.9.3, < 3.0)
-      rubocop-ast (>= 1.44.0, < 2.0)
+      rubocop-ast (>= 1.46.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 4.0)
     rubocop-ast (1.47.1)
@@ -836,10 +836,10 @@ GEM
     sqlite3_ar_regexp (3.0.0)
       activerecord (>= 6.0)
       sqlite3 (>= 1.4)
-    standard (1.50.0)
+    standard (1.51.1)
       language_server-protocol (~> 3.17.0.2)
       lint_roller (~> 1.0)
-      rubocop (~> 1.75.5)
+      rubocop (~> 1.80.2)
       standard-custom (~> 1.0.0)
       standard-performance (~> 1.8)
     standard-custom (1.0.2)
@@ -1036,7 +1036,7 @@ DEPENDENCIES
   spdx (~> 4.1)
   spring
   sqlite3_ar_regexp (~> 3.0)
-  standard (~> 1.50)
+  standard (~> 1.51)
   stimulus-rails (~> 1.3.4)
   stopwords-filter2
   string-similarity (~> 2.1)
@@ -1262,7 +1262,7 @@ CHECKSUMS
   pp (0.6.2) sha256=947ec3120c6f92195f8ee8aa25a7b2c5297bb106d83b41baa02983686577b6ff
   prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193
   prime (0.1.2) sha256=d4e956cadfaf04de036dc7dc74f95bf6a285a62cc509b28b7a66b245d19fe3a4
-  prism (1.5.1) sha256=b40c1b76ccb9fcccc3d1553967cda6e79fa7274d8bfea0d98b15d27a6d187134
+  prism (1.6.0) sha256=bfc0281a81718c4872346bc858dc84abd3a60cae78336c65ad35c8fbff641c6b
   propshaft (1.3.1) sha256=9acc664ef67e819ffa3d95bd7ad4c3623ea799110c5f4dee67fa7e583e74c392
   pry (0.15.2) sha256=12d54b8640d3fa29c9211dd4ffb08f3fd8bf7a4fd9b5a73ce5b59c8709385b6b
   psych (5.2.6) sha256=814328aa5dcb6d604d32126a20bc1cbcf05521a5b49dbb1a8b30a07e580f316e
@@ -1316,7 +1316,7 @@ CHECKSUMS
   rswag-api (2.16.0) sha256=b653f7bd92e98be18b01ab4525d88950d7b0960e293a99f856b9efcee3ae6074
   rswag-specs (2.16.0) sha256=8ba26085c408b0bd2ed21dc8015c80f417c7d34c63720ab7133c2549b5bd2a91
   rswag-ui (2.16.0) sha256=a1f49e927dceda92e6e6e7c1000f1e217ee66c565f69e28131dc98b33cd3a04f
-  rubocop (1.75.8) sha256=c80ab4286c5dcfc49d7ad1787cdba5569b63b58c96ee7afde4ec47a9c8a85be9
+  rubocop (1.80.2) sha256=6485f30fefcf5c199db3b91e5e253b1ef43f7e564784e2315255809a3dd9abf4
   rubocop-ast (1.47.1) sha256=592682017855408b046a8190689490763aecea175238232b1b526826349d01ae
   rubocop-capybara (2.22.1) sha256=ced88caef23efea53f46e098ff352f8fc1068c649606ca75cb74650970f51c0c
   rubocop-factory_bot (2.27.1) sha256=9d744b5916778c1848e5fe6777cc69855bd96548853554ec239ba9961b8573fe
@@ -1353,7 +1353,7 @@ CHECKSUMS
   sqlite3 (2.5.0-x86_64-darwin) sha256=e3c6d2fa04db9d0773455cb6c79835f230c363424b69c34dd718e1aff8609d35
   sqlite3 (2.5.0-x86_64-linux-gnu) sha256=c62c8d625da7e2ce93d694f02cd9c9d537638f56b09f2e8f28bea2d030b3923b
   sqlite3_ar_regexp (3.0.0) sha256=90ce99f00b9256721104550853a227e31972c6488963f203aa50f053a8c7c005
-  standard (1.50.0) sha256=b6c67f61fd6cedeec90ee338c6e913d9ccc4c467660ad1575da8aa6ba10f4aec
+  standard (1.51.1) sha256=6d0d98a1fac26d660393f37b3d9c864632bb934b17abfa23811996b20f87faf2
   standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b
   standard-performance (1.8.0) sha256=ed17b7d0e061b2a19a91dd434bef629439e2f32310f22f26acb451addc92b788
   starry (0.2.0) sha256=2696b0a165694269177bd7d98f77b6e76fd62b69455f297684ba416088d429b1
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
@@ -1,6 +1,7 @@
 class ApplicationController < ActionController::Base
   include Pundit::Authorization
   include BetterContentSecurityPolicy::HasContentSecurityPolicy
+
   after_action :verify_authorized, except: :index, unless: -> { respond_to?(:fasp_client_controller?) }
   after_action :verify_policy_scoped, only: :index, unless: -> { respond_to?(:fasp_client_controller?) }
   after_action :set_content_security_policy_header, if: -> { request.format.html? }
diff --git a/app/controllers/concerns/filterable.rb b/app/controllers/concerns/filterable.rb
@@ -1,5 +1,6 @@
 module Filterable
   extend ActiveSupport::Concern
+
   included do
     before_action :get_filters, only: [:index, :show] # rubocop:todo Rails/LexicallyScopedActionFilter
   end
diff --git a/app/deserializers/integrations/thangs/base_deserializer.rb b/app/deserializers/integrations/thangs/base_deserializer.rb
@@ -4,7 +4,7 @@ class Integrations::Thangs::BaseDeserializer < Integrations::BaseDeserializer
     model_slug: /(?<model_slug>[[:alnum:]\- ]+)/,
     model_id: /(?<model_id>[[:digit:]]+)/
   }
-  USERNAME_PATTERN = /[[:alnum:]_\-]+/
+  USERNAME_PATTERN = /[[:alnum:]_-]+/
 
   private
 
diff --git a/app/deserializers/integrations/thingiverse/base_deserializer.rb b/app/deserializers/integrations/thingiverse/base_deserializer.rb
@@ -1,5 +1,5 @@
 class Integrations::Thingiverse::BaseDeserializer < Integrations::BaseDeserializer
-  USERNAME_PATTERN = /[[:alnum:]_\-]+/
+  USERNAME_PATTERN = /[[:alnum:]_-]+/
 
   private
 
diff --git a/app/jobs/application_job.rb b/app/jobs/application_job.rb
@@ -1,5 +1,6 @@
 class ApplicationJob < ActiveJob::Base
   include ActiveJob::Status
+
   sidekiq_options retry: 10
 
   # Most jobs are safe to ignore if the underlying records are no longer available
diff --git a/app/jobs/scan/check_all_job.rb b/app/jobs/scan/check_all_job.rb
@@ -1,5 +1,6 @@
 class Scan::CheckAllJob < ApplicationJob
   include JobIteration::Iteration
+
   queue_as :scan
   unique :until_executed
 
diff --git a/app/jobs/upgrade/backfill_image_derivatives.rb b/app/jobs/upgrade/backfill_image_derivatives.rb
@@ -1,5 +1,6 @@
 class Upgrade::BackfillImageDerivatives < ApplicationJob
   include JobIteration::Iteration
+
   queue_as :low
   unique :until_executed
 
diff --git a/app/jobs/upgrade/fix_nil_file_size_values.rb b/app/jobs/upgrade/fix_nil_file_size_values.rb
@@ -2,6 +2,7 @@
 
 class Upgrade::FixNilFileSizeValues < ApplicationJob
   include JobIteration::Iteration
+
   unique :until_executed
 
   def build_enumerator(cursor:)
diff --git a/app/jobs/upgrade/generate_slugs_job.rb b/app/jobs/upgrade/generate_slugs_job.rb
@@ -3,6 +3,7 @@
 # Originally done in db/data/20230617222353_generate_slugs.rb
 class Upgrade::GenerateSlugsJob < ApplicationJob
   include JobIteration::Iteration
+
   unique :until_executed
 
   def build_enumerator(model, cursor:)
diff --git a/app/jobs/upgrade/prune_orphaned_problems.rb b/app/jobs/upgrade/prune_orphaned_problems.rb
@@ -2,6 +2,7 @@
 
 class Upgrade::PruneOrphanedProblems < ApplicationJob
   include JobIteration::Iteration
+
   unique :until_executed
 
   def build_enumerator(cursor:)
diff --git a/app/models/comment.rb b/app/models/comment.rb
@@ -2,11 +2,11 @@
 
 class Comment < ApplicationRecord
   include PublicIDable
+  include Federails::DataEntity
 
   belongs_to :commenter, polymorphic: true, optional: true
   belongs_to :commentable, polymorphic: true
 
-  include Federails::DataEntity
   acts_as_federails_data handles: "Note", actor_entity_method: :commenter, url_param: :public_id, should_federate_method: :federate?
 
   def to_activitypub_object
diff --git a/app/models/concerns/commentable.rb b/app/models/concerns/commentable.rb
@@ -1,5 +1,6 @@
 module Commentable
   extend ActiveSupport::Concern
+
   included do
     has_many :comments, as: :commentable, dependent: :destroy
   end
diff --git a/app/models/link.rb b/app/models/link.rb
@@ -1,5 +1,6 @@
 class Link < ApplicationRecord
   include Problematic
+
   belongs_to :linkable, polymorphic: true
 
   validates :url, presence: true, uniqueness: {scope: :linkable} # rubocop:disable Rails/UniqueValidationWithoutIndex
diff --git a/app/models/site_settings.rb b/app/models/site_settings.rb
@@ -9,7 +9,7 @@ class SiteSettings < RailsSettings::Base
   field :model_tags_auto_tag_new, type: :string, default: "!new"
   field :model_path_template, type: :string, default: "{tags}/{modelName}{modelId}"
   field :model_ignored_files, type: :array, default: [
-    /^\.[^\.]+/, # Hidden files starting with .
+    /^\.[^.]+/, # Hidden files starting with .
     /.*\/@eaDir\/.*/, # Synology temp files
     /__MACOSX/ # MACOS resource forks
   ]
diff --git a/app/models/user.rb b/app/models/user.rb
@@ -31,7 +31,7 @@ class User < ApplicationRecord
   validates :username,
     presence: true,
     uniqueness: {case_sensitive: false},
-    format: {with: /\A[[:alnum:]\.\-_;]+\z/}
+    format: {with: /\A[[:alnum:].\-_;]+\z/}
 
   validates :email,
     presence: true,
@@ -125,7 +125,7 @@ def self.from_omniauth(auth)
           (auth.info.preferred_username || auth.info.nickname || auth.info.email&.split("@")&.[](0) || "") + SecureRandom.hex(2)
         ]
           .compact
-          .map { |u| u.gsub(/[^[:alnum:]\.\-_;]/, "-") }
+          .map { |u| u.gsub(/[^[:alnum:].\-_;]/, "-") }
           .find { |u| !User.exists?(username: u) }
       end
     end
diff --git a/app/views/models/_form.html.erb b/app/views/models/_form.html.erb
@@ -22,7 +22,7 @@
         end %>
   <% end %>
 
-  <%= render "tags_edit", form: form, name: "model[tag_list]", value: (@model.tags.order(taggings_count: :desc, name: :asc).map { |tag| tag.name }).join(","), label: translate(".tags"), tags: @available_tags %>
+  <%= render "tags_edit", form: form, name: "model[tag_list]", value: @model.tags.order(taggings_count: :desc, name: :asc).map { |tag| tag.name }.join(","), label: translate(".tags"), tags: @available_tags %>
 
   <%= collection_select_input_row form,
         :collection, @collections, :id, :name_with_domain,
diff --git a/spec/helpers/problems_helper_spec.rb b/spec/helpers/problems_helper_spec.rb
@@ -2,6 +2,7 @@
 
 RSpec.describe ProblemsHelper, :as_member do
   include Devise::Test::ControllerHelpers
+
   let(:model) { create(:model) }
 
   it "converts a problem to a severity level" do

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@ class Integrations::Thangs::BaseDeserializer < Integrations::BaseDeserializer`
`4`	`4`	`model_slug: /(?<model_slug>[[:alnum:]\- ]+)/,`
`5`	`5`	`model_id: /(?<model_id>[[:digit:]]+)/`
`6`	`6`	`}`
`7`		`- USERNAME_PATTERN = /[[:alnum:]_\-]+/`
	`7`	`+ USERNAME_PATTERN = /[[:alnum:]_-]+/`
`8`	`8`
`9`	`9`	`private`
`10`	`10`