govuk_app_config 4.0.0 → 4.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f8077ef6fb7147f51cfa723573145d8552deccc046e51fb7fa5870517b44c404
-  data.tar.gz: f172b22ff57d9a7c86a2a6cd9d25b5f27a5f207e714e82f40e031d3ba979aadf
+  metadata.gz: 6c537dcfbb4c9d9f5c3780934fd66b9a31d0e9dade0b9972b837650ab99c69f4
+  data.tar.gz: cc4db9f009c6a15015d3c06e1a765d96f6ae28873ff5540a05168954df83414a
 SHA512:
-  metadata.gz: 59bf46da65446015dd8521f505f01af02f04149490f8d653e6e3436fe9512a920637211054a3e6cfc75cc66f15e81036631a9921410b2226f3d5489cf6e65182
-  data.tar.gz: f70c89f913ead21b565f92a6150958b88469da6585166077c3e112cd60444377e5593d56f8d9881379e24e859406741668aad545a046c4d48744f6bbc08d6820
+  metadata.gz: d9c3ad899bd4e81c750e809adc50dc8e094cb89cabb6641a7ba75b7840c56c91a4cae43c1f2291031f21b1c92fccce527ee34eb34b15601cc4c52ce7adee5aed
+  data.tar.gz: 940fca52216b248625ef93aac95198c20df19bda11d98bd5195a42e4921ad12739d56d966dd35343ee48f2f7d5b1802a8d7cb1562933fa835c9d8e11fd04dd65

data/CHANGELOG.md

