content_block_tools 1.1.1 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fb006e7903ec6cae4253ae9332308c42accf3f4e424da21e3bdb3d5ce2efe89c
-  data.tar.gz: 5cfd7df4e3bfa56fcd4b1333e7d09d0ab26b71de12cc6e8f7f13855493d5d6c6
+  metadata.gz: 31aa623f594711bad29bb3e3dcd8540565f469a3432d9fd4a2d6d01e00cbef99
+  data.tar.gz: dbe0f54e0ed010a2cb110259ca56d81cadd782373119aa632d7b447c03fd10c2
 SHA512:
-  metadata.gz: 4d084a5f1684a8189d3b38db0d8df0a453e461b7c96aba6612493a326232312593de5fb0ec97402141c8865862fd36b09c6ff7bfca5796c287aedce4b2e93e40
-  data.tar.gz: ddf80b36ba7d6292219afb73df52a6df83b04640c8a2befec36054e9382cd34d5b6b573de844e67dfdbe91d3f17fa72ec8cba3df12d0c40d1112dcaee3576eb0
+  metadata.gz: e8f105b4fda9c8680ebf69f1bc48f79278e861050035a5febeac7d0cc932f1dc96dfcc793f1cb4c12161b57e24d17bc55da55b13ce125efe7d0118bd0648bc58
+  data.tar.gz: 868af6b530f82d1bc74877aa6baca6f20ebd86c07cd62b1ce233ddae724865676bca53d249ecce791a75377411761f073b094aa14265b6899baf7c36f1ebab3b

data/app/assets/stylesheets/content_block_tools.scss

@@ -1,25 +1,26 @@
-@import "govuk/core/links";
 @import "govuk/core/lists";
 @import "govuk/core/typography";
 
