govuk_app_config 4.10.0 → 4.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1f29dd29e2aa59d60c6c4139cd3194303a3e485fc81c3ff0cc4b541015ae2f6c
-  data.tar.gz: 294a43ae30bca8b61a75de8a7e49d4b9162acf608b79431860765039d0ebeb82
+  metadata.gz: 9a99ab31af0eeb89e3d7b1fb7538ea6095d52d93e08dbccd8cf17a9431beaa1e
+  data.tar.gz: f3664830daf4a0900bad8f5087daf791969a9310e6a8d39c1b71165519600d2c
 SHA512:
-  metadata.gz: e3597f2f8cc645bf1888d14708918b5c9d87bb4d9f2fbade1393ad37880ab277dc0f94321e4da0b9c0fdf58dc841eff218c93a26abf53cf9b59d9028085416d9
-  data.tar.gz: 66a1bb4da547d49e496caca8770c5aa9b93b8d965276fcb16943f5d4c796679a60b1f685e8ff3417eb2389de102429befc351d13fb4388c8f15aab2f8763f18e
+  metadata.gz: 13ae8c4325ed10df67460a2eabce7fd6bd9da83b0d250ac7cbbefc78ab8d32fad2370f106cb323b38c14f379c27e881300ecc63adb4971caa3acd5aaa75df13d
+  data.tar.gz: 6b439e2ea5f9970c9e9eb7ecd38e6389ab4f4a028b62b566c107fa6b79459f62a5ddb5eae016f16b8fbd74258dee339d93e802335270e6c321c39041e56bde88

data/CHANGELOG.md

@@ -1,3 +1,12 @@
+# 4.11.0
+
+- Update Plek support to allow version 5
+- Add I18n plural rules for Welsh (cy), Maltese (mt) and Chinese (zh) since Rails-I18n has [dropped support](https://github.com/svenfuchs/rails-i18n/pull/1017) for them in 7.0.6 ([#266](https://github.com/alphagov/govuk_app_config/pull/266))
+
+# 4.10.1
+
+- Fix an object ownership/sharing bug where the Rails log level was erroneously being set to `WARN` when initialising Sentry.
+
 # 4.10.0
 
 - Reduce log level for the Sentry gem from `INFO` to `WARN` to avoid polluting logs with uninformative messages. This only affects log messages from the Sentry gem itself, which go to `stdout`.

data/govuk_app_config.gemspec

@@ -21,7 +21,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = %w[lib]
 
   spec.add_dependency "logstasher", "~> 2.1"
-  spec.add_dependency "plek", "~> 4"
+  spec.add_dependency "plek", ">= 4", "< 6"
   spec.add_dependency "prometheus_exporter", "~> 2.0"
   spec.add_dependency "puma", ">= 5.6", "< 7.0"
   spec.add_dependency "rack-proxy", "~> 0.7"
@@ -37,6 +37,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rake", "~> 13.0"
   spec.add_development_dependency "rspec", "~> 3.10"
   spec.add_development_dependency "rspec-its", "~> 1.3"
-  spec.add_development_dependency "rubocop-govuk", "4.7.0"
+  spec.add_development_dependency "rubocop-govuk", "4.8.0"
   spec.add_development_dependency "webmock"
 end

data/lib/govuk_app_config/govuk_error/configuration.rb

@@ -74,6 +74,10 @@ module GovukError
         "GdsApi::ContentStore::ItemNotFound",
       ]
 
+      # Avoid "Sending envelope with items ... to Sentry" logspew, since we
+      # don't use Sentry's automatic session tracking.
+      self.auto_session_tracking = false
+
       @before_send_callbacks = [
         ignore_excluded_exceptions_in_data_sync,
         increment_govuk_statsd_counters,

data/lib/govuk_app_config/govuk_error.rb

@@ -40,8 +40,6 @@ module GovukError
 
     Sentry.init do |sentry_config|
       config = Configuration.new(sentry_config)
-      # Avoid "Sending envelope with items ... to Sentry" logspew on stdout.
-      config.logger.level = Sentry::Logger::WARN
       yield config if block_given?
     end
   end

data/lib/govuk_app_config/govuk_i18n.rb

@@ -3,6 +3,19 @@ module GovukI18n
     {
       # Azerbaijani
       az: { i18n: { plural: { keys: %i[one other], rule: ->(n) { n == 1 ? :one : :other } } } },
+      # Welsh
+      cy: { i18n: { plural: { keys: %i[zero one two few many other],
+                              rule:
+                                lambda do |n|
+                                  case n
+                                  when 0 then :zero
+                                  when 1 then :one
+                                  when 2 then :two
+                                  when 3 then :few
+                                  when 6 then :many
+                                  else :other
+                                  end
+                                end } } },
       # 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
@@ -31,12 +44,31 @@ module GovukI18n
       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 } } } },
+      # Maltese
+      mt: { i18n: { plural: { keys: %i[one few many other],
+                              rule:
+                                lambda do |n|
+                                  n ||= 0
+                                  mod100 = n % 100
+
+                                  if n == 1
+                                    :one
+                                  elsif n.zero? || (2..10).to_a.include?(mod100)
+                                    :few
+                                  elsif (11..19).to_a.include?(mod100)
+                                    :many
+                                  else
+                                    :other
+                                  end
+                                end } } },
       # 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
+      zh: { i18n: { plural: { keys: %i[other], rule: ->(_) { :other } } } },
       # Chinese Hong Kong
       "zh-hk" => { i18n: { plural: { keys: %i[one other], rule: ->(n) { n == 1 ? :one : :other } } } },
       # Chinese Taiwan

data/lib/govuk_app_config/railtie.rb

@@ -4,8 +4,7 @@ module GovukAppConfig
   class Railtie < Rails::Railtie
     initializer "govuk_app_config.configure_govuk_proxy" do |app|
       if ENV["GOVUK_PROXY_STATIC_ENABLED"] == "true"
-        static_url = Plek.new.find("static")
-        app.middleware.use GovukProxy::StaticProxy, backend: static_url
+        app.middleware.use GovukProxy::StaticProxy, backend: Plek.find("static")
       end
     end
 

data/lib/govuk_app_config/version.rb

@@ -1,3 +1,3 @@
 module GovukAppConfig
-  VERSION = "4.10.0".freeze
+  VERSION = "4.11.0".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: govuk_app_config
 version: !ruby/object:Gem::Version
-  version: 4.10.0
+  version: 4.11.0
 platform: ruby
 authors:
 - GOV.UK Dev
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-10-21 00:00:00.000000000 Z
+date: 2022-11-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: logstasher
@@ -28,16 +28,22 @@ dependencies:
   name: plek
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '4'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '4'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '6'
 - !ruby/object:Gem::Dependency
   name: prometheus_exporter
   requirement: !ruby/object:Gem::Requirement
@@ -246,14 +252,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.7.0
+        version: 4.8.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.7.0
+        version: 4.8.0
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
@@ -331,7 +337,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.24
+rubygems_version: 3.3.26
 signing_key: 
 specification_version: 4
 summary: Base configuration for GOV.UK applications