content_block_tools 1.10.4 → 1.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 76585fdad22164fb9dfd3b6953cb7be7f97dfd100c351382ef964208aa614465
-  data.tar.gz: 3d085a7d8ad591f8f0697a1d8692b257aaec4e24aeaafd00a7c635f4335a1a81
+  metadata.gz: cb61fc3df8d1dc8cb8d612db04f79372df5b136c84af620aa50727e6dd7ee17f
+  data.tar.gz: b70351fcd23de104adfbb6d0e1c23ed3720eb8c22487ce22eda3894e4cefa908
 SHA512:
-  metadata.gz: de0296c3df4f4ecc38bf097b7d7c51964fdcdefbefbccbb999373a91da915997bbf53e08d3b122296148c94e1d5f9e0c50962b7dbed8602fe28eb8f72db34618
-  data.tar.gz: 9dada776d7e0aa69dfc74c6c2267d6c236459b8cfd571e509306e1118d584c4bab8133f912c29de1ecd31368e1f66eca05deb1dfa7c0ba72cda18cfc24c291e2
+  metadata.gz: '05793c290c8331ba99b6c5973928d5d3f3f25c585c3c21057646962a8775943b9a64f627acebab02a856ba2a1736491a67706ae24b868eeb8536461ecc7b8960'
+  data.tar.gz: 954103c40e093cb47a6d64ebd92b4ae2fd6166a4c89cb8b9b958e7228c20e11b432dda2e6bf5b59ba25d94f374c3bc2a7fa749641c02d67fafefd26a1c337e61

data/app/components/content_block_tools/time_period_component.rb

@@ -2,25 +2,28 @@ module ContentBlockTools
   class TimePeriodComponent < ContentBlockTools::BaseComponent
     def initialize(content_block:, _block_type: nil, _block_name: nil)
       @content_block = content_block
+      @normalised_date_range = normalise_date_range
     end
 
     def start_date
-      presented_date(
-        content_block.details.dig(:date_range, :start, :date),
-      )
+      presented_date(normalised_date_range.start_date)
     end
 
     def end_date
-      presented_date(
-        content_block.details.dig(:date_range, :end, :date),
-      )
+      presented_date(normalised_date_range.end_date)
     end
 
   private
 
-    attr_reader :content_block
+    attr_reader :content_block, :normalised_date_range
+
+    def normalise_date_range
+      NormalisedDateRange.new(content_block.details[:date_range])
+    end
 
     def presented_date(date)
+      return unless date.present?
+
       Presenters::FieldPresenters::TimePeriod::DatePresenter.new(
         date,
       ).render

data/lib/content_block_tools/normalised_date_range.rb

@@ -0,0 +1,63 @@
+# frozen_string_literal: true
+
+module ContentBlockTools
+  class NormalisedDateRange
+    class ParseError < StandardError; end
+
+    def initialize(date_range)
+      @date_range = date_range || {}
+    end
+
+    def start_time
+      @start_time ||= parse_value(date_range[:start])
+    end
+
+    def end_time
+      @end_time ||= parse_value(date_range[:end])
+    end
+
+    def start_date
+      start_time&.to_date
+    end
+
+    def end_date
+      end_time&.to_date
+    end
+
+  private
+
+    attr_reader :date_range
+
+    def parse_value(value)
+      return nil if value.blank?
+
+      if value.is_a?(Hash)
+        parse_legacy_format(value)
+      else
+        parse_iso8601_format(value)
+      end
+    end
+
+    def parse_legacy_format(value)
+      date_string = value[:date]
+      time_string = value[:time]
+
+      return nil if date_string.blank?
+
+      # Validate date with Date.parse (stricter than Time.zone.parse)
+      Date.parse(date_string)
+
+      datetime_string = [date_string, time_string].compact.join(" ")
+      Time.zone.parse(datetime_string)
+    rescue Date::Error
+      raise ParseError, "Invalid legacy date format: #{value.inspect}"
+    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
+    end
+  end
+end

data/lib/content_block_tools/presenters/field_presenters/time_period/date_presenter.rb

@@ -6,8 +6,23 @@ module ContentBlockTools
           def render
             return unless field.present?
 
