active-icalendar-events 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 981c99140882554d70998f2b1225ce89cb47b80fb7471172c62c215204aecdb5
-  data.tar.gz: 5d58a68cb6195024aedb6a0d461c8c03a98a1f88ad5d4c0f0250e4fe08e5d077
+  metadata.gz: aec07e1857f72267287393b71a8d3cf600a8ad92814ef862c99b8693890e473e
+  data.tar.gz: 95720ab414ecd1df386c6f7c1c9f7664313c1efb3437b65d464616c18c9b3a68
 SHA512:
-  metadata.gz: 426bb70b73ab75023013c15040498a1fc69605c5c39f08d06a83457e8e29467074064c7058083dd7223d4afad2be5a3d5c281d8a289b79d36560eff124b57ad4
-  data.tar.gz: be2600c740997701ffeab23b6eb51e844cefe31912f8c7baa9b383501a4505e50381e52c0fa844be76aad25ca2591403770999809ff0e7d0f88974f15b435083
+  metadata.gz: bf9a2bd544578257b52702aaaa71900116cf4a97ecc1b02e35a326d2550806350956fb4dcf17b5dd9e2ca66b8deef33e6a43197db8412a87198ba4f49aaaee76
+  data.tar.gz: ca6940f8a84da10a6f2c9477ee525507a105b8691afabc3e113999ab2b3584ddb8a95f918109cc6018d440fee7375c28dbb78242e49820f554bdd4c7b1de63b3

data/lib/active-icalendar-events.rb

@@ -94,23 +94,48 @@ module ActiveIcalendarEvents
     icalendar_data.first.events.map { |e|
       event_start = e.dtstart
       if event_start.is_a?(Icalendar::Values::Date)
-        timezone = ActiveSupport::TimeZone.new(e.parent.timezones.first.tzid.to_s)
+        timezone ||= ActiveSupport::TimeZone.new(e.parent.timezones.first.tzid.to_s)
         event_start = timezone.local(event_start.year, event_start.month, event_start.day)
       end
 
       event_end = e.dtend
       if event_end.is_a?(Icalendar::Values::Date)
-        timezone = ActiveSupport::TimeZone.new(e.parent.timezones.first.tzid.to_s)
+        timezone ||= ActiveSupport::TimeZone.new(e.parent.timezones.first.tzid.to_s)
         event_end = timezone.local(event_end.year, event_end.month, event_end.day)
       end
 
+      excluding_dates = e.exdate.map { |d|
+        if d.is_a?(Icalendar::Values::Date)
+          timezone ||= ActiveSupport::TimeZone.new(e.parent.timezones.first.tzid.to_s)
+          timezone.local(d.year, d.month, d.day)
+        else
+          d
+        end
+      }
+
+      recurrence_dates = e.rdate.map { |d|
+        if d.is_a?(Icalendar::Values::Date)
+          timezone ||= ActiveSupport::TimeZone.new(e.parent.timezones.first.tzid.to_s)
+          timezone.local(d.year, d.month, d.day)
+        else
+          d
+        end
+      }
+
+      e.rrule.each { |rrule|
+        if !rrule.until.nil?
+          timezone ||= ActiveSupport::TimeZone.new(e.parent.timezones.first.tzid.to_s)
+          rrule.until = timezone.parse(rrule.until)
+        end
+      }
+
       {
         name: e.summary,
         event_start: event_start,
         event_end: event_end,
         recurrence_rule: e.rrule,
-        recurrence_dates: e.rdate,
-        excluding_dates: e.exdate,
+        recurrence_dates: recurrence_dates,
+        excluding_dates: excluding_dates,
         recurrence_id: e.recurrence_id,
         uid: e.uid
       }
@@ -362,18 +387,13 @@ module ActiveIcalendarEvents
       return name if is_event_active?(datetime, recurrence_event_start, recurrence_event_end)
     }
 
-    until_datetime = nil
-    if !recurrence_rule.until.nil?
-      until_datetime = DateTime.parse(recurrence_rule.until)
-    end
-
     case recurrence_rule.frequency
     when "DAILY"
       return name if is_daily_event_active_for_datetime?(
         datetime,
         event_start,
         event_end,
-        until_datetime,
+        recurrence_rule.until,
         recurrence_rule.count,
         recurrence_rule.interval.nil? ? 1 : recurrence_rule.interval,
         excluding_dates,
@@ -384,7 +404,7 @@ module ActiveIcalendarEvents
         datetime,
         event_start,
         event_end,
-        until_datetime,
+        recurrence_rule.until,
         recurrence_rule.count,
         recurrence_rule.interval.nil? ? 1 : recurrence_rule.interval,
         recurrence_rule.by_day,
@@ -396,7 +416,7 @@ module ActiveIcalendarEvents
         datetime,
         event_start,
         event_end,
-        until_datetime,
+        recurrence_rule.until,
         recurrence_rule.count,
         recurrence_rule.interval.nil? ? 1 : recurrence_rule.interval,
         recurrence_rule.by_day,
@@ -409,7 +429,7 @@ module ActiveIcalendarEvents
         datetime,
         event_start,
         event_end,
-        until_datetime,
+        recurrence_rule.until,
         recurrence_rule.count,
         recurrence_rule.interval.nil? ? 1 : recurrence_rule.interval,
         excluding_dates,

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active-icalendar-events
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - William Starling