govuk_personalisation 0.13.0 → 0.14.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3a5a2220ec7824bf32bffa97e4965169731f346303b2712908b4160587c85b1f
-  data.tar.gz: 9129d15308675709673f548c3df9d8be6c9d72a076395ef1817e563eb7482572
+  metadata.gz: 9bcf8d368f8b0a1b1262d714d53eca96638270d12d9a064bb91439d384b42eb0
+  data.tar.gz: 277a7a1ca1a96370676bbce2548a85a033a73b8c49e1bcae6ca3f56671e45c6f
 SHA512:
-  metadata.gz: a1ad6932786c4569c68280bab4e0e02a74b0e0afae6e504028c94a6877273ae9c8df75c7de869fcba9eb3502067e2acf724fb72be17a00e04c5c7ac6a03d46a7
-  data.tar.gz: bd8db5c53d6f7526bb10f3ae8ca0240500932dfa6b91d361c3ae79ede0055dbcfc0c2faf7c87bd0f5fbe51b9dfecea307c176e7b004800f4db94c7ed5b50e214
+  metadata.gz: 1cd009d3a20051533961e3c581b178ffde8def6bf2e29fc4b2bde9745626abed38aa8153c8a99153401dac9b2d72d1cfcdfe97cad465f01f512bd8367d018167
+  data.tar.gz: 5c68fbff6fdbb178bb13e07e9002ba934a78e68a40e309de241495cd6eee265ab6ca5be0a8fe0f9bda39aa465e069baac407a433d72b0174d18feb6dfa30c65c

data/.github/workflows/ci.yml

@@ -7,7 +7,7 @@ jobs:
       fail-fast: false
       matrix:
         # Due to https://github.com/actions/runner/issues/849, we have to use quotes for '3.0'
-        ruby: [2.7, '3.0', 3.1, 3.2]
+        ruby: ['3.0', 3.1, 3.2]
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3

data/.ruby-version

@@ -1 +1 @@
-2.7.6
+3.0.5

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+# 0.14.0
+
+- Use GOVUK_ENVIRONMENT as a backstop for DIGITAL_IDENTITY_ENVIRONMENT ([#53](https://github.com/alphagov/govuk_personalisation/pull/53))
+- Drop Ruby 2.7 support ([#51](https://github.com/alphagov/govuk_personalisation/pull/51))
+
 # 0.13.0
 
 - Minimum Ruby version is now 2.7.6 ([#39](https://github.com/alphagov/govuk_personalisation/pull/39))

data/govuk_personalisation.gemspec

@@ -14,7 +14,7 @@ Gem::Specification.new do |spec|
   spec.description   = "A gem to hold shared code which other GOV.UK apps will use to implement accounts-related functionality."
   spec.homepage      = "https://github.com/alphagov/govuk_personalisation"
   spec.license       = "MIT"
-  spec.required_ruby_version = Gem::Requirement.new(">= 2.7.6")
+  spec.required_ruby_version = Gem::Requirement.new(">= 3.0")
 
   # Specify which files should be added to the gem when it is released.
   # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
@@ -33,5 +33,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "pry-byebug"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "rspec-rails"
-  spec.add_development_dependency "rubocop-govuk", "4.9.0"
+  spec.add_development_dependency "rubocop-govuk", "4.11.0"
 end

data/lib/govuk_personalisation/flash.rb

@@ -3,7 +3,7 @@
 module GovukPersonalisation::Flash
   SESSION_SEPARATOR = "$$"
   MESSAGE_SEPARATOR = ","
-  MESSAGE_REGEX = /\A[a-zA-Z0-9._-]+\z/.freeze
+  MESSAGE_REGEX = /\A[a-zA-Z0-9._-]+\z/
 
   # Splits the session header into a session value (suitable for using
   # in account-api calls) and flash messages.

data/lib/govuk_personalisation/urls.rb

@@ -95,11 +95,16 @@ module GovukPersonalisation::Urls
   #
   # @return [String] the domain
   def self.digital_identity_domain
-    environment = ENV["DIGITAL_IDENTITY_ENVIRONMENT"]
-    if environment
-      "home.#{environment}.account.gov.uk"
+    if digital_identity_environment
+      "home.#{digital_identity_environment}.account.gov.uk"
     else
       "home.account.gov.uk"
     end
   end
+
+  def self.digital_identity_environment
+    return ENV["DIGITAL_IDENTITY_ENVIRONMENT"] if ENV["DIGITAL_IDENTITY_ENVIRONMENT"]
+
+    ENV["GOVUK_ENVIRONMENT"] == "production" ? nil : ENV["GOVUK_ENVIRONMENT"]
+  end
 end

data/lib/govuk_personalisation/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module GovukPersonalisation
-  VERSION = "0.13.0"
+  VERSION = "0.14.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: govuk_personalisation
 version: !ruby/object:Gem::Version
-  version: 0.13.0
+  version: 0.14.0
 platform: ruby
 authors:
 - GOV.UK Dev
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-01-19 00:00:00.000000000 Z
+date: 2023-07-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: plek
@@ -120,14 +120,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.9.0
+        version: 4.11.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.9.0
+        version: 4.11.0
 description: A gem to hold shared code which other GOV.UK apps will use to implement
   accounts-related functionality.
 email:
@@ -170,14 +170,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.7.6
+      version: '3.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.4
+rubygems_version: 3.4.15
 signing_key: 
 specification_version: 4
 summary: A gem to hold shared code which other GOV.UK apps will use to implement accounts-related