content_block_tools 0.5.4 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 317a33abd963522a97d5421d905b916f8c178935645081bba320b984ed0108b4
-  data.tar.gz: 9503e913fb0c5826cfbafae81e7263351e149b44009e0bb836ac1d1dc00c8ca4
+  metadata.gz: c89dc222cfb30a2a3ab8263c0203fc06fb59f5c19140b49104fa76e3a55ebf76
+  data.tar.gz: 750d97c98bea404136dd7ab33416409cd9cb352ae587268c405c8e22236d984c
 SHA512:
-  metadata.gz: 716b6950c8633ccc8f80eba30d685e117ce638471f9eadc5c7353e8189a2e2d0eb263e86dd4f6e340cc68d3c54b234e758fc3211ff0078e5ab0dba12c298695e
-  data.tar.gz: '078faf1ebb791e906f33744cf8dd0f3a6a8c5355c5b2296926bc68eaccff13c931df39786ac59b5af9958fbe61b7162a9868cb50edf5afb94e4b7f33a06f39d5'
+  metadata.gz: ed10a2a905af5a7747f8222d2ed9c815140371651ed2e0d9082d68c4b3ac333b1f6dc7d7c20cf6f2f4bfb376ab5896143d549760cb43eb0f01a8e2dc5520f4d4
+  data.tar.gz: 1eb7eb43cfbcf21cddd296d4cc1dd7985cd6b3d3ceba02bf7bab78bcbc7ce4c2aee976eabd685b2f16b39b38632c224c03c2b8909c7d70e2178550aabbce7632

data/CHANGELOG.md

@@ -7,6 +7,10 @@
   useful summary for people upgrading their application, not a replication
   of the commit log.
 
+## 0.6.0
+
+- Support rendering nested blocks ([45](https://github.com/alphagov/govuk_content_block_tools/pull/45))
+
 ## 0.5.4
 
 - Remove old email_address and postal_address types ([38](https://github.com/alphagov/govuk_content_block_tools/pull/38))

data/lib/content_block_tools/presenters/base_presenter.rb

@@ -10,6 +10,9 @@ module ContentBlockTools
       # 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
 
@@ -59,26 +62,28 @@ module ContentBlockTools
       # {#content}
       def content
         ContentBlockTools.logger.info("Getting content for content block #{content_block.content_id}")
-        if field_names.present?
-          content_for_fields
-        else
-          default_content
-        end
+        field_names.present? ? content_for_field_names : default_content
       end
 
       def default_content
         content_block.title
       end
 
-      def content_for_fields
+      def content_for_field_names
         content = content_block.details.deep_symbolize_keys.dig(*field_names)
+
         if content.blank?
           ContentBlockTools.logger.warn("Content not found for content block #{content_block.content_id} and fields #{field_names}")
-          content_block.embed_code
-        else
-          presenter = field_presenter || ContentBlockTools::Presenters::FieldPresenters::BasePresenter
-          presenter.new(content).render
+          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
       end
 
       def field_names
@@ -95,6 +100,10 @@ module ContentBlockTools
         @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 ? :span : self.class::BASE_TAG_TYPE
       end

data/lib/content_block_tools/presenters/contact_presenter.rb

@@ -9,6 +9,10 @@ module ContentBlockTools
         email_address: ContentBlockTools::Presenters::FieldPresenters::Contact::EmailAddressPresenter,
       }.freeze
 
+      BLOCK_PRESENTERS = {
+        addresses: ContentBlockTools::Presenters::BlockPresenters::Contact::AddressPresenter,
+      }.freeze
+
       has_embedded_objects :addresses, :email_addresses, :telephones, :contact_forms
 
     private

data/lib/content_block_tools/version.rb

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

metadata

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