content_block_tools 1.11.0 → 1.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cb61fc3df8d1dc8cb8d612db04f79372df5b136c84af620aa50727e6dd7ee17f
-  data.tar.gz: b70351fcd23de104adfbb6d0e1c23ed3720eb8c22487ce22eda3894e4cefa908
+  metadata.gz: a3bf1b62951cbf2844753aff33c301958ef6bab65ed77f4b8bc3b7e3f2ec0a80
+  data.tar.gz: d38c2405d4acd27a334fc627c35aa22ca2436df664ad8adf0e1a55496c274dbd
 SHA512:
-  metadata.gz: '05793c290c8331ba99b6c5973928d5d3f3f25c585c3c21057646962a8775943b9a64f627acebab02a856ba2a1736491a67706ae24b868eeb8536461ecc7b8960'
-  data.tar.gz: 954103c40e093cb47a6d64ebd92b4ae2fd6166a4c89cb8b9b958e7228c20e11b432dda2e6bf5b59ba25d94f374c3bc2a7fa749641c02d67fafefd26a1c337e61
+  metadata.gz: 6da6482464ac0f9fc7ea84dfb576c26e96115547b79a4238d1889fac7a2893615b8d44258a0c9561a10cc0ff06ff776006efb161cd59adc64641c5a6b9157202
+  data.tar.gz: 830911495f8f4874c1367dcd113467244b1159ea146e6b11fe108335a5d6231cb3877f809b625c9b2a14ff0000621377498e1711dc8931082ea46dc593b3e525

data/app/components/content_block_tools/time_period/long_form_component.html.erb

@@ -0,0 +1,3 @@
+<p class="govuk-body">
+  <%= formatted_date(start_date) %> to <%= formatted_date(end_date) %>
+</p>

data/app/components/content_block_tools/time_period/long_form_component.rb

@@ -0,0 +1,24 @@
+module ContentBlockTools
+  module TimePeriod
+    class LongFormComponent < ContentBlockTools::BaseComponent
+      def initialize(start_date:, end_date:)
+        @start_date = start_date
+        @end_date = end_date
+      end
+
+      def render
+        return "" unless start_date && end_date
+
+        render_in(view_context)
+      end
+
+    private
+
+      attr_reader :start_date, :end_date
+
+      def formatted_date(date)
+        Presenters::FieldPresenters::TimePeriod::DatePresenter.new(date).render
+      end
+    end
+  end
+end

data/app/components/content_block_tools/time_period/months_and_years_long_component.html.erb

@@ -0,0 +1,3 @@
+<p class="govuk-body">
+  <%= formatted_date(start_date) %> to <%= formatted_date(end_date) %>
+</p>

data/app/components/content_block_tools/time_period/months_and_years_long_component.rb

@@ -0,0 +1,24 @@
+module ContentBlockTools
+  module TimePeriod
+    class MonthsAndYearsLongComponent < ContentBlockTools::BaseComponent
+      def initialize(start_date:, end_date:)
+        @start_date = start_date
+        @end_date = end_date
+      end
+
+      def render
+        return "" unless start_date && end_date
+
+        render_in(view_context)
+      end
+
+    private
+
+      attr_reader :start_date, :end_date
+
+      def formatted_date(date)
+        date.strftime("%B %Y")
+      end
+    end
+  end
+end

data/app/components/content_block_tools/time_period/start_day_and_month_component.html.erb

@@ -0,0 +1,3 @@
+<p class="govuk-body">
+  <%= formatted_date %>
+</p>

data/app/components/content_block_tools/time_period/start_day_and_month_component.rb

@@ -0,0 +1,23 @@
+module ContentBlockTools
+  module TimePeriod
+    class StartDayAndMonthComponent < ContentBlockTools::BaseComponent
+      def initialize(start_date:)
+        @start_date = start_date
+      end
+
+      def render
+        return "" unless start_date
+
+        render_in(view_context)
+      end
+
+    private
+
+      attr_reader :start_date
+
+      def formatted_date
+        start_date.strftime("%e %B").strip
+      end
+    end
+  end
+end

