content_block_tools 0.8.0 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 899485acaf4c5c55bdeb7e8803501ce4e0ce3f2a4145b008418ca10cf955580c
-  data.tar.gz: 3e128c92ce7e7cb9cf1319b6c04b968a30512fd44a42597f557575a56d288569
+  metadata.gz: 076d610c0146672c70d0b2d7971b6917c87fc395599ff546e0f50a0fe6817bf5
+  data.tar.gz: 3027bd4756b5246363b8ad1f220d9ec6da2e3c30dd79d3b1716ac568146be0fa
 SHA512:
-  metadata.gz: 3d02b0d69c9d14a1edaade41d7ef3f573a94647f533f14542ead97e0cb7d9315e56c1f7d91a05b8723831c34b79e2b26fbe9ed1ccaf589cbc870d88cd11b9e53
-  data.tar.gz: 01bcb437e45fd6a77f305e59d56cbd6b267e1a7e83058037a8d002b940e82ab70d63f3d6d66780d5b4fd318999efdadf97b1063e45b8d184716d73a73f0741a7
+  metadata.gz: 31ebe02a43ba3a92b7f5c18717dc7e9b889aba02fd453d68f7bd71a494d82af835c182eebd8ff54abeed544dc0983016ef1abf659b356faca233d1ca8da3e8dc
+  data.tar.gz: 1dd7eeeaa7aaba5f6ff1c7ca485eb4ed131dd604845dce282c700318f1314b281989d9993074e55f0dd12ba17e0324372a36acd9f508cfb506c53a6862c3a74a

data/CHANGELOG.md

@@ -7,6 +7,15 @@
   useful summary for people upgrading their application, not a replication
   of the commit log.
 
+## 0.10.0
+
+- Add content block titles to individual contact blocks ([60](https://github.com/alphagov/govuk_content_block_tools/pull/60))
+- Render title and description within telephone blocks ([60](https://github.com/alphagov/govuk_content_block_tools/pull/60))
+
+## 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/content_block_tools.gemspec

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

data/lib/content_block_tools/helpers/govspeak.rb

@@ -0,0 +1,10 @@
+module ContentBlockTools
+  module Govspeak
+    def render_govspeak(body, root_class: nil)
+      html = ::Govspeak::Document.new(body).to_html
+      Nokogiri::HTML.fragment(html).tap { |fragment|
+        fragment.children[0].add_class(root_class) if root_class
+      }.to_s.html_safe
+    end
+  end
+end

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, rendering_context: :field_names).render
+        field_or_block_presenter.new(field_or_block_content, rendering_context: :field_names, content_block:).render
       end
 
       def field_names

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

@@ -4,6 +4,8 @@ module ContentBlockTools
       class BasePresenter
         include ActionView::Context
         include ActionView::Helpers::TextHelper
+        include ContentBlockTools::Govspeak
+
         BASE_TAG_TYPE = :span
 
         attr_reader :item

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

@@ -1,15 +1,21 @@
+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
+                  content_tag(:span, item[field], { class: class_for_field_name(field) })
+                }.compact_blank.join(",<br/>").html_safe
+              end
             end
           end
 

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

@@ -5,24 +5,28 @@ module ContentBlockTools
         module BlockLevelContactItem
           BASE_TAG_TYPE = :div
 
-          def initialize(item, rendering_context: :block, **_args)
+          def initialize(item, content_block:, rendering_context: :block, **_args)
             @item = item
+            @content_block = content_block
             @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
+                concat title
+                concat yield block
               end
             else
-              content_tag(:div, class: "email-url-number") do
-                yield block
-              end
+              yield block
             end
           end
+
+          def title
+            content_tag(:p,
+                        @content_block.title,
+                        class: "govuk-!-margin-bottom-3")
+          end
         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,12 +9,36 @@ 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 title_and_description
+                concat number_list
+                concat opening_hours_list if item[:opening_hours].present?
+                concat call_charges_link
+              end
+            end
+          end
+
+          def title_and_description
+            items = [
+              (item_title if item[:title].present?),
+              (description if item[:description].present?),
+            ].compact
+
+            if items.any?
+              content_tag(:div, class: "govuk-!-margin-bottom-3") do
+                concat items.join("").html_safe
+              end
             end
           end
 
+          def item_title
+            content_tag(:p, item[:title], { class: "govuk-!-margin-bottom-0" })
+          end
+
+          def description
+            render_govspeak(item[:description], root_class: "govuk-!-margin-top-1 govuk-!-margin-bottom-0")
+          end
+
           def number_list
             content_tag(:ul) do
               item[:telephone_numbers].each do |number|

data/lib/content_block_tools/presenters/contact_presenter.rb

@@ -27,7 +27,7 @@ module ContentBlockTools
               concat content_tag(:p, content_block.title, class: "fn org")
               embedded_objects.each do |object|
                 items = send(object)
-                concat(items.map { |item| presenter_for_object_type(object).new(item).render }.join.html_safe)
+                concat(items.map { |item| presenter_for_object_type(object).new(item, content_block:).render }.join.html_safe)
               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.10.0"
 end

data/lib/content_block_tools.rb

@@ -2,6 +2,9 @@
 
 require "action_view"
 require "uri"
+require "govspeak"
+
+require "content_block_tools/helpers/govspeak"
 
 require "content_block_tools/presenters/field_presenters/base_presenter"
 require "content_block_tools/presenters/field_presenters/contact/email_address_presenter"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: content_block_tools
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.10.0
 platform: ruby
 authors:
 - GOV.UK Dev
@@ -79,6 +79,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '6'
+- !ruby/object:Gem::Dependency
+  name: govspeak
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 10.4.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 10.4.1
 email:
 - govuk-dev@digital.cabinet-office.gov.uk
 executables: []
@@ -105,6 +119,7 @@ files:
 - lib/content_block_tools.rb
 - lib/content_block_tools/content_block.rb
 - lib/content_block_tools/content_block_reference.rb
+- lib/content_block_tools/helpers/govspeak.rb
 - 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
@@ -135,7 +150,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.9
+rubygems_version: 3.7.0
 specification_version: 4
 summary: A suite of tools for working with GOV.UK Content Blocks
 test_files: []