Fix new rubocop warnings

diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index a0b57f586badc5006e2b9ba7f7f52395a526b374..a204e75361a3d2f10a78e9094f87e1b8a8fab467 100644 (file)
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -1,6 +1,6 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
 # This configuration was generated by
 # `rubocop --auto-gen-config`

-# on 2021-01-11 19:00:54 UTC using RuboCop version 1.8.1.
+# on 2021-06-29 17:25:37 UTC using RuboCop version 1.18.0.

 # 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
 # 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


@@ -14,14 +14,14 @@ require:
   - rubocop-rails
   - rubocop-rake
 
   - rubocop-rails
   - rubocop-rake
 

-# Offense count: 544
+# Offense count: 510

 # Cop supports --auto-correct.
 # Configuration parameters: AutoCorrect, AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, IgnoredPatterns.
 # URISchemes: http, https
 Layout/LineLength:
   Max: 270
 
 # Cop supports --auto-correct.
 # Configuration parameters: AutoCorrect, AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, IgnoredPatterns.
 # URISchemes: http, https
 Layout/LineLength:
   Max: 270
 

-# Offense count: 36
+# Offense count: 34

 # Configuration parameters: AllowSafeAssignment.
 Lint/AssignmentInCondition:
   Exclude:
 # Configuration parameters: AllowSafeAssignment.
 Lint/AssignmentInCondition:
   Exclude:


@@ -50,12 +50,12 @@ Lint/DuplicateBranch:
     - 'app/helpers/browse_tags_helper.rb'
     - 'lib/password_hash.rb'
 
     - 'app/helpers/browse_tags_helper.rb'
     - 'lib/password_hash.rb'
 

-# Offense count: 487
+# Offense count: 631

 # Configuration parameters: IgnoredMethods, CountRepeatedAttributes.
 Metrics/AbcSize:
   Max: 235
 
 # Configuration parameters: IgnoredMethods, CountRepeatedAttributes.
 Metrics/AbcSize:
   Max: 235
 

-# Offense count: 62
+# Offense count: 68

 # Configuration parameters: CountComments, CountAsOne, ExcludedMethods, IgnoredMethods.
 # IgnoredMethods: refine
 Metrics/BlockLength:
 # Configuration parameters: CountComments, CountAsOne, ExcludedMethods, IgnoredMethods.
 # IgnoredMethods: refine
 Metrics/BlockLength:


@@ -66,17 +66,17 @@ Metrics/BlockLength:
 Metrics/BlockNesting:
   Max: 5
 
 Metrics/BlockNesting:
   Max: 5
 

-# Offense count: 24
+# Offense count: 25

 # Configuration parameters: CountComments, CountAsOne.
 Metrics/ClassLength:
 # Configuration parameters: CountComments, CountAsOne.
 Metrics/ClassLength:

-  Max: 587
+  Max: 361

 
 

-# Offense count: 52
+# Offense count: 56

 # Configuration parameters: IgnoredMethods.
 Metrics/CyclomaticComplexity:
 # Configuration parameters: IgnoredMethods.
 Metrics/CyclomaticComplexity:

-  Max: 26
+  Max: 25

 
 

-# Offense count: 553
+# Offense count: 703

 # Configuration parameters: CountComments, CountAsOne, ExcludedMethods, IgnoredMethods.
 Metrics/MethodLength:
   Max: 179
 # Configuration parameters: CountComments, CountAsOne, ExcludedMethods, IgnoredMethods.
 Metrics/MethodLength:
   Max: 179


@@ -86,14 +86,14 @@ Metrics/MethodLength:
 Metrics/ParameterLists:
   Max: 6
 
 Metrics/ParameterLists:
   Max: 6
 

-# Offense count: 56
+# Offense count: 60

 # Configuration parameters: IgnoredMethods.
 Metrics/PerceivedComplexity:
   Max: 26
 
 # Configuration parameters: IgnoredMethods.
 Metrics/PerceivedComplexity:
   Max: 26
 

-# Offense count: 365
+# Offense count: 519

 Minitest/MultipleAssertions:
 Minitest/MultipleAssertions:

-  Max: 97
+  Max: 88

 
 # Offense count: 4
 Naming/AccessorMethodName:
 
 # Offense count: 4
 Naming/AccessorMethodName:


@@ -102,6 +102,20 @@ Naming/AccessorMethodName:
     - 'app/helpers/title_helper.rb'
     - 'lib/osm.rb'
 
     - 'app/helpers/title_helper.rb'
     - 'lib/osm.rb'
 

