content_block_tools 0.11.0 → 0.12.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c52e34cc23cba69ff684cf24401cd78982eca8566ecbf7003f4d95b09ecf5e4c
-  data.tar.gz: ac0ab24be15c2a8485fb7364e68c63afcef338a1038050caaaf2d1b838169c53
+  metadata.gz: d0c58a0d3ef7154dbb64562eb49e195b35d092aa8253ae4a78281ac82969a0d2
+  data.tar.gz: b30e824dc93f731ce4f76feb81d4893405214c735c1c54988ddf45f3f6c7a20d
 SHA512:
-  metadata.gz: 5dc783c3a7697d8d7b52fd3067b0c33238666f237664735e97efcbd26ee17bb69e50e03a7629bce0afd7ac23d50270250b3cab07ce055fcb8be52adb44571ae7
-  data.tar.gz: 8464890505ccea65c1da3557a8838e156f86e39f105e86c53c534cb37cdf16e50adbbb16db9d17b1ffcddd21190dd9227843634b9599578ebf430108f156c1f2
+  metadata.gz: d7cb23a7de08bd50f54066cccd6e2d3869030745e896d62e8f4d6b8aa48886971a1c313d7328de45d42457250752af7fd018049feda48f4c315d943867423b69
+  data.tar.gz: 63ac67b402438f97f09655c96be96a561e5e59c566a19ead87e8c42e55365fec94b5e8ddbefb368d3e10e68d63c271104acaf50a55de98cb96992a73ca959ff8

data/CHANGELOG.md

@@ -7,6 +7,14 @@
   useful summary for people upgrading their application, not a replication
   of the commit log.
 
