content_block_tools 1.1.1 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fb006e7903ec6cae4253ae9332308c42accf3f4e424da21e3bdb3d5ce2efe89c
-  data.tar.gz: 5cfd7df4e3bfa56fcd4b1333e7d09d0ab26b71de12cc6e8f7f13855493d5d6c6
+  metadata.gz: dd6b4006445fa5c5a11bf7f14e6ccfcd1819a9bc043af6f3ad19a56334d54172
+  data.tar.gz: 8c513039b815152a5a3bdb0171dc89e4ec6934068ebc46c25c93d64801943d1f
 SHA512:
-  metadata.gz: 4d084a5f1684a8189d3b38db0d8df0a453e461b7c96aba6612493a326232312593de5fb0ec97402141c8865862fd36b09c6ff7bfca5796c287aedce4b2e93e40
-  data.tar.gz: ddf80b36ba7d6292219afb73df52a6df83b04640c8a2befec36054e9382cd34d5b6b573de844e67dfdbe91d3f17fa72ec8cba3df12d0c40d1112dcaee3576eb0
+  metadata.gz: 2c96843959e74701746dc5aa20e8b605ad811c810b703f55d6d2cd3ad84a5c17c43bfefe741a5099fedc31f3a67480ee3c4e1d9d8a0ef24d9d4fe4f9ea3eec54
+  data.tar.gz: d7a5a5463e75a58b615fa680e4f0ef264d95e1b5c14c2474b40fdc2e61c9bcb01064052cbcf70461968c059206b3fb288ea658328b9554bd3a15e002e17283a9

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,13 +1,13 @@
 <div class="vcard">
   <p class="fn org content-block__title"><%= content_block.title %></p>
 
-  <% if block_type.present? && content_block.details[:description] %>
+  <% 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| %>
+     <% content_for_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 %>

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.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.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.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.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.1.2"
 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.1.2
 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