govuk_app_config 2.8.2 → 2.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bfa87f684df24220687512ce9cfe0460b6120060adfac81abc42b370677aa7ac
-  data.tar.gz: 937419626d13a54f7946bc3a57093b29347cea5098ea6a18820287ae97b27936
+  metadata.gz: f98f57ba0b9010154d3aefbc2540acd056d35ef42af9e3b22b00495255f46899
+  data.tar.gz: c5315e4ba1f476e7c0fcb99839ad9e8705a1546e4b48e3246a16e94f6552b383
 SHA512:
-  metadata.gz: af58922a495c6ad99551f068bd7edcdd8a1c0771216e8aef90dcf4890d5e5628f30b7d034bea3119dd479de642ea648e735ea415f6c9ec9cfecb0bd9dc79eb08
-  data.tar.gz: a944b1a576c9bff262fbef40b79d7225df6e677044f4133216e27d06a3c7b35d287ba582d06b35df79ad4a1082c365e4d9896a8c66390c2b1aa9a69a56224c09
+  metadata.gz: cea414c28b13d2b9cb359bade9dd6626eceb9dfd0f76ca79f77b2b8bff9f4807c01858951860e6888f795a32aa50cd2c79cc1ea63f72a01315a6cbd44b49d8cd
+  data.tar.gz: 3ef1e0ea53a489935775c9475cecb5f55585d2cfba0aed30b6a184430ab7fada8e24670150ebfa60043a59a6d750f76aeb913b89f826da2bbe3db68ca524cc7a

data/CHANGELOG.md

