Merge tag '4.9.0-rc'

Q4 2019 Data release

.codeclimate.yml

@@ -34,7 +34,7 @@ checks:
 plugins:
   rubocop:
     enabled: true
-    channel: rubocop-0-76
+    channel: rubocop-0-77
   brakeman:
     enabled: true
   bundler-audit:

.rubocop_todo.yml

@@ -1,35 +1,24 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2019-10-31 09:26:23 +0100 using RuboCop version 0.76.0.
+# on 2019-12-04 18:58:38 +0100 using RuboCop version 0.77.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
 # versions of RuboCop, may require this file to be generated again.
 
-# Offense count: 2
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, IndentationWidth.
-# SupportedStyles: with_first_argument, with_fixed_indentation
-Layout/AlignArguments:
-  Exclude:
-    - 'db/20190812093710_add_json_path_to_flows.rb'
-
-# Offense count: 37
-# Cop supports --auto-correct.
-# Configuration parameters: AllowMultipleStyles, EnforcedHashRocketStyle, EnforcedColonStyle, EnforcedLastArgumentHashStyle.
-# SupportedHashRocketStyles: key, separator, table
-# SupportedColonStyles: key, separator, table
-# SupportedLastArgumentHashStyles: always_inspect, always_ignore, ignore_implicit, ignore_explicit
-Layout/AlignHash:
-  Exclude:
-    - 'lib/tasks/auto_annotate_models.rake'
-
 # Offense count: 3
 # Cop supports --auto-correct.
 Layout/ClosingParenthesisIndentation:
   Exclude:
     - 'app/services/api/v3/import/stats.rb'
 
+# Offense count: 2
+# Cop supports --auto-correct.
+Layout/CommentIndentation:
+  Exclude:
+    - 'app/services/api/public/node_types/filter.rb'
+    - 'app/services/api/v3/dashboards/filter_nodes.rb'
+
 # Offense count: 42
 # Cop supports --auto-correct.
 Layout/EmptyLineAfterGuardClause:
@@ -49,21 +38,31 @@ Layout/EndAlignment:
   Exclude:
     - 'app/services/api/v3/actors/top_nodes_summary.rb'
 
-# Offense count: 28
+# Offense count: 30
 # Cop supports --auto-correct.
 # Configuration parameters: IndentationWidth.
 # SupportedStyles: special_inside_parentheses, consistent, align_brackets
-Layout/IndentFirstArrayElement:
+Layout/FirstArrayElementIndentation:
   EnforcedStyle: consistent
 
 # Offense count: 3
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, IndentationWidth.
 # SupportedStyles: consistent, align_parentheses
-Layout/IndentFirstParameter:
+Layout/FirstParameterIndentation:
   Exclude:
     - 'app/services/api/v3/import/stats.rb'
 
+# Offense count: 37
+# Cop supports --auto-correct.
+# Configuration parameters: AllowMultipleStyles, EnforcedHashRocketStyle, EnforcedColonStyle, EnforcedLastArgumentHashStyle.
+# SupportedHashRocketStyles: key, separator, table
+# SupportedColonStyles: key, separator, table
+# SupportedLastArgumentHashStyles: always_inspect, always_ignore, ignore_implicit, ignore_explicit
+Layout/HashAlignment:
+  Exclude:
+    - 'lib/tasks/auto_annotate_models.rake'
+
 # Offense count: 1
 # Cop supports --auto-correct.
 # Configuration parameters: AllowDoxygenCommentStyle.
@@ -80,13 +79,14 @@ Layout/SpaceBeforeBlockBraces:
   Exclude:
     - 'spec/services/api/v3/manage_download_attributes_spec.rb'
 
-# Offense count: 2
+# Offense count: 3
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle.
 # SupportedStyles: final_newline, final_blank_line
-Layout/TrailingBlankLines:
+Layout/TrailingEmptyLines:
   Exclude:
     - 'Rakefile'
+    - 'app/controllers/api/public/node_types_controller.rb'
     - 'spec/responses/api/v3/commodity_countries_facts_spec.rb'
 
 # Offense count: 2
@@ -121,7 +121,7 @@ Lint/UselessAssignment:
 Metrics/AbcSize:
   Max: 46
 
-# Offense count: 18
+# Offense count: 19
 # Configuration parameters: CountComments.
 Metrics/ClassLength:
   Max: 331
@@ -130,7 +130,7 @@ Metrics/ClassLength:
 Metrics/CyclomaticComplexity:
   Max: 11
 
-# Offense count: 192
+# Offense count: 193
 # Configuration parameters: CountComments, ExcludedMethods.
 Metrics/MethodLength:
   Max: 62
@@ -149,26 +149,26 @@ Naming/AccessorMethodName:
   Exclude:
     - 'lib/db_helpers/search_path_helpers.rb'
 
-# Offense count: 1
-# Configuration parameters: NamePrefix, NamePrefixBlacklist, NameWhitelist, MethodDefinitionMacros.
-# NamePrefix: is_, has_, have_
-# NamePrefixBlacklist: is_, has_, have_
-# NameWhitelist: is_a?
-# MethodDefinitionMacros: define_method, define_singleton_method
-Naming/PredicateName:
-  Exclude:
-    - 'spec/**/*'
-    - 'app/models/concerns/api/v3/is_downloadable.rb'
-
 # Offense count: 13
 # Configuration parameters: MinNameLength, AllowNamesEndingInNumbers, AllowedNames, ForbiddenNames.
 # AllowedNames: io, id, to, by, on, in, at, ip, db, os
