govuk_publishing_components 53.0.0 → 54.0.1

data/config/locales/ta.yml

@@ -123,7 +123,6 @@ ta:
         label:
       navigation_links_columns:
       navigation_menu_heading:
-      navigation_search_heading:
       navigation_search_subheading:
       search_text:
     metadata:

data/config/locales/th.yml

@@ -120,7 +120,6 @@ th:
         label:
       navigation_links_columns:
       navigation_menu_heading:
-      navigation_search_heading:
       navigation_search_subheading:
       search_text:
     metadata:

data/config/locales/tk.yml

@@ -123,7 +123,6 @@ tk:
         label:
       navigation_links_columns:
       navigation_menu_heading:
-      navigation_search_heading:
       navigation_search_subheading:
       search_text:
     metadata:

data/config/locales/tr.yml

@@ -123,7 +123,6 @@ tr:
         label:
       navigation_links_columns:
       navigation_menu_heading:
-      navigation_search_heading:
       navigation_search_subheading:
       search_text:
     metadata:

data/config/locales/uk.yml

@@ -129,7 +129,6 @@ uk:
         label:
       navigation_links_columns:
       navigation_menu_heading:
-      navigation_search_heading:
       navigation_search_subheading:
       search_text:
     metadata:

data/config/locales/ur.yml

@@ -119,7 +119,6 @@ ur:
         label:
       navigation_links_columns:
       navigation_menu_heading:
-      navigation_search_heading:
       navigation_search_subheading:
       search_text:
     metadata:

data/config/locales/uz.yml

@@ -124,7 +124,6 @@ uz:
         label:
       navigation_links_columns:
       navigation_menu_heading:
-      navigation_search_heading:
       navigation_search_subheading:
       search_text:
     metadata:

data/config/locales/vi.yml

@@ -121,7 +121,6 @@ vi:
         label:
       navigation_links_columns:
       navigation_menu_heading:
-      navigation_search_heading:
       navigation_search_subheading:
       search_text:
     metadata:

data/config/locales/zh-hk.yml

@@ -120,7 +120,6 @@ zh-hk:
         label:
       navigation_links_columns:
       navigation_menu_heading:
-      navigation_search_heading:
       navigation_search_subheading:
       search_text:
     metadata:

data/config/locales/zh-tw.yml

@@ -120,7 +120,6 @@ zh-tw:
         label:
       navigation_links_columns:
       navigation_menu_heading:
-      navigation_search_heading:
       navigation_search_subheading:
       search_text:
     metadata:

data/config/locales/zh.yml

@@ -120,7 +120,6 @@ zh:
         label:
       navigation_links_columns:
       navigation_menu_heading:
-      navigation_search_heading:
       navigation_search_subheading:
       search_text:
     metadata:

data/lib/govuk_publishing_components/app_helpers/asset_helper.rb

@@ -15,26 +15,25 @@ module GovukPublishingComponents
 
       # This is used to dedupe stylesheets.
       STATIC_STYLESHEET_LIST = %w[
-        govuk_publishing_components/components/_breadcrumbs.css
-        govuk_publishing_components/components/_button.css
-        govuk_publishing_components/components/_error-message.css
-        govuk_publishing_components/components/_heading.css
-        govuk_publishing_components/components/_hint.css
-        govuk_publishing_components/components/_input.css
-        govuk_publishing_components/components/_label.css
-        govuk_publishing_components/components/_search.css
-        govuk_publishing_components/components/_search-with-autocomplete.css
-        govuk_publishing_components/components/_skip-link.css
-        govuk_publishing_components/components/_textarea.css
-        govuk_publishing_components/components/_title.css
-
-        govuk_publishing_components/components/_cookie-banner.css
-        govuk_publishing_components/components/_cross-service-header.css
-        govuk_publishing_components/components/_feedback.css
-        govuk_publishing_components/components/_layout-footer.css
-        govuk_publishing_components/components/_layout-for-public.css
-        govuk_publishing_components/components/_layout-header.css
-        govuk_publishing_components/components/_layout-super-navigation-header.css
+        breadcrumbs
+        button
+        error-message
+        heading
+        hint
+        input
+        label
+        search
+        search-with-autocomplete
+        skip-link
+        textarea
+        title
+        cookie-banner
+        cross-service-header
+        feedback
+        layout-footer
+        layout-for-public
+        layout-header
+        layout-super-navigation-header
       ].freeze
 
       def add_stylesheet_path(component_path)
@@ -81,15 +80,25 @@ module GovukPublishingComponents
     private
 
       def is_already_used?(component)
-        if GovukPublishingComponents::Config.exclude_css_from_static && !viewing_component_guide?
-          all_component_stylesheets_being_used.include?(component) || STATIC_STYLESHEET_LIST.include?(component)
-        else
-          all_component_stylesheets_being_used.include?(component)
-        end
+        (all_component_stylesheets_being_used + component_paths(css_exclude_list)).include?(component)
+      end
+
+      def css_exclude_list
+        return [] if viewing_component_guide?
+        return GovukPublishingComponents::Config.custom_css_exclude_list if GovukPublishingComponents::Config.custom_css_exclude_list&.any?
+        return STATIC_STYLESHEET_LIST if GovukPublishingComponents::Config.exclude_css_from_static
+
+        []
       end
 
       def viewing_component_guide?
