content_block_tools 0.5.3 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: eae6ff92c882ed6bfee080071382b326d498eb2c968c1a647862aec6a256c2ef
-  data.tar.gz: 01166220c324cc80e9aba6a6267dc52f63e1802e8f2a8ae1320146829bbf3d26
+  metadata.gz: c89dc222cfb30a2a3ab8263c0203fc06fb59f5c19140b49104fa76e3a55ebf76
+  data.tar.gz: 750d97c98bea404136dd7ab33416409cd9cb352ae587268c405c8e22236d984c
 SHA512:
-  metadata.gz: 000253f63e76b3a3c7ff5fa020aa1b96e8b05236cdc5fbe9b4757afe26b48deff4a052098a4ec39bb42502b30d291c6cb69a68cf0ad08523b49d43032bd30aec
-  data.tar.gz: 7fb4acf5cbfae9c4ed46df225a81e812b18d78c0b52fe834ce72cd4275a6e23d90e49c79094729a2b269dea9f430d0a0a1536dc77f64920df65a2256d1da4467
+  metadata.gz: ed10a2a905af5a7747f8222d2ed9c815140371651ed2e0d9082d68c4b3ac333b1f6dc7d7c20cf6f2f4bfb376ab5896143d549760cb43eb0f01a8e2dc5520f4d4
+  data.tar.gz: 1eb7eb43cfbcf21cddd296d4cc1dd7985cd6b3d3ceba02bf7bab78bcbc7ce4c2aee976eabd685b2f16b39b38632c224c03c2b8909c7d70e2178550aabbce7632

data/CHANGELOG.md

@@ -7,6 +7,14 @@
   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))
+
 ## 0.5.3
 
 - Add spacing to contact item titles ([35](https://github.com/alphagov/govuk_content_block_tools/pull/35))

data/README.md

@@ -19,13 +19,13 @@ or add it to your Gemfile
 To find embed code in a block of text, use `ContentBlockReference.find_all_in_document`:
 
 ```ruby
-content = "Hello - here is a embed code {{embed:content_block_email_address:be24ee44-b636-4a3e-b979-0da27b4a8e62}}"
+content = "Hello - here is a embed code {{embed:content_block_pension:be24ee44-b636-4a3e-b979-0da27b4a8e62}}"
 ContentBlockReference.find_all_in_document(content)
 # =>
 #[#<data ContentBlockTools::ContentBlockReference
-#  document_type="content_block_email_address",
+#  document_type="content_block_pension",
 #  content_id="be24ee44-b636-4a3e-b979-0da27b4a8e62",
-#  embed_code="{{embed:content_block_email_address:be24ee44-b636-4a3e-b979-0da27b4a8e62}}">]
+#  embed_code="{{embed:content_block_pension:be24ee44-b636-4a3e-b979-0da27b4a8e62}}">]
 ```
 
 ### Rendering a content block

data/lib/content_block_tools/content_block.rb

@@ -23,7 +23,7 @@ module ContentBlockTools
   #   will be used to render the content block. All supported document_types are documented in
   #   {ContentBlockTools::ContentBlockReference::SUPPORTED_DOCUMENT_TYPES}
   #   @example
-  #     content_block.document_type #=> "content_block_email_address"
+  #     content_block.document_type #=> "content_block_pension"
   #   @return [String] the document type
   #   @api public
   #
@@ -37,15 +37,13 @@ module ContentBlockTools
   # @!attribute [r] embed_code
   #  The embed_code used for a block containing optional field name
   #  @example
-  #    content_block_reference.embed_code #=> "{{embed:content_block_email_address:2b92cade-549c-4449-9796-e7a3957f3a86}}"
-  #    content_block_reference.embed_code #=> "{{embed:content_block_postal_address:2b92cade-549c-4449-9796-e7a3957f3a86/field_name}}"
+  #    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_email_address" => ContentBlockTools::Presenters::EmailAddressPresenter,
-      "content_block_postal_address" => ContentBlockTools::Presenters::PostalAddressPresenter,
       "content_block_pension" => ContentBlockTools::Presenters::PensionPresenter,
     }.freeze
 

data/lib/content_block_tools/content_block_reference.rb

@@ -9,7 +9,7 @@ module ContentBlockTools
   #   will be used to render the content block. All supported document_types are documented in
   #   {ContentBlockTools::ContentBlockReference::SUPPORTED_DOCUMENT_TYPES}
   #   @example
-  #     content_block_reference.document_type #=> "content_block_email_address"
+  #     content_block_reference.document_type #=> "content_block_pension"
   #   @return [String] the document type
   #   @api public
   #
@@ -24,11 +24,11 @@ module ContentBlockTools
   # @!attribute [r] embed_code
   #   The embed_code used for a block
   #   @example
-  #     content_block_reference.embed_code #=> "{{embed:content_block_email_address:2b92cade-549c-4449-9796-e7a3957f3a86}}"
+  #     content_block_reference.embed_code #=> "{{embed:content_block_pension:2b92cade-549c-4449-9796-e7a3957f3a86}}"
   #   @return [String]
   class ContentBlockReference < Data
     # An array of the supported document types
-    SUPPORTED_DOCUMENT_TYPES = %w[contact content_block_email_address content_block_postal_address content_block_pension content_block_contact].freeze
+    SUPPORTED_DOCUMENT_TYPES = %w[contact content_block_pension content_block_contact].freeze
     # The regex used to find UUIDs
     UUID_REGEX = /[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}/
     # The regex used to find content ID aliases

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.3"
+  VERSION = "0.6.0"
 end

data/lib/content_block_tools.rb

@@ -14,8 +14,6 @@ require "content_block_tools/presenters/block_presenters/contact/telephone_prese
 
 require "content_block_tools/presenters/base_presenter"
 require "content_block_tools/presenters/contact_presenter"
-require "content_block_tools/presenters/email_address_presenter"
-require "content_block_tools/presenters/postal_address_presenter"
 require "content_block_tools/presenters/pension_presenter"
 
 require "content_block_tools/content_block"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: content_block_tools
 version: !ruby/object:Gem::Version
-  version: 0.5.3
+  version: 0.6.0
 platform: ruby
 authors:
 - GOV.UK Dev
@@ -112,11 +112,9 @@ files:
 - 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/email_address_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/postal_address_presenter.rb
 - lib/content_block_tools/version.rb
 homepage: https://github.com/alphagov/content_block_tools
 licenses:

data/lib/content_block_tools/presenters/email_address_presenter.rb

@@ -1,14 +0,0 @@
-module ContentBlockTools
-  module Presenters
-    class EmailAddressPresenter < BasePresenter
-    private
-
-      def content
-        content_tag(:a,
-                    content_block.details[:email_address],
-                    class: "govuk-link",
-                    href: "mailto:#{content_block.details[:email_address]}")
-      end
-    end
-  end
-end

data/lib/content_block_tools/presenters/postal_address_presenter.rb

@@ -1,11 +0,0 @@
-module ContentBlockTools
-  module Presenters
-    class PostalAddressPresenter < BasePresenter
-    private
-
-      def default_content
-        "#{content_block.details[:line_1]}, #{content_block.details[:town_or_city]}, #{content_block.details[:postcode]}"
-      end
-    end
-  end
-end