content_block_tools 1.0.2 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 12237d984dd481c7d46d14b86cde8ecbafa25f3a5fb5880004ffebcda3a128e9
-  data.tar.gz: 32b6a8c2b1102950408b6bb18f4ddf5681a0a8455db0de599cec49335cf096d6
+  metadata.gz: d6e2e8e76c7ac69f15bcb193069f82be59acdd78b7291812cbff6f896e6c8c87
+  data.tar.gz: f46aa1f1fac9b526a45811b367db042c4d9f48b29c9f629fb708cdf0693ad299
 SHA512:
-  metadata.gz: 5fddff7d9d2964c7e0c46e05b98eb71b2d033a885f918663455d856aaaa5b3ec38ab4dd9fd9d9f396debcc739b65c97e462a31a40c78da3d81f02bd9dda4fa4b
-  data.tar.gz: 24a69d66c20764ef4328500b7bf6736a20a12e0e745340f30981dc457ab009fa968591893f9504ec3d0961f9f9ff7bd44a542ef64fa3a6854a9e83e16e19091f
+  metadata.gz: 62173df5e11a6023a91f7f2c39378098c89293ae6f5db96aa2289aca1f9cdbc030d5ed932b2d8fba1dc914d8514e3e87cb240c2377f034968b5ccfe47c515675
+  data.tar.gz: fb9389766399957affb5c8c45640bd4324f26c383057ec3e458fbf2719b6dfe7eca81c7006294b041b1ca5fc65e51280ace5b632a1de513149061f2dc753563a

data/app/assets/stylesheets/content_block_tools.scss

@@ -1,3 +1,4 @@
+@import "govuk/core/links";
 @import "govuk/core/lists";
 @import "govuk/core/typography";
 

data/lib/content_block_tools/components/base_component.rb

@@ -0,0 +1,15 @@
+module ContentBlockTools
+  module Components
+    class BaseComponent < ViewComponent::Base
+      def render
+        render_in(view_context)
+      end
+
+    private
+
+      def view_context
+        ActionView::Base.new(ActionView::LookupContext.new([]), {}, nil)
+      end
+    end
+  end
+end

data/lib/content_block_tools/components/contact_component.html.erb

@@ -0,0 +1,18 @@
+<div class="vcard">
+  <p class="fn org content-block__title"><%= content_block.title %></p>
+
+  <% if block_type.present? && content_block.details[:description] %>
+    <%= render_govspeak(content_block.details[:description])  %>
+  <% end %>
+
+  <% if block_type.nil? %>
+    <% BLOCK_TYPES.each do |block_type| %>
+     <% content_by_block_type[block_type].each do |item| %>
+        <p class="content-block__subtitle"><%= item[:title] %></p>
+        <%= component_for_block_type(block_type).new(item:).render.html_safe %>
+      <% end %>
+    <% end %>
+  <% else %>
+    <%= component_for_block_type(block_type).new(item: item_to_render).render.html_safe %>
+  <% end %>
+</div>

data/lib/content_block_tools/components/contact_component.rb

@@ -0,0 +1,31 @@
+module ContentBlockTools
+  module Components
+    class ContactComponent < ContentBlockTools::Components::BaseComponent
+      BLOCK_TYPES = %i[addresses email_addresses telephones contact_links].freeze
+
+      def initialize(content_block:, block_type: nil, block_name: nil)
+        @content_block = content_block
+        @block_type = block_type
+        @block_name = block_name
+      end
+
+    private
+
+      attr_reader :content_block, :block_type, :block_name
+
+      def component_for_block_type(block_type)
+        "ContentBlockTools::Components::Contacts::#{block_type.to_s.singularize.camelize}Component".constantize
+      end
+
+      def content_by_block_type
+        @content_by_block_type ||= content_block.details.keys.map { |key|
+          [key, content_block.details[key]&.values]
+        }.to_h
+      end
+
+      def item_to_render
+        content_block.details.dig(block_type, block_name)
+      end
+    end
+  end
+end