data/app/components/content_block_tools/time_period/start_month_as_word_component.html.erb

@@ -0,0 +1,3 @@
+<p class="govuk-body">
+  <%= formatted_date %>
+</p>

data/app/components/content_block_tools/time_period/start_month_as_word_component.rb

@@ -0,0 +1,23 @@
+module ContentBlockTools
+  module TimePeriod
+    class StartMonthAsWordComponent < ContentBlockTools::BaseComponent
+      def initialize(start_date:)
+        @start_date = start_date
+      end
+
+      def render
+        return "" unless start_date
+
+        render_in(view_context)
+      end
+
+    private
+
+      attr_reader :start_date
+
+      def formatted_date
+        start_date.strftime("%B")
+      end
+    end
+  end
+end

data/app/components/content_block_tools/time_period/years_component.html.erb

@@ -0,0 +1,3 @@
+<p class="govuk-body">
+  <%= formatted_years %>
+</p>

data/app/components/content_block_tools/time_period/years_component.rb

@@ -0,0 +1,24 @@
+module ContentBlockTools
+  module TimePeriod
+    class YearsComponent < ContentBlockTools::BaseComponent
+      def initialize(start_date:, end_date:)
+        @start_date = start_date
+        @end_date = end_date
+      end
+
+      def render
+        return "" unless start_date && end_date
+
+        render_in(view_context)
+      end
+
+    private
+
+      attr_reader :start_date, :end_date
+
+      def formatted_years
+        "#{start_date.year}-#{end_date.year}"
+      end
+    end
+  end
+end

data/app/components/content_block_tools/time_period/years_short_component.html.erb

@@ -0,0 +1,3 @@
+<p class="govuk-body">
+  <%= formatted_years %>
+</p>

data/app/components/content_block_tools/time_period/years_short_component.rb

@@ -0,0 +1,24 @@
+module ContentBlockTools
+  module TimePeriod
+    class YearsShortComponent < ContentBlockTools::BaseComponent
+      def initialize(start_date:, end_date:)
+        @start_date = start_date
+        @end_date = end_date
+      end
+
+      def render
+        return "" unless start_date && end_date
+
+        render_in(view_context)
+      end
+
+    private
+
+      attr_reader :start_date, :end_date
+
+      def formatted_years
+        "#{start_date.year}-#{end_date.strftime('%y')}"
+      end
+    end
+  end
+end

data/app/components/content_block_tools/time_period_component.rb

@@ -1,32 +1,70 @@
 module ContentBlockTools
   class TimePeriodComponent < ContentBlockTools::BaseComponent
+    SUPPORTED_FORMATS = %w[
+      default
+      long_form
+      months_and_years_long
+      start_day_and_month
+      start_month_as_word
+      years
+      years_short
+    ].freeze
+
     def initialize(content_block:, _block_type: nil, _block_name: nil)
       @content_block = content_block
       @normalised_date_range = normalise_date_range
+      validate_format!
     end
 
-    def start_date
-      presented_date(normalised_date_range.start_date)
-    end
-
-    def end_date
-      presented_date(normalised_date_range.end_date)
+    def render
+      format_component.render
     end
 
   private
 
     attr_reader :content_block, :normalised_date_range
 
+    delegate :format, to: :content_block
+
+    def format_component
+      case defaulted_format
+      when "long_form"
+        TimePeriod::LongFormComponent.new(start_date:, end_date:)
+      when "months_and_years_long"
+        TimePeriod::MonthsAndYearsLongComponent.new(start_date:, end_date:)
+      when "start_day_and_month"
+        TimePeriod::StartDayAndMonthComponent.new(start_date:)
+      when "start_month_as_word"
+        TimePeriod::StartMonthAsWordComponent.new(start_date:)
+      when "years"
+        TimePeriod::YearsComponent.new(start_date:, end_date:)
+      when "years_short"
+        TimePeriod::YearsShortComponent.new(start_date:, end_date:)
+      end
+    end
+
+    def defaulted_format
+      return "long_form" if format == Format::DEFAULT_FORMAT
+
+      format
+    end
+
+    def validate_format!
+      return if SUPPORTED_FORMATS.include?(format)
+
+      raise InvalidFormatError, "Unknown format '#{format}' for time_period"
+    end
+
     def normalise_date_range
       NormalisedDateRange.new(content_block.details[:date_range])
     end
 
