preserve the timezone of time_object with ActiveSupport >= 7.2

icalendar · Dec 13, 2024 · b34ff7b · b34ff7b
1 parent 4b49e03
commit b34ff7b
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/lib/icalendar/recurrence/time_util.rb b/lib/icalendar/recurrence/time_util.rb
@@ -26,7 +26,12 @@ def to_time(time_object, options = {})
         if supported_time_object?(time_object)
           time_object
         elsif supported_icalendar_object?(time_object)
-          time_object.value
+          if !defined?(ActiveSupport) || Gem::Version.new(ActiveSupport::VERSION::STRING) < Gem::Version.new('7.2')
+            time_object.value
+          else
+            # Preserve the timezone of the time_object
+            time_object.value.to_time.in_time_zone(time_object.value.time_zone)
+          end
         elsif supported_datetime_object?(time_object)
           datetime_to_time(time_object, options)
         elsif supported_date_object?(time_object)