ccs-frontend_helpers 3.4.0 → 3.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 818be8a5adc4da073cad350833f043325c50da21328a75594908314ab2fa66a3
-  data.tar.gz: fd013bcc1c712daf19609ead118df43345eba59e9154046754ac372119ee8b77
+  metadata.gz: 1bf265f14acc642010d47b175977bdffa353900061e2264145423e8bb03000c9
+  data.tar.gz: 1fc0369b330f35bbdfe8106c34e96fab791c59ffa796633fdfdc246095b6fdbb
 SHA512:
-  metadata.gz: 3c22049c6e35cbaecaa910baac1a9371200a0bd307b2b2e0df9117ed08bac77ec11262f8825966396e57dedc65cfd97724257cccadd1523d10e0584a2b17c34a
-  data.tar.gz: 8975ccb89f525fb8427f6b8c6753d46ffd66b3f132581ba87c041790514a36db13937b2098cf05a9eb004501d3dda7316dc5dcc8f06e4710cd8fcfc06cbb4e97
+  metadata.gz: 12a68aa2aa3af988e6272c89b9d71d3dea4e745958f873c9dae96a16418ea3d6057b298e87952fc536744d3a63f3b3ab3f8e33a4ac378670a9acd9c838acdab1
+  data.tar.gz: 25d9bcb35a00bde3588ffae2a214d6d3c09970e2dd2c1cfdb04da7f3682b022b3ba6eb4e4daaba18303eab53ae5a7126bb16c68720d90bde5a9f901572201796

data/CHANGELOG.md

@@ -7,6 +7,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [3.5.0] - 2026-02-02
+
+### Added
+
+- Updated CCS Frontend to v2.5.0
+
 ## [3.4.0] - 2026-01-19
 
 ### Added

data/Gemfile

@@ -16,7 +16,7 @@ gem 'simplecov', '~> 0.21'
 gem 'nokogiri-diff', '~> 0.3.0'
 
 # Gems for linting/formatting the package
-gem 'rubocop', '~> 1.82'
+gem 'rubocop', '~> 1.84'
 gem 'rubocop-capybara', '~> 2.22'
 gem 'rubocop-rails', '~> 2.34'
 gem 'rubocop-rake', '~> 0.7'

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    ccs-frontend_helpers (3.4.0)
+    ccs-frontend_helpers (3.5.0)
       rails (>= 7.2)
 
 GEM
@@ -152,13 +152,13 @@ GEM
       nokogiri (~> 1.5)
       tdiff (~> 0.4)
     parallel (1.27.0)
-    parser (3.3.10.0)
+    parser (3.3.10.1)
       ast (~> 2.4.1)
       racc
     pp (0.6.3)
       prettyprint
     prettyprint (0.2.0)
-    prism (1.7.0)
+    prism (1.9.0)
     psych (5.3.1)
       date
       stringio
@@ -224,7 +224,7 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
     rspec-support (3.13.6)
-    rubocop (1.82.1)
+    rubocop (1.84.0)
       json (~> 2.3)
       language_server-protocol (~> 3.17.0.2)
       lint_roller (~> 1.1.0)
@@ -232,7 +232,7 @@ GEM
       parser (>= 3.3.0.2)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 2.9.3, < 3.0)
-      rubocop-ast (>= 1.48.0, < 2.0)
+      rubocop-ast (>= 1.49.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 4.0)
     rubocop-ast (1.49.0)
@@ -298,7 +298,7 @@ DEPENDENCIES
   nokogiri-diff (~> 0.3.0)
   rake (~> 13.3)
   rspec (~> 3.13)
-  rubocop (~> 1.82)
+  rubocop (~> 1.84)
   rubocop-capybara (~> 2.22)
   rubocop-rails (~> 2.34)
   rubocop-rake (~> 0.7)

data/README.md

@@ -14,6 +14,7 @@ The following table shows the version of CCS Frontend Helpers that you should us
 
 | CCS Frontend Helpers Version  | Target GOV.UK Frontend Version | Target CCS Frontend Version |
 | ----------------------------- | ------------------------------ | --------------------------- |