@@ -1,3 +1,19 @@
+# 4.3.0
+
+- Remove Speedcurve's LUX from the connect-src policy ([#216](https://github.com/alphagov/govuk_app_config/pull/216)).
+
+# 4.2.0
+
+- Add pluralisation rules for Azerbaijani, Persian, Georgian, and Turkish. ([#219](https://github.com/alphagov/govuk_app_config/pull/219))
+
+# 4.1.0
+
+- Add Puma to dependencies ([#214](https://github.com/alphagov/govuk_app_config/pull/214)).
+
+# 4.0.1
+
+- Update Content Security Policy with new klick2contact.com subdomain ([#213](https://github.com/alphagov/govuk_app_config/pull/213)).
+
 # 4.0.0
 
 - BREAKING: replaces deprecated `sentry-raven` with `sentry-ruby` and `sentry-rails`. Follow the **[migration guide](https://docs.sentry.io/platforms/ruby/migration/)** before upgrading to this version of govuk_app_config to ensure full compatibility with the new gems.

data/govuk_app_config.gemspec

@@ -21,6 +21,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = %w[lib]
 
   spec.add_dependency "logstasher", ">= 1.2.2", "< 2.2.0"
+  spec.add_dependency "puma", "~> 5.0"
   spec.add_dependency "sentry-rails", "~> 4.5.0"
   spec.add_dependency "sentry-ruby", "~> 4.5.0"
   spec.add_dependency "statsd-ruby", "~> 1.5.0"

data/lib/govuk_app_config/govuk_content_security_policy.rb

@@ -76,15 +76,9 @@ module GovukContentSecurityPolicy
                        # Allow JSON call to Nuance - HMRC web chat provider
                        "hmrc-uk.digital.nuance.com",
                        # Allow JSON call to klick2contact - HMPO web chat provider
-                       "gov.klick2contact.com",
+                       "hmpowebchat.klick2contact.com",
                        # Allow connecting to Verify to check whether the user is logged in
-                       "www.signin.service.gov.uk",
-                       # Allow connection to Speedcurve's CDN for LUX - used for
-                       # real user metrics on GOV.UK. This loads using an image
-                       # (see image policy), but returns a JavaScript file -
-                       # which is why this has to be added to the `connect-src`
-                       # policy as well.
-                       "lux.speedcurve.com"
+                       "www.signin.service.gov.uk"
 
     # Disallow all <object>, <embed>, and <applet> elements
     #

data/lib/govuk_app_config/govuk_i18n.rb

@@ -1,10 +1,14 @@
 module GovukI18n
   def self.plurals
     {
+      # Azerbaijani
+      az: { i18n: { plural: { keys: %i[one other], rule: ->(n) { n == 1 ? :one : :other } } } },
       # Dari - this isn't an iso code. Probably should be 'prs' as per ISO 639-3.
       dr: { i18n: { plural: { keys: %i[one other], rule: ->(n) { n == 1 ? :one : :other } } } },
       # Latin America and Caribbean Spanish
       "es-419": { i18n: { plural: { keys: %i[one other], rule: ->(n) { n == 1 ? :one : :other } } } },
+      # Persian
+      fa: { i18n: { plural: { keys: %i[one other], rule: ->(n) { [0, 1].include?(n) ? :one : :other } } } },
       # Scottish Gaelic
       gd: { i18n: { plural: { keys: %i[one two few other],
                               rule:
@@ -21,12 +25,16 @@ module GovukI18n
                                 end } } },
       # Armenian
       hy: { i18n: { plural: { keys: %i[one other], rule: ->(n) { n == 1 ? :one : :other } } } },
+      # Georgian
+      ka: { i18n: { plural: { keys: %i[one other], rule: ->(n) { n == 1 ? :one : :other } } } },
       # Kazakh
       kk: { i18n: { plural: { keys: %i[one other], rule: ->(n) { n == 1 ? :one : :other } } } },
       # Punjabi Shahmukhi
       "pa-pk": { i18n: { plural: { keys: %i[one other], rule: ->(n) { n == 1 ? :one : :other } } } },
       # Sinhalese
       si: { i18n: { plural: { keys: %i[one other], rule: ->(n) { n == 1 ? :one : :other } } } },
+      # Turkish
+      tr: { i18n: { plural: { keys: %i[one other], rule: ->(n) { n == 1 ? :one : :other } } } },
       # Uzbek
       uz: { i18n: { plural: { keys: %i[one other], rule: ->(n) { n == 1 ? :one : :other } } } },
       # Chinese Hong Kong

data/lib/govuk_app_config/govuk_puma.rb

@@ -0,0 +1,37 @@
+module GovukPuma
+  def self.configure_rails(config)
+    config.port ENV.fetch("PORT", 3000)
+
+    config.environment ENV.fetch("RAILS_ENV", "development")
+
+    if ENV["GOVUK_APP_LOGROOT"]
+      config.stdout_redirect "#{ENV['GOVUK_APP_LOGROOT']}/app.out.log" "#{ENV['GOVUK_APP_LOGROOT']}/app.err.log"
+    end
+
+    # `worker_timeout` specifies how many seconds Puma will wait before terminating a worker.
+    timeout = ENV.fetch("RAILS_ENV", "development") == "development" ? 3600 : 15
+    config.worker_timeout timeout
+
+    # When changing the min/max threads for Puma, also consider changing ActiveRecord to match.
+    max_threads_count = ENV.fetch("RAILS_MAX_THREADS", 5)
+    min_threads_count = ENV.fetch("RAILS_MIN_THREADS", max_threads_count)
+    config.threads min_threads_count, max_threads_count
+
+    # `workers` specifies the number of worker processes that Puma will fork.
+    # The overall concurrency limit is worker count * max threads per worker.
+    config.workers ENV.fetch("WEB_CONCURRENCY", 2)
+
+    # `preload_app!` tells Puma to load application code before forking worker processes.
+    # This reduces RAM wastage by making better use of copy-on-write.
+    config.preload_app!
+
+    config.before_fork do |_server|
+      next unless ENV["GOVUK_APP_ROOT"]
+
+      ENV["BUNDLE_GEMFILE"] = "#{ENV['GOVUK_APP_ROOT']}/Gemfile"
+    end
+
+    # Allow puma to be restarted by `rails restart` command.
+    config.plugin :tmp_restart
+  end
+end

data/lib/govuk_app_config/version.rb

@@ -1,3 +1,3 @@
 module GovukAppConfig
-  VERSION = "4.0.0".freeze
+  VERSION = "4.3.0".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: govuk_app_config
 version: !ruby/object:Gem::Version
-  version: 4.0.0
+  version: 4.3.0
 platform: ruby
 authors:
 - GOV.UK Dev
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-07-16 00:00:00.000000000 Z
+date: 2022-02-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: logstasher
@@ -30,6 +30,20 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: 2.2.0
+- !ruby/object:Gem::Dependency
+  name: puma
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: sentry-rails
   requirement: !ruby/object:Gem::Requirement
@@ -254,6 +268,7 @@ files:
 - lib/govuk_app_config/govuk_healthcheck/sidekiq_redis.rb
 - lib/govuk_app_config/govuk_i18n.rb
 - lib/govuk_app_config/govuk_logging.rb
+- lib/govuk_app_config/govuk_puma.rb
 - lib/govuk_app_config/govuk_statsd.rb
 - lib/govuk_app_config/govuk_unicorn.rb
 - lib/govuk_app_config/rails_ext/action_dispatch/debug_exceptions.rb