-            date = Date.parse(field)
-            date.strftime("%e %B %Y").strip
+            time = field.is_a?(String) ? parsed_string : field
+
+            time.strftime("%e %B %Y").strip
+          rescue Date::Error
+            nil
+          end
+
+        private
+
+          def parsed_string
+            validate_string_representation
+
+            Time.zone.parse(field)
+          end
+
+          def validate_string_representation
+            Date.parse(field)
           end
         end
       end

data/lib/content_block_tools/presenters/field_presenters/time_period/date_range_presenter.rb

@@ -5,25 +5,38 @@ module ContentBlockTools
         class TimePeriodPresenterError < RuntimeError; end
 
         class DateRangePresenter < BasePresenter
+          def initialize(field, **args)
+            super
+            @normalised_date_range = normalise_date_range
+          end
+
           def render
             return unless start_date.present? && end_date.present?
 
             "#{start_date} to #{end_date}"
-          rescue Date::Error, TypeError
-            raise TimePeriodPresenterError, "Not a valid date range: #{field}"
+          rescue NormalisedDateRange::ParseError => e
+            raise TimePeriodPresenterError, "Not a valid date range: #{field} (#{e.message})"
           end
 
         private
 
+          attr_reader :normalised_date_range
+
           def start_date
-            presented_date(field.dig(:start, :date))
+            presented_date(normalised_date_range.start_date)
           end
 
           def end_date
-            presented_date(field.dig(:end, :date))
+            presented_date(normalised_date_range.end_date)
+          end
+
+          def normalise_date_range
+            NormalisedDateRange.new(field)
           end
 
           def presented_date(date)
+            return unless date.present?
+
             Presenters::FieldPresenters::TimePeriod::DatePresenter.new(
               date,
             ).render

data/lib/content_block_tools/presenters/field_presenters/time_period/end_presenter.rb

@@ -0,0 +1,17 @@
+module ContentBlockTools
+  module Presenters
+    module FieldPresenters
+      module TimePeriod
+        class EndPresenter < BasePresenter
+          def render
+            return unless field.present?
+
+            Presenters::FieldPresenters::TimePeriod::DatePresenter.new(
+              field,
+            ).render
+          end
+        end
+      end
+    end
+  end
+end

data/lib/content_block_tools/presenters/field_presenters/time_period/start_presenter.rb

@@ -0,0 +1,17 @@
+module ContentBlockTools
+  module Presenters
+    module FieldPresenters
+      module TimePeriod
+        class StartPresenter < BasePresenter
+          def render
+            return unless field.present?
+
+            Presenters::FieldPresenters::TimePeriod::DatePresenter.new(
+              field,
+            ).render
+          end
+        end
+      end
+    end
+  end
+end

data/lib/content_block_tools/version.rb

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

data/lib/content_block_tools.rb

@@ -13,9 +13,12 @@ require "content_block_tools/presenters/field_presenters/contact/email_presenter
 require "content_block_tools/presenters/field_presenters/time_period/date_range_presenter"
 require "content_block_tools/presenters/field_presenters/time_period/date_presenter"
 require "content_block_tools/presenters/field_presenters/time_period/time_presenter"
+require "content_block_tools/presenters/field_presenters/time_period/start_presenter"
+require "content_block_tools/presenters/field_presenters/time_period/end_presenter"
 
 require "content_block_tools/content_block"
 require "content_block_tools/content_block_reference"
+require "content_block_tools/normalised_date_range"
 
 require "content_block_tools/engine"
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: content_block_tools
 version: !ruby/object:Gem::Version
-  version: 1.10.4
+  version: 1.11.0
 platform: ruby
 authors:
 - GOV.UK Dev
@@ -188,10 +188,13 @@ files:
 - lib/content_block_tools/engine.rb
 - lib/content_block_tools/helpers/govspeak.rb
 - lib/content_block_tools/helpers/override_classes.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
 - lib/content_block_tools/presenters/field_presenters/time_period/date_presenter.rb
 - lib/content_block_tools/presenters/field_presenters/time_period/date_range_presenter.rb
+- 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/version.rb
 - node_modules/govuk-frontend/README.md