content_block_tools 0.5.4 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 317a33abd963522a97d5421d905b916f8c178935645081bba320b984ed0108b4
-  data.tar.gz: 9503e913fb0c5826cfbafae81e7263351e149b44009e0bb836ac1d1dc00c8ca4
+  metadata.gz: 1b432a7791692f66578f8ac72f9e02548436de162c781c1359758779c72d5beb
+  data.tar.gz: 94df9abb5ba25e1338396802d0040659e836d1a4aca0825a86921f7045281f1b
 SHA512:
-  metadata.gz: 716b6950c8633ccc8f80eba30d685e117ce638471f9eadc5c7353e8189a2e2d0eb263e86dd4f6e340cc68d3c54b234e758fc3211ff0078e5ab0dba12c298695e
-  data.tar.gz: '078faf1ebb791e906f33744cf8dd0f3a6a8c5355c5b2296926bc68eaccff13c931df39786ac59b5af9958fbe61b7162a9868cb50edf5afb94e4b7f33a06f39d5'
+  metadata.gz: 1ef1c7687153fb85bb6c92f732846f6227ed2f68f19f7c7660ac0a8c0c9d11f1943da3749d35072ac1a5f34f9402a953480597dbac7b6b11397cb3d1bbce9632
+  data.tar.gz: 776b3c2b907514517da5e47b206f96def040815b76edfdab10cd74b20092767a814d28f093de51358b36100ae5be7998025014e51ec773df31c90dc6288098df

data/.gitignore

@@ -10,4 +10,10 @@
 # rspec failure tracking
 .rspec_status
 Gemfile.lock
+
+# DS Store
 /.DS_Store
+lib/.DS_Store
+spec/.DS_Store
+lib/content_block_tools/.DS_Store
+spec/content_block_tools/.DS_Store

data/CHANGELOG.md

@@ -7,6 +7,14 @@
   useful summary for people upgrading their application, not a replication
   of the commit log.
 
+## 0.6.1
+
+- Handle multiple telephone numbers for a Contact block ([48](https://github.com/alphagov/govuk_content_block_tools/pull/48)
+
+## 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/block_presenters/contact/telephone_presenter.rb

@@ -4,12 +4,26 @@ module ContentBlockTools
       module Contact
         class TelephonePresenter < ContentBlockTools::Presenters::BlockPresenters::BasePresenter
           def render
-            content_tag(:p, class: "govuk-body govuk-!-margin-bottom-4") do
-              concat content_tag(:span, title_content)
+            content_tag(:div, class: "govuk-body govuk-!-margin-bottom-4") do
+              concat number_list
+            end
+          end
+
+          def number_list
+            content_tag(:ul, class: "govuk-!-padding-0", style: "list-style: none;") do
+              item[:telephone_numbers].each do |number|
+                concat number_list_item(number)
+              end
+            end
+          end
+
+          def number_list_item(number)
+            content_tag(:li) do
+              concat content_tag(:span, "#{number[:label]}: ")
               concat content_tag(:a,
-                                 item[:telephone],
+                                 number[:telephone_number],
                                  class: "govuk-link",
-                                 href: "tel:#{CGI.escape item[:telephone]}")
+                                 href: "tel:#{CGI.escape number[:telephone_number]}")
             end
           end
         end

data/lib/content_block_tools/presenters/contact_presenter.rb

@@ -9,6 +9,11 @@ module ContentBlockTools
         email_address: ContentBlockTools::Presenters::FieldPresenters::Contact::EmailAddressPresenter,
       }.freeze
 
+      BLOCK_PRESENTERS = {
+        addresses: ContentBlockTools::Presenters::BlockPresenters::Contact::AddressPresenter,
+        telephones: ContentBlockTools::Presenters::BlockPresenters::Contact::TelephonePresenter,
+      }.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.1"
 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.1
 platform: ruby
 authors:
 - GOV.UK Dev