content_block_tools 0.5.1 → 0.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a8de300ea972686e97b1fcbe422979f9a3876060ae7e69d575b8270e65c0c509
-  data.tar.gz: 4db995f515fdbcb10c22695f03e74ba7d0d5c2f037b9870c52e274a54bee7674
+  metadata.gz: eae6ff92c882ed6bfee080071382b326d498eb2c968c1a647862aec6a256c2ef
+  data.tar.gz: 01166220c324cc80e9aba6a6267dc52f63e1802e8f2a8ae1320146829bbf3d26
 SHA512:
-  metadata.gz: c74f391d6df0c5feee05dfbfafdb59576a99226029252c849a8a5714b44ea87a09fc54b4583e0de5424ccb9dfcc131d02c8477b309c3230c9536e8cb09e191df
-  data.tar.gz: b24e0e97e96edd7791cf586282c740feb13a2832a0d1c59234f93539e2b8b652851a387675a147703ac10ca041120c0ac150af803dad49e7cc6a1dcac5fc3dcc
+  metadata.gz: 000253f63e76b3a3c7ff5fa020aa1b96e8b05236cdc5fbe9b4757afe26b48deff4a052098a4ec39bb42502b30d291c6cb69a68cf0ad08523b49d43032bd30aec
+  data.tar.gz: 7fb4acf5cbfae9c4ed46df225a81e812b18d78c0b52fe834ce72cd4275a6e23d90e49c79094729a2b269dea9f430d0a0a1536dc77f64920df65a2256d1da4467

data/CHANGELOG.md

@@ -7,6 +7,15 @@
   useful summary for people upgrading their application, not a replication
   of the commit log.
 