+# Offense count: 21
+# Configuration parameters: CheckIdentifiers, CheckConstants, CheckVariables, CheckStrings, CheckSymbols, CheckComments, CheckFilepaths, FlaggedTerms.
+Naming/InclusiveLanguage:
+  Exclude:
+    - 'app/controllers/sessions_controller.rb'
+    - 'app/controllers/users_controller.rb'
+    - 'app/helpers/browse_tags_helper.rb'
+    - 'app/views/api/capabilities/show.builder'
+    - 'config/environments/production.rb'
+    - 'config/initializers/canonical_rails.rb'
+    - 'config/initializers/config.rb'
+    - 'config/initializers/doorkeeper.rb'
+    - 'test/integration/user_login_test.rb'
+

 # Offense count: 8
 # Configuration parameters: NamePrefix, ForbiddenPrefixes, AllowedMethods, MethodDefinitionMacros.
 # NamePrefix: is_, has_, have_
 # Offense count: 8
 # Configuration parameters: NamePrefix, ForbiddenPrefixes, AllowedMethods, MethodDefinitionMacros.
 # NamePrefix: is_, has_, have_


@@ -142,6 +156,9 @@ Rails/HelperInstanceVariable:
   Exclude:
     - 'app/helpers/title_helper.rb'
 
   Exclude:
     - 'app/helpers/title_helper.rb'
 

+# Offense count: 1
+# Configuration parameters: Include.
+# Include: app/controllers/**/*.rb

 Rails/LexicallyScopedActionFilter:
   Exclude:
     - 'app/controllers/oauth2_applications_controller.rb'
 Rails/LexicallyScopedActionFilter:
   Exclude:
     - 'app/controllers/oauth2_applications_controller.rb'


@@ -157,7 +174,7 @@ Rails/NotNullColumn:
     - 'db/migrate/025_add_end_time_to_changesets.rb'
     - 'db/migrate/20120404205604_add_user_and_description_to_redaction.rb'
 
     - 'db/migrate/025_add_end_time_to_changesets.rb'
     - 'db/migrate/20120404205604_add_user_and_description_to_redaction.rb'
 

-# Offense count: 8
+# Offense count: 9

 Rails/OutputSafety:
   Exclude:
     - 'app/controllers/sessions_controller.rb'
 Rails/OutputSafety:
   Exclude:
     - 'app/controllers/sessions_controller.rb'


@@ -166,30 +183,30 @@ Rails/OutputSafety:
     - 'lib/rich_text.rb'
     - 'test/helpers/application_helper_test.rb'
 
     - 'lib/rich_text.rb'
     - 'test/helpers/application_helper_test.rb'
 

-# Offense count: 80
+# Offense count: 91

 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle.
 # SupportedStyles: strict, flexible
 Rails/TimeZone:
   Enabled: false
 
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle.
 # SupportedStyles: strict, flexible
 Rails/TimeZone:
   Enabled: false
 

-# Offense count: 8
+# Offense count: 6
+# Cop supports --auto-correct.

 Rake/Desc:
   Exclude:
     - 'lib/tasks/auto_annotate_models.rake'
     - 'lib/tasks/eslint.rake'
     - 'lib/tasks/subscribe_diary_authors.rake'
     - 'lib/tasks/subscribe_old_changesets.rake'
 Rake/Desc:
   Exclude:
     - 'lib/tasks/auto_annotate_models.rake'
     - 'lib/tasks/eslint.rake'
     - 'lib/tasks/subscribe_diary_authors.rake'
     - 'lib/tasks/subscribe_old_changesets.rake'

-    - 'lib/tasks/testing.rake'

 
 

-# Offense count: 558
+# Offense count: 597

 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle.
 # SupportedStyles: always, always_true, never
 Style/FrozenStringLiteralComment:
   Enabled: false
 
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle.
 # SupportedStyles: always, always_true, never
 Style/FrozenStringLiteralComment:
   Enabled: false
 

-# Offense count: 54
+# Offense count: 73

 # Cop supports --auto-correct.
 # Configuration parameters: Strict.
 Style/NumericLiterals:
 # Cop supports --auto-correct.
 # Configuration parameters: Strict.
 Style/NumericLiterals:

diff --git a/db/migrate/008_remove_segments.rb b/db/migrate/008_remove_segments.rb
index c528742c9f44c825f3c0f903554a7dcf1f6d7edb..504528e4ce7ad9c933a4885700928f8fa5fef6ae 100644 (file)
--- a/db/migrate/008_remove_segments.rb
+++ b/db/migrate/008_remove_segments.rb
@@ -9,7 +9,7 @@ class RemoveSegments < ActiveRecord::Migration[4.2]
       src = "#{cmd}.cc"
       if !File.exist?(cmd) || File.mtime(cmd) < File.mtime(src)
         system("c++ -O3 -Wall `mysql_config --cflags --libs` " \
       src = "#{cmd}.cc"
       if !File.exist?(cmd) || File.mtime(cmd) < File.mtime(src)
         system("c++ -O3 -Wall `mysql_config --cflags --libs` " \

-          "#{src} -o #{cmd}") || raise
+               "#{src} -o #{cmd}") || raise

       end
 
       conn_opts = ApplicationRecord.connection
       end
 
       conn_opts = ApplicationRecord.connection

