content_block_tools 0.8.0 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 899485acaf4c5c55bdeb7e8803501ce4e0ce3f2a4145b008418ca10cf955580c
-  data.tar.gz: 3e128c92ce7e7cb9cf1319b6c04b968a30512fd44a42597f557575a56d288569
+  metadata.gz: 565c412328ad54e9e45ca5ce473e6876147543cf88900dafde91083042c6b0ab
+  data.tar.gz: 8de3aab0cbfb65213cf1dceadd420ebdd1c006d6f9e715963bb6e49383617b1b
 SHA512:
-  metadata.gz: 3d02b0d69c9d14a1edaade41d7ef3f573a94647f533f14542ead97e0cb7d9315e56c1f7d91a05b8723831c34b79e2b26fbe9ed1ccaf589cbc870d88cd11b9e53
-  data.tar.gz: 01bcb437e45fd6a77f305e59d56cbd6b267e1a7e83058037a8d002b940e82ab70d63f3d6d66780d5b4fd318999efdadf97b1063e45b8d184716d73a73f0741a7
+  metadata.gz: ffda22c0d89798cea8b029ee90c2bc65564ab25fe7de67047251aafd53b01b1a7f127bc5c4af9deebba2e21e968767380dbde01993d9d9143394f7e0308ad5a4
+  data.tar.gz: '07429aa7168f233ca8935cf7c20c4e30221bdf0a1970f4376ffa30214e5bd09307509f331e97fd86e30d8babe94c7e4242c5a2cfe757dc0bfacf00a4362e351b'

data/CHANGELOG.md

@@ -7,6 +7,10 @@
   useful summary for people upgrading their application, not a replication
   of the commit log.
 
+## 0.9.0
+
+- Render addresses within a `contact` div ([58](https://github.com/alphagov/govuk_content_block_tools/pull/58))
+
 ## 0.8.0
 
 - Add wrapper classes to contact sub-blocks ([57](https://github.com/alphagov/govuk_content_block_tools/pull/57))

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

@@ -1,15 +1,31 @@
+require_relative "./block_level_contact_item"
+
 module ContentBlockTools
   module Presenters
     module BlockPresenters
       module Contact
         class AddressPresenter < ContentBlockTools::Presenters::BlockPresenters::BasePresenter
+          include ContentBlockTools::Presenters::BlockPresenters::Contact::BlockLevelContactItem
+
           def render
-            content_tag(:p, class: "adr") do
-              %i[street_address locality region postal_code country].map { |field|
-                next if item[field].blank?
+            wrapper do
+              content_tag(:p, class: "adr") do
+                %i[street_address locality region postal_code country].map { |field|
+                  next if item[field].blank?
+
+                  content_tag(:span, item[field], { class: class_for_field_name(field) })
+                }.compact_blank.join(",<br/>").html_safe
+              end
+            end
+          end
 
-                content_tag(:span, item[field], { class: class_for_field_name(field) })
-              }.compact_blank.join(",<br/>").html_safe
+          def wrapper(&block)
+            if @rendering_context == :field_names
+              content_tag(:div, class: "contact") do
+                yield block
+              end
+            else
+              yield block
             end
           end
 

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

@@ -13,14 +13,10 @@ module ContentBlockTools
           def wrapper(&block)
             if @rendering_context == :field_names
               content_tag(:div, class: "contact") do
-                content_tag(:div, class: "email-url-number") do
-                  yield block
-                end
-              end
-            else
-              content_tag(:div, class: "email-url-number") do
                 yield block
               end
+            else
+              yield block
             end
           end
         end

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

@@ -9,12 +9,14 @@ module ContentBlockTools
 
           def render
             wrapper do
-              content_tag(:p) do
-                concat content_tag(:span, item[:title])
-                concat content_tag(:a,
-                                   item[:url],
-                                   class: "url",
-                                   href: item[:url])
+              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
               end
             end
           end

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

@@ -9,12 +9,14 @@ module ContentBlockTools
 
           def render
             wrapper do
-              content_tag(:p) do
-                concat content_tag(:span, item[:title])
-                concat content_tag(:a,
-                                   item[:email_address],
-                                   class: "email",
-                                   href: "mailto:#{item[:email_address]}")
+              content_tag(:div, class: "email-url-number") do
+                content_tag(:p) do
+                  concat content_tag(:span, item[:title])
+                  concat content_tag(:a,
+                                     item[:email_address],
+                                     class: "email",
+                                     href: "mailto:#{item[:email_address]}")
+                end
               end
             end
           end

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

@@ -9,9 +9,11 @@ module ContentBlockTools
 
           def render
             wrapper do
-              concat number_list
-              concat opening_hours_list if item[:opening_hours].present?
-              concat call_charges_link
+              content_tag(:div, class: "email-url-number") do
+                concat number_list
+                concat opening_hours_list if item[:opening_hours].present?
+                concat call_charges_link
+              end
             end
           end
 

data/lib/content_block_tools/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: content_block_tools
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.9.0
 platform: ruby
 authors:
 - GOV.UK Dev