-    def presented_date(date)
-      return unless date.present?
+    def start_date
+      normalised_date_range.start_date
+    end
 
-      Presenters::FieldPresenters::TimePeriod::DatePresenter.new(
-        date,
-      ).render
+    def end_date
+      normalised_date_range.end_date
     end
   end
 end

data/lib/content_block_tools/content_block.rb

@@ -38,10 +38,13 @@ module ContentBlockTools
   #    content_block_reference.embed_code #=> "{{embed:content_block_pension:2b92cade-549c-4449-9796-e7a3957f3a86}}"
   #    content_block_reference.embed_code #=> "{{embed:content_block_contact:2b92cade-549c-4449-9796-e7a3957f3a86/field_name}}"
   #  @return [String]
+  #
+  # @!attribute [r] format
+  #  The format specifier from the embed code, used to control rendering output
+  #  @example
+  #    content_block.format #=> "years_short"
+  #  @return [String]
   class ContentBlock
-    include ActionView::Helpers::TagHelper
-    class UnknownComponentError < StandardError; end
-
     CONTENT_BLOCK_PREFIX = "content_block_".freeze
 
     attr_reader :content_id, :title, :embed_code
@@ -86,22 +89,12 @@ module ContentBlockTools
       @embed_code = embed_code
     end
 
-    # Calls the appropriate presenter class to return a HTML representation of a content
-    # block. Defaults to {Presenters::BasePresenter}
+    # Renders the content block to HTML using the appropriate component or presenter
     #
-    # @return [string] A HTML representation of the content block
+    # @return [String] A HTML representation of the content block
+    # @see Renderer
     def render
-      content_tag(
-        base_tag,
-        content,
-        class: %W[content-block content-block--#{document_type}],
-        data: {
-          content_block: "",
-          document_type: document_type,
-          content_id: content_id,
-          embed_code: embed_code,
-        },
-      )
+      Renderer.new(self).render
     end
 
     def details
@@ -112,70 +105,8 @@ module ContentBlockTools
       @document_type.delete_prefix(CONTENT_BLOCK_PREFIX)
     end
 
-  private
-
-    def base_tag
-      rendering_block? ? :div : :span
-    end
-
-    def content
-      field_names.present? ? field_or_block_content : component.new(content_block: self).render
-    rescue UnknownComponentError
-      title
-    end
-
-    def field_or_block_content
-      content = details.dig(*field_names)
-
-      case content
-      when String
-        field_presenter(field_names.last).new(content).render
-      when Hash
-        if embedded_object_in_one_to_one_relationship?
-          field_presenter(field_names.last).new(content).render
-        else
-          component.new(content_block: self, block_type: field_names.first, block_name: field_names.last).render
-        end
-      else
-        ContentBlockTools.logger.warn("Content not found for content block #{content_id} and fields #{field_names}")
-        embed_code
-      end
-    end
-
-    def embedded_object_in_one_to_one_relationship?
-      field_names.one?
-    end
-
-    def rendering_block?
-      !field_names.present? || details.dig(*field_names).is_a?(Hash)
-    end
-
-    def component
-      "ContentBlockTools::#{document_type.camelize}Component".constantize
-    rescue NameError
-      raise UnknownComponentError
-    end
-
-    def field_presenter(field)
-      "ContentBlockTools::Presenters::FieldPresenters::#{document_type.camelize}::#{field.to_s.camelize}Presenter".constantize
-    rescue NameError
-      ContentBlockTools::Presenters::FieldPresenters::BasePresenter
-    end
-
-    def field_names
-      @field_names ||= begin
-        embed_code_match = ContentBlockReference::EMBED_REGEX.match(embed_code)
-        if embed_code_match.present?
-          all_fields = embed_code_match[4]&.reverse&.chomp("/")&.reverse
-          all_fields&.split("/")&.map do |item|
-            is_number?(item) ? item.to_i : item.to_sym
-          end
-        end
-      end
-    end
-
-    def is_number?(item)
-      Float(item, exception: false)
+    def format
+      EmbedCode.new(embed_code).format
     end
   end
 end

data/lib/content_block_tools/content_block_reference.rb

@@ -40,10 +40,10 @@ module ContentBlockTools
     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\-–—]+/