+| [3.5.0](https://github.com/Crown-Commercial-Service/ccs-frontend_helpers/releases/tag/v3.5.0) | [5.14.0](https://github.com/alphagov/govuk-frontend/releases/tag/v5.14.0) | [2.5.0](https://github.com/Crown-Commercial-Service/ccs-frontend-project/releases/tag/v2.5.0) |
 | [3.4.0](https://github.com/Crown-Commercial-Service/ccs-frontend_helpers/releases/tag/v3.4.0) | [5.14.0](https://github.com/alphagov/govuk-frontend/releases/tag/v5.14.0) | [2.4.0](https://github.com/Crown-Commercial-Service/ccs-frontend-project/releases/tag/v2.4.0) |
 | [3.3.0](https://github.com/Crown-Commercial-Service/ccs-frontend_helpers/releases/tag/v3.3.0) | [5.13.0](https://github.com/alphagov/govuk-frontend/releases/tag/v5.13.0) | [2.3.0](https://github.com/Crown-Commercial-Service/ccs-frontend-project/releases/tag/v2.3.0) |
 | [3.2.0](https://github.com/Crown-Commercial-Service/ccs-frontend_helpers/releases/tag/v3.2.0) | [5.13.0](https://github.com/alphagov/govuk-frontend/releases/tag/v5.13.0) | [2.2.1](https://github.com/Crown-Commercial-Service/ccs-frontend-project/releases/tag/v2.2.1) |

data/bun.lock

@@ -4,13 +4,13 @@
   "workspaces": {
     "": {
       "devDependencies": {
-        "ccs-frontend": "2.4.0",
+        "ccs-frontend": "2.5.0",
         "govuk-frontend": "5.14.0",
       },
     },
   },
   "packages": {
-    "ccs-frontend": ["ccs-frontend@2.4.0", "", { "peerDependencies": { "govuk-frontend": "^5.14.0", "jquery": "^4.x" } }, "sha512-ZqVx/G1aNFnExMo/c1exM694M2kI8EAiWWW1AoXly1iGnfrqRcv+qLVSRlTLDuZ9dh8IZN7kfmNeh+XnUGSaRA=="],
+    "ccs-frontend": ["ccs-frontend@2.5.0", "", { "peerDependencies": { "govuk-frontend": "^5.14.0", "jquery": "^4.x" } }, "sha512-RlHbYbuzkbEgAtWaLvptMGxKIJrxvjg6VtESLmAAjeW8NxxsErmQudTGrnX1ATsn5UdfH9/sEkmChpjJRikHpQ=="],
 
     "govuk-frontend": ["govuk-frontend@5.14.0", "", {}, "sha512-MgfaXswIM6KpXS2T5gltEnzgVLgfM3UoE9+rYkhBiR0suaJ8Let31VZXQZqz9QhiPDbv28fW1nRjIyLujfZIBA=="],
 

data/lib/ccs/components/ccs/header.rb

@@ -19,6 +19,7 @@ module CCS
 
         public
 
+        # @param use_gca_branding [Boolean] flag to use GCA branding in logo
         # @param options [Hash] options that will be used in customising the HTML
         #
         # @option options [String] :classes additional CSS classes for the header HTML
@@ -26,13 +27,13 @@ module CCS
         # @option options [String] :homepage_url URL of the homepage. Defaults to +/https://www.crowncommercial.gov.uk+
         # @option options [Hash] :attributes additional attributes that will added as part of the header HTML
 
-        def initialize(**)
+        def initialize(use_gca_branding: nil, **)
           super
 
           @options[:container_classes] ||= 'govuk-width-container'
-          @options[:homepage_url] ||= 'https://www.crowncommercial.gov.uk'
+          @options[:homepage_url] ||= (use_gca_branding ? 'https://www.gca.gov.uk' : 'https://www.crowncommercial.gov.uk')
 
-          @logo = Logo.new(context: @context)
+          @logo = Logo.new(context: @context, use_gca_branding: use_gca_branding)
         end
 
         # Generates the HTML for the CCS Header component

data/lib/ccs/components/ccs/logo.rb

@@ -7,9 +7,30 @@ module CCS
       #
       # This is used for generating the logo component from the
       # {https://github.com/Crown-Commercial-Service/ccs-frontend-project/tree/main/packages/ccs-frontend/src/ccs/components/logo CCS - Components - Logo}
+      #
+      # @!attribute [r] show_only_crown
+      #   @return [Boolean] Flag to show only the crown part of the logo
+      # @!attribute [r] use_gca_branding
+      #   @return [Boolean] Flag to use GCA branding in logo
 
       class Logo < Base
-        # rubocop:disable Metrics/AbcSize
+        private
+
+        attr_reader :show_only_crown, :use_gca_branding
+
+        public
+
+        # @param show_only_crown [Boolean] flag to show only the crown part of the logo
+        # @param use_gca_branding [Boolean] flag to use GCA branding in logo
+
+        def initialize(show_only_crown: nil, use_gca_branding: nil, **)
+          super
+
+          @show_only_crown = show_only_crown
+          @use_gca_branding = use_gca_branding
+        end
+
+        # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
 
         # Generates the HTML for the CCS Logo.
         # Used in {CCS::Components::CCS::Header Header} and {CCS::Components::CCS::Footer Footer}
@@ -18,7 +39,7 @@ module CCS
 
         def render
           tag.span(class: 'ccs-logo') do
-            if @options[:show_only_crown]
+            if show_only_crown
               concat(tag.svg(class: 'ccs-logo__svg', xmlns: 'http://www.w3.org/2000/svg', width: '132.22', height: '121', aria: { hidden: 'true' }, focusable: 'false', viewBox: '0 0 371.06668 339.57333') do
                 concat(tag.g(transform: 'matrix(1.3333333,0,0,-1.3333333,0,339.57333)') do
                   tag.g(transform: 'scale(0.34)') do
@@ -31,24 +52,36 @@ module CCS
                 concat(tag.g(transform: 'matrix(1.3333333,0,0,-1.3333333,0,339.57333)') do
                   tag.g(transform: 'scale(0.1)') do
                     CCS_STACKED_LOGO_PATHS.each { |ccs_logo_path_attributes| concat(tag.path(**ccs_logo_path_attributes)) }
-                    concat(logo_stacked_text_graphic)
+                    concat(use_gca_branding ? logo_stacked_text_graphic_gca : logo_stacked_text_graphic_ccs)
                   end
                 end)
               end)
-              concat(tag.svg(class: 'ccs-logo__svg ccs-logo__svg--linear', xmlns: 'http://www.w3.org/2000/svg', width: '320', height: '48.5', aria: { hidden: 'true' }, focusable: 'false', viewBox: '0 0 899 137') do
-                concat(tag.g(transform: 'matrix(1.3333333,0,0,-1.3333333,0,137)') do
-                  tag.g(transform: 'scale(0.1)') do
-                    CCS_LINEAR_LOGO_PATHS.each { |ccs_logo_path_attributes| concat(tag.path(**ccs_logo_path_attributes)) }
-                    concat(logo_linear_text_graphic)
-                  end
+              if use_gca_branding
+                concat(tag.svg(class: 'ccs-logo__svg ccs-logo__svg--linear', xmlns: 'http://www.w3.org/2000/svg', width: '378', height: '48.5', aria: { hidden: 'true' }, focusable: 'false', viewBox: '0 0 1061 137') do
+                  concat(tag.g(transform: 'matrix(1.3333333,0,0,-1.3333333,0,137)') do
+                    tag.g(transform: 'scale(0.1)') do
+                      CCS_LINEAR_LOGO_PATHS.each { |ccs_logo_path_attributes| concat(tag.path(**ccs_logo_path_attributes)) }
+                      concat(logo_linear_text_graphic_gca)
+                    end
+                  end)
                 end)
-              end)
-              concat(tag.span('Crown Commercial Service', class: 'ccs-logo__text', hidden: true))
+                concat(tag.span('Government Commercial Agency', class: 'ccs-logo__text', hidden: true))
+              else
+                concat(tag.svg(class: 'ccs-logo__svg ccs-logo__svg--linear', xmlns: 'http://www.w3.org/2000/svg', width: '320', height: '48.5', aria: { hidden: 'true' }, focusable: 'false', viewBox: '0 0 899 137') do
+                  concat(tag.g(transform: 'matrix(1.3333333,0,0,-1.3333333,0,137)') do
+                    tag.g(transform: 'scale(0.1)') do
+                      CCS_LINEAR_LOGO_PATHS.each { |ccs_logo_path_attributes| concat(tag.path(**ccs_logo_path_attributes)) }
+                      concat(logo_linear_text_graphic_ccs)
+                    end
+                  end)
+                end)
+                concat(tag.span('Crown Commercial Service', class: 'ccs-logo__text', hidden: true))
+              end
             end
           end
         end
 
-        # rubocop:enable Metrics/AbcSize
+        # rubocop:enable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
 
         # Array of the SVG paths for the CCS Logo
 
@@ -526,7 +559,7 @@ module CCS
 
         private
 
-        def logo_stacked_text_graphic
+        def logo_stacked_text_graphic_ccs
           tag.g(transform: 'scale(10)') do
             tag.text(
               'xml:space': 'preserve',
@@ -540,7 +573,21 @@ module CCS
           end
         end
 
-        def logo_linear_text_graphic
+        def logo_stacked_text_graphic_gca
+          tag.g(transform: 'scale(10)') do
+            tag.text(
+              'xml:space': 'preserve',
+              transform: 'matrix(1,0,0,-1,20.3102,129.569)',
+              class: 'ccs-logo__text-graphic'
+            ) do
+              concat(tag.tspan('Government ', x: '0 35 62 85 110 125 149 188 212 237 250', y: '0', 'sodipodi:role': 'line'))
+              concat(tag.tspan('Commercial ', x: '0 33.314499 59.416096 99.105995 138.7959 163.4126 177.5981 201.77882 210.5835 234.9653 244.37253', y: '53', 'sodipodi:role': 'line'))
+              concat(tag.tspan('Agency ', x: '0 31.5 58 82.5 108 133.5', y: '106', 'sodipodi:role': 'line'))
+            end
+          end
+        end
+
+        def logo_linear_text_graphic_ccs
           tag.g(transform: 'scale(10)') do
             tag.text(
               'xml:space': 'preserve',
@@ -551,6 +598,18 @@ module CCS
             end
           end
         end
+
+        def logo_linear_text_graphic_gca
+          tag.g(transform: 'scale(10)') do
+            tag.text(
+              'xml:space': 'preserve',
+              transform: 'matrix(1,0,0,-1,120,30)',
+              class: 'ccs-logo__text-graphic'
+            ) do
+              concat(tag.tspan('Government Commercial Agency', x: '0 35 62 85 110 125 149 188 212 237 250 260 293.314499 319.416096 359.105995 398.7959 423.4126 437.5981 461.77882 470.5835 494.9653 504.37253 515 546.5 573 597.5 623 648.5', y: '0', 'sodipodi:role': 'line'))
+            end
+          end
+        end
       end
     end
   end

data/lib/ccs/frontend_helpers/version.rb

@@ -2,6 +2,6 @@
 
 module CCS
   module FrontendHelpers
-    VERSION = '3.4.0'
+    VERSION = '3.5.0'
   end
 end

data/package.json

@@ -6,6 +6,6 @@
   "license": "MIT",
   "devDependencies": {
     "govuk-frontend": "5.14.0",
-    "ccs-frontend": "2.4.0"
+    "ccs-frontend": "2.5.0"
   }
 }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ccs-frontend_helpers
 version: !ruby/object:Gem::Version
-  version: 3.4.0
+  version: 3.5.0
 platform: ruby
 authors:
 - Crown Commercial Service