+## 0.12.1
+
+- Fix when content block codes include special dashes ([64](https://github.com/alphagov/govuk_content_block_tools/pull/64))
+
+## 0.12.0
+
+- Add missing fields for contact object ([62](https://github.com/alphagov/govuk_content_block_tools/pull/62))
+
 ## 0.11.0
 
 - Update address and contact presenter to match model changes([61](https://github.com/alphagov/govuk_content_block_tools/pull/61))

data/lib/content_block_tools/content_block_reference.rb

@@ -32,9 +32,9 @@ module ContentBlockTools
     # 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
-    CONTENT_ID_ALIAS_REGEX = /[a-z0-9-]+/
+    CONTENT_ID_ALIAS_REGEX = /[a-z0-9-–—]+/
     # The regex to find optional field names after the UUID, begins with '/'
-    FIELD_REGEX = /(\/[a-z0-9_\-\/]*)?/
+    FIELD_REGEX = /(\/[a-z0-9_\-–—\/]*)?/
     # The regex used when scanning a document using {ContentBlockTools::ContentBlockReference.find_all_in_document}
     EMBED_REGEX = /({{embed:(#{SUPPORTED_DOCUMENT_TYPES.join('|')}):(#{UUID_REGEX}|#{CONTENT_ID_ALIAS_REGEX})#{FIELD_REGEX}}})/
 
@@ -52,10 +52,30 @@ module ContentBlockTools
       # @return [Array<ContentBlockReference>] An array of content block references
       def find_all_in_document(document)
         document.scan(ContentBlockReference::EMBED_REGEX).map do |match|
+          match = prepare_match(match)
           ContentBlockTools.logger.info("Found Content Block Reference: #{match}")
           ContentBlockReference.new(document_type: match[1], identifier: match[2], embed_code: match[0])
         end
       end
+
+    private
+
+      # This replaces an en / em dashes in content block references with double or triple dashes. This can occur
+      # because Kramdown (the markdown parser that Govspeak is based on) replaces double dashes with en dashes and
+      # triple dashes with em dashes
+      def prepare_match(match)
+        [
+          replace_dashes(match[0]),
+          match[1],
+          replace_dashes(match[2]),
+          match[3],
+        ]
+      end
+
+      def replace_dashes(value)
+        value&.gsub("–", "--")
+          &.gsub("—", "---")
+      end
     end
   end
 end

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

@@ -9,13 +9,19 @@ module ContentBlockTools
 
           def render
             wrapper do
-              content_tag(:p, class: "adr") do
-                %i[street_address town_or_city state_or_county postal_code country].map { |field|
+              output = []
+
+              output << content_tag(:p, class: "adr") do
+                %i[title street_address town_or_city state_or_county postal_code country].map { |field|
                   next if item[field].blank?
 
                   content_tag(:span, item[field], { class: class_for_field_name(field) })
                 }.compact_blank.join(",<br/>").html_safe
               end
+
+              output << render_govspeak(item[:description]) if item[:description].present?
+
+              output.join.html_safe
             end
           end
 
@@ -28,6 +34,12 @@ module ContentBlockTools
               country: "country-name",
             }[field_name]
           end
+
+        private
+
+          def show_title_in_field_names_context?
+            false
+          end
         end
       end
     end

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

@@ -14,7 +14,7 @@ module ContentBlockTools
           def wrapper(&block)
             if @rendering_context == :field_names
               content_tag(:div, class: "contact") do
-                concat title
+                concat title if show_title_in_field_names_context?
                 concat yield block
               end
             else
@@ -27,6 +27,12 @@ module ContentBlockTools
                         @content_block.title,
                         class: "govuk-!-margin-bottom-3")
           end
+
+        private
+
+          def show_title_in_field_names_context?
+            true
+          end
         end
       end
     end

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

@@ -10,16 +10,30 @@ module ContentBlockTools
           def render
             wrapper do
               content_tag(:div, class: "email-url-number") do
-                content_tag(:p) do
-                  concat content_tag(:span, item[:title])
-                  concat content_tag(:a,
-                                     item[:email_address],
-                                     class: "email",
-                                     href: "mailto:#{item[:email_address]}")
-                end
+                concat email
+                concat render_govspeak(item[:description]) if item[:description].present?
               end
             end
           end
+
+          def email
+            content_tag(:p) do
+              concat content_tag(:span, item[:title])
+              concat content_tag(:a,
+                                 item[:email_address],
+                                 class: "email",
+                                 href: "mailto:#{item[:email_address]}#{query_params}")
+            end
+          end
+
+          def query_params
+            params = {
+              subject: item[:subject],
+              body: item[:body],
+            }.compact.map { |k, v| "#{k}=#{v}" }.join("&")
+
+            "?#{params}" if params.present?
+          end
         end
       end
     end

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

@@ -12,6 +12,8 @@ module ContentBlockTools
               content_tag(:div, class: "email-url-number") do
                 concat title_and_description
                 concat number_list
+                concat video_relay_service
+                concat bsl_details
                 concat opening_hours_list if item[:opening_hours].present?
                 concat call_charges_link
               end
@@ -54,6 +56,21 @@ module ContentBlockTools
             end
           end
 
+          def video_relay_service
+            video_relay_service = item[:video_relay_service] || {}
+
+            if video_relay_service[:show]
+              content = "#{video_relay_service[:prefix]} #{video_relay_service[:telephone_number]}"
+              render_govspeak(content, root_class: "govuk-!-margin-bottom-0")
+            end
+          end
+
+          def bsl_details
+            bsl_guidance = item[:bsl_guidance] || {}
+
+            render_govspeak(bsl_guidance[:value], root_class: "govuk-!-margin-bottom-0") if bsl_guidance[:show]
+          end
+
           def opening_hours_list
             content_tag(:ul) do
               item[:opening_hours].each do |item|
@@ -67,12 +84,14 @@ module ContentBlockTools
           end
 
           def call_charges_link
-            if item[:show_uk_call_charges] == "true"
+            call_charges = item[:call_charges] || {}
+
+            if call_charges[:show_call_charges_info_url]
               content_tag(:p) do
                 concat content_tag(:a,
-                                   "Find out about call charges",
+                                   call_charges[:label],
                                    class: "govuk-link",
-                                   href: "https://www.gov.uk/call-charges")
+                                   href: call_charges[:call_charges_info_url])
               end
             end
           end

data/lib/content_block_tools/presenters/contact_presenter.rb

@@ -2,6 +2,7 @@ module ContentBlockTools
   module Presenters
     class ContactPresenter < BasePresenter
       include ActionView::Helpers::TextHelper
+      include ContentBlockTools::Govspeak
 
       BASE_TAG_TYPE = :div
 
@@ -25,6 +26,7 @@ module ContentBlockTools
           content_tag(:div, class: "content") do
             content_tag(:div, class: "vcard contact-inner") do
               concat content_tag(:p, content_block.title, class: "fn org")
+              concat render_govspeak(content_block.details[:description]) if content_block.details[:description]
               embedded_objects.each do |object|
                 items = send(object)
                 concat(items.map { |item| presenter_for_object_type(object).new(item, content_block:).render }.join.html_safe)

data/lib/content_block_tools/version.rb

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

metadata

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