@@ -1,3 +1,22 @@
+# 2.10.0
+* Allow LUX domain on img-src policy ([#191](https://github.com/alphagov/govuk_app_config/pull/191))
+
+# 2.9.1
+
+* Fixes bug in GovukI18n introduced in the last version ([#189](https://github.com/alphagov/govuk_app_config/pull/189))
+
+# 2.9.0
+
+* Add GovukI18n module with custom plural rules ([#187](https://github.com/alphagov/govuk_app_config/pull/187))
+
+# 2.8.4
+
+* Ensure Redis healthcheck avoids potential race condition ([#185](https://github.com/alphagov/govuk_app_config/pull/185))
+
+# 2.8.3
+
+* Add new Redis healthcheck and relevant tests ([#183](https://github.com/alphagov/govuk_app_config/pull/183))
+
 # 2.8.2
 
 * Allow apps to configure the host and protocol for Statsd ([#180](https://github.com/alphagov/govuk_app_config/pull/180))

data/README.md

@@ -162,6 +162,10 @@ app with the following content:
 GovukContentSecurityPolicy.configure
 ```
 
+## i18n rules 
+
+Some frontend apps support languages that are not defined in the i18n gem. This provides them with our own custom rules for these languages.
+
 ## License
 
 [MIT License](LICENSE.md)

data/lib/govuk_app_config.rb

@@ -3,6 +3,7 @@ require "govuk_app_config/govuk_statsd"
 require "govuk_app_config/govuk_error"
 require "govuk_app_config/govuk_error/configure"
 require "govuk_app_config/govuk_healthcheck"
+require "govuk_app_config/govuk_i18n"
 # This require is deprecated and should be removed on next major version bump
 # and should be required by applications directly.
 require "govuk_app_config/govuk_unicorn"

data/lib/govuk_app_config/govuk_content_security_policy.rb

@@ -32,7 +32,10 @@ module GovukContentSecurityPolicy
                    *GOVUK_DOMAINS,
                    *GOOGLE_ANALYTICS_DOMAINS, # Tracking pixels
                    # Some content still links to an old domain we used to use
-                   "assets.digital.cabinet-office.gov.uk"
+                   "assets.digital.cabinet-office.gov.uk",
+                   # Allow images to be loaded for Speedcurve's LUX - used for
+                   # getting real user metrics on GOV.UK
+                   "lux.speedcurve.com"
 
     # https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Content-Security-Policy/script-src
     policy.script_src :self,

data/lib/govuk_app_config/govuk_healthcheck.rb

@@ -2,6 +2,7 @@ require "govuk_app_config/govuk_healthcheck/checkup"
 require "govuk_app_config/govuk_healthcheck/active_record"
 require "govuk_app_config/govuk_healthcheck/mongoid"
 require "govuk_app_config/govuk_healthcheck/rails_cache"
+require "govuk_app_config/govuk_healthcheck/redis"
 require "govuk_app_config/govuk_healthcheck/sidekiq_redis"
 require "govuk_app_config/govuk_healthcheck/threshold_check"
 require "govuk_app_config/govuk_healthcheck/sidekiq_queue_check"

data/lib/govuk_app_config/govuk_healthcheck/redis.rb

@@ -0,0 +1,25 @@
+require "securerandom"
+
+module GovukHealthcheck
+  class Redis
+    def name
+      :redis_connectivity
+    end
+
+    def status
+      client = ::Redis.new
+
+      key = "healthcheck-#{SecureRandom.hex}"
+
+      client.set(key, "val")
+      client.get(key)
+      client.del(key)
+
+      client.close
+
+      GovukHealthcheck::OK
+    rescue StandardError
+      GovukHealthcheck::CRITICAL
+    end
+  end
+end

data/lib/govuk_app_config/govuk_i18n.rb

@@ -0,0 +1,38 @@
+module GovukI18n
+  def self.plurals
+    {
+      # 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 } } } },
+      # Scottish Gaelic
+      gd: { i18n: { plural: { keys: %i[one two few other],
+                              rule:
+                                lambda do |n|
+                                  if [1, 11].include?(n)
+                                    :one
+                                  elsif [2, 12].include?(n)
+                                    :two
+                                  elsif [3, 4, 5, 6, 7, 8, 9, 10, 13, 14, 15, 16, 17, 18, 19].include?(n)
+                                    :few
+                                  else
+                                    :other
+                                  end
+                                end } } },
+      # Armenian
+      hy: { 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 } } } },
+      # Uzbek
+      uz: { i18n: { plural: { keys: %i[one other], rule: ->(n) { n == 1 ? :one : :other } } } },
+      # Chinese Hong Kong
+      "zh-hk" => { i18n: { plural: { keys: %i[one other], rule: ->(n) { n == 1 ? :one : :other } } } },
+      # Chinese Taiwan
+      "zh-tw" => { i18n: { plural: { keys: %i[one other], rule: ->(n) { n == 1 ? :one : :other } } } },
+    }
+  end
+end

data/lib/govuk_app_config/version.rb

@@ -1,3 +1,3 @@
 module GovukAppConfig
-  VERSION = "2.8.2".freeze
+  VERSION = "2.10.0".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: govuk_app_config
 version: !ruby/object:Gem::Version
-  version: 2.8.2
+  version: 2.10.0
 platform: ruby
 authors:
 - GOV.UK Dev
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-01-07 00:00:00.000000000 Z
+date: 2021-03-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: logstasher
@@ -236,11 +236,13 @@ files:
 - lib/govuk_app_config/govuk_healthcheck/checkup.rb
 - lib/govuk_app_config/govuk_healthcheck/mongoid.rb
 - lib/govuk_app_config/govuk_healthcheck/rails_cache.rb
+- lib/govuk_app_config/govuk_healthcheck/redis.rb
 - lib/govuk_app_config/govuk_healthcheck/sidekiq_queue_check.rb
 - lib/govuk_app_config/govuk_healthcheck/sidekiq_queue_latency_check.rb
 - lib/govuk_app_config/govuk_healthcheck/sidekiq_redis.rb
 - lib/govuk_app_config/govuk_healthcheck/sidekiq_retry_size_check.rb
 - lib/govuk_app_config/govuk_healthcheck/threshold_check.rb
+- lib/govuk_app_config/govuk_i18n.rb
 - lib/govuk_app_config/govuk_logging.rb
 - lib/govuk_app_config/govuk_statsd.rb
 - lib/govuk_app_config/govuk_unicorn.rb