data/lib/content_block_tools/components/contacts/address_component.html.erb

@@ -0,0 +1,5 @@
+<p class="adr content-block__body">
+  <%= lines.map { |field, value| address_line(field, value) }.join(",<br />").html_safe %>
+</p>
+
+<%= render_govspeak(item[:description]) if item[:description].present? %>

data/lib/content_block_tools/components/contacts/address_component.rb

@@ -0,0 +1,44 @@
+module ContentBlockTools
+  module Components
+    module Contacts
+      class AddressComponent < ContentBlockTools::Components::BaseComponent
+        include ContentBlockTools::Govspeak
+
+        def initialize(item:)
+          @item = item
+        end
+
+      private
+
+        attr_reader :item
+
+        def lines
+          address_parts.map { |attribute|
+            next if item[attribute].blank?
+
+            [attribute, item[attribute]]
+          }.compact.to_h
+        end
+
+        def address_parts
+          %i[recipient street_address town_or_city state_or_county postal_code country]
+        end
+
+        def address_line(field, value)
+          content_tag(:span, value, { class: class_for_field_name(field) })
+        end
+
+        def class_for_field_name(field_name)
+          {
+            recipient: "organization-name",
+            street_address: "street-address",
+            town_or_city: "locality",
+            state_or_county: "region",
+            postal_code: "postal-code",
+            country: "country-name",
+          }[field_name]
+        end
+      end
+    end
+  end
+end

data/lib/content_block_tools/components/contacts/contact_link_component.html.erb

@@ -0,0 +1,12 @@
+<ul class="content-block__list">
+  <li>
+    <a href="<%= item[:url] %>" class="url content-block__link">
+      <%= link_text %>
+    </a>
+  </li>
+  <% if item[:description] %>
+    <li>
+      <%= render_govspeak(item[:description]) %>
+    </li>
+  <% end %>
+</ul>

data/lib/content_block_tools/components/contacts/contact_link_component.rb

@@ -0,0 +1,21 @@
+module ContentBlockTools
+  module Components
+    module Contacts
+      class ContactLinkComponent < ContentBlockTools::Components::BaseComponent
+        include ContentBlockTools::Govspeak
+
+        def initialize(item:)
+          @item = item
+        end
+
+      private
+
+        attr_reader :item
+
+        def link_text
+          item[:label] || item[:url]
+        end
+      end
+    end
+  end
+end

data/lib/content_block_tools/components/contacts/email_address_component.html.erb

@@ -0,0 +1,12 @@
+<ul class="content-block__list">
+  <li>
+    <a href="<%= "mailto:#{item[:email_address]}#{query_params}" %>" class="email content-block__link">
+      <%= link_text %>
+    </a>
+  </li>
+  <% if item[:description] %>
+    <li>
+      <%= render_govspeak(item[:description]) %>
+    </li>
+  <% end %>
+</ul>

data/lib/content_block_tools/components/contacts/email_address_component.rb

@@ -0,0 +1,30 @@
+module ContentBlockTools
+  module Components
+    module Contacts
+      class EmailAddressComponent < ContentBlockTools::Components::BaseComponent
+        include ContentBlockTools::Govspeak
+
+        def initialize(item:)
+          @item = item
+        end
+
+      private
+
+        attr_reader :item
+
+        def query_params
+          params = {
+            subject: item[:subject],
+            body: item[:body],
+          }.compact.map { |k, v| "#{k}=#{v}" }.join("&")
+
+          "?#{params}" if params.present?
+        end
+
+        def link_text
+          item[:label] || item[:email_address]
+        end
+      end
+    end
+  end
+end

data/lib/content_block_tools/components/contacts/telephone_component.html.erb