-    # The regex to find optional field names after the UUID, begins with '/'
-    FIELD_REGEX = /(\/[a-z0-9_\-–—\/]*)?/
+    # The regex to find optional internal content path after the UUID, begins with '/'
+    INTERNAL_CONTENT_PATH_REGEX = /(?<internal_content_path>\/[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}}})/
+    EMBED_REGEX = /(?<embed_code>{{embed:(?<document_type>#{SUPPORTED_DOCUMENT_TYPES.join('|')}):(?<identifier>#{UUID_REGEX}|#{CONTENT_ID_ALIAS_REGEX})#{INTERNAL_CONTENT_PATH_REGEX}}})/
 
     # Returns if the identifier is an alias
     #
@@ -73,8 +73,8 @@ module ContentBlockTools
       #
       # @return [Array<ContentBlockReference>] An array of content block references
       def find_all_in_document(document)
-        document.scan(EMBED_REGEX).map do |match_data|
-          ContentBlockReference.from_match_data(match_data)
+        document.to_enum(:scan, EMBED_REGEX).map do
+          ContentBlockReference.from_match_data(Regexp.last_match)
         end
       end
 
@@ -97,7 +97,7 @@ module ContentBlockTools
         match_data = embed_code.match(/^#{EMBED_REGEX}$/)
         raise InvalidEmbedCodeError unless match_data
 
-        ContentBlockReference.from_match_data(match_data.captures)
+        ContentBlockReference.from_match_data(match_data)
       end
 
       # Converts match data from a regex scan into a ContentBlockReference object
@@ -107,8 +107,8 @@ module ContentBlockTools
       # by replacing en/em dashes with double/triple dashes (which can occur due to Kramdown's
       # markdown parsing) before creating the object.
       #
-      # @param match_data [MatchData, Array] the match data from scanning with {EMBED_REGEX}
-      #   Expected to contain: [full_match, document_type, identifier, field]
+      # @param match_data [MatchData] the match data from scanning with {EMBED_REGEX}
+      #   Expected named captures: embed_code, document_type, identifier, internal_content_path
       # @example Creating from match data
       #   match_data = "{{embed:content_block_pension:2b92cade-549c-4449-9796-e7a3957f3a86}}".match(EMBED_REGEX)
       #   ContentBlockReference.from_match_data(match_data)
@@ -121,7 +121,11 @@ module ContentBlockTools
       def from_match_data(match_data)
         match = prepare_match(match_data)
         ContentBlockTools.logger.info("Found Content Block Reference: #{match}")
-        ContentBlockReference.new(document_type: match[1], identifier: match[2], embed_code: match[0])
+        ContentBlockReference.new(
+          document_type: match[:document_type],
+          identifier: match[:identifier],
+          embed_code: match[:embed_code],
+        )
       end
 
     private
@@ -130,12 +134,12 @@ module ContentBlockTools
       # 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)
-        [
-          match[0],
-          match[1],
-          replace_dashes(match[2]),
-          match[3],
-        ]
+        {
+          embed_code: match[:embed_code],
+          document_type: match[:document_type],
+          identifier: replace_dashes(match[:identifier]),
+          internal_content_path: match[:internal_content_path],
+        }
       end
 
       def replace_dashes(value)

data/lib/content_block_tools/embed_code.rb

@@ -0,0 +1,77 @@
+module ContentBlockTools
+  # Parses and represents an embed code string
+  #
+  # An embed code identifies a content block and optionally specifies which
+  # fields to render. The format is:
+  #   {{embed:block_type:identifier}}
+  #   {{embed:block_type:identifier/field1/nested_field2}}
+  #   {{embed:block_type:identifier|format}}
+  #   {{embed:block_type:identifier/field1|format}}
+  #
+  # @example Basic embed code
+  #   embed_code = EmbedCode.new("{{embed:content_block_contact:main-office}}")
+  #   embed_code.internal_content_path.present? #=> false
+  #
+  # @example Embed code with field path
+  #   embed_code = EmbedCode.new("{{embed:content_block_contact:main-office/email_addresses/main}}")
+  #   embed_code.internal_content_path.path #=> [:email_addresses, :main]
+  #
+  # @example Embed code with format
+  #   embed_code = EmbedCode.new("{{embed:content_block_time_period:tax-year#years_short}}")
+  #   embed_code.format #=> "years_short"
+  #
+  class EmbedCode
+    FORMAT_REGEX = /\#(?<format>[^}#]+)}}$/
+
+    def initialize(embed_code_string)
+      @embed_code_string = embed_code_string
+    end
+
+    # Returns the internal content path for this embed code
+    #
+    # @return [InternalContentPath] The path to internal content
+    def internal_content_path
+      @internal_content_path ||= InternalContentPath.new(parse_path_segments)
+    end
+
+    # Returns the format specifier from the embed code
+    #
+    # @return [String] The format name, or Format::DEFAULT_FORMAT if none specified
+    def format
+      @format ||= parse_format
+    end
+
+  private
+
+    attr_reader :embed_code_string
+
+    def parse_path_segments
+      match = ContentBlockReference::EMBED_REGEX.match(embed_code_string)
+      return [] unless match
+
+      all_segments = strip_leading_slash(match[:internal_content_path])
+      return [] if all_segments.nil?
+
+      all_segments.split("/").map { |item| convert_segment(item) }
+    end
+
+    def strip_leading_slash(path)
+      path&.reverse&.chomp("/")&.reverse
+    end
+
+    def convert_segment(item)
+      numeric?(item) ? item.to_i : item.to_sym
+    end
+
+    def parse_format
+      match = FORMAT_REGEX.match(embed_code_string)
+      return Format::DEFAULT_FORMAT unless match
+
+      match[:format]
+    end
+
+    def numeric?(item)
+      Float(item, exception: false)
+    end
+  end
+end

data/lib/content_block_tools/format.rb

@@ -0,0 +1,5 @@
+module ContentBlockTools
+  module Format
+    DEFAULT_FORMAT = "default".freeze
+  end
+end

data/lib/content_block_tools/internal_content_path.rb

@@ -0,0 +1,49 @@
+module ContentBlockTools
+  # Represents the path to internal content within a content block
+  #
+  # An internal content path identifies a specific piece of content within a
+  # content block's details hash. The path is used with `dig` to traverse the
+  # nested structure.
+  #
+  # @example Path to a block
+  #   path = InternalContentPath.new([:email_addresses, :main])
+  #   path.present?    #=> true
+  #   path.singular?   #=> false
+  #   path.block_type  #=> :email_addresses
+  #   path.block_name  #=> :main
+  #
+  # @example Path to a field in a one-to-one relationship
+  #   path = InternalContentPath.new([:date_range])
+  #   path.singular?   #=> true
+  #   path.block_type  #=> :date_range
+  #   path.block_name  #=> :date_range
+  #
+  # @example Empty path (render the whole block)
+  #   path = InternalContentPath.new([])
+  #   path.present?    #=> false
+  #   path.block_type  #=> nil
+  #
+  class InternalContentPath
+    attr_reader :path
+
+    def initialize(path)
+      @path = path
+    end
+
+    def present?
+      path.any?
+    end
+
+    def singular?
+      path.one?
+    end
+
+    def block_type
+      path.first
+    end
+
+    def block_name
+      path.last
+    end
+  end
+end

data/lib/content_block_tools/normalised_date_range.rb

@@ -54,10 +54,9 @@ module ContentBlockTools
     end
 
     def parse_iso8601_format(datetime_string)
-      result = Time.zone.parse(datetime_string)
-      raise ParseError, "Invalid ISO 8601 format: #{datetime_string.inspect}" if result.nil?
-
-      result
+      Time.parse(datetime_string)
+    rescue ArgumentError
+      raise ParseError, "Invalid ISO 8601 format: #{datetime_string.inspect}"
     end
   end
 end

data/lib/content_block_tools/renderer.rb

@@ -0,0 +1,107 @@
+module ContentBlockTools
+  # Renders a ContentBlock to HTML
+  #
+  # This class encapsulates the logic for rendering a content block,
+  # including determining the appropriate component or presenter to use
+  # and wrapping the result in the standard content block markup.
+  #
+  # @example
+  #   content_block = ContentBlock.new(...)
+  #   html = Renderer.new(content_block).render
+  #
+  class Renderer
+    include ActionView::Helpers::TagHelper
+
+    class UnknownComponentError < StandardError; end
+
+    def initialize(content_block)
+      @content_block = content_block
+    end
+
+    # Renders the content block to HTML
+    #
+    # @return [String] HTML representation of the content block
+    def render
+      content_tag(
+        base_tag,
+        content,
+        class: %W[content-block content-block--#{content_block.document_type}],
+        data: {
+          content_block: "",
+          document_type: content_block.document_type,
+          content_id: content_block.content_id,
+          embed_code: content_block.embed_code,
+        },
+      )
+    end
+
+  private
+
+    attr_reader :content_block
+
+    def base_tag
+      rendering_block? ? :div : :span
+    end
+
+    def content
+      internal_content_path.present? ? field_or_block_content : component.new(content_block:).render
+    rescue UnknownComponentError
+      content_block.title
+    end
+
+    def field_or_block_content
+      field_content = content_block.details.dig(*internal_content_path.path)
+
+      case field_content
+      when String
+        field_presenter(internal_content_path.block_name).new(field_content).render
+      when Hash
+        render_hash_content(field_content)
+      else
+        log_content_not_found
+        content_block.embed_code
+      end
+    end
+
+    def render_hash_content(field_content)
+      if internal_content_path.singular?
+        field_presenter(internal_content_path.block_name).new(field_content).render
+      else
+        component.new(
+          content_block:,
+          block_type: internal_content_path.block_type,
+          block_name: internal_content_path.block_name,
+        ).render
+      end
+    end
+
+    def log_content_not_found
+      ContentBlockTools.logger.warn(
+        "Content not found for content block #{content_block.content_id} " \
+        "and fields #{internal_content_path.path}",
+      )
+    end
+
+    def rendering_block?
+      !internal_content_path.present? || content_block.details.dig(*internal_content_path.path).is_a?(Hash)
+    end
+
+    def component
+      "ContentBlockTools::#{content_block.document_type.camelize}Component".constantize
+    rescue NameError
+      raise UnknownComponentError
+    end
+
+    def field_presenter(field)
+      presenter_class_name = "ContentBlockTools::Presenters::FieldPresenters::" \
+                             "#{content_block.document_type.camelize}::#{field.to_s.camelize}Presenter"
+      presenter_class_name.constantize
+    rescue NameError
+      ContentBlockTools::Presenters::FieldPresenters::BasePresenter
+    end
+
+    def internal_content_path
+      @internal_content_path ||= EmbedCode.new(content_block.embed_code).internal_content_path
+    end
+  end
+end

data/lib/content_block_tools/version.rb

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

data/lib/content_block_tools.rb

@@ -18,7 +18,11 @@ require "content_block_tools/presenters/field_presenters/time_period/end_present
 
 require "content_block_tools/content_block"
 require "content_block_tools/content_block_reference"
+require "content_block_tools/embed_code"
+require "content_block_tools/format"
+require "content_block_tools/internal_content_path"
 require "content_block_tools/normalised_date_range"
+require "content_block_tools/renderer"
 
 require "content_block_tools/engine"
 
@@ -27,11 +31,13 @@ require "content_block_tools/version"
 module ContentBlockTools
   class Error < StandardError; end
   class InvalidEmbedCodeError < StandardError; end
+  class InvalidFormatError < StandardError; end
 
   module Presenters; end
 
   module Components
     module Contacts; end
+    module TimePeriod; end
   end
 
   class << self

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: content_block_tools
 version: !ruby/object:Gem::Version
-  version: 1.11.0
+  version: 1.12.0
 platform: ruby
 authors:
 - GOV.UK Dev
@@ -9,20 +9,48 @@ bindir: exe
 cert_chain: []
 date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: cucumber
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '9.2'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '9.2'
+- !ruby/object:Gem::Dependency
+  name: pry-byebug
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 13.3.1
+        version: 13.4.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 13.3.1
+        version: 13.4.2
 - !ruby/object:Gem::Dependency
   name: rspec-html-matchers
   requirement: !ruby/object:Gem::Requirement
@@ -57,14 +85,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 5.2.0
+        version: 5.2.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 5.2.0
+        version: 5.2.1
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -180,14 +208,28 @@ files:
 - app/components/content_block_tools/contacts/email_address_component.rb
 - app/components/content_block_tools/contacts/telephone_component.html.erb
 - app/components/content_block_tools/contacts/telephone_component.rb
-- app/components/content_block_tools/time_period_component.html.erb
+- app/components/content_block_tools/time_period/long_form_component.html.erb
+- app/components/content_block_tools/time_period/long_form_component.rb
+- app/components/content_block_tools/time_period/months_and_years_long_component.html.erb
+- app/components/content_block_tools/time_period/months_and_years_long_component.rb
+- app/components/content_block_tools/time_period/start_day_and_month_component.html.erb
+- app/components/content_block_tools/time_period/start_day_and_month_component.rb
+- app/components/content_block_tools/time_period/start_month_as_word_component.html.erb
+- app/components/content_block_tools/time_period/start_month_as_word_component.rb
+- app/components/content_block_tools/time_period/years_component.html.erb
+- app/components/content_block_tools/time_period/years_component.rb
+- app/components/content_block_tools/time_period/years_short_component.html.erb
+- app/components/content_block_tools/time_period/years_short_component.rb
 - app/components/content_block_tools/time_period_component.rb
 - lib/content_block_tools.rb
 - lib/content_block_tools/content_block.rb
 - lib/content_block_tools/content_block_reference.rb
+- lib/content_block_tools/embed_code.rb
 - lib/content_block_tools/engine.rb
+- lib/content_block_tools/format.rb
 - lib/content_block_tools/helpers/govspeak.rb
 - lib/content_block_tools/helpers/override_classes.rb
+- lib/content_block_tools/internal_content_path.rb
 - lib/content_block_tools/normalised_date_range.rb
 - lib/content_block_tools/presenters/field_presenters/base_presenter.rb
 - lib/content_block_tools/presenters/field_presenters/contact/email_presenter.rb
@@ -196,6 +238,7 @@ files:
 - lib/content_block_tools/presenters/field_presenters/time_period/end_presenter.rb
 - lib/content_block_tools/presenters/field_presenters/time_period/start_presenter.rb
 - lib/content_block_tools/presenters/field_presenters/time_period/time_presenter.rb
+- lib/content_block_tools/renderer.rb
 - lib/content_block_tools/version.rb
 - node_modules/govuk-frontend/README.md
 - node_modules/govuk-frontend/dist/govuk-prototype-kit/functions.js

data/app/components/content_block_tools/time_period_component.html.erb

@@ -1,8 +0,0 @@
-<% if start_date.present? && end_date.present?  %>
-  <p class="govuk-body">
-    <%= start_date %>
-    to
-    <%= end_date %>
-  </p>
-<% end %>
-