content_block_tools 0.9.0 → 0.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 565c412328ad54e9e45ca5ce473e6876147543cf88900dafde91083042c6b0ab
-  data.tar.gz: 8de3aab0cbfb65213cf1dceadd420ebdd1c006d6f9e715963bb6e49383617b1b
+  metadata.gz: c52e34cc23cba69ff684cf24401cd78982eca8566ecbf7003f4d95b09ecf5e4c
+  data.tar.gz: ac0ab24be15c2a8485fb7364e68c63afcef338a1038050caaaf2d1b838169c53
 SHA512:
-  metadata.gz: ffda22c0d89798cea8b029ee90c2bc65564ab25fe7de67047251aafd53b01b1a7f127bc5c4af9deebba2e21e968767380dbde01993d9d9143394f7e0308ad5a4
-  data.tar.gz: '07429aa7168f233ca8935cf7c20c4e30221bdf0a1970f4376ffa30214e5bd09307509f331e97fd86e30d8babe94c7e4242c5a2cfe757dc0bfacf00a4362e351b'
+  metadata.gz: 5dc783c3a7697d8d7b52fd3067b0c33238666f237664735e97efcbd26ee17bb69e50e03a7629bce0afd7ac23d50270250b3cab07ce055fcb8be52adb44571ae7
+  data.tar.gz: 8464890505ccea65c1da3557a8838e156f86e39f105e86c53c534cb37cdf16e50adbbb16db9d17b1ffcddd21190dd9227843634b9599578ebf430108f156c1f2

data/CHANGELOG.md

@@ -7,6 +7,15 @@
   useful summary for people upgrading their application, not a replication
   of the commit log.
 
+## 0.11.0
+
+- Update address and contact presenter to match model changes([61](https://github.com/alphagov/govuk_content_block_tools/pull/61))
+
+## 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))

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

@@ -10,7 +10,7 @@ module ContentBlockTools
           def render
             wrapper do
               content_tag(:p, class: "adr") do
-                %i[street_address locality region postal_code country].map { |field|
+                %i[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) })
@@ -19,21 +19,11 @@ module ContentBlockTools
             end
           end
 
-          def wrapper(&block)
-            if @rendering_context == :field_names
-              content_tag(:div, class: "contact") do
-                yield block
-              end
-            else
-              yield block
-            end
-          end
-
           def class_for_field_name(field_name)
             {
               street_address: "street-address",
-              locality: "locality",
-              region: "region",
+              town_or_city: "locality",
+              state_or_county: "region",
               postal_code: "postal-code",
               country: "country-name",
             }[field_name]

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

@@ -5,20 +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
-                yield block
+                concat title
+                concat yield block
               end
             else
               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/telephone_presenter.rb

@@ -10,6 +10,7 @@ module ContentBlockTools
           def render
             wrapper do
               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
@@ -17,6 +18,27 @@ module ContentBlockTools
             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.9.0"
+  VERSION = "0.11.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.9.0
+  version: 0.11.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: []