govuk_publishing_components 23.10.1 → 23.10.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d2f681b78ca039b8a55b58be79b935acbb1f8c1ca30e010d8cbc26eaaf1b26b4
-  data.tar.gz: 0f7fdd2c05953ec4a4ccc73e7335d11195923a62fd959a1f99eebc5a944a0bc1
+  metadata.gz: 737265f42ca1a81cb1a854d9858c053b36da1dd49096d4ab271880e40a0d265a
+  data.tar.gz: 53e08f6b824be9665c54eb1e421463d63d8a761cc0aa8b432fdea43025fe173f
 SHA512:
-  metadata.gz: 070cf7a1d723b8d4aaddb9cfc366ab2f8b25445316efa000f8eacc4ea4c852aa764da637714ff29073fa016f2056b9a6083e1ed35b75629aea3156068f051232
-  data.tar.gz: e5632bc51e2307471d9b48dd668f8b76ff3c1f52f138e4efd07f09580887d6df510153e13d3aa4bfe5f18396d3d7fedd7ab9067f73297752c950a2c2dd989098
+  metadata.gz: d668236b7496da22426217927da594ff3dc3da9a903fafe647ca9ab47cc7877d779aef7dd841dde4b1f514571155a149a8d81bc40ff0b4e506ec8d90eeb6b80b
+  data.tar.gz: 5ea78e25ed6a8ca39346ce90b46262b96c793ebd0fcc84a83715378099f029aa2c72bc29f758ba1b414d81fc7a73a3b21e7bd35603313d621d8c7fb112b1364f

data/lib/govuk_publishing_components.rb

@@ -37,15 +37,17 @@ require "govuk_publishing_components/app_helpers/brand_helper"
 require "govuk_publishing_components/app_helpers/countdown_helper"
 require "govuk_publishing_components/app_helpers/environment"
 
-# Add view and i18n paths for usage outside of a Rails app
-ActionController::Base.append_view_path(
-  File.expand_path("app/views", GovukPublishingComponents::Config.gem_directory),
-)
-
+# Add i18n paths and views for usage outside of a Rails app
 I18n.load_path.unshift(
   *Dir.glob(File.expand_path("config/locales/*.yml", GovukPublishingComponents::Config.gem_directory)),
 )
 
+ActiveSupport.on_load(:action_controller) do
+  ActionController::Base.append_view_path(
+    File.expand_path("app/views", GovukPublishingComponents::Config.gem_directory),
+  )
+end
+
 module GovukPublishingComponents
   def self.render(component, options = {})
     I18n.with_locale(options.fetch(:locale, "en")) do

data/lib/govuk_publishing_components/app_helpers/countdown_helper.rb

@@ -1,18 +1,18 @@
 module GovukPublishingComponents
   module AppHelpers
     class CountdownHelper
-      END_OF_TRANSITION_PERIOD = Date.new(2021, 1, 1)
+      DEADLINE = Time.new(2020, 12, 31, 23, 59)
 
       def days_left
-        sprintf "%02d", days_left_integer
+        sprintf "%02d", days_left_until_deadline
       end
 
       def show?
-        days_left_integer.positive?
+        minutes_left_until_deadline >= 30
       end
 
       def days_text
-        if days_left_integer == 1
+        if days_left_until_deadline == 1
           I18n.t!("components.transition_countdown.day_to_go")
         else
           I18n.t!("components.transition_countdown.days_to_go")
@@ -21,12 +21,28 @@ module GovukPublishingComponents
 
     private
 
-      def days_left_integer
-        (END_OF_TRANSITION_PERIOD - today_in_london).to_i
+      def days_left_until_deadline
+        (minutes_left_until_deadline / 60 / 24).ceil
       end
 
-      def today_in_london
-        Time.find_zone("Europe/London").today
+      def minutes_left_until_deadline
+        (seconds_left_until_deadline / 60)
+      end
+
+      def seconds_left_until_deadline
+        end_of_transition_period - now_in_london
+      end
+
+      def end_of_transition_period
+        london_time_zone(DEADLINE)
+      end
+
+      def now_in_london
+        london_time_zone(Time.now)
+      end
+
+      def london_time_zone(time)
+        time.in_time_zone("Europe/London")
       end
     end
   end

data/lib/govuk_publishing_components/version.rb

@@ -1,3 +1,3 @@
 module GovukPublishingComponents
-  VERSION = "23.10.1".freeze
+  VERSION = "23.10.2".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: govuk_publishing_components
 version: !ruby/object:Gem::Version
-  version: 23.10.1
+  version: 23.10.2
 platform: ruby
 authors:
 - GOV.UK Dev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-12-17 00:00:00.000000000 Z
+date: 2020-12-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: govuk_app_config