@@ -0,0 +1,32 @@
+<% if item[:description] %>
+  <%= render_govspeak(item[:description], root_class: "content-block__body") %>
+<% end %>
+
+<ul class="content-block__list">
+  <% item[:telephone_numbers].each do |number| %>
+    <li>
+      <span><%= number[:label] %>: </span>
+      <span class="tel"><%= number[:telephone_number] %></span>
+    </li>
+  <% end %>
+</ul>
+
+<% if show_video_relay_service? %>
+  <%= render_govspeak(video_relay_service_content) %>
+<% end %>
+
+<% if show_bsl_guidance? %>
+  <%= render_govspeak(bsl_guidance[:value], root_class: "content-block__body") %>
+<% end %>
+
+<% if show_opening_hours? %>
+  <%= render_govspeak(opening_hours[:opening_hours], root_class: "content-block__body") %>
+<% end %>
+
+<% if show_call_charges? %>
+  <p class="content-block__body">
+    <a href="<%= call_charges[:call_charges_info_url] %>" class="content-block__link">
+      <%= call_charges[:label] %>
+    </a>
+  </p>
+<% end %>

data/lib/content_block_tools/components/contacts/telephone_component.rb

@@ -0,0 +1,53 @@
+module ContentBlockTools
+  module Components
+    module Contacts
+      class TelephoneComponent < ContentBlockTools::Components::BaseComponent
+        include ContentBlockTools::Govspeak
+
+        def initialize(item:)
+          @item = item
+        end
+
+      private
+
+        attr_reader :item
+
+        def video_relay_service
+          @video_relay_service ||= item[:video_relay_service] || {}
+        end
+
+        def show_video_relay_service?
+          video_relay_service[:show].present?
+        end
+
+        def video_relay_service_content
+          "#{video_relay_service[:prefix]} #{video_relay_service[:telephone_number]}"
+        end
+
+        def bsl_guidance
+          @bsl_guidance ||= item[:bsl_guidance] || {}
+        end
+
+        def show_bsl_guidance?
+          bsl_guidance[:show].present?
+        end
+
+        def opening_hours
+          @opening_hours ||= item[:opening_hours] || {}
+        end
+
+        def show_opening_hours?
+          opening_hours[:show_opening_hours].present?
+        end
+
+        def call_charges
+          @call_charges ||= item[:call_charges] || {}
+        end
+
+        def show_call_charges?
+          call_charges[:show_call_charges_info_url].present?
+        end
+      end
+    end
+  end
+end

data/lib/content_block_tools/content_block.rb

@@ -1,6 +1,4 @@
 module ContentBlockTools
-  ContentBlock = Data.define(:content_id, :title, :document_type, :details, :embed_code)
-
   # Defines a Content Block
   #
   # @api public
@@ -40,25 +38,100 @@ module ContentBlockTools
   #    content_block_reference.embed_code #=> "{{embed:content_block_pension:2b92cade-549c-4449-9796-e7a3957f3a86}}"
   #    content_block_reference.embed_code #=> "{{embed:content_block_contact:2b92cade-549c-4449-9796-e7a3957f3a86/field_name}}"
   #  @return [String]
-  class ContentBlock < Data
-    # A lookup of presenters for particular content block types
-    CONTENT_PRESENTERS = {
-      "content_block_contact" => ContentBlockTools::Presenters::ContactPresenter,
-      "content_block_pension" => ContentBlockTools::Presenters::PensionPresenter,
-    }.freeze
+  class ContentBlock
+    include ActionView::Helpers::TagHelper
+
+    CONTENT_BLOCK_PREFIX = "content_block_".freeze
+
+    attr_reader :content_id, :title, :embed_code
+
+    def initialize(content_id:, title:, document_type:, details:, embed_code:)
+      @content_id = content_id
+      @title = title
+      @document_type = document_type
+      @details = details
+      @embed_code = embed_code
+    end
 
     # Calls the appropriate presenter class to return a HTML representation of a content
     # block. Defaults to {Presenters::BasePresenter}
     #
     # @return [string] A HTML representation of the content block
     def render
