govuk_publishing_components 63.3.0 → 63.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 165109e571c6ba5445e74e15f2be52f24c787509790ad41a4ea88664e9efdb65
-  data.tar.gz: be9e4eafdc824e8cc3ae4e3ad5829f33a85a4df2e6ad3ac86a0c89fd52a2a084
+  metadata.gz: 6accce7654a1f778de97ed1e1c305ea2b61ba6e1cd65c18003179d298075dd1f
+  data.tar.gz: 17f5ec5d9b2ce4f0dac0f16cf3de381b575bd8c24ce5a1d295dc264e14203829
 SHA512:
-  metadata.gz: a4b8872ec44bbe165d2962f38157b1919f3c6433e13c14a714738bfe001b46cab9ea75d0a6d4e7f8c4fd42f98e8e2a4a3c174ff39e6f8dc1fcdcd2d987613eca
-  data.tar.gz: 2a6335737c699d6a6c5d397a1149e1e8f30e02dae6ba84f11f49edb41bc69743f26b98d22cde3e227447f4dafc00ac90e754384d307a9041586730fcbf720d9c
+  metadata.gz: f747916bfc169df32c1c8bf40630a8c03855c7666b467072cb1a21cd413d1f5ffacb8117b1c051f98402ad90f8ae8c205a2cacfeeded10d52a5dab37031810de
+  data.tar.gz: a16291d0bf67efc71960cc73c18d721b7f9d629b72ba23e35dcd3a42e9b84165aa64bb2a5e0817de2826b7175cb5e9adb514bdc7c998201be951226eb51be891

data/app/views/govuk_publishing_components/components/docs/organisation_logo.yml

@@ -18,10 +18,6 @@ shared_accessibility_criteria:
   - link
 examples:
   default:
-    data:
-      organisation:
-        name: 'Organisation<br>Name'
-  with_a_link:
     data:
       organisation:
         name: 'Organisation<br>Name'
@@ -162,6 +158,12 @@ examples:
         image:
           url: 'https://assets.publishing.service.gov.uk/media/6850134301d3b0e7b62da740/hmps_25_gov_240x188.png'
           alt_text: 'HM Prison Service'
+  without_a_link:
+    data:
+      organisation:
+        name: Cabinet Office
+        brand: cabinet-office
+        crest: 'single-identity'
   as_a_heading:
     description: The `heading_level` option takes a number from 1 to 6.
     data:

data/lib/govuk_publishing_components/presenters/organisation_logo_helper.rb

@@ -4,44 +4,40 @@ module GovukPublishingComponents
       include ActionView::Helpers
       include ActionView::Context
 
-      def initialize(local_assigns)
-        raise(ArgumentError, "Component requires an organisation including a name") unless minimum_for_component?(local_assigns)
+      attr_reader :name, :url, :crest, :image, :logo_image_src, :logo_image_alt, :hide_underline
 
+      def initialize(local_assigns)
         @name = local_assigns[:organisation][:name]
         @url = local_assigns[:organisation][:url]
         @crest = local_assigns[:organisation][:crest]
         @image = local_assigns[:organisation][:image] || false
         if @image
-          @logo_image_src = local_assigns[:organisation][:image][:url] || nil
-          @logo_image_alt = local_assigns[:organisation][:image][:alt_text] || nil
+          @logo_image_src = local_assigns[:organisation][:image][:url] || false
+          @logo_image_alt = local_assigns[:organisation][:image][:alt_text] || false
         end
         @hide_underline = local_assigns[:hide_underline] || false
       end
 
       def logo_content
-        if @image
-          image_tag(@logo_image_src, alt: @logo_image_alt, class: "gem-c-organisation-logo__image")
+        if image
+          image_tag(logo_image_src, alt: logo_image_alt, class: "gem-c-organisation-logo__image")
         else
-          content_tag("span", @name, class: "gem-c-organisation-logo__name")
+          content_tag("span", name, class: "gem-c-organisation-logo__name")
         end
       end
 
       def logo_container_class
-        logo_class = %w[gem-c-organisation-logo__container]
-        logo_class << "gem-c-organisation-logo__link" if @url
-        logo_class << "gem-c-organisation-logo__link-hide-underline" if @hide_underline
-        logo_class << "gem-c-organisation-logo__crest gem-c-organisation-logo__crest--#{@crest}" if crest_has_visual_identity?
-        logo_class.join(" ")
+        logo_class = "gem-c-organisation-logo__container"
+        logo_class = "#{logo_class} gem-c-organisation-logo__link" if url
+        logo_class = "#{logo_class} gem-c-organisation-logo__link-hide-underline" if hide_underline
+        logo_class = "#{logo_class} gem-c-organisation-logo__crest gem-c-organisation-logo__crest--#{crest}" if crest_has_visual_identity?
+        logo_class
       end
 
     private
 
-      def minimum_for_component?(options)
-        true unless !options[:organisation] || options[:organisation] && !options[:organisation][:name]
-      end
-
       def crest_has_visual_identity?
-        @crest.present? && !%w[no-identity custom].include?(@crest)
+        crest.present? && !%w[no-identity custom].include?(crest)
       end
     end
   end

data/lib/govuk_publishing_components/version.rb

@@ -1,3 +1,3 @@
 module GovukPublishingComponents
-  VERSION = "63.3.0".freeze
+  VERSION = "63.3.1".freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: govuk_publishing_components
 version: !ruby/object:Gem::Version
-  version: 63.3.0
+  version: 63.3.1
 platform: ruby
 authors:
 - GOV.UK Dev