content_block_tools 0.14.0 → 0.16.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7c35f73a3b07fb8b012edb15983ee33d887d6210983da08260ef5aa4ee179602
-  data.tar.gz: 7957496b23bb4abf3631ed7119bf389c62f545d03e16caf805072c485baf0e7b
+  metadata.gz: dc5c252953a643976df3b67edfeb89574770b18f19c83e8c89fe97117b9a12d3
+  data.tar.gz: 9621e75ef84f2e2ecfed5dc8e2452de47e157e1fa7ffc5448c133957733977a3
 SHA512:
-  metadata.gz: 9eb65abd8380bcf954c049343336d5ad9aa964c19fec7587c4769fe741e82777f7127a99540c1cf884a889ff4d72a68ecc52a4f8e4510c93a13f9a728f6ad6bf
-  data.tar.gz: 79fa8d0a4b48ef725ebade643c9556422b0dac61874aed1ce9323fbf258f8622c0cdcd40874876f0ceb3f6447976b2bac3319ed97e5f2e1d6d757b8d1036a9bb
+  metadata.gz: f2e7e1129b8c885327926d605a8bfc0aa9556cf037b3c91ee4a4c36436cd7751646b31c5ecf65301c18520bb65efc45fdbb427e2d6d946f28d0cc63e090048be
+  data.tar.gz: c9b5aa1eae520f16eab7dd0143de7af184c7e9c07865af3054caab14cbfea1d22eaab8a85ef06bafd6363286a5b8dcbc3bdbef99a902927032ae5288d65a835d

data/CHANGELOG.md

@@ -7,9 +7,19 @@
   useful summary for people upgrading their application, not a replication
   of the commit log.
 
+## 0.16.0
+
+- Use label as link text for contact link ([74](https://github.com/alphagov/govuk_content_block_tools/pull/74))
+- Add description to contact link ([74](https://github.com/alphagov/govuk_content_block_tools/pull/74))
+- Use label as link text for contact link ([74](https://github.com/alphagov/govuk_content_block_tools/pull/74))
+
+## 0.15.0
+
+- Rename content block classes ([72](https://github.com/alphagov/govuk_content_block_tools/pull/72))
+
 ## 0.14.0
 
-- Update telephone to support simple opening hours ([71](https://github.com/alphagov/govuk_content_block_tools/pull/70))
+- Update telephone to support simple opening hours ([71](https://github.com/alphagov/govuk_content_block_tools/pull/71))
 
 ## 0.13.0
 

data/content_block_tools.gemspec

@@ -31,5 +31,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rubocop-govuk", "5.1.18"
 
   spec.add_dependency "actionview", ">= 6"
-  spec.add_dependency "govspeak", "10.6.0"
+  spec.add_dependency "govspeak", "10.6.1"
 end

data/lib/content_block_tools/presenters/base_presenter.rb

@@ -41,10 +41,10 @@ module ContentBlockTools
         content_tag(
           base_tag,
           content,
-          class: %W[content-embed content-embed__#{content_block.document_type}],
+          class: %W[content-block content-block--#{document_type}],
           data: {
             content_block: "",
-            document_type: content_block.document_type,
+            document_type: document_type,
             content_id: content_block.content_id,
             embed_code: content_block.embed_code,
           },
@@ -129,6 +129,10 @@ module ContentBlockTools
       def embedded_objects
         self.class.instance_variable_get("@embedded_objects")
       end
+
+      def document_type
+        content_block.document_type.delete_prefix("content_block_")
+      end
     end
   end
 end

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

@@ -10,16 +10,28 @@ 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[:url],
-                                     class: "url",
-                                     href: item[:url])
-                end
+                concat link
+                concat description if item[:description]
               end
             end
           end
+
+          def link
+            content_tag(:p) do
+              content_tag(:a,
+                          link_text,
+                          class: "url",
+                          href: item[:url])
+            end
+          end
+
+          def link_text
+            item[:label] || item[:url]
+          end
+
+          def description
+            render_govspeak(item[:description])
+          end
         end
       end
     end

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

@@ -18,9 +18,8 @@ module ContentBlockTools
 
           def email
             content_tag(:p) do
-              concat content_tag(:span, item[:title])
               concat content_tag(:a,
-                                 item[:email_address],
+                                 link_text,
                                  class: "email",
                                  href: "mailto:#{item[:email_address]}#{query_params}")
             end
@@ -34,6 +33,10 @@ module ContentBlockTools
 
             "?#{params}" if params.present?
           end
+
+          def link_text
+            item[:label] || item[:email_address]
+          end
         end
       end
     end

data/lib/content_block_tools/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: content_block_tools
 version: !ruby/object:Gem::Version
-  version: 0.14.0
+  version: 0.16.0
 platform: ruby
 authors:
 - GOV.UK Dev
@@ -85,14 +85,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 10.6.0
+        version: 10.6.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 10.6.0
+        version: 10.6.1
 email:
 - govuk-dev@digital.cabinet-office.gov.uk
 executables: []