+## 0.5.3
+
+- Add spacing to contact item titles ([35](https://github.com/alphagov/govuk_content_block_tools/pull/35))
+- Add new fields to contact items ([35](https://github.com/alphagov/govuk_content_block_tools/pull/35))
+
+## 0.5.2
+
+- Use `deep_symbolize_keys` when initializing a block's details  ([31](https://github.com/alphagov/govuk_content_block_tools/pull/31))
+
 ## 0.5.1
 
 - Update dependencies

data/lib/content_block_tools/content_block.rb

@@ -60,7 +60,7 @@ module ContentBlockTools
     end
 
     def details
-      to_h[:details].symbolize_keys
+      to_h[:details].deep_symbolize_keys
     end
   end
 end

data/lib/content_block_tools/presenters/base_presenter.rb

@@ -10,6 +10,16 @@ module ContentBlockTools
       # A lookup of presenters for particular fields - can be overridden in a subclass
       FIELD_PRESENTERS = {}.freeze
 
+      def self.has_embedded_objects(*object_types)
+        @embedded_objects = object_types
+
+        object_types.each do |object_type|
+          define_method(object_type) do
+            embedded_objects_of_type(object_type)
+          end
+        end
+      end
+
       # Returns a new presenter object
       #
       # @param [{ContentBlockTools::ContentBlock}] content_block  A content block object
@@ -88,6 +98,14 @@ module ContentBlockTools
       def base_tag
         field_names ? :span : self.class::BASE_TAG_TYPE
       end
+
+      def embedded_objects_of_type(type)
+        content_block.details.fetch(type, {}).values
+      end
+
+      def embedded_objects
+        self.class.instance_variable_get("@embedded_objects")
+      end
     end
   end
 end

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

@@ -0,0 +1,22 @@
+module ContentBlockTools
+  module Presenters
+    module BlockPresenters
+      class BasePresenter
+        include ActionView::Context
+        include ActionView::Helpers::TextHelper
+
+        attr_reader :item
+
+        def initialize(item)
+          @item = item
+        end
+
+        def title_content
+          "#{item[:title]}: "
+        end
+
+        def render; end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,21 @@
+module ContentBlockTools
+  module Presenters
+    module BlockPresenters
+      module Contact
+        class AddressPresenter < ContentBlockTools::Presenters::BlockPresenters::BasePresenter
+          def render
+            content_tag(:p, class: "govuk-body govuk-!-margin-bottom-4") do
+              [
+                item[:street_address],
+                item[:locality],
+                item[:region],
+                item[:postal_code],
+                item[:country],
+              ].compact_blank.join(",<br/>").html_safe
+            end
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,19 @@
+module ContentBlockTools
+  module Presenters
+    module BlockPresenters
+      module Contact
+        class ContactFormPresenter < ContentBlockTools::Presenters::BlockPresenters::BasePresenter
+          def render
+            content_tag(:p, class: "govuk-body govuk-!-margin-bottom-4") do
+              concat content_tag(:span, title_content)
+              concat content_tag(:a,
+                                 item[:url],
+                                 class: "govuk-link",
+                                 href: item[:url])
+            end
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,19 @@
+module ContentBlockTools
+  module Presenters
+    module BlockPresenters
+      module Contact
+        class EmailAddressPresenter < ContentBlockTools::Presenters::BlockPresenters::BasePresenter
+          def render
+            content_tag(:p, class: "govuk-body govuk-!-margin-bottom-4") do
+              concat content_tag(:span, title_content)
+              concat content_tag(:a,
+                                 item[:email_address],
+                                 class: "govuk-link",
+                                 href: "mailto:#{item[:email_address]}")
+            end
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,19 @@
+module ContentBlockTools
+  module Presenters
+    module BlockPresenters
+      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)
+              concat content_tag(:a,
+                                 item[:telephone],
+                                 class: "govuk-link",
+                                 href: "tel:#{CGI.escape item[:telephone]}")
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/content_block_tools/presenters/contact_presenter.rb

@@ -9,42 +9,22 @@ module ContentBlockTools
         email_address: ContentBlockTools::Presenters::FieldPresenters::Contact::EmailAddressPresenter,
       }.freeze
 
+      has_embedded_objects :addresses, :email_addresses, :telephones, :contact_forms
+
     private
 
       def default_content
         content_tag(:div, class: "contact") do
           concat content_tag(:p, content_block.title, class: "govuk-body")
-          concat(email_addresses.map { |email_address| email_address_content(email_address) }.join.html_safe) if email_addresses.any?
-          concat(phone_numbers.map { |phone_number| phone_number_content(phone_number) }.join.html_safe) if phone_numbers.any?
+          embedded_objects.each do |object|
+            items = send(object)
+            concat(items.map { |item| presenter_for_object_type(object).new(item).render }.join.html_safe)
+          end
         end
       end
 
-      def email_address_content(email_address)
-        content_tag(:p, class: "govuk-body govuk-!-margin-bottom-4") do
-          concat content_tag(:span, email_address[:title])
-          concat content_tag(:a,
-                             email_address[:email_address],
-                             class: "govuk-link",
-                             href: "mailto:#{email_address[:email_address]}")
-        end
-      end
-
-      def phone_number_content(phone_number)
-        content_tag(:p, class: "govuk-body govuk-!-margin-bottom-4") do
-          concat content_tag(:span, phone_number[:title])
-          concat content_tag(:a,
-                             phone_number[:telephone],
-                             class: "govuk-link",
-                             href: "tel:#{CGI.escape phone_number[:telephone]}")
-        end
-      end
-
-      def email_addresses
-        content_block.details[:email_addresses]&.values
-      end
-
-      def phone_numbers
-        content_block.details[:telephones]&.values
+      def presenter_for_object_type(type)
+        "ContentBlockTools::Presenters::BlockPresenters::Contact::#{type.to_s.singularize.underscore.camelize}Presenter".constantize
       end
     end
   end

data/lib/content_block_tools/version.rb

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

data/lib/content_block_tools.rb

@@ -6,6 +6,12 @@ require "uri"
 require "content_block_tools/presenters/field_presenters/base_presenter"
 require "content_block_tools/presenters/field_presenters/contact/email_address_presenter"
 
+require "content_block_tools/presenters/block_presenters/base_presenter"
+require "content_block_tools/presenters/block_presenters/contact/address_presenter"
+require "content_block_tools/presenters/block_presenters/contact/contact_form_presenter"
+require "content_block_tools/presenters/block_presenters/contact/email_address_presenter"
+require "content_block_tools/presenters/block_presenters/contact/telephone_presenter"
+
 require "content_block_tools/presenters/base_presenter"
 require "content_block_tools/presenters/contact_presenter"
 require "content_block_tools/presenters/email_address_presenter"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: content_block_tools
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.3
 platform: ruby
 authors:
 - GOV.UK Dev
@@ -106,6 +106,11 @@ files:
 - lib/content_block_tools/content_block.rb
 - lib/content_block_tools/content_block_reference.rb
 - lib/content_block_tools/presenters/base_presenter.rb
+- lib/content_block_tools/presenters/block_presenters/base_presenter.rb
+- lib/content_block_tools/presenters/block_presenters/contact/address_presenter.rb
+- lib/content_block_tools/presenters/block_presenters/contact/contact_form_presenter.rb
+- 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
@@ -131,7 +136,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.8
+rubygems_version: 3.6.9
 specification_version: 4
 summary: A suite of tools for working with GOV.UK Content Blocks
 test_files: []