-      CONTENT_PRESENTERS
-        .fetch(document_type, Presenters::BasePresenter)
-        .new(self).render
+      content_tag(
+        base_tag,
+        content,
+        class: %W[content-block content-block--#{document_type}],
+        data: {
+          content_block: "",
+          document_type: document_type,
+          content_id: content_id,
+          embed_code: embed_code,
+        },
+      )
     end
 
     def details
-      to_h[:details].deep_symbolize_keys
+      @details.deep_symbolize_keys
+    end
+
+    def document_type
+      @document_type.delete_prefix(CONTENT_BLOCK_PREFIX)
+    end
+
+  private
+
+    def base_tag
+      rendering_block? ? :div : :span
+    end
+
+    def content
+      field_names.present? ? field_or_block_content : component.new(content_block: self).render
+    rescue NameError
+      title
+    end
+
+    def field_or_block_content
+      content = details.dig(*field_names)
+      case content
+      when String
+        field_presenter(field_names.last).new(content).render
+      when Hash
+        component.new(content_block: self, block_type: field_names.first, block_name: field_names.last).render
+      else
+        ContentBlockTools.logger.warn("Content not found for content block #{content_id} and fields #{field_names}")
+        embed_code
+      end
+    end
+
+    def rendering_block?
+      !field_names.present? || details.dig(*field_names).is_a?(Hash)
+    end
+
+    def component
+      "ContentBlockTools::Components::#{document_type.camelize}Component".constantize
+    end
+
+    def field_presenter(field)
+      "ContentBlockTools::Presenters::FieldPresenters::#{document_type.camelize}::#{field.to_s.camelize}Presenter".constantize
+    rescue NameError
+      ContentBlockTools::Presenters::FieldPresenters::BasePresenter
+    end
+
+    def field_names
+      @field_names ||= begin
+        embed_code_match = ContentBlockReference::EMBED_REGEX.match(embed_code)
+        if embed_code_match.present?
+          all_fields = embed_code_match[4]&.reverse&.chomp("/")&.reverse
+          all_fields&.split("/")&.map do |item|
+            is_number?(item) ? item.to_i : item.to_sym
+          end
+        end
+      end
+    end
+
+    def is_number?(item)
+      Float(item, exception: false)
     end
   end
 end

data/lib/content_block_tools/presenters/field_presenters/contact/{email_address_presenter.rb → email_presenter.rb}

@@ -2,7 +2,7 @@ module ContentBlockTools
   module Presenters
     module FieldPresenters
       module Contact
-        class EmailAddressPresenter < BasePresenter
+        class EmailPresenter < BasePresenter
           def render
             content_tag(:a, field, class: "govuk-link", href: "mailto:#{field}")
           end

data/lib/content_block_tools/version.rb

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

data/lib/content_block_tools.rb

@@ -1,23 +1,22 @@
 # frozen_string_literal: true
 
 require "action_view"
+require "rails"
 require "uri"
 require "govspeak"
+require "view_component/base"
 
 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"
-
-require "content_block_tools/presenters/block_presenters/base_presenter"
-require "content_block_tools/presenters/block_presenters/contact/address_presenter"
-require "content_block_tools/presenters/block_presenters/contact/contact_link_presenter"
-require "content_block_tools/presenters/block_presenters/contact/email_address_presenter"
-require "content_block_tools/presenters/block_presenters/contact/telephone_presenter"
+require "content_block_tools/components/base_component"
+require "content_block_tools/components/contact_component"
+require "content_block_tools/components/contacts/address_component"
+require "content_block_tools/components/contacts/contact_link_component"
+require "content_block_tools/components/contacts/email_address_component"
+require "content_block_tools/components/contacts/telephone_component"
 
-require "content_block_tools/presenters/base_presenter"
-require "content_block_tools/presenters/contact_presenter"
-require "content_block_tools/presenters/pension_presenter"
+require "content_block_tools/presenters/field_presenters/base_presenter"
+require "content_block_tools/presenters/field_presenters/contact/email_presenter"
 
 require "content_block_tools/content_block"
 require "content_block_tools/content_block_reference"
@@ -30,6 +29,10 @@ module ContentBlockTools
   class Error < StandardError; end
   module Presenters; end
 
+  module Components
+    module Contacts; end
+  end
+
   class << self
     attr_writer :logger
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: content_block_tools
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.1.0
 platform: ruby
 authors:
 - GOV.UK Dev
@@ -93,6 +93,34 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 10.6.1
+- !ruby/object:Gem::Dependency
+  name: rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: view_component
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 4.0.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 4.0.1
 email:
 - govuk-dev@digital.cabinet-office.gov.uk
 executables: []
@@ -103,21 +131,23 @@ files:
 - app/assets/stylesheets/blocks/_contact.scss
 - app/assets/stylesheets/content_block_tools.scss
 - lib/content_block_tools.rb
+- lib/content_block_tools/components/base_component.rb
+- lib/content_block_tools/components/contact_component.html.erb
+- lib/content_block_tools/components/contact_component.rb
+- lib/content_block_tools/components/contacts/address_component.html.erb
+- lib/content_block_tools/components/contacts/address_component.rb
+- lib/content_block_tools/components/contacts/contact_link_component.html.erb
+- lib/content_block_tools/components/contacts/contact_link_component.rb
+- lib/content_block_tools/components/contacts/email_address_component.html.erb
+- lib/content_block_tools/components/contacts/email_address_component.rb
+- lib/content_block_tools/components/contacts/telephone_component.html.erb
+- lib/content_block_tools/components/contacts/telephone_component.rb
 - lib/content_block_tools/content_block.rb
 - lib/content_block_tools/content_block_reference.rb
 - lib/content_block_tools/engine.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
-- lib/content_block_tools/presenters/block_presenters/contact/block_level_contact_item.rb
-- lib/content_block_tools/presenters/block_presenters/contact/contact_link_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
-- lib/content_block_tools/presenters/contact_presenter.rb
 - lib/content_block_tools/presenters/field_presenters/base_presenter.rb
-- lib/content_block_tools/presenters/field_presenters/contact/email_address_presenter.rb
-- lib/content_block_tools/presenters/pension_presenter.rb
+- lib/content_block_tools/presenters/field_presenters/contact/email_presenter.rb
 - lib/content_block_tools/version.rb
 - node_modules/govuk-frontend/README.md
 - node_modules/govuk-frontend/dist/govuk-prototype-kit/functions.js

data/lib/content_block_tools/presenters/base_presenter.rb

@@ -1,138 +0,0 @@
-module ContentBlockTools
-  module Presenters
-    class BasePresenter
-      include ActionView::Context
-      include ActionView::Helpers::TagHelper
-
-      # The default HTML tag to wrap the presented response in - can be overridden in a subclass
-      BASE_TAG_TYPE = :span
-
-      # A lookup of presenters for particular fields - can be overridden in a subclass
-      FIELD_PRESENTERS = {}.freeze
-
-      # A lookup of presenters for particular blocks - can be overridden in a subclass
-      BLOCK_PRESENTERS = {}.freeze
-
-      def self.has_embedded_objects(*object_types)
-        @embedded_objects = object_types
-
-        object_types.each do |object_type|
-          define_method(object_type) do
-            embedded_objects_of_type(object_type)
-          end
-        end
-      end
-
-      # Returns a new presenter object
-      #
-      # @param [{ContentBlockTools::ContentBlock}] content_block  A content block object
-      #
-      # @return [{ContentBlockTools::Presenters::BasePresenter}]
-      def initialize(content_block)
-        @content_block = content_block
-      end
-
-      # Returns a HTML representation of the content block wrapped in a base tag with
-      # a class and data attributes
-      # Calls the {#content} method, which can be overridden in a subclass
-      #
-      # @return [string] A HTML representation of the content block
-      def render
-        content_tag(
-          base_tag,
-          content,
-          class: %W[content-block content-block--#{document_type}],
-          data: {
-            content_block: "",
-            document_type: document_type,
-            content_id: content_block.content_id,
-            embed_code: content_block.embed_code,
-          },
-        )
-      end
-
-    private
-
-      attr_reader :content_block
-
-      # The default representation of the content block - this can be overridden in a subclass
-      # by overriding the content, default_content or content_for_fields methods
-      #
-      # @return [string] A representation of the content block to be wrapped in the base_tag in
-      # {#content}
-      def content
-        ContentBlockTools.logger.info("Getting content for content block #{content_block.content_id}")
-        field_names.present? ? content_for_field_names : default_content
-      end
-
-      def default_content
-        content_block.title
-      end
-
-      def content_for_field_names
-        if field_or_block_content.blank?
-          ContentBlockTools.logger.warn("Content not found for content block #{content_block.content_id} and fields #{field_names}")
-          return content_block.embed_code
-        end
-
-        field_or_block_presenter.new(field_or_block_content, rendering_context: :field_names, content_block:).render
-      end
-
-      def field_names
-        @field_names ||= begin
-          embed_code_match = ContentBlockReference::EMBED_REGEX.match(content_block.embed_code)
-          if embed_code_match.present?
-            all_fields = embed_code_match[4]&.reverse&.chomp("/")&.reverse
-            all_fields&.split("/")&.map do |item|
-              is_number?(item) ? item.to_i : item.to_sym
-            end
-          end
-        end
-      end
-
-      def is_number?(item)
-        Float(item, exception: false)
-      end
-
-      def field_or_block_content
-        @field_or_block_content ||= field_names.any? ? content_block.details.deep_symbolize_keys.dig(*field_names) : nil
-      end
-
-      def rendering_block?
-        field_or_block_content.is_a?(Hash)
-      end
-
-      def field_or_block_presenter
-        @field_or_block_presenter ||= if rendering_block?
-                                        block_presenter || ContentBlockTools::Presenters::BlockPresenters::BasePresenter
-                                      else
-                                        field_presenter || ContentBlockTools::Presenters::FieldPresenters::BasePresenter
-                                      end
-      end
-
-      def field_presenter
-        @field_presenter ||= field_names ? self.class::FIELD_PRESENTERS[field_names.last] : nil
-      end
-
-      def block_presenter
-        @block_presenter ||= field_names ? self.class::BLOCK_PRESENTERS[field_names.first] : nil
-      end
-
-      def base_tag
-        field_names ? field_or_block_presenter::BASE_TAG_TYPE : self.class::BASE_TAG_TYPE
-      end
-
-      def embedded_objects_of_type(type)
-        content_block.details.fetch(type, {}).values
-      end
-
-      def embedded_objects
-        self.class.instance_variable_get("@embedded_objects")
-      end
-
-      def document_type
-        content_block.document_type.delete_prefix("content_block_")
-      end
-    end
-  end
-end

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

@@ -1,21 +0,0 @@
-module ContentBlockTools
-  module Presenters
-    module BlockPresenters
-      class BasePresenter
-        include ActionView::Context
-        include ActionView::Helpers::TextHelper
-        include ContentBlockTools::Govspeak
-
-        BASE_TAG_TYPE = :span
-
-        attr_reader :item
-
-        def initialize(item, **_args)
-          @item = item
-        end
-
-        def render; end
-      end
-    end
-  end
-end

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

@@ -1,42 +0,0 @@
-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
-            wrapper do
-              output = []
-
-              output << content_tag(:p, class: "adr content-block__body") do
-                %i[recipient 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) })
-                }.compact_blank.join(",<br/>").html_safe
-              end
-
-              output << render_govspeak(item[:description]) if item[:description].present?
-
-              output.join.html_safe
-            end
-          end
-
-          def class_for_field_name(field_name)
-            {
-              recipient: "organization-name",
-              street_address: "street-address",
-              town_or_city: "locality",
-              state_or_county: "region",
-              postal_code: "postal-code",
-              country: "country-name",
-            }[field_name]
-          end
-        end
-      end
-    end
-  end
-end

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

