Merge tag '4.10.0-rc'

Q4 code release

.codeclimate.yml

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

.gitignore

@@ -17,8 +17,8 @@
 # Ignore the default SQLite database.
 /db/*.sqlite3
 /db/*.sqlite3-journal
-/doc/db/all_tables/**/*
-/doc/db/blue_tables/**/*
+/doc/gh-pages/db/all_tables/**/*
+/doc/gh-pages/db/blue_tables/**/*
 
 # Ignore all logfiles and tempfiles.
 /log/*
@@ -28,7 +28,6 @@
 
 /public/downloads
 /public/system
-/public/urls.txt
 
 # Ignore gold master responses
 spec/support/gold_master.zip

.rubocop.yml

@@ -18,6 +18,12 @@ Bundler/OrderedGems:
 Layout/DotPosition:
   EnforcedStyle: trailing
 
+Layout/LineLength:
+  Max: 80
+  Include:
+    - 'app/services/api/v3/actors/**/*'
+    - 'app/services/api/v3/places/**/*'
+
 Layout/MultilineMethodCallIndentation:
   EnforcedStyle: indented
 
@@ -37,12 +43,6 @@ Metrics/BlockLength:
     - 'lib/tasks/**/*'
     - 'app/admin/**/*'
 
-Metrics/LineLength:
-  Max: 80
-  Include:
-    - 'app/services/api/v3/actors/**/*'
-    - 'app/services/api/v3/places/**/*'
-
 Style/Alias:
   Enabled: false
 
@@ -83,6 +83,9 @@ Style/PercentLiteralDelimiters:
 Style/PerlBackrefs:
   Enabled: false
 
+Style/RaiseArgs:
+  EnforcedStyle: compact
+
 Style/RegexpLiteral:
   EnforcedStyle: slashes
   AllowInnerSlashes: true

.rubocop_todo.yml

@@ -1,6 +1,6 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2019-12-04 18:58:38 +0100 using RuboCop version 0.77.0.
+# on 2020-01-09 08:40:56 +0100 using RuboCop version 0.79.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
@@ -53,7 +53,7 @@ Layout/FirstParameterIndentation:
   Exclude:
     - 'app/services/api/v3/import/stats.rb'
 
-# Offense count: 37
+# Offense count: 38
 # Cop supports --auto-correct.
 # Configuration parameters: AllowMultipleStyles, EnforcedHashRocketStyle, EnforcedColonStyle, EnforcedLastArgumentHashStyle.
 # SupportedHashRocketStyles: key, separator, table
@@ -70,6 +70,12 @@ Layout/LeadingCommentSpace:
   Exclude:
     - 'spec/services/api/v3/actor/basic_attributes_spec.rb'
 
+# Offense count: 3
+# Cop supports --auto-correct.
+Layout/SpaceAfterComma:
+  Exclude:
+    - 'spec/services/api/v3/flows/filter_spec.rb'
+
 # Offense count: 1
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, EnforcedStyleForEmptyBraces.
@@ -79,14 +85,24 @@ Layout/SpaceBeforeBlockBraces:
   Exclude:
     - 'spec/services/api/v3/manage_download_attributes_spec.rb'
 
-# Offense count: 3
+# Offense count: 1
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, EnforcedStyleForEmptyBraces, SpaceBeforeBlockParameters.
+# SupportedStyles: space, no_space
+# SupportedStylesForEmptyBraces: space, no_space
+Layout/SpaceInsideBlockBraces:
+  Exclude:
+    - 'app/services/api/v3/flows/filter.rb'
+
+# Offense count: 4
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle.
 # SupportedStyles: final_newline, final_blank_line
 Layout/TrailingEmptyLines:
   Exclude:
     - 'Rakefile'
     - 'app/controllers/api/public/node_types_controller.rb'
+    - 'app/services/api/v3/table_partitions/create_partitions_for_flows.rb'
     - 'spec/responses/api/v3/commodity_countries_facts_spec.rb'
 
 # Offense count: 2
@@ -100,37 +116,58 @@ Lint/AssignmentInCondition:
   Exclude:
     - 'spec/support/helpers/zip_helpers.rb'
 
+# Offense count: 1
+# Cop supports --auto-correct.
+Lint/NonDeterministicRequireOrder:
+  Exclude:
+    - 'spec/rails_helper.rb'
+
 # Offense count: 1
 Lint/ShadowingOuterLocalVariable:
   Exclude:
     - 'lib/tasks/charts.rake'
 
-# Offense count: 1
+# Offense count: 2
 # Cop supports --auto-correct.
 # Configuration parameters: IgnoreEmptyBlocks, AllowUnusedKeywordArguments.
 Lint/UnusedBlockArgument:
   Exclude:
     - 'cms_ideas/batch_save_form.rb'
+    - 'spec/services/api/v3/flows/filter_spec.rb'
 
 # Offense count: 1