-Naming/UncommunicativeMethodParamName:
+Naming/MethodParameterName:
   Exclude:
     - 'lib/db_helpers/search_path_helpers.rb'
     - 'lib/hash_sorter.rb'
     - 'spec/services/api/v3/dashboards/charts/single_year_ncont_overview_spec.rb'
 
+# Offense count: 1
+# Configuration parameters: NamePrefix, ForbiddenPrefixes, AllowedMethods, MethodDefinitionMacros.
+# NamePrefix: is_, has_, have_
+# ForbiddenPrefixes: is_, has_, have_
+# AllowedMethods: is_a?
+# MethodDefinitionMacros: define_method, define_singleton_method
+Naming/PredicateName:
+  Exclude:
+    - 'spec/**/*'
+    - 'app/models/concerns/api/v3/is_downloadable.rb'
+
 # Offense count: 1
 # Configuration parameters: EnforcedStyle.
 # SupportedStyles: snake_case, normalcase, non_integer
@@ -183,12 +183,6 @@ Performance/Count:
     - 'app/services/api/v3/database_validation/checks/has_exactly_one_of.rb'
     - 'app/services/api/v3/database_validation/errors_list.rb'
 
-# Offense count: 1
-# Cop supports --auto-correct.
-Performance/Detect:
-  Exclude:
-    - 'spec/services/api/v3/dashboards/filter_metas_spec.rb'
-
 # Offense count: 1
 # Cop supports --auto-correct.
 Performance/InefficientHashSearch:
@@ -204,6 +198,14 @@ Style/BracesAroundHashParameters:
     - 'app/models/api/v3/chart.rb'
     - 'spec/services/api/v3/nodes/filter_spec.rb'
 
+# Offense count: 1
+# Cop supports --auto-correct.
+# Configuration parameters: Keywords.
+# Keywords: TODO, FIXME, OPTIMIZE, HACK, REVIEW
+Style/CommentAnnotation:
+  Exclude:
+    - 'app/models/api/v3/node_property.rb'
+
 # Offense count: 1
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, SingleLineConditionsOnly, IncludeTernaryExpressions.
@@ -234,10 +236,25 @@ Style/HashSyntax:
   Exclude:
     - 'app/models/concerns/api/v3/associated_attributes.rb'
 
-# Offense count: 16
+# Offense count: 15
 # Cop supports --auto-correct.
 Style/IfUnlessModifier:
-  Enabled: false
+  Exclude:
+    - 'app/admin/api/v3/database_export.rb'
+    - 'app/controllers/api/v3/sankey_card_links_controller.rb'
+    - 'app/controllers/content/tweets_controller.rb'
+    - 'app/models/api/readonly/base_model.rb'
+    - 'app/models/concerns/api/v3/associated_attributes.rb'
+    - 'app/serializers/api/v3/dashboards/template_serializer.rb'
+    - 'app/services/api/public/attributes/response_builder.rb'
+    - 'app/services/api/public/filter_commodities.rb'
+    - 'app/services/api/v3/dashboards/chart_parameters/flow_values.rb'
+    - 'app/services/api/v3/database_import/importer.rb'
+    - 'app/services/api/v3/flows/filter.rb'
+    - 'app/services/concerns/api/v3/dashboards/charts/helpers.rb'
+    - 'lib/api/v3/profiles/get_tooltip_per_attribute.rb'
+    - 'lib/tasks/gold_master.rake'
+    - 'spec/rails_helper.rb'
 
 # Offense count: 1
 # Cop supports --auto-correct.
@@ -274,23 +291,16 @@ Style/RedundantParentheses:
   Exclude:
     - 'app/services/api/v3/dashboards/parametrised_charts/node_types_to_break_by.rb'
 
-# Offense count: 2
+# Offense count: 3
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, ConsistentQuotesInMultiline.
 # SupportedStyles: single_quotes, double_quotes
 Style/StringLiterals:
   Exclude:
+    - 'spec/responses/api/public/node_types_spec.rb'
     - 'spec/responses/api/v3/nodes_search_spec.rb'
     - 'spec/services/api/v3/download/precomputed_download_spec.rb'
 
-# Offense count: 1
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, MinSize.
-# SupportedStyles: percent, brackets
-Style/SymbolArray:
-  Exclude:
-    - 'app/controllers/api/v3/countries_controller.rb'
-
 # Offense count: 1
 # Cop supports --auto-correct.
 # Configuration parameters: IgnoredMethods.

Gemfile

@@ -38,7 +38,7 @@ gem 'ckeditor', '4.3.0'
 gem 'paperclip', '~> 6.1.0'
 gem 'aws-sdk-s3', '~> 1'
 
-gem 'rack-cors', '~> 1.0'
+gem 'rack-cors', '~> 1.1'
 gem 'twitter', '~> 6.1'
 
 gem 'appsignal'
@@ -63,7 +63,7 @@ end
 group :development do
   gem 'annotate'
 
-  gem 'listen', '~> 3.2.0'
+  gem 'listen', '~> 3.2.1'
   # Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring
   gem 'spring'
   gem 'spring-watcher-listen', '~> 2.0.0'
@@ -75,7 +75,7 @@ group :development do
   gem 'capistrano-passenger'
   gem 'capistrano-nvm'
 
-  gem 'rubocop', '~> 0.76.0', require: false
+  gem 'rubocop', '~> 0.77.0', require: false
   gem 'rubocop-performance', require: false
   gem 'rbnacl', '>= 3.2', '< 5.0'
   gem 'rbnacl-libsodium'