govuk_app_config 4.10.1 → 4.11.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 49d2ba8d4a28f3bcbe72bebb31f5516123964e8142dcf93a08c69f7efecc8d30
-  data.tar.gz: 061e91536be46ef802a5c6379dfa5a465e04cdb7657faa18371cecd439484a24
+  metadata.gz: 3860b6855cbcf400a78ac81032a4db049ee483a6c60614eab68e19f9340331e2
+  data.tar.gz: 8151cbc7c4be367f57c8dbaafdc5755beb09e410f474d8a9830f1f3fc3e89382
 SHA512:
-  metadata.gz: 4d526f99f686189933127e1e440f0153682a6147f6b21f1d44003fb1c7de129c151cffb6b8145ff3560af5963e80cae48d97c0b0d3c551b64948ea6eda0fc547
-  data.tar.gz: 5791cd78d85920e76bc58ae734ceadd50b636fccb2e16fb91952bd00e15ed45e3aaccc191e9947626721c43326c535b8f05655b3c2e20ddde2b3ebd992ef04f6
+  metadata.gz: c2af9398cbf1d148e39f4d48b315bb7c10443f05737713c50f933ad4e3c3f69e4e45c5d19f79cfeb1a55f102e2477702cd77edd04a7d3ba654053d8b0caf7149
+  data.tar.gz: 553747a1e310ab22a5ccf2cc8da122dafc8fd46402262edefdf2bd2e897f510fdc976198f505f57b8657c256621d40b3d49931ec0f0822abc877eda94fcda41a

data/.github/dependabot.yml

@@ -4,9 +4,7 @@ updates:
   directory: "/"
   schedule:
     interval: daily
-    time: "03:00"
-  open-pull-requests-limit: 10
-  ignore:
-  - dependency-name: aws-xray-sdk
-    versions:
-    - "> 0.10.0"
+- package-ecosystem: "github-actions"
+  directory: "/"
+  schedule:
+    interval: daily

data/CHANGELOG.md

@@ -1,3 +1,12 @@
+# 4.11.1
+
+- Remove govuk_i18n plural rules file
+
+# 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.

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.9.0"
   spec.add_development_dependency "webmock"
 end

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.1".freeze
+  VERSION = "4.11.1".freeze
 end

data/lib/govuk_app_config.rb

@@ -3,7 +3,6 @@ require "govuk_app_config/govuk_statsd"
 require "govuk_app_config/govuk_error"
 require "govuk_app_config/govuk_proxy/static_proxy"
 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"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: govuk_app_config
 version: !ruby/object:Gem::Version
-  version: 4.10.1
+  version: 4.11.1
 platform: ruby
 authors:
 - GOV.UK Dev
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-10-24 00:00:00.000000000 Z
+date: 2022-12-12 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.9.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.7.0
+        version: 4.9.0
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
@@ -302,7 +308,6 @@ files:
 - lib/govuk_app_config/govuk_healthcheck/rails_cache.rb
 - lib/govuk_app_config/govuk_healthcheck/redis.rb
 - 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_prometheus_exporter.rb
 - lib/govuk_app_config/govuk_proxy/static_proxy.rb
@@ -331,7 +336,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

data/lib/govuk_app_config/govuk_i18n.rb

@@ -1,46 +0,0 @@
-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:
-                                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 } } } },
-      # 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
-      "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