content_block_tools 0.12.0 → 0.12.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7bd3435567461a7899094649b4c46efc6ae674c943e94b7f7d8dc28615c90c54
-  data.tar.gz: 9cb772f8e04c00854c6824628f3defa875faa997a85f3c7be458fe1e22c758ee
+  metadata.gz: 2a3d284308ecfac92b7c39739db61d4897edd0c185087aa5a307be162e663cc0
+  data.tar.gz: 276d0984c5e5c15b2cebcd1a8cf1beb8ad1a92571ab5b087917ad1fb65e90851
 SHA512:
-  metadata.gz: 57b390d576c0b7b4d2ac7e16d852d60c97ea3990f69861d633d8cf0041751391c0c8c4b06bd6ae037f057f8b909944a7a48819b75d22e147e497e8b3a0b2f1cc
-  data.tar.gz: a1d49cbc4e5ad8b87c16e4705d1c68ae7cc3143b960a5c02a9426a1b799a25934cfbdd0670b4605cc43333461b1b203bc4c29a0b8754a5c2126c6423bb6e1dc4
+  metadata.gz: 866336c803901cad6a3328343db12db865ba2e256802702f85364fa66f589747a62dee09af69dd34af8969ee381c44cb5b933c0774bba29f2c84a55eb1f01161
+  data.tar.gz: d2db11eebab075a70f9b688954cb1b341317284100470fefaf9a7e746ae0c80d69342c307208a089903e3c588974a6bae5630e469458cc7ea2c92a16e9e5b6ae

data/CHANGELOG.md

@@ -7,6 +7,14 @@
   useful summary for people upgrading their application, not a replication
   of the commit log.
 
+## 0.12.2
+
+- Add escape character to silence warnings ([65](https://github.com/alphagov/govuk_content_block_tools/pull/65))
+
+## 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))

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/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: content_block_tools
 version: !ruby/object:Gem::Version
-  version: 0.12.0
+  version: 0.12.2
 platform: ruby
 authors:
 - GOV.UK Dev
@@ -150,7 +150,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.7.0
+rubygems_version: 3.7.1
 specification_version: 4
 summary: A suite of tools for working with GOV.UK Content Blocks
 test_files: []