-        request&.path&.include?("/component-guide")
+        return false unless request
+
+        request.path.include?("/component-guide")
+      end
+
+      def component_paths(component_list)
+        component_list.map { |c| "govuk_publishing_components/components/_#{c}.css" }
       end
     end
   end

data/lib/govuk_publishing_components/config.rb

@@ -18,6 +18,9 @@ module GovukPublishingComponents
     mattr_accessor :application_javascript
     self.application_javascript = "application"
 
+    mattr_accessor :custom_css_exclude_list
+    self.custom_css_exclude_list = []
+
     mattr_accessor :exclude_css_from_static
     self.exclude_css_from_static = true
 

data/lib/govuk_publishing_components/presenters/attachment_helper.rb

@@ -47,13 +47,9 @@ module GovukPublishingComponents
         )
       end
 
-      def content_type_abbr
-        content_type.abbr
-      end
+      delegate :abbr, to: :content_type, prefix: true
 
-      def content_type_name
-        content_type.name
-      end
+      delegate :name, to: :content_type, prefix: true
 
       def file_size
         attachment_data[:file_size]

data/lib/govuk_publishing_components/presenters/checkboxes_helper.rb

@@ -64,7 +64,7 @@ module GovukPublishingComponents
       end
 
       def heading_markup
-        return unless @heading.present?
+        return if @heading.blank?
 
         if @is_page_heading
           content_tag(
@@ -87,7 +87,7 @@ module GovukPublishingComponents
         checkbox_id = checkbox[:id] || "#{@id}-#{index}"
         controls = checkbox[:controls]
         aria_controls = "#{checkbox_id}-conditional-#{index || rand(1..100)}" if checkbox[:conditional].present?
-        checkbox_name = checkbox[:name].present? ? checkbox[:name] : @name
+        checkbox_name = checkbox[:name].presence || @name
         checked = true if checkbox[:checked].present?
         data = checkbox[:data_attributes] || {}
         data[:controls] = controls

data/lib/govuk_publishing_components/presenters/component_wrapper_helper.rb

@@ -24,24 +24,24 @@ module GovukPublishingComponents
       def all_attributes
         attributes = {}
 
-        attributes[:id] = @options[:id] unless @options[:id].blank?
-        attributes[:data] = @options[:data_attributes] unless @options[:data_attributes].blank?
-        attributes[:aria] = @options[:aria] unless @options[:aria].blank?
+        attributes[:id] = @options[:id] if @options[:id].present?
+        attributes[:data] = @options[:data_attributes] if @options[:data_attributes].present?
+        attributes[:aria] = @options[:aria] if @options[:aria].present?
 
         ((@options[:classes] ||= "") << " govuk-!-margin-bottom-#{@options[:margin_bottom]}").strip! if @options[:margin_bottom]
-        attributes[:class] = @options[:classes] unless @options[:classes].blank?
+        attributes[:class] = @options[:classes] if @options[:classes].present?
 
-        attributes[:role] = @options[:role] unless @options[:role].blank?
-        attributes[:lang] = @options[:lang] unless @options[:lang].blank?
-        attributes[:open] = @options[:open] unless @options[:open].blank?
+        attributes[:role] = @options[:role] if @options[:role].present?
+        attributes[:lang] = @options[:lang] if @options[:lang].present?
+        attributes[:open] = @options[:open] if @options[:open].present?
         attributes[:hidden] = @options[:hidden] unless @options[:hidden].nil?
-        attributes[:tabindex] = @options[:tabindex] unless @options[:tabindex].blank?
-        attributes[:dir] = @options[:dir] unless @options[:dir].blank?
-        attributes[:type] = @options[:type] unless @options[:type].blank?
-        attributes[:draggable] = @options[:draggable] unless @options[:draggable].blank?
-        attributes[:rel] = @options[:rel] unless @options[:rel].blank?
-        attributes[:target] = @options[:target] unless @options[:target].blank?
-        attributes[:title] = @options[:title] unless @options[:title].blank?
+        attributes[:tabindex] = @options[:tabindex] if @options[:tabindex].present?
+        attributes[:dir] = @options[:dir] if @options[:dir].present?
+        attributes[:type] = @options[:type] if @options[:type].present?
+        attributes[:draggable] = @options[:draggable] if @options[:draggable].present?
+        attributes[:rel] = @options[:rel] if @options[:rel].present?
+        attributes[:target] = @options[:target] if @options[:target].present?
+        attributes[:title] = @options[:title] if @options[:title].present?
 
         attributes
       end

data/lib/govuk_publishing_components/presenters/content_breadcrumbs_based_on_organisations.rb

@@ -24,7 +24,7 @@ module GovukPublishingComponents
 
       def organisation_breadcrumbs_items
         first_related_organisation = ContentItem.new(content_item.related_organisations.first)
-        return [] unless first_related_organisation.present?
+        return [] if first_related_organisation.blank?
 
         [{
           title: first_related_organisation.title,

data/lib/govuk_publishing_components/presenters/content_breadcrumbs_based_on_taxons.rb

@@ -14,7 +14,7 @@ module GovukPublishingComponents
         ordered_parents = all_parents.map.with_index do |parent, index|
           {
             title: parent.title,
-            url: parent.url_override.present? ? parent.url_override : parent.base_path,
+            url: parent.url_override.presence || parent.base_path,
             is_page_parent: index.zero?,
           }
         end

data/lib/govuk_publishing_components/presenters/content_item.rb

@@ -124,9 +124,7 @@ module GovukPublishingComponents
         content_id == other.content_id
       end
 
-      def hash
-        content_id.hash
-      end
+      delegate :hash, to: :content_id
 
       def eql?(other)
         self == other

data/lib/govuk_publishing_components/presenters/machine_readable/article_schema.rb

@@ -29,7 +29,7 @@ module GovukPublishingComponents
       # Not all formats have a `body` - some have their content split over
       # multiple fields. In this case we'll skip the `articleBody` field
       def body
-        return {} unless page.body.present?
+        return {} if page.body.blank?
 
         {
           "articleBody" => page.body,

data/lib/govuk_publishing_components/presenters/machine_readable/government_service_schema.rb

@@ -25,7 +25,7 @@ module GovukPublishingComponents
       def related_services
         related_links = page.content_item.dig("links", "ordered_related_items")
 
-        return {} unless related_links.present?
+        return {} if related_links.blank?
 
         {
           "isRelatedTo" => related_links.each_with_object([]) do |link, items|
@@ -43,7 +43,7 @@ module GovukPublishingComponents
       def provider
         organisations = page.content_item.dig("links", "organisations")
 
-        return {} unless organisations.present?
+        return {} if organisations.blank?
 
         providers = organisations.map do |organisation|
           {

data/lib/govuk_publishing_components/presenters/machine_readable/organisation_schema.rb

@@ -29,7 +29,7 @@ module GovukPublishingComponents
     private
 
       def members
-        return {} unless ministers.present?
+        return {} if ministers.blank?
 
         members = ministers_with_grouped_roles.map do |person, roles|
           person.merge("hasOccupation" => roles)
@@ -67,7 +67,7 @@ module GovukPublishingComponents
       end
 
       def role_for_minister(minister)
-        return {} unless minister["role"].present?
+        return {} if minister["role"].blank?
 
         {
           "@type" => "Role",
@@ -108,7 +108,7 @@ module GovukPublishingComponents
       def related_organisations(link_type, schema_name)
         organisations = page.content_item.dig("links", link_type)
 
-        return {} unless organisations.present?
+        return {} if organisations.blank?
 
         related_orgs = organisations.map do |org|
           page = Page.new(content_item: org)

data/lib/govuk_publishing_components/presenters/meta_tags.rb

@@ -47,8 +47,8 @@ module GovukPublishingComponents
         meta_tags["govuk:updated-at"] = content_item[:updated_at] if content_item[:updated_at]
         meta_tags["govuk:public-updated-at"] = content_item[:public_updated_at] if content_item[:public_updated_at]
         primary_publisher = content_item.dig(:links, :primary_publishing_organisation)
-        primary_publisher = primary_publisher.first[:title] unless primary_publisher.blank?
-        meta_tags["govuk:primary-publishing-organisation"] = primary_publisher unless primary_publisher.blank?
+        primary_publisher = primary_publisher.first[:title] if primary_publisher.present?
+        meta_tags["govuk:primary-publishing-organisation"] = primary_publisher if primary_publisher.present?
 
         # Some browse topics are nested in the content item, we want to grab these for GA4 tracking.
         ga4_browse_topic = content_item.dig(:links, :ordered_related_items, 0, :links, :mainstream_browse_pages, 0, :links, :parent, 0, :title)

data/lib/govuk_publishing_components/presenters/page_with_step_by_step_navigation.rb

@@ -140,7 +140,7 @@ module GovukPublishingComponents
       end
 
       def active_step_nav_content_id
-        @active_step_nav_content_id ||= @query_parameters["step-by-step-nav"].present? ? @query_parameters["step-by-step-nav"] : nil
+        @active_step_nav_content_id ||= @query_parameters["step-by-step-nav"].presence
       end
 
       def steps

data/lib/govuk_publishing_components/version.rb

@@ -1,3 +1,3 @@
 module GovukPublishingComponents
-  VERSION = "53.0.0".freeze
+  VERSION = "54.0.1".freeze
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: govuk_publishing_components
 version: !ruby/object:Gem::Version
-  version: 53.0.0
+  version: 54.0.1
 platform: ruby
 authors:
 - GOV.UK Dev
 bindir: bin
 cert_chain: []
-date: 2025-02-26 00:00:00.000000000 Z
+date: 2025-03-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: govuk_app_config