-@import "blocks/contact";
-
 .content-block {
-  &__body {
-    @extend %govuk-body-m;
+  &__contact-key, &__contact-value, &__contact-list {
+    margin: 0;
+    padding: 0;
   }
 
-  ul#{&}__list {
-    @extend %govuk-list;
-    margin-left: 0;
+  &__contact-list {
+    .content-block__contact-key {
+      @extend %govuk-heading-m;
+    }
 
-    & > li {
-      list-style: none;
-      margin-bottom: govuk-spacing(1);
+    &--nested {
+      .content-block__contact-key {
+        @extend %govuk-heading-s;
+      }
     }
   }
 
-  &__link {
-    @extend %govuk-link;
+  ul.content-block__list {
+    @extend %govuk-list;
+    margin-left: 0;
   }
 }

data/app/components/content_block_tools/base_component.rb

@@ -1,5 +1,6 @@
 module ContentBlockTools
   class BaseComponent < ViewComponent::Base
+    include ContentBlockTools::Govspeak
     def render
       render_in(view_context)
     end

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

@@ -1,18 +1,23 @@
-<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 %>
+<dl class="vcard content-block__contact-list">
+  <dt class="content-block__contact-key fn org"><%= content_block.title %></dt>
 
   <% 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 %>
+    <dd class="content-block__contact-value">
+      <%= render_govspeak(content_block.details[:description]) if content_block.details[:description] %>
+      <dl class="content-block__contact-list--nested">
+        <% BLOCK_TYPES.each do |block_type| %>
+         <% content_for_block_type(block_type).each do |item| %>
+            <dt class="content-block__contact-key"><%= item[:title] %></dt>
+            <dd class="content-block__contact-value">
+              <%= component_for_block_type(block_type).new(item:).render.html_safe %>
+            </dd>
+          <% end %>
+        <% end %>
+      </dl>
+    </dd>
   <% else %>
-    <%= component_for_block_type(block_type).new(item: item_to_render).render.html_safe %>
+    <dd class="content-block__contact-value">
+      <%= component_for_block_type(block_type).new(item: item_to_render).render.html_safe %>
+    </dd>
   <% end %>
-</div>
+</dl>

data/app/components/content_block_tools/contact_component.rb

@@ -16,10 +16,8 @@ module ContentBlockTools
       "ContentBlockTools::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
+    def content_for_block_type(block_type)
+      content_block.details.fetch(block_type, {}).values
     end
 
     def item_to_render

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

@@ -1,4 +1,4 @@
-<p class="adr content-block__body">
+<p class="adr">
   <%= lines.map { |field, value| address_line(field, value) }.join(",<br />").html_safe %>
 </p>
 

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

@@ -1,8 +1,6 @@
 module ContentBlockTools
   module Contacts
     class AddressComponent < ContentBlockTools::BaseComponent
-      include ContentBlockTools::Govspeak
-
       def initialize(item:)
         @item = item
       end

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

@@ -1,6 +1,6 @@
 <ul class="content-block__list">
   <li>
-    <a href="<%= item[:url] %>" class="url content-block__link">
+    <a href="<%= item[:url] %>" class="url">
       <%= link_text %>
     </a>
   </li>

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

@@ -1,8 +1,6 @@
 module ContentBlockTools
   module Contacts
     class ContactLinkComponent < ContentBlockTools::BaseComponent
-      include ContentBlockTools::Govspeak
-
       def initialize(item:)
         @item = item
       end

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

@@ -1,6 +1,6 @@
 <ul class="content-block__list">
   <li>
-    <a href="<%= "mailto:#{item[:email_address]}#{query_params}" %>" class="email content-block__link">
+    <a href="<%= "mailto:#{item[:email_address]}#{query_params}" %>" class="email">
       <%= link_text %>
     </a>
   </li>

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

@@ -1,8 +1,6 @@
 module ContentBlockTools
   module Contacts
     class EmailAddressComponent < ContentBlockTools::BaseComponent
-      include ContentBlockTools::Govspeak
-
       def initialize(item:)
         @item = item
       end

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

@@ -1,5 +1,5 @@
 <% if item[:description] %>
-  <%= render_govspeak(item[:description], root_class: "content-block__body") %>
+  <%= render_govspeak(item[:description]) %>
 <% end %>
 
 <ul class="content-block__list">
@@ -16,16 +16,16 @@
 <% end %>
 
 <% if show_bsl_guidance? %>
-  <%= render_govspeak(bsl_guidance[:value], root_class: "content-block__body") %>
+  <%= render_govspeak(bsl_guidance[:value]) %>
 <% end %>
 
 <% if show_opening_hours? %>
-  <%= render_govspeak(opening_hours[:opening_hours], root_class: "content-block__body") %>
+  <%= render_govspeak(opening_hours[:opening_hours]) %>
 <% end %>
 
 <% if show_call_charges? %>
-  <p class="content-block__body">
-    <a href="<%= call_charges[:call_charges_info_url] %>" class="content-block__link">
+  <p>
+    <a href="<%= call_charges[:call_charges_info_url] %>">
       <%= call_charges[:label] %>
     </a>
   </p>

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

@@ -1,8 +1,6 @@
 module ContentBlockTools
   module Contacts
     class TelephoneComponent < ContentBlockTools::BaseComponent
-      include ContentBlockTools::Govspeak
-
       def initialize(item:)
         @item = item
       end

data/lib/content_block_tools/content_block.rb

@@ -40,6 +40,7 @@ module ContentBlockTools
   #  @return [String]
   class ContentBlock
     include ActionView::Helpers::TagHelper
+    class UnknownComponentError < StandardError; end
 
     CONTENT_BLOCK_PREFIX = "content_block_".freeze
 
@@ -87,7 +88,7 @@ module ContentBlockTools
 
     def content
       field_names.present? ? field_or_block_content : component.new(content_block: self).render
-    rescue NameError
+    rescue UnknownComponentError
       title
     end
 
@@ -110,6 +111,8 @@ module ContentBlockTools
 
     def component
       "ContentBlockTools::#{document_type.camelize}Component".constantize
+    rescue NameError
+      raise UnknownComponentError
     end
 
     def field_presenter(field)

data/lib/content_block_tools/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: content_block_tools
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.2.0
 platform: ruby
 authors:
 - GOV.UK Dev
@@ -65,6 +65,20 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 5.1.18
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: actionview
   requirement: !ruby/object:Gem::Requirement
@@ -128,7 +142,6 @@ extensions: []
 extra_rdoc_files: []
 files:
 - README.md
-- app/assets/stylesheets/blocks/_contact.scss
 - app/assets/stylesheets/content_block_tools.scss
 - app/components/content_block_tools/base_component.rb
 - app/components/content_block_tools/contact_component.html.erb

data/app/assets/stylesheets/blocks/_contact.scss

@@ -1,13 +0,0 @@
-@import "govuk/core/typography";
-
-.content-block--contact {
-  .content-block {
-    &__title {
-      @extend %govuk-heading-m;
-    }
-
-    &__subtitle {
-      @extend %govuk-heading-s;
-    }
-  }
-}