govuk_app_config 4.1.0 → 4.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 035dcbe366b0f0f062233f632cbdd44363f0fd145da5bf8d1f567c8827f6ef7f
-  data.tar.gz: 8a3eda8f28a196cf032e437369b08505a9c71d7ec6ee1c11e4ff8489ad51cec9
+  metadata.gz: 076cb83af8162e164922a360a9cff7cdf46d3e2ddf1bf3c83068bb51ae23b306
+  data.tar.gz: 73e0cc6b9753b976481a9d3d8786466142444c8af54834d5fb5c2c1a1b02fa6e
 SHA512:
-  metadata.gz: 17439c255bc340863a3ea220021920a9ad4081bad08cfee2101ff618715fb21ddc6c8c1579826c53a7e05e41d85654c5a23de3be01678a85b8c842887fc611cd
-  data.tar.gz: 2e285f5737b24f5e1407a4f6112e25d73da1a055ba27fda7f97d60efaeccefea145455be97409c6f4b52f833234a3f0b2b8d445eb7c21699a2be20facce9422c
+  metadata.gz: fe96757c73874032419eecc48ed1bfd29ea341ad38521bcad7e2cab727cb8353480aabb4679696802dc6b9576c058a8cbeffd92eed7bcc61e68f102712ae72fc
+  data.tar.gz: 04bad176e09a1ddfd18042813052af7ce6e70f7e5cd2994c38fd08c98ccd8c8467a7c265bb3a9629dd302784f3a2374a677bc060922505fe6cfe9e03b7408450

data/CHANGELOG.md

@@ -1,3 +1,14 @@
+# 4.4.0
+
+- Add GovukPrometheusModule, to allow for export of prometheus metrics ([#223](https://github.com/alphagov/govuk_app_config/pull/223)).
+# 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)).

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 "prometheus_exporter", "~> 2.0.2"
   spec.add_dependency "puma", "~> 5.0"
   spec.add_dependency "sentry-rails", "~> 4.5.0"
   spec.add_dependency "sentry-ruby", "~> 4.5.0"

data/lib/govuk_app_config/govuk_content_security_policy.rb

@@ -78,13 +78,7 @@ module GovukContentSecurityPolicy
                        # Allow JSON call to klick2contact - HMPO web chat provider
                        "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_prometheus_exporter.rb

@@ -0,0 +1,13 @@
+require "prometheus_exporter/server"
+require "prometheus_exporter/middleware"
+
+module GovukPrometheusExporter
+  def self.configure
+    unless Rails.env == "test"
+      server = PrometheusExporter::Server::WebServer.new bind: "localhost", port: 9394
+      server.start
+
+      Rails.application.middleware.unshift PrometheusExporter::Middleware
+    end
+  end
+end

data/lib/govuk_app_config/version.rb

@@ -1,3 +1,3 @@
 module GovukAppConfig
-  VERSION = "4.1.0".freeze
+  VERSION = "4.4.0".freeze
 end

data/lib/govuk_app_config.rb

@@ -6,6 +6,7 @@ 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"
+require "govuk_app_config/govuk_prometheus_exporter"
 
 if defined?(Rails)
   require "govuk_app_config/govuk_logging"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: govuk_app_config
 version: !ruby/object:Gem::Version
-  version: 4.1.0
+  version: 4.4.0
 platform: ruby
 authors:
 - GOV.UK Dev
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-10-26 00:00:00.000000000 Z
+date: 2022-03-04 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: prometheus_exporter
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.0.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.0.2
 - !ruby/object:Gem::Dependency
   name: puma
   requirement: !ruby/object:Gem::Requirement
@@ -268,6 +282,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_prometheus_exporter.rb
 - lib/govuk_app_config/govuk_puma.rb
 - lib/govuk_app_config/govuk_statsd.rb
 - lib/govuk_app_config/govuk_unicorn.rb