Merge pull request #266 from epimorphics/task/update-dependencies

Update Rails and JS dependencies
epimorphics · Sep 30, 2020 · f7802e0 · f7802e0
2 parents abb3793 + 42a0d12
commit f7802e0
Show file tree

Hide file tree

Showing 10 changed files with 812 additions and 596 deletions.
diff --git a/.rubocop.yml b/.rubocop.yml
@@ -5,6 +5,7 @@ AllCops:
     - app/models/regions_table.rb
     - app/models/locations_table.rb
     - 'node_modules/**/*'
+  NewCops: enable
 
 # Customize rules
 Layout/LineLength:

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Changes to the UKHPI app by version and date
 
+## 1.5.8 - 2020-09-29 (Ian)
+
+- Update Rails and JS dependencies
+- Various additional Welsh translation fixes, including support for
+  consonant mutations (nb: this is a retrospective entry for the
+  previous PR)
+
 ## 1.5.7 - 2020-09-24 (Ian)
 
 - Fix problem `$t is not defined`, GH-263

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -10,56 +10,56 @@ GIT
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (6.0.3.2)
-      actionpack (= 6.0.3.2)
+    actioncable (6.0.3.3)
+      actionpack (= 6.0.3.3)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
-    actionmailbox (6.0.3.2)
-      actionpack (= 6.0.3.2)
-      activejob (= 6.0.3.2)
-      activerecord (= 6.0.3.2)
-      activestorage (= 6.0.3.2)
-      activesupport (= 6.0.3.2)
+    actionmailbox (6.0.3.3)
+      actionpack (= 6.0.3.3)
+      activejob (= 6.0.3.3)
+      activerecord (= 6.0.3.3)
+      activestorage (= 6.0.3.3)
+      activesupport (= 6.0.3.3)
       mail (>= 2.7.1)
-    actionmailer (6.0.3.2)
-      actionpack (= 6.0.3.2)
-      actionview (= 6.0.3.2)
-      activejob (= 6.0.3.2)
+    actionmailer (6.0.3.3)
+      actionpack (= 6.0.3.3)
+      actionview (= 6.0.3.3)
+      activejob (= 6.0.3.3)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 2.0)
-    actionpack (6.0.3.2)
-      actionview (= 6.0.3.2)
-      activesupport (= 6.0.3.2)
+    actionpack (6.0.3.3)
+      actionview (= 6.0.3.3)
+      activesupport (= 6.0.3.3)
       rack (~> 2.0, >= 2.0.8)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.2.0)
-    actiontext (6.0.3.2)
-      actionpack (= 6.0.3.2)
-      activerecord (= 6.0.3.2)
-      activestorage (= 6.0.3.2)
-      activesupport (= 6.0.3.2)
+    actiontext (6.0.3.3)
+      actionpack (= 6.0.3.3)
+      activerecord (= 6.0.3.3)
+      activestorage (= 6.0.3.3)
+      activesupport (= 6.0.3.3)
       nokogiri (>= 1.8.5)
-    actionview (6.0.3.2)
-      activesupport (= 6.0.3.2)
+    actionview (6.0.3.3)
+      activesupport (= 6.0.3.3)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.1, >= 1.2.0)
-    activejob (6.0.3.2)
-      activesupport (= 6.0.3.2)
+    activejob (6.0.3.3)
+      activesupport (= 6.0.3.3)
       globalid (>= 0.3.6)
-    activemodel (6.0.3.2)
-      activesupport (= 6.0.3.2)
-    activerecord (6.0.3.2)
-      activemodel (= 6.0.3.2)
-      activesupport (= 6.0.3.2)
-    activestorage (6.0.3.2)
-      actionpack (= 6.0.3.2)
-      activejob (= 6.0.3.2)
-      activerecord (= 6.0.3.2)
+    activemodel (6.0.3.3)
+      activesupport (= 6.0.3.3)
+    activerecord (6.0.3.3)
+      activemodel (= 6.0.3.3)
+      activesupport (= 6.0.3.3)
+    activestorage (6.0.3.3)
+      actionpack (= 6.0.3.3)
+      activejob (= 6.0.3.3)
+      activerecord (= 6.0.3.3)
       marcel (~> 0.3.1)
-    activesupport (6.0.3.2)
+    activesupport (6.0.3.3)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
@@ -84,11 +84,13 @@ GEM
       capybara (>= 2)
       minitest (>= 4)
     childprocess (3.0.0)
-    concurrent-ruby (1.1.6)
+    concurrent-ruby (1.1.7)
     crass (1.0.6)
     docile (1.3.2)
-    ebnf (1.2.0)
+    ebnf (2.1.1)
+      htmlentities (~> 4.3)
       rdf (~> 3.1)
+      scanf (~> 1.0)
       sxp (~> 1.1)
     erubi (1.9.0)
     erubis (2.7.0)
