content_block_tools 0.7.0 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 55ffab3c548b42f43db5e9ea658b4fc6cdd13e0d51eaef12c1c7b60a72f00bb7
-  data.tar.gz: e6ca9db8eddd145974c49edb2a57b4f6b1b327b1f94a855a9ae2e61dc2765261
+  metadata.gz: 899485acaf4c5c55bdeb7e8803501ce4e0ce3f2a4145b008418ca10cf955580c
+  data.tar.gz: 3e128c92ce7e7cb9cf1319b6c04b968a30512fd44a42597f557575a56d288569
 SHA512:
-  metadata.gz: 6ce195b0111b12dcf83b791f3702e75e2d4edeb2abb1bb8caa827257780eb1f858b8a1f78bbdd4c7ae439968eed27d360d59026ad0a46bfb170930bbe67fd6bd
-  data.tar.gz: a33e0a2898e36fd0c73245e115f9eac3732bf183c59c4836621b20ac89138a69d87ee234714b201c92421f49d035a8ee8c9dc35ad14601fdfb782d417c1a2612
+  metadata.gz: 3d02b0d69c9d14a1edaade41d7ef3f573a94647f533f14542ead97e0cb7d9315e56c1f7d91a05b8723831c34b79e2b26fbe9ed1ccaf589cbc870d88cd11b9e53
+  data.tar.gz: 01bcb437e45fd6a77f305e59d56cbd6b267e1a7e83058037a8d002b940e82ab70d63f3d6d66780d5b4fd318999efdadf97b1063e45b8d184716d73a73f0741a7

data/CHANGELOG.md

@@ -7,6 +7,10 @@
   useful summary for people upgrading their application, not a replication
   of the commit log.
 
+## 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/block_level_contact_item.rb

@@ -0,0 +1,30 @@
+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
+                content_tag(:div, class: "email-url-number") do
+                  yield block
+                end
+              end
+            else
+              content_tag(:div, class: "email-url-number") do
+                yield block
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -1,10 +1,14 @@
+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
+            wrapper do
               content_tag(:p) do
                 concat content_tag(:span, item[:title])
                 concat content_tag(:a,

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

@@ -1,10 +1,14 @@
+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
+            wrapper do
               content_tag(:p) do
                 concat content_tag(:span, item[:title])
                 concat content_tag(:a,

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

@@ -1,12 +1,14 @@
+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
+            wrapper do
               concat number_list
               concat opening_hours_list if item[:opening_hours].present?
               concat call_charges_link

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.8.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.8.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