content_block_tools 0.6.2 → 0.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2c9c67068e398c086a3a7def3a3e5ade924454659704267cdec35f76c8c0d004
-  data.tar.gz: 5ee2169390f8aa091b712c893aa3d0bf08375ce9d66f23f74e32500990c2bf00
+  metadata.gz: 3b4f73d4250542e48814f4b1a7f9963315909983df3cd8f306316c00945c0f27
+  data.tar.gz: b376678520df72388f10802a1652fa3819a0a3ad13d295ed681a5c7bdaf20b1d
 SHA512:
-  metadata.gz: 9a943d1e6f7e28ba452e3a5b690cb069c2365dc96b27c0a348905f149c97410ba65727bb7112842516bd72de05ef513df972083cbff0a6ecd0b1fcbe23628d70
-  data.tar.gz: eda17b6958df99a8e5e1e47c172ade147add6ce11ad5366975d2448812d25b1f85b1bcd286fdf6b00f9e452d0dc60fd8e0da973644d6b7c8833358f5a46b31b1
+  metadata.gz: 3ab65c991be77d1feb1f8720e9d36d193bfacae7a5e57cebad50ea894ea28a1ceac34c03df4660f0fc8d7f2ecc2195e005fd2a33133540502655e19334fc7a27
+  data.tar.gz: aab61f2f75566b7e869ac36fc8535ad5f5a48bb8dce7304952cdf3a5f056f10e9b396c4e0cf5d7d5491d54535f6f4c131f73fc097017edb1b597adb2a6abf994

data/CHANGELOG.md

@@ -7,6 +7,10 @@
   useful summary for people upgrading their application, not a replication
   of the commit log.
 
+## 0.6.3
+
+- Fix rendering telephone numbers and rendering individual nested fields ([53](https://github.com/alphagov/govuk_content_block_tools/pull/53))
+
 ## 0.6.2
 
 - Handle UK call charges for a Contact block, remove links from telephone numbers ([51](https://github.com/alphagov/govuk_content_block_tools/pull/51))

data/lib/content_block_tools/presenters/base_presenter.rb

@@ -70,20 +70,12 @@ module ContentBlockTools
       end
 
       def content_for_field_names
-        content = content_block.details.deep_symbolize_keys.dig(*field_names)
-
-        if content.blank?
+        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
 
-        presenter = if content.is_a?(Hash)
-                      block_presenter || ContentBlockTools::Presenters::BlockPresenters::BasePresenter
-                    else
-                      field_presenter || ContentBlockTools::Presenters::FieldPresenters::BasePresenter
-                    end
-
-        presenter.new(content).render
+        field_or_block_presenter.new(field_or_block_content).render
       end
 
       def field_names
@@ -91,11 +83,33 @@ module ContentBlockTools
           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(&:to_sym)
+            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
@@ -105,7 +119,7 @@ module ContentBlockTools
       end
 
       def base_tag
-        field_names ? :span : self.class::BASE_TAG_TYPE
+        field_names ? field_or_block_presenter::BASE_TAG_TYPE : self.class::BASE_TAG_TYPE
       end
 
       def embedded_objects_of_type(type)

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

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

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

@@ -3,6 +3,8 @@ module ContentBlockTools
     module BlockPresenters
       module Contact
         class TelephonePresenter < ContentBlockTools::Presenters::BlockPresenters::BasePresenter
+          BASE_TAG_TYPE = :div
+
           def render
             content_tag(:div, class: "govuk-body") do
               concat number_list
@@ -11,7 +13,7 @@ module ContentBlockTools
           end
 
           def number_list
-            content_tag(:ul, class: "govuk-!-padding-0 govuk-!-margin-0", style: "list-style: none;") do
+            content_tag(:ul, class: "govuk-!-padding-0 govuk-!-margin-0 govuk-list") do
               item[:telephone_numbers].each do |number|
                 concat number_list_item(number)
               end

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

@@ -4,6 +4,7 @@ module ContentBlockTools
       class BasePresenter
         include ActionView::Context
         include ActionView::Helpers::TagHelper
+        BASE_TAG_TYPE = :span
 
         attr_reader :field
 

data/lib/content_block_tools/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: content_block_tools
 version: !ruby/object:Gem::Version
-  version: 0.6.2
+  version: 0.6.3
 platform: ruby
 authors:
 - GOV.UK Dev