@@ -134,6 +136,7 @@ GEM
       haml (>= 4.0, < 6)
       nokogiri (>= 1.6.0)
       ruby_parser (~> 3.5)
+    htmlentities (4.3.4)
     http_accept_language (2.1.1)
     i18n (1.8.5)
       concurrent-ruby (~> 1.0)
@@ -143,7 +146,7 @@ GEM
     json (2.3.1)
     json_expressions (0.9.0)
     link_header (0.0.8)
-    loofah (2.6.0)
+    loofah (2.7.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     m (1.5.1)
@@ -157,7 +160,7 @@ GEM
     mimemagic (0.3.5)
     mini_mime (1.0.2)
     mini_portile2 (2.4.0)
-    minitest (5.14.1)
+    minitest (5.14.2)
     minitest-rails (6.0.1)
       minitest (~> 5.10)
       railties (~> 6.0.0)
@@ -168,44 +171,44 @@ GEM
       ruby-progressbar
     mocha (1.11.2)
     multipart-post (2.1.1)
-    nio4r (2.5.2)
-    nokogiri (1.10.9)
+    nio4r (2.5.4)
+    nokogiri (1.10.10)
       mini_portile2 (~> 2.4.0)
-    oj (3.10.6)
+    oj (3.10.14)
     parallel (1.19.2)
-    parser (2.7.1.4)
+    parser (2.7.1.5)
       ast (~> 2.4.1)
-    public_suffix (4.0.5)
-    puma (4.3.5)
+    public_suffix (4.0.6)
+    puma (5.0.2)
       nio4r (~> 2.0)
     rack (2.2.3)
     rack-proxy (0.6.5)
       rack
     rack-test (1.1.0)
       rack (>= 1.0, < 3)
-    rails (6.0.3.2)
-      actioncable (= 6.0.3.2)
-      actionmailbox (= 6.0.3.2)
-      actionmailer (= 6.0.3.2)
-      actionpack (= 6.0.3.2)
-      actiontext (= 6.0.3.2)
-      actionview (= 6.0.3.2)
-      activejob (= 6.0.3.2)
-      activemodel (= 6.0.3.2)
-      activerecord (= 6.0.3.2)
-      activestorage (= 6.0.3.2)
-      activesupport (= 6.0.3.2)
+    rails (6.0.3.3)
+      actioncable (= 6.0.3.3)
+      actionmailbox (= 6.0.3.3)
+      actionmailer (= 6.0.3.3)
+      actionpack (= 6.0.3.3)
+      actiontext (= 6.0.3.3)
+      actionview (= 6.0.3.3)
+      activejob (= 6.0.3.3)
+      activemodel (= 6.0.3.3)
+      activerecord (= 6.0.3.3)
+      activestorage (= 6.0.3.3)
+      activesupport (= 6.0.3.3)
       bundler (>= 1.3.0)
-      railties (= 6.0.3.2)
+      railties (= 6.0.3.3)
       sprockets-rails (>= 2.0.0)
     rails-dom-testing (2.0.3)
       activesupport (>= 4.2.0)
       nokogiri (>= 1.6)
     rails-html-sanitizer (1.3.0)
       loofah (~> 2.3)
-    railties (6.0.3.2)
-      actionpack (= 6.0.3.2)
-      activesupport (= 6.0.3.2)
+    railties (6.0.3.3)
+      actionpack (= 6.0.3.3)
+      activesupport (= 6.0.3.3)
       method_source
       rake (>= 0.8.7)
       thor (>= 0.20.3, < 2.0)
@@ -214,31 +217,31 @@ GEM
     rb-fsevent (0.10.4)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
-    rdf (3.1.4)
+    rdf (3.1.6)
       hamster (~> 3.0)
       link_header (~> 0.0, >= 0.0.8)
-    rdf-turtle (3.1.1)
-      ebnf (~> 1.2)
+    rdf-turtle (3.1.2)
+      ebnf (~> 2.0)
       rdf (~> 3.1, >= 3.1.2)
-    regexp_parser (1.7.1)
+    regexp_parser (1.8.1)
     rexml (3.2.4)
-    rubocop (0.88.0)
+    rubocop (0.92.0)
       parallel (~> 1.10)
-      parser (>= 2.7.1.1)
+      parser (>= 2.7.1.5)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.7)
       rexml
-      rubocop-ast (>= 0.1.0, < 1.0)
+      rubocop-ast (>= 0.5.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 2.0)
-    rubocop-ast (0.2.0)
-      parser (>= 2.7.0.1)
-    rubocop-rails (2.7.1)
+    rubocop-ast (0.7.1)
+      parser (>= 2.7.1.5)
+    rubocop-rails (2.8.1)
       activesupport (>= 4.2.0)
       rack (>= 1.1)
       rubocop (>= 0.87.0)
     ruby-progressbar (1.10.1)