@@ -1,34 +0,0 @@
-module ContentBlockTools
-  module Presenters
-    module BlockPresenters
-      module Contact
-        module BlockLevelContactItem
-          BASE_TAG_TYPE = :div
-
-          def initialize(item, content_block:, rendering_context: :block, **_args)
-            @item = item
-            @content_block = content_block
-            @rendering_context = rendering_context
-          end
-
-          def wrapper(&block)
-            content_tag(:div) do
-              concat title
-              concat yield block
-            end
-          end
-
-          def title
-            if @rendering_context == :field_names
-              content_tag(:p,
-                          @content_block.title,
-                          class: "content-block__title")
-            else
-              content_tag(:p, item[:title], class: "content-block__subtitle")
-            end
-          end
-        end
-      end
-    end
-  end
-end

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

@@ -1,41 +0,0 @@
-require_relative "./block_level_contact_item"
-
-module ContentBlockTools
-  module Presenters
-    module BlockPresenters
-      module Contact
-        class ContactLinkPresenter < ContentBlockTools::Presenters::BlockPresenters::BasePresenter
-          include ContentBlockTools::Presenters::BlockPresenters::Contact::BlockLevelContactItem
-
-          def render
-            wrapper do
-              content_tag(:ul, class: "content-block__list") do
-                concat link
-                concat description if item[:description]
-              end
-            end
-          end
-
-          def link
-            content_tag(:li) do
-              content_tag(:a,
-                          link_text,
-                          class: "url content-block__link",
-                          href: item[:url])
-            end
-          end
-
-          def link_text
-            item[:label] || item[:url]
-          end
-
-          def description
-            content_tag(:li) do
-              render_govspeak(item[:description])
-            end
-          end
-        end
-      end
-    end
-  end
-end

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