+# Cop supports --auto-correct.
+# Configuration parameters: AllowUnusedKeywordArguments, IgnoreEmptyMethods.
+Lint/UnusedMethodArgument:
+  Exclude:
+    - 'app/services/api/v3/table_partitions/create_partitions.rb'
+
+# Offense count: 2
 Lint/UselessAssignment:
   Exclude:
+    - 'app/services/api/v3/flows/result.rb'
     - 'lib/tasks/db_remote_import.rake'
 
 # Offense count: 76
 Metrics/AbcSize:
   Max: 46
 
-# Offense count: 19
+# Offense count: 1
+# Configuration parameters: CountComments, ExcludedMethods.
+# ExcludedMethods: refine
+Metrics/BlockLength:
+  Max: 38
+
+# Offense count: 18
 # Configuration parameters: CountComments.
 Metrics/ClassLength:
-  Max: 331
+  Max: 348
 
 # Offense count: 8
 Metrics/CyclomaticComplexity:
   Max: 11
 
-# Offense count: 193
+# Offense count: 192
 # Configuration parameters: CountComments, ExcludedMethods.
 Metrics/MethodLength:
   Max: 62
@@ -189,13 +226,14 @@ Performance/InefficientHashSearch:
   Exclude:
     - 'app/services/api/v3/dashboards/parametrised_charts/node_types_to_break_by.rb'
 
-# Offense count: 3
+# Offense count: 4
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle.
 # SupportedStyles: braces, no_braces, context_dependent
 Style/BracesAroundHashParameters:
   Exclude:
     - 'app/models/api/v3/chart.rb'
+    - 'app/models/api/v3/context_node_type_property.rb'
     - 'spec/services/api/v3/nodes/filter_spec.rb'
 
 # Offense count: 1
@@ -226,7 +264,7 @@ Style/GuardClause:
   Exclude:
     - 'app/models/api/v3/context_node_type_property.rb'
     - 'app/services/api/v3/download/flow_download_query_builder.rb'
-    - 'app/services/api/v3/table_partitions.rb'
+    - 'app/services/api/v3/table_partitions/create_partitions.rb'
 
 # Offense count: 1
 # Cop supports --auto-correct.
@@ -279,6 +317,12 @@ Style/OrAssignment:
     - 'spec/support/contexts/api/v3/brazil/brazil_exporter_actor_profile.rb'
     - 'spec/support/contexts/api/v3/brazil/brazil_municipality_place_profile.rb'
 
+# Offense count: 1
+# Cop supports --auto-correct.
+Style/ParallelAssignment:
+  Exclude:
+    - 'app/services/api/v3/flows/filter.rb'
+
 # Offense count: 1
 # Cop supports --auto-correct.
 Style/RedundantBegin:
@@ -291,12 +335,19 @@ Style/RedundantParentheses:
   Exclude:
     - 'app/services/api/v3/dashboards/parametrised_charts/node_types_to_break_by.rb'
 
-# Offense count: 3
+# Offense count: 1
+# Cop supports --auto-correct.
+Style/RedundantSelf:
+  Exclude:
+    - 'app/models/concerns/api/v3/readonly/materialised_table.rb'
+
+# Offense count: 5
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, ConsistentQuotesInMultiline.
 # SupportedStyles: single_quotes, double_quotes
 Style/StringLiterals:
   Exclude:
+    - 'app/models/api/v3/context_node_type_property.rb'
     - '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'

.travis.yml

@@ -1,4 +1,4 @@
-dist: xenial
+dist: bionic
 env:
   global:
     - CC_TEST_REPORTER_ID=ae4098e380eed3c112bd34c4c2ceec913288ce9479bb748bf098a57b75ff5de5
@@ -9,11 +9,13 @@ matrix:
   include:
     - language: ruby
       rvm:
-        - 2.6.3
-      services:
-        - postgresql
-      addons:
-        postgresql: 11
+        - 2.6.5
+      # PostgreSQL 11 support:
+      # the solution in Travis docs is to use postgresql and apt addons
+      # and override the port env var ( or two, PGPORT and POSTGRES_PORT)
+      # we're not using that solution, because there's an issue
+      # we're using a workaround instead
+      # https://travis-ci.community/t/install-postgresql-11/3894/5
       before_install:
         - sudo apt-get update
         - sudo apt-get --yes remove postgresql\*
@@ -42,9 +44,9 @@ matrix:
           skip-cleanup: true
           github-token: $GITHUB_TOKEN # Set in the settings page of your repository, as a secure variable
           keep-history: true
-          local-dir: doc/db/gh-pages
+          local-dir: doc/gh-pages
           on:
-            branch: master
+            branch: develop
         - provider: surge
           project: ./frontend/docs/
           domain: trase.surge.sh

Capfile

@@ -46,5 +46,4 @@ require 'capistrano/sitemap_generator'
 # Load custom tasks from `lib/capistrano/tasks` if you have any defined
 Dir.glob('lib/capistrano/tasks/*.rake').each { |r| import r }
 
-require 'whenever/capistrano'
 require 'appsignal/capistrano'