content_block_tools 1.10.0 → 1.10.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 995ae1c7fb38df54eff5b1df0af68aeb8558cee5e587e9334e8e8d4d903703b0
-  data.tar.gz: 0fda3eaef6bf5a4009d7e11dc0fb13cf2ddfdf462db070d6865af65123ba7335
+  metadata.gz: e4bffc74453392e4176a013c3f295f8bd7c22d003c36aec1253f2340408b0689
+  data.tar.gz: fe1b05f582fad533f93fe6fc515ac78d7050546033c2226d671e4d42ae11184c
 SHA512:
-  metadata.gz: 9b40e81a30e9e2b9c9c1b22f816911b4886148d7e61347b2ecd8becde453f7a0304f6db89eae4de60ad2d9af65cb607e0d76758028d17373330dc13e56a84f1a
-  data.tar.gz: '0783a6f182c878b206847103f7872e4ccfe9263f104f2077f4d8377d48c94b1045292a3523727878f8055541b8715b711d7b1dbe3ce11d0128f80d7640b22bb2'
+  metadata.gz: 5760656e4fb6f49f6232311eedcbf7f38209f6a430c43a21a1ee697be545a6559bc7497adaf150e28a31a4ca146b8eb1fa6aeaa6cbf9e5e43e3584c26b60f02c
+  data.tar.gz: 95877b32ff1607c425f248b83edd31a891a1dab0b352edf32d17c5fc53763b252edc0fa73fde0ed1c7178eaa6698bfa6676218e5bd9c8c473cc9f36bbbd142db

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

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

data/lib/content_block_tools/content_block.rb

@@ -126,17 +126,26 @@ module ContentBlockTools
 
     def field_or_block_content
       content = details.dig(*field_names)
+
       case content
       when String
         field_presenter(field_names.last).new(content).render
       when Hash
-        component.new(content_block: self, block_type: field_names.first, block_name: field_names.last).render
+        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

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

@@ -4,6 +4,8 @@ module ContentBlockTools
       module TimePeriod
         class DatePresenter < BasePresenter
           def render
+            return unless field.present?
+
             date = Date.parse(field)
             date.strftime("%e %B %Y").strip
           end

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

@@ -0,0 +1,35 @@
+module ContentBlockTools
+  module Presenters
+    module FieldPresenters
+      module TimePeriod
+        class TimePeriodPresenterError < RuntimeError; end
+
+        class DateRangePresenter < BasePresenter
+          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}"
+          end
+
+        private
+
+          def start_date
+            presented_date(field.dig(:start, :date))
+          end
+
+          def end_date
+            presented_date(field.dig(:end, :date))
+          end
+
+          def presented_date(date)
+            Presenters::FieldPresenters::TimePeriod::DatePresenter.new(
+              date,
+            ).render
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -4,6 +4,8 @@ module ContentBlockTools
       module TimePeriod
         class TimePresenter < BasePresenter
           def render
+            return unless field.present?
+
             time = Time.parse(field)
             hour = time.strftime("%H")
             minute = time.strftime("%M")

data/lib/content_block_tools/version.rb

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

data/lib/content_block_tools.rb

@@ -10,6 +10,7 @@ require "content_block_tools/helpers/override_classes"
 
 require "content_block_tools/presenters/field_presenters/base_presenter"
 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"
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: content_block_tools
 version: !ruby/object:Gem::Version
-  version: 1.10.0
+  version: 1.10.2
 platform: ruby
 authors:
 - GOV.UK Dev
@@ -108,7 +108,7 @@ dependencies:
         version: '101.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '102.1'
+        version: '103.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -118,7 +118,7 @@ dependencies:
         version: '101.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '102.1'
+        version: '103.1'
 - !ruby/object:Gem::Dependency
   name: govspeak
   requirement: !ruby/object:Gem::Requirement
@@ -197,6 +197,7 @@ files:
 - 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/time_presenter.rb
 - lib/content_block_tools/version.rb
 - node_modules/govuk-frontend/README.md