diff --git a/db/migrate/020_populate_node_tags_and_remove.rb b/db/migrate/020_populate_node_tags_and_remove.rb
index c8c017806a2964466cc28debdf6763f37f7f890f..16eafd89da168ded4373d8f8baa5c1b9e090f956 100644 (file)
--- a/db/migrate/020_populate_node_tags_and_remove.rb
+++ b/db/migrate/020_populate_node_tags_and_remove.rb
@@ -9,7 +9,7 @@ class PopulateNodeTagsAndRemove < ActiveRecord::Migration[4.2]
       src = "#{cmd}.c"
       if !File.exist?(cmd) || File.mtime(cmd) < File.mtime(src)
         system("cc -O3 -Wall `mysql_config --cflags --libs` " \
       src = "#{cmd}.c"
       if !File.exist?(cmd) || File.mtime(cmd) < File.mtime(src)
         system("cc -O3 -Wall `mysql_config --cflags --libs` " \

-          "#{src} -o #{cmd}") || raise
+               "#{src} -o #{cmd}") || raise

       end
 
       conn_opts = ApplicationRecord.connection.instance_eval { @connection_options }
       end
 
       conn_opts = ApplicationRecord.connection.instance_eval { @connection_options }

diff --git a/lib/bounding_box.rb b/lib/bounding_box.rb
index 3b366dc1ef5da4d8b7ea0be87f87da37141ada7b..1350d69babdd84c6e6691eb56a8217fb58378bc4 100644 (file)
--- a/lib/bounding_box.rb
+++ b/lib/bounding_box.rb
@@ -64,7 +64,7 @@ class BoundingBox
 
     if min_lon < -LON_LIMIT || min_lat < -LAT_LIMIT || max_lon > +LON_LIMIT || max_lat > +LAT_LIMIT
       raise OSM::APIBadBoundingBox, "The latitudes must be between #{-LAT_LIMIT} and #{LAT_LIMIT}," \
 
     if min_lon < -LON_LIMIT || min_lat < -LAT_LIMIT || max_lon > +LON_LIMIT || max_lat > +LAT_LIMIT
       raise OSM::APIBadBoundingBox, "The latitudes must be between #{-LAT_LIMIT} and #{LAT_LIMIT}," \

-                                       " and longitudes between #{-LON_LIMIT} and #{LON_LIMIT}"
+                                    " and longitudes between #{-LON_LIMIT} and #{LON_LIMIT}"

     end
     self
   end
     end
     self
   end

diff --git a/lib/diff_reader.rb b/lib/diff_reader.rb
index 501a918d0b4f0d9f1037050699e5811aabe75222..1189c86d0e3236307ec4f4fdb50d42c7c5ecc150 100644 (file)
--- a/lib/diff_reader.rb
+++ b/lib/diff_reader.rb
@@ -85,7 +85,7 @@ class DiffReader
       model = MODELS[model_name]
       if model.nil?
         raise OSM::APIBadUserInput, "Unexpected element type #{model_name}, " \
       model = MODELS[model_name]
       if model.nil?
         raise OSM::APIBadUserInput, "Unexpected element type #{model_name}, " \

-                                       "expected node, way or relation."
+                                    "expected node, way or relation."

       end
       # new in libxml-ruby >= 2, expand returns an element not associated
       # with a document. this means that there's no encoding parameter,
       end
       # new in libxml-ruby >= 2, expand returns an element not associated
       # with a document. this means that there's no encoding parameter,

diff --git a/test/controllers/api/changesets_controller_test.rb b/test/controllers/api/changesets_controller_test.rb
index 1f394d126cce511e9bc5b5d8a77468a202f9f189..567f77fd35d8ef64e834eff776b4c5c6be935297 100644 (file)
--- a/test/controllers/api/changesets_controller_test.rb
+++ b/test/controllers/api/changesets_controller_test.rb
@@ -1210,7 +1210,7 @@ module Api
         # upload it
         post changeset_upload_path(changeset), :params => diff, :headers => auth_header
         assert_response(:success, "should be able to upload " \
         # upload it
         post changeset_upload_path(changeset), :params => diff, :headers => auth_header
         assert_response(:success, "should be able to upload " \

-                        "empty changeset: " + diff)
+                                  "empty changeset: " + diff)

       end
     end
 
       end
     end