content_block_tools 0.7.0 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 55ffab3c548b42f43db5e9ea658b4fc6cdd13e0d51eaef12c1c7b60a72f00bb7
-  data.tar.gz: e6ca9db8eddd145974c49edb2a57b4f6b1b327b1f94a855a9ae2e61dc2765261
+  metadata.gz: 565c412328ad54e9e45ca5ce473e6876147543cf88900dafde91083042c6b0ab
+  data.tar.gz: 8de3aab0cbfb65213cf1dceadd420ebdd1c006d6f9e715963bb6e49383617b1b
 SHA512:
-  metadata.gz: 6ce195b0111b12dcf83b791f3702e75e2d4edeb2abb1bb8caa827257780eb1f858b8a1f78bbdd4c7ae439968eed27d360d59026ad0a46bfb170930bbe67fd6bd
-  data.tar.gz: a33e0a2898e36fd0c73245e115f9eac3732bf183c59c4836621b20ac89138a69d87ee234714b201c92421f49d035a8ee8c9dc35ad14601fdfb782d417c1a2612
+  metadata.gz: ffda22c0d89798cea8b029ee90c2bc65564ab25fe7de67047251aafd53b01b1a7f127bc5c4af9deebba2e21e968767380dbde01993d9d9143394f7e0308ad5a4
+  data.tar.gz: '07429aa7168f233ca8935cf7c20c4e30221bdf0a1970f4376ffa30214e5bd09307509f331e97fd86e30d8babe94c7e4242c5a2cfe757dc0bfacf00a4362e351b'

data/CHANGELOG.md

@@ -7,6 +7,14 @@
   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))
+
 ## 0.7.0
 
 - Alter markup of contact ([55](https://github.com/alphagov/govuk_content_block_tools/pull/55))

data/lib/content_block_tools/presenters/base_presenter.rb

@@ -75,7 +75,7 @@ module ContentBlockTools
           return content_block.embed_code
         end
 
-        field_or_block_presenter.new(field_or_block_content).render
+        field_or_block_presenter.new(field_or_block_content, rendering_context: :field_names).render
       end
 
       def field_names

data/lib/content_block_tools/presenters/block_presenters/base_presenter.rb

@@ -8,7 +8,7 @@ module ContentBlockTools
 
         attr_reader :item
 
-        def initialize(item)
+        def initialize(item, **_args)
           @item = item
         end
 

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

@@ -0,0 +1,26 @@
+module ContentBlockTools
+  module Presenters
+    module BlockPresenters
+      module Contact
+        module BlockLevelContactItem
+          BASE_TAG_TYPE = :div
+
+          def initialize(item, rendering_context: :block, **_args)
+            @item = item
+            @rendering_context = rendering_context
+          end
+
+          def wrapper(&block)
+            if @rendering_context == :field_names
+              content_tag(:div, class: "contact") do
+                yield block
+              end
+            else
+              yield block
+            end
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -1,16 +1,22 @@
+require_relative "./block_level_contact_item"
+
 module ContentBlockTools
   module Presenters
     module BlockPresenters
       module Contact
         class ContactFormPresenter < ContentBlockTools::Presenters::BlockPresenters::BasePresenter
+          include ContentBlockTools::Presenters::BlockPresenters::Contact::BlockLevelContactItem
+
           def render
-            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])
+            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
               end
             end
           end

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

@@ -1,16 +1,22 @@
+require_relative "./block_level_contact_item"
+
 module ContentBlockTools
   module Presenters
     module BlockPresenters
       module Contact
         class EmailAddressPresenter < ContentBlockTools::Presenters::BlockPresenters::BasePresenter
+          include ContentBlockTools::Presenters::BlockPresenters::Contact::BlockLevelContactItem
+
           def render
-            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]}")
+            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[: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

@@ -1,15 +1,19 @@
+require_relative "./block_level_contact_item"
+
 module ContentBlockTools
   module Presenters
     module BlockPresenters
       module Contact
         class TelephonePresenter < ContentBlockTools::Presenters::BlockPresenters::BasePresenter
-          BASE_TAG_TYPE = :div
+          include ContentBlockTools::Presenters::BlockPresenters::Contact::BlockLevelContactItem
 
           def render
-            content_tag(:div, class: "email-url-number") do
-              concat number_list
-              concat opening_hours_list if item[:opening_hours].present?
-              concat call_charges_link
+            wrapper do
+              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/presenters/contact_presenter.rb

@@ -12,6 +12,8 @@ module ContentBlockTools
       BLOCK_PRESENTERS = {
         addresses: ContentBlockTools::Presenters::BlockPresenters::Contact::AddressPresenter,
         telephones: ContentBlockTools::Presenters::BlockPresenters::Contact::TelephonePresenter,
+        email_addresses: ContentBlockTools::Presenters::BlockPresenters::Contact::EmailAddressPresenter,
+        contact_forms: ContentBlockTools::Presenters::BlockPresenters::Contact::ContactFormPresenter,
       }.freeze
 
       has_embedded_objects :addresses, :email_addresses, :telephones, :contact_forms

data/lib/content_block_tools/presenters/field_presenters/base_presenter.rb

@@ -8,7 +8,7 @@ module ContentBlockTools
 
         attr_reader :field
 
-        def initialize(field)
+        def initialize(field, **_args)
           @field = field
         end
 

data/lib/content_block_tools/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ContentBlockTools
-  VERSION = "0.7.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.7.0
+  version: 0.9.0
 platform: ruby
 authors:
 - GOV.UK Dev
@@ -108,6 +108,7 @@ files:
 - lib/content_block_tools/presenters/base_presenter.rb
 - lib/content_block_tools/presenters/block_presenters/base_presenter.rb
 - lib/content_block_tools/presenters/block_presenters/contact/address_presenter.rb
+- lib/content_block_tools/presenters/block_presenters/contact/block_level_contact_item.rb
 - lib/content_block_tools/presenters/block_presenters/contact/contact_form_presenter.rb
 - lib/content_block_tools/presenters/block_presenters/contact/email_address_presenter.rb
 - lib/content_block_tools/presenters/block_presenters/contact/telephone_presenter.rb