-    ruby_parser (3.14.2)
+    ruby_parser (3.15.0)
       sexp_processor (~> 4.9)
     rubyzip (2.3.0)
     sass (3.7.4)
@@ -256,22 +259,23 @@ GEM
       sprockets (> 3.0)
       sprockets-rails
       tilt
+    scanf (1.0.0)
     selenium-webdriver (3.142.7)
       childprocess (>= 0.5, < 4.0)
       rubyzip (>= 1.2.2)
     semantic_range (2.3.0)
-    sentry-raven (3.0.0)
+    sentry-raven (3.1.1)
       faraday (>= 1.0)
-    sexp_processor (4.15.0)
-    simplecov (0.18.5)
+    sexp_processor (4.15.1)
+    simplecov (0.19.0)
       docile (~> 1.1)
       simplecov-html (~> 0.11)
-    simplecov-html (0.12.2)
-    spring (2.1.0)
+    simplecov-html (0.12.3)
+    spring (2.1.1)
     sprockets (4.0.2)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
-    sprockets-rails (3.2.1)
+    sprockets-rails (3.2.2)
       actionpack (>= 4.0)
       activesupport (>= 4.0)
       sprockets (>= 3.0.0)
@@ -290,17 +294,17 @@ GEM
       execjs (>= 0.3.0, < 3)
     unicode-display_width (1.7.0)
     vcr (6.0.0)
-    web-console (4.0.3)
+    web-console (4.0.4)
       actionview (>= 6.0.0)
       activemodel (>= 6.0.0)
       bindex (>= 0.4.0)
       railties (>= 6.0.0)
-    webpacker (5.1.1)
+    webpacker (5.2.1)
       activesupport (>= 5.2)
       rack-proxy (>= 0.6.1)
       railties (>= 5.2)
       semantic_range (>= 2.3.0)
-    websocket-driver (0.7.2)
+    websocket-driver (0.7.3)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.5)
     xpath (3.2.0)

diff --git a/app/lib/version.rb b/app/lib/version.rb
@@ -3,6 +3,6 @@
 module Version
   MAJOR = '1'
   MINOR = '5'
-  REVISION = '7'
+  REVISION = '8'
   VERSION = "#{MAJOR}.#{MINOR}.#{REVISION}"
 end
diff --git a/app/presenters/download_column.rb b/app/presenters/download_column.rb
@@ -9,7 +9,7 @@ def initialize(options)
     @options = options
   end
 
-  def label # rubocop:disable Metrics/AbcSize
+  def label
     return options[:label] if options[:label]
 
     ind_key = "indicator.#{options[:ind]&.slug}"

diff --git a/app/presenters/landing_state.rb b/app/presenters/landing_state.rb
@@ -75,7 +75,7 @@ def to_value(val)
   def format_percentage(change)
     if change == 'unknown'
       change
-    elsif change == 0.0
+    elsif change.zero?
       I18n.t('landing.change.same')
     elsif change.positive?
       format('%s %.1f%%', I18n.t('landing.change.risen'), change.abs)

diff --git a/config/environments/production.rb b/config/environments/production.rb
@@ -81,7 +81,7 @@
   config.action_view.logger = nil
 
   if ENV['RAILS_LOG_TO_STDOUT'].present?
-    logger           = ActiveSupport::Logger.new(STDOUT)
+    logger           = ActiveSupport::Logger.new($stdout)
     logger.formatter = config.log_formatter
     config.logger    = ActiveSupport::TaggedLogging.new(logger)
   end

diff --git a/lib/tasks/ds_api.rake b/lib/tasks/ds_api.rake
@@ -5,9 +5,9 @@ namespace :ukhpi do
   desc 'Create the DSAPI config file from the current DSD'
   task dsapi_config: :environment do
     ukhpi_data_cube = UkhpiDataCube.new
-    FILENAME = 'config/dsapi/ukhpi.ttl'
+    filename = 'config/dsapi/ukhpi.ttl'
 
-    File.open(FILENAME, 'w') do |file|
+    File.open(filename, 'w') do |file|
       file << <<~PREFIXES
         @prefix owl:   <http://www.w3.org/2002/07/owl#> .
         @prefix rdf:   <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .

diff --git a/lib/tasks/location.rake b/lib/tasks/location.rake
@@ -291,7 +291,7 @@ namespace :ukhpi do
     uri = args[:uri]
     query = "describe <#{uri}>"
 
-    squery = (ENV['FUSEKI'] || '/home/ian/dev/java/jena-fuseki') + '/bin/s-query'
+    squery = "#{(ENV['FUSEKI'] || '/home/ian/dev/java/jena-fuseki')}/bin/s-query"
     server = ENV['SERVER'] || 'http://lr-data-dev-c.epimorphics.net/landregistry/query'
 
     puts 'Running SPARQL query ...'