@@ -1,50 +0,0 @@
-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
-            wrapper do
-              content_tag(:ul, class: "content-block__list") do
-                concat email
-                concat description if item[:description].present?
-              end
-            end
-          end
-
-          def email
-            content_tag(:li) do
-              concat content_tag(:a,
-                                 link_text,
-                                 class: "email content-block__link",
-                                 href: "mailto:#{item[:email_address]}#{query_params}")
-            end
-          end
-
-          def query_params
-            params = {
-              subject: item[:subject],
-              body: item[:body],
-            }.compact.map { |k, v| "#{k}=#{v}" }.join("&")
-
-            "?#{params}" if params.present?
-          end
-
-          def link_text
-            item[:label] || item[:email_address]
-          end
-
-          def description
-            content_tag(:li) do
-              render_govspeak(item[:description])
-            end
-          end
-        end
-      end
-    end
-  end
-end

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

@@ -1,83 +0,0 @@
-require_relative "./block_level_contact_item"
-
-module ContentBlockTools
-  module Presenters
-    module BlockPresenters
-      module Contact
-        class TelephonePresenter < ContentBlockTools::Presenters::BlockPresenters::BasePresenter
-          include ContentBlockTools::Presenters::BlockPresenters::Contact::BlockLevelContactItem
-
-          def render
-            wrapper do
-              content_tag(:div) do
-                concat description if item[:description].present?
-                concat number_list
-                concat video_relay_service
-                concat bsl_details
-                concat opening_hours
-                concat call_charges_link
-              end
-            end
-          end
-
-          def description
-            render_govspeak(item[:description], root_class: "content-block__body")
-          end
-
-          def number_list
-            content_tag(:ul, class: "content-block__list") do
-              item[:telephone_numbers].each do |number|
-                concat number_list_item(number)
-              end
-            end
-          end
-
-          def number_list_item(number)
-            content_tag(:li) do
-              concat content_tag(:span, "#{number[:label]}: ")
-              concat content_tag(:span, number[:telephone_number], { class: "tel" })
-            end
-          end
-
-          def video_relay_service
-            video_relay_service = item[:video_relay_service] || {}
-
-            if video_relay_service[:show]
-              content = "#{video_relay_service[:prefix]} #{video_relay_service[:telephone_number]}"
-              render_govspeak(content, root_class: "content-block__body")
-            end
-          end
-
-          def bsl_details
-            bsl_guidance = item[:bsl_guidance] || {}
-
-            render_govspeak(bsl_guidance[:value], root_class: "content-block__body") if bsl_guidance[:show]
-          end
-
-          def opening_hours
-            opening_hours = item[:opening_hours] || {}
-
-            render_govspeak(opening_hours[:opening_hours], root_class: "content-block__body") if opening_hours[:show_opening_hours]
-          end
-
-          def opening_hours_list_item(item)
-            content_tag(:li, "#{item[:day_from]} to #{item[:day_to]}, #{item[:time_from]} to #{item[:time_to]}")
-          end
-
-          def call_charges_link
-            call_charges = item[:call_charges] || {}
-
-            if call_charges[:show_call_charges_info_url]
-              content_tag(:p) do
-                concat content_tag(:a,
-                                   call_charges[:label],
-                                   class: "content-block__link",
-                                   href: call_charges[:call_charges_info_url])
-              end
-            end
-          end
-        end
-      end
-    end
-  end
-end

