content_block_tools 0.15.0 → 0.17.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a7fb206c79f70f74406c8a60d9a9700edc36dd3d1b770aa20bec8f66882e9ace
-  data.tar.gz: 57ea041ddeedc73c7cd4ee6f0dc14ab6f9936e6c0c37f04cd871f3272160f199
+  metadata.gz: b4c641c9036c389a69525715b7e71149166f7511ab1de92f4c15ad95b16d62dd
+  data.tar.gz: a607de42bbe8f3b0fe1906d46743e1f73486ea792b1a2cb1374084afa398f4f5
 SHA512:
-  metadata.gz: 47025bb1c515acfe6c6a13efbeea0c7112982312d238f2ca1d2de085920c36204acfffcde065cf34d3081b61a80bdf4f514ca962b610c704cc3b7369441073a6
-  data.tar.gz: cc3b70d529ed13abc838f84fc3b8fa7a88a52efc9f3bc9472b591002e0c59bd495da56ba7f7a524faa52c2d899d7366c09a19bdf8f6bf000584b413897c2f590
+  metadata.gz: d711299258a6a6156ba85240bc67143989ace9485999bc41f6e45510294a61418622bfa329eaf6f8b2f693b2a816008cdffaf53e899660e8ba63d8fc8f043bee
+  data.tar.gz: a83c41c21a95b2f35c67a2be4ceead0ff6c1fe5d11e3993fa902456063667c519b9750f45175a0306627980581a9d55bda1b24a8b27a0b6bb8b04bb80bd0234c

data/CHANGELOG.md

@@ -7,6 +7,16 @@
   useful summary for people upgrading their application, not a replication
   of the commit log.
 
+## 0.17.0
+
+- Use recipient field in address ([75](https://github.com/alphagov/govuk_content_block_tools/pull/75))
+
+## 0.16.0
+
+- Use label as link text for contact link ([74](https://github.com/alphagov/govuk_content_block_tools/pull/74))
+- Add description to contact link ([74](https://github.com/alphagov/govuk_content_block_tools/pull/74))
+- Use label as link text for contact link ([74](https://github.com/alphagov/govuk_content_block_tools/pull/74))
+
 ## 0.15.0
 
 - Rename content block classes ([72](https://github.com/alphagov/govuk_content_block_tools/pull/72))

data/content_block_tools.gemspec

@@ -31,5 +31,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rubocop-govuk", "5.1.18"
 
   spec.add_dependency "actionview", ">= 6"
-  spec.add_dependency "govspeak", "10.6.0"
+  spec.add_dependency "govspeak", "10.6.1"
 end

data/lib/content_block_tools/presenters/block_presenters/contact/address_presenter.rb

@@ -12,7 +12,7 @@ module ContentBlockTools
               output = []
 
               output << content_tag(:p, class: "adr") do
-                %i[title street_address town_or_city state_or_county postal_code country].map { |field|
+                %i[recipient street_address town_or_city state_or_county postal_code country].map { |field|
                   next if item[field].blank?
 
                   content_tag(:span, item[field], { class: class_for_field_name(field) })
@@ -27,6 +27,7 @@ module ContentBlockTools
 
           def class_for_field_name(field_name)
             {
+              recipient: "organization-name",
               street_address: "street-address",
               town_or_city: "locality",
               state_or_county: "region",

data/lib/content_block_tools/presenters/block_presenters/contact/contact_link_presenter.rb

@@ -10,16 +10,28 @@ module ContentBlockTools
           def render
             wrapper do
               content_tag(:div, class: "email-url-number") do
-                content_tag(:p) do
-                  concat content_tag(:span, item[:title])
-                  concat content_tag(:a,
-                                     item[:url],
-                                     class: "url",
-                                     href: item[:url])
-                end
+                concat link
+                concat description if item[:description]
               end
             end
           end
+
+          def link
+            content_tag(:p) do
+              content_tag(:a,
+                          link_text,
+                          class: "url",
+                          href: item[:url])
+            end
+          end
+
+          def link_text
+            item[:label] || item[:url]
+          end
+
+          def description
+            render_govspeak(item[:description])
+          end
         end
       end
     end

data/lib/content_block_tools/presenters/block_presenters/contact/email_address_presenter.rb

@@ -18,9 +18,8 @@ module ContentBlockTools
 
           def email
             content_tag(:p) do
-              concat content_tag(:span, item[:title])
               concat content_tag(:a,
-                                 item[:email_address],
+                                 link_text,
                                  class: "email",
                                  href: "mailto:#{item[:email_address]}#{query_params}")
             end
@@ -34,6 +33,10 @@ module ContentBlockTools
 
             "?#{params}" if params.present?
           end
+
+          def link_text
+            item[:label] || item[:email_address]
+          end
         end
       end
     end

data/lib/content_block_tools/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ContentBlockTools
-  VERSION = "0.15.0"
+  VERSION = "0.17.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: content_block_tools
 version: !ruby/object:Gem::Version
-  version: 0.15.0
+  version: 0.17.0
 platform: ruby
 authors:
 - GOV.UK Dev
@@ -85,14 +85,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 10.6.0
+        version: 10.6.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 10.6.0
+        version: 10.6.1
 email:
 - govuk-dev@digital.cabinet-office.gov.uk
 executables: []