diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml index d0ba1ec4..45457a6b 100644 --- a/.rubocop_todo.yml +++ b/.rubocop_todo.yml @@ -1,12 +1,12 @@ # This configuration was generated by # `rubocop --auto-gen-config` -# on 2021-08-13 12:49:18 UTC using RuboCop version 1.19.0. +# on 2022-02-10 16:47:29 UTC using RuboCop version 1.25.1. # The point is for the user to remove these configuration records # one by one as the offenses are removed from the code base. # Note that changes in the inspected code, or installation of new # versions of RuboCop, may require this file to be generated again. -# Offense count: 1 +# Offense count: 2 # Cop supports --auto-correct. # Configuration parameters: TreatCommentsAsGroupSeparators, ConsiderPunctuation, Include. # Include: **/*.gemfile, **/Gemfile, **/gems.rb @@ -14,13 +14,12 @@ Bundler/OrderedGems: Exclude: - 'Gemfile' -# Offense count: 5 +# Offense count: 1 # Cop supports --auto-correct. # Configuration parameters: IndentationWidth. Layout/AssignmentIndentation: Exclude: - 'app/helpers/format_helper.rb' - - 'config/environments/development.rb' # Offense count: 4 # Cop supports --auto-correct. @@ -33,6 +32,7 @@ Layout/ClosingParenthesisIndentation: # Offense count: 14 # Cop supports --auto-correct. +# Configuration parameters: AllowForAlignment. Layout/CommentIndentation: Exclude: - 'app/controllers/admin/comments_controller.rb' @@ -62,7 +62,7 @@ Layout/EmptyLineAfterMagicComment: Exclude: - 'spec/models/conference_spec.rb' -# Offense count: 113 +# Offense count: 108 # Cop supports --auto-correct. # Configuration parameters: EnforcedStyle. # SupportedStyles: empty_lines, no_empty_lines @@ -75,17 +75,13 @@ Layout/EmptyLinesAroundExceptionHandlingKeywords: Exclude: - 'app/models/payment.rb' -# Offense count: 13 +# Offense count: 6 # Cop supports --auto-correct. # Configuration parameters: AllowForAlignment, AllowBeforeTrailingComments, ForceEqualSignAlignment. Layout/ExtraSpacing: Exclude: - - 'Guardfile' - 'app/controllers/application_controller.rb' - 'app/views/admin/events/_all_with_comments.xlsx.axlsx' - - 'bin/rails' - - 'config.ru' - - 'config/environments/test.rb' - 'db/migrate/20140623101032_create_ahoy_events.rb' - 'db/migrate/20140701123203_add_events_per_week_to_conference.rb' - 'db/migrate/20140719160903_create_delayed_jobs.rb' @@ -140,12 +136,11 @@ Layout/IndentationWidth: Exclude: - 'app/controllers/users_controller.rb' -# Offense count: 4 +# Offense count: 2 # Cop supports --auto-correct. # Configuration parameters: AllowDoxygenCommentStyle, AllowGemfileRubyComment. Layout/LeadingCommentSpace: Exclude: - - 'Guardfile' - 'app/models/comment.rb' # Offense count: 32 @@ -179,14 +174,14 @@ Layout/MultilineHashBraceLayout: - 'config/routes.rb' - 'spec/models/event_spec.rb' -# Offense count: 36 +# Offense count: 35 # Cop supports --auto-correct. # Configuration parameters: EnforcedStyle. # SupportedStyles: symmetrical, new_line, same_line Layout/MultilineMethodCallBraceLayout: Enabled: false -# Offense count: 56 +# Offense count: 55 # Cop supports --auto-correct. # Configuration parameters: EnforcedStyle, IndentationWidth. # SupportedStyles: aligned, indented, indented_relative_to_receiver @@ -241,14 +236,13 @@ Layout/SpaceAroundMethodCallOperator: - 'spec/features/organizer_ability_spec.rb' - 'spec/models/program_spec.rb' -# Offense count: 3 +# Offense count: 2 # Cop supports --auto-correct. # Configuration parameters: AllowForAlignment, EnforcedStyleForExponentOperator. # SupportedStylesForExponentOperator: space, no_space Layout/SpaceAroundOperators: Exclude: - 'app/views/admin/events/_all_with_comments.xlsx.axlsx' - - 'config/environments/test.rb' - 'lib/tasks/data.rake' # Offense count: 139 @@ -278,12 +272,6 @@ Layout/SpaceBeforeFirstArg: Exclude: - 'app/controllers/admin/booths_controller.rb' -# Offense count: 1 -# Cop supports --auto-correct. -Layout/SpaceBeforeSemicolon: - Exclude: - - 'Guardfile' - # Offense count: 8 # Cop supports --auto-correct. # Configuration parameters: EnforcedStyle, EnforcedStyleForEmptyBrackets. @@ -339,7 +327,7 @@ Layout/SpaceInsideHashLiteralBraces: # Offense count: 4 # Cop supports --auto-correct. # Configuration parameters: EnforcedStyle. -# SupportedStyles: space, no_space +# SupportedStyles: space, compact, no_space Layout/SpaceInsideParens: Exclude: - 'app/views/admin/registrations/index.xlsx.axlsx' @@ -371,11 +359,17 @@ Lint/AmbiguousBlockAssociation: - 'spec/controllers/schedules_controller_spec.rb' - 'spec/models/user_spec.rb' -# Offense count: 1 -# Configuration parameters: AllowSafeAssignment. -Lint/AssignmentInCondition: +# Offense count: 13 +# Cop supports --auto-correct. +Lint/AmbiguousOperatorPrecedence: Exclude: - - 'bin/spring' + - 'app/controllers/application_controller.rb' + - 'app/helpers/conference_helper.rb' + - 'app/models/admin_ability.rb' + - 'app/models/commercial.rb' + - 'app/models/conference.rb' + - 'app/models/track.rb' + - 'app/pdfs/ticket_pdf.rb' # Offense count: 1 # Configuration parameters: AllowedMethods. @@ -409,31 +403,12 @@ Lint/IneffectiveAccessModifier: - 'app/models/commercial.rb' - 'app/models/conference.rb' -# Offense count: 1 -# Cop supports --auto-correct. -Lint/NonDeterministicRequireOrder: - Exclude: - - 'spec/spec_helper.rb' - # Offense count: 1 # Cop supports --auto-correct. Lint/RedundantCopDisableDirective: Exclude: - 'spec/support/save_feature_failures.rb' -# Offense count: 2 -# Cop supports --auto-correct. -Lint/ScriptPermission: - Exclude: - - 'Guardfile' - - 'Rakefile' - -# Offense count: 1 -# Configuration parameters: AllowComments, AllowNil. -Lint/SuppressedException: - Exclude: - - 'bin/rspec' - # Offense count: 1 # Cop supports --auto-correct. # Configuration parameters: IgnoreEmptyBlocks, AllowUnusedKeywordArguments. @@ -455,16 +430,16 @@ Lint/UriRegexp: - 'app/models/commercial.rb' - 'app/models/contact.rb' -# Offense count: 128 +# Offense count: 127 # Configuration parameters: IgnoredMethods, CountRepeatedAttributes. Metrics/AbcSize: Max: 71 -# Offense count: 315 +# Offense count: 313 # Configuration parameters: CountComments, CountAsOne, ExcludedMethods, IgnoredMethods. # IgnoredMethods: refine Metrics/BlockLength: - Max: 1344 + Max: 1341 # Offense count: 1 # Configuration parameters: CountBlocks. @@ -476,12 +451,12 @@ Metrics/BlockNesting: Metrics/ClassLength: Max: 652 -# Offense count: 28 +# Offense count: 29 # Configuration parameters: IgnoredMethods. Metrics/CyclomaticComplexity: Max: 16 -# Offense count: 150 +# Offense count: 152 # Configuration parameters: CountComments, CountAsOne, ExcludedMethods, IgnoredMethods. Metrics/MethodLength: Max: 56 @@ -491,7 +466,7 @@ Metrics/MethodLength: Metrics/ModuleLength: Max: 173 -# Offense count: 25 +# Offense count: 26 # Configuration parameters: IgnoredMethods. Metrics/PerceivedComplexity: Max: 19 @@ -510,15 +485,6 @@ Naming/HeredocDelimiterNaming: - 'spec/factories/users.rb' - 'spec/models/user_spec.rb' -# Offense count: 10 -# Configuration parameters: CheckIdentifiers, CheckConstants, CheckVariables, CheckStrings, CheckSymbols, CheckComments, CheckFilepaths, FlaggedTerms. -Naming/InclusiveLanguage: - Exclude: - - 'app/controllers/admin/contacts_controller.rb' - - 'app/controllers/users_controller.rb' - - 'app/uploaders/picture_uploader.rb' - - 'config/application.rb' - # Offense count: 2 # Configuration parameters: MinNameLength, AllowNamesEndingInNumbers, AllowedNames, ForbiddenNames. # AllowedNames: at, by, db, id, in, io, ip, of, on, os, pp, to @@ -618,7 +584,7 @@ RSpec/DescribedClass: - 'spec/serializers/speaker_serializer_spec.rb' - 'spec/serializers/track_serializer_spec.rb' -# Offense count: 13 +# Offense count: 11 # Cop supports --auto-correct. # Configuration parameters: AllowConsecutiveOneLiners. RSpec/EmptyLineAfterExample: @@ -649,7 +615,7 @@ RSpec/EmptyLineAfterFinalLet: - 'spec/models/payment_spec.rb' - 'spec/models/ticket_spec.rb' -# Offense count: 16 +# Offense count: 17 # Cop supports --auto-correct. RSpec/EmptyLineAfterHook: Exclude: @@ -682,7 +648,7 @@ RSpec/EmptyLineAfterSubject: RSpec/ExampleLength: Max: 187 -# Offense count: 19 +# Offense count: 18 # Cop supports --auto-correct. # Configuration parameters: CustomTransform, IgnoredWords. RSpec/ExampleWording: @@ -829,7 +795,7 @@ RSpec/MultipleDescribes: - 'spec/controllers/application_controller_spec.rb' - 'spec/models/conference_spec.rb' -# Offense count: 279 +# Offense count: 277 RSpec/MultipleExpectations: Max: 97 @@ -951,7 +917,7 @@ Style/AccessorGrouping: - 'app/models/payment.rb' # Offense count: 12 -# Cop supports --auto-correct. +# Cop supports --auto-correct-all. Style/CaseLikeIf: Exclude: - 'app/controllers/admin/roles_controller.rb' @@ -1007,14 +973,6 @@ Style/ConditionalAssignment: Style/Documentation: Enabled: false -# Offense count: 1 -# Cop supports --auto-correct. -# Configuration parameters: EnforcedStyle. -# SupportedStyles: allowed_in_returns, forbidden -Style/DoubleNegation: - Exclude: - - 'config/environments/production.rb' - # Offense count: 2 # Cop supports --auto-correct. Style/EmptyCaseCondition: @@ -1042,37 +1000,23 @@ Style/EmptyMethod: - 'db/migrate/20130206192339_rename_attending_social_events_with_partner.rb' - 'db/migrate/20130216122155_set_registration_defaults_to_false.rb' -# Offense count: 4 +# Offense count: 3 # Cop supports --auto-correct. Style/Encoding: Exclude: - 'app/uploaders/picture_uploader.rb' - 'config/initializers/formtastic.rb' - - 'config/initializers/money.rb' - 'spec/models/conference_spec.rb' -# Offense count: 11 +# Offense count: 3 # Cop supports --auto-correct. Style/ExpandPathArguments: Exclude: - - 'Rakefile' - 'bin/bundle' - - 'bin/rails' - 'bin/rspec' - - 'bin/setup' - - 'bin/update' - - 'config.ru' - - 'config/application.rb' - - 'config/environment.rb' - 'spec/spec_helper.rb' -# Offense count: 9 -# Cop supports --auto-correct. -Style/ExplicitBlockArgument: - Exclude: - - 'Guardfile' - -# Offense count: 48 +# Offense count: 41 # Cop supports --auto-correct. # Configuration parameters: EnforcedStyle. # SupportedStyles: always, always_true, never @@ -1085,7 +1029,7 @@ Style/GlobalStdStream: Exclude: - 'config/environments/production.rb' -# Offense count: 28 +# Offense count: 29 # Configuration parameters: MinBodyLength. Style/GuardClause: Enabled: false @@ -1114,25 +1058,22 @@ Style/HashLikeCase: Exclude: - 'app/helpers/versions_helper.rb' -# Offense count: 7 +# Offense count: 358 # Cop supports --auto-correct. -# Configuration parameters: EnforcedStyle, UseHashRocketsWithSymbolValues, PreferHashRocketsForNonAlnumEndingSymbols. +# Configuration parameters: EnforcedStyle, EnforcedShorthandSyntax, UseHashRocketsWithSymbolValues, PreferHashRocketsForNonAlnumEndingSymbols. # SupportedStyles: ruby19, hash_rockets, no_mixed_keys, ruby19_no_mixed_keys +# SupportedShorthandSyntax: always, never, either Style/HashSyntax: - Exclude: - - 'Gemfile' - - 'app/views/admin/events/events.xlsx.axlsx' - - 'app/views/admin/registrations/index.xlsx.axlsx' - - 'lib/tasks/user.rake' + Enabled: false # Offense count: 2 -# Cop supports --auto-correct. +# Cop supports --auto-correct-all. Style/HashTransformValues: Exclude: - 'app/controllers/admin/comments_controller.rb' - 'app/helpers/chart_helper.rb' -# Offense count: 59 +# Offense count: 61 # Cop supports --auto-correct. Style/IfUnlessModifier: Enabled: false @@ -1144,6 +1085,12 @@ Style/LineEndConcatenation: - 'spec/features/conference_spec.rb' - 'spec/features/registration_periods_spec.rb' +# Offense count: 1 +# Cop supports --auto-correct-all. +Style/MapToHash: + Exclude: + - 'app/controllers/admin/comments_controller.rb' + # Offense count: 9 # Cop supports --auto-correct. # Configuration parameters: EnforcedStyle. @@ -1154,12 +1101,9 @@ Style/MethodDefParentheses: - 'app/models/user.rb' - 'lib/tasks/demo_data_for_development.rake' -# Offense count: 4 +# Offense count: 1 Style/MixinUsage: Exclude: - - 'bin/setup' - - 'bin/update' - - 'config/application.rb' - 'spec/spec_helper.rb' # Offense count: 7 @@ -1213,12 +1157,12 @@ Style/NumericLiteralPrefix: # Offense count: 7 # Cop supports --auto-correct. -# Configuration parameters: Strict. +# Configuration parameters: Strict, AllowedNumbers. Style/NumericLiterals: MinDigits: 15 # Offense count: 36 -# Cop supports --auto-correct. +# Cop supports --auto-correct-all. # Configuration parameters: EnforcedStyle, IgnoredMethods. # SupportedStyles: predicate, comparison Style/NumericPredicate: @@ -1266,14 +1210,28 @@ Style/ParenthesesAroundCondition: - 'app/controllers/application_controller.rb' - 'app/helpers/format_helper.rb' -# Offense count: 21 +# Offense count: 19 # Cop supports --auto-correct. # Configuration parameters: PreferredDelimiters. Style/PercentLiteralDelimiters: - Enabled: false + Exclude: + - 'Gemfile' + - 'app/controllers/admin/users_controller.rb' + - 'app/models/cfp.rb' + - 'app/models/comment.rb' + - 'app/models/commercial.rb' + - 'app/models/conference.rb' + - 'app/models/contact.rb' + - 'app/models/registration.rb' + - 'app/models/subscription.rb' + - 'app/models/track.rb' + - 'app/uploaders/picture_uploader.rb' + - 'config/deploy.rb' + - 'config/initializers/formtastic.rb' + - 'spec/models/program_spec.rb' # Offense count: 1 -# Cop supports --auto-correct. +# Cop supports --auto-correct-all. # Configuration parameters: EnforcedStyle. # SupportedStyles: short, verbose Style/PreferredHashMethods: @@ -1308,7 +1266,7 @@ Style/RedundantCondition: - 'app/models/ticket.rb' # Offense count: 3 -# Cop supports --auto-correct. +# Cop supports --auto-correct-all. # Configuration parameters: SafeForConstants. Style/RedundantFetchBlock: Exclude: @@ -1336,13 +1294,12 @@ Style/RedundantReturn: - 'app/controllers/admin/events_controller.rb' - 'app/controllers/admin/organizations_controller.rb' -# Offense count: 3 +# Offense count: 1 # Cop supports --auto-correct. # Configuration parameters: EnforcedStyle, AllowInnerSlashes. # SupportedStyles: slashes, percent_r, mixed Style/RegexpLiteral: Exclude: - - 'Guardfile' - 'app/uploaders/picture_uploader.rb' # Offense count: 2 @@ -1363,13 +1320,6 @@ Style/SignalException: - 'lib/tasks/user.rake' - 'spec/support/flash.rb' -# Offense count: 1 -# Cop supports --auto-correct. -# Configuration parameters: AllowIfMethodIsEmpty. -Style/SingleLineMethods: - Exclude: - - 'Guardfile' - # Offense count: 6 # Cop supports --auto-correct. # Configuration parameters: AllowModifier. @@ -1382,13 +1332,20 @@ Style/SoleNestedConditional: - 'db/migrate/20140801170430_move_event_media_to_commercial.rb' - 'db/migrate/20151018152439_create_programs_table.rb' -# Offense count: 31 +# Offense count: 1 # Cop supports --auto-correct. +# Configuration parameters: RequireEnglish. +# SupportedStyles: use_perl_names, use_english_names +Style/SpecialGlobalVars: + EnforcedStyle: use_perl_names + +# Offense count: 31 +# Cop supports --auto-correct-all. # Configuration parameters: Mode. Style/StringConcatenation: Enabled: false -# Offense count: 31 +# Offense count: 35 # Cop supports --auto-correct. # Configuration parameters: EnforcedStyle, ConsistentQuotesInMultiline. # SupportedStyles: single_quotes, double_quotes @@ -1396,7 +1353,6 @@ Style/StringLiterals: Exclude: - 'Gemfile' - 'bin/rspec' - - 'bin/spring' - 'config/deploy.rb' - 'config/environments/production.rb' - 'config/puma.rb' @@ -1416,7 +1372,7 @@ Style/StringLiteralsInInterpolation: - 'app/views/admin/events/_confirmed_events.xlsx.axlsx' - 'lib/tasks/dump_db.rake' -# Offense count: 108 +# Offense count: 109 # Cop supports --auto-correct. # Configuration parameters: EnforcedStyle, MinSize. # SupportedStyles: percent, brackets @@ -1424,7 +1380,7 @@ Style/SymbolArray: Enabled: false # Offense count: 10 -# Cop supports --auto-correct. +# Cop supports --auto-correct-all. # Configuration parameters: AllowMethodsWithArguments, IgnoredMethods. # IgnoredMethods: respond_to, define_method Style/SymbolProc: @@ -1445,14 +1401,6 @@ Style/TernaryParentheses: Exclude: - 'app/helpers/format_helper.rb' -# Offense count: 2 -# Cop supports --auto-correct. -# Configuration parameters: EnforcedStyleForMultiline. -# SupportedStylesForMultiline: comma, consistent_comma, no_comma -Style/TrailingCommaInArrayLiteral: - Exclude: - - 'Guardfile' - # Offense count: 21 # Cop supports --auto-correct. # Configuration parameters: EnforcedStyleForMultiline. @@ -1476,9 +1424,9 @@ Style/WordArray: EnforcedStyle: percent MinSize: 6 -# Offense count: 533 +# Offense count: 532 # Cop supports --auto-correct. -# Configuration parameters: AutoCorrect, AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, IgnoredPatterns. +# Configuration parameters: AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, IgnoredPatterns. # URISchemes: http, https Layout/LineLength: Max: 619 diff --git a/Gemfile.lock b/Gemfile.lock index 253970b7..dafb1692 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -365,8 +365,8 @@ GEM paper_trail (12.1.0) activerecord (>= 5.2) request_store (~> 1.1) - parallel (1.20.1) - parser (3.0.2.0) + parallel (1.21.0) + parser (3.1.0.0) ast (~> 2.4.1) pdf-core (0.9.0) pdf-inspector (1.3.0) @@ -437,7 +437,7 @@ GEM method_source rake (>= 0.8.7) thor (>= 0.19.0, < 2.0) - rainbow (3.0.0) + rainbow (3.1.1) rake (13.0.6) rb-fsevent (0.11.0) rb-inotify (0.10.1) @@ -445,7 +445,7 @@ GEM recaptcha (4.14.0) json redcarpet (3.5.1) - regexp_parser (2.1.1) + regexp_parser (2.2.0) request_store (1.5.0) rack (>= 1.4) responders (3.0.1) @@ -483,16 +483,16 @@ GEM rspec-mocks (~> 3.6.0) rspec-support (~> 3.6.0) rspec-support (3.6.0) - rubocop (1.19.1) + rubocop (1.25.1) parallel (~> 1.10) - parser (>= 3.0.0.0) + parser (>= 3.1.0.0) rainbow (>= 2.2.2, < 4.0) regexp_parser (>= 1.8, < 3.0) rexml - rubocop-ast (>= 1.9.1, < 2.0) + rubocop-ast (>= 1.15.1, < 2.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 1.4.0, < 3.0) - rubocop-ast (1.11.0) + rubocop-ast (1.15.1) parser (>= 3.0.1.1) rubocop-rails (2.11.3) activesupport (>= 4.2.0) @@ -584,7 +584,7 @@ GEM unf (0.1.4) unf_ext unf_ext (0.0.7.7) - unicode-display_width (2.0.0) + unicode-display_width (2.1.0) unicode_utils (1.4.0) unobtrusive_flash (3.3.1) railties diff --git a/Gemfile.next.lock b/Gemfile.next.lock index 8a823de5..73049b10 100644 --- a/Gemfile.next.lock +++ b/Gemfile.next.lock @@ -406,8 +406,8 @@ GEM paper_trail (12.0.0) activerecord (>= 5.2) request_store (~> 1.1) - parallel (1.20.1) - parser (3.0.2.0) + parallel (1.21.0) + parser (3.1.0.0) ast (~> 2.4.1) pdf-core (0.9.0) pdf-inspector (1.3.0) @@ -480,12 +480,12 @@ GEM rake (>= 12.2) thor (~> 1.0) zeitwerk (~> 2.5) - rainbow (3.0.0) + rainbow (3.1.1) rake (13.0.6) recaptcha (5.8.1) json redcarpet (3.5.1) - regexp_parser (2.1.1) + regexp_parser (2.2.0) request_store (1.5.0) rack (>= 1.4) responders (3.0.1) @@ -523,16 +523,16 @@ GEM rspec-mocks (~> 3.10) rspec-support (~> 3.10) rspec-support (3.10.2) - rubocop (1.19.0) + rubocop (1.25.1) parallel (~> 1.10) - parser (>= 3.0.0.0) + parser (>= 3.1.0.0) rainbow (>= 2.2.2, < 4.0) regexp_parser (>= 1.8, < 3.0) rexml - rubocop-ast (>= 1.9.1, < 2.0) + rubocop-ast (>= 1.15.1, < 2.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 1.4.0, < 3.0) - rubocop-ast (1.10.0) + rubocop-ast (1.15.1) parser (>= 3.0.1.1) rubocop-rails (2.11.3) activesupport (>= 4.2.0) @@ -620,7 +620,7 @@ GEM unf (0.1.4) unf_ext unf_ext (0.0.7.7) - unicode-display_width (2.0.0) + unicode-display_width (2.1.0) unicode_utils (1.4.0) unobtrusive_flash (3.3.1) railties