data/lib/content_block_tools/presenters/contact_presenter.rb

@@ -1,40 +0,0 @@
-module ContentBlockTools
-  module Presenters
-    class ContactPresenter < BasePresenter
-      include ActionView::Helpers::TextHelper
-      include ContentBlockTools::Govspeak
-
-      BASE_TAG_TYPE = :div
-
-      FIELD_PRESENTERS = {
-        email_address: ContentBlockTools::Presenters::FieldPresenters::Contact::EmailAddressPresenter,
-      }.freeze
-
-      BLOCK_PRESENTERS = {
-        addresses: ContentBlockTools::Presenters::BlockPresenters::Contact::AddressPresenter,
-        telephones: ContentBlockTools::Presenters::BlockPresenters::Contact::TelephonePresenter,
-        email_addresses: ContentBlockTools::Presenters::BlockPresenters::Contact::EmailAddressPresenter,
-        contact_links: ContentBlockTools::Presenters::BlockPresenters::Contact::ContactLinkPresenter,
-      }.freeze
-
-      has_embedded_objects :addresses, :email_addresses, :telephones, :contact_links
-
-    private
-
-      def default_content
-        content_tag(:div, class: "vcard") do
-          concat content_tag(:p, content_block.title, class: "fn org content-block__title")
-          concat render_govspeak(content_block.details[:description]) if content_block.details[:description]
-          embedded_objects.each do |object|
-            items = send(object)
-            concat(items.map { |item| presenter_for_object_type(object).new(item, content_block:).render }.join.html_safe)
-          end
-        end
-      end
-
-      def presenter_for_object_type(type)
-        "ContentBlockTools::Presenters::BlockPresenters::Contact::#{type.to_s.singularize.underscore.camelize}Presenter".constantize
-      end
-    end
-  end
-end

data/lib/content_block_tools/presenters/pension_presenter.rb

@@ -1,11 +0,0 @@
-module ContentBlockTools
-  module Presenters
-    class PensionPresenter < BasePresenter
-    private
-
-      def default_content
-        content_block.title
-      end
-    end
-  end
-end