active-icalendar-events 0.0.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b212810d18b04c9d70bdfc4bdf9f23dc98ac30e0342ed7087807210080deaf15
-  data.tar.gz: 31679287a660305ec7df1cc588c6abbf1a53c90becca8f1154a5388e6731eae7
+  metadata.gz: aec07e1857f72267287393b71a8d3cf600a8ad92814ef862c99b8693890e473e
+  data.tar.gz: 95720ab414ecd1df386c6f7c1c9f7664313c1efb3437b65d464616c18c9b3a68
 SHA512:
-  metadata.gz: eda2bbc9424bf898d1aafe3f3085f11e7bb283a72c6d1b4e29d92d9790db8db3732bbae4058c77b92094d8ce2507a26a04f09ee8c64f4b6986c98a28318e3cbe
-  data.tar.gz: 6c40b35406af38798b9acd4d5df6caec1b9daa31053571d7837cf7722ed26f77c2c835a8d58848006f5533b9400d3b6cfbeab8b0b4c05e59c359bae6b6d192f9
+  metadata.gz: bf9a2bd544578257b52702aaaa71900116cf4a97ecc1b02e35a326d2550806350956fb4dcf17b5dd9e2ca66b8deef33e6a43197db8412a87198ba4f49aaaee76
+  data.tar.gz: ca6940f8a84da10a6f2c9477ee525507a105b8691afabc3e113999ab2b3584ddb8a95f918109cc6018d440fee7375c28dbb78242e49820f554bdd4c7b1de63b3

data/lib/active-icalendar-events.rb

@@ -87,18 +87,55 @@ module ActiveIcalendarEvents
     # Remove 'nil' if it has been put in the set
     active_events.delete nil
 
-    active_events
+    active_events.to_a
   end
 
   def format_icalendar_data(icalendar_data)
     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)
+        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)
+        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.downcase,
-        event_start: e.dtstart,
-        event_end: e.dtend,
+        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
       }
@@ -138,9 +175,8 @@ module ActiveIcalendarEvents
                !overridden_dates.include?(event_start_considered)
       end
 
-      if !excluding_dates.include?(event_start_considered)
-        considered_count += 1
-      end
+      # We consider both active dates and excluded dates for the recurrence count
+      considered_count += 1
 
       event_start_considered = event_start_considered + interval.days
       event_end_considered = event_end_considered + interval.days
@@ -174,15 +210,13 @@ module ActiveIcalendarEvents
                  !overridden_dates.include?(event_start_considered)
         end
 
-        if !excluding_dates.include?(event_start_considered)
-          considered_count += 1
-        end
+        # We consider both active dates and excluded dates for the recurrence count
+        considered_count += 1
       else
         week_event_start_considered =
           event_start_considered.monday? ? event_start_considered :
                                            event_start_considered.prev_occurring(:monday)
-        week_event_end_considered =
-          (week_event_start_considered.to_time + (event_end.to_time - event_start.to_time)).to_datetime
+        week_event_end_considered = week_event_start_considered + (event_end.to_time - event_start.to_time).seconds
 
         (1..7).each { |_|
           if week_event_start_considered >= event_start
@@ -200,9 +234,8 @@ module ActiveIcalendarEvents
                        !overridden_dates.include?(week_event_start_considered)
               end
 
-              if !excluding_dates.include?(week_event_start_considered)
-                considered_count += 1
-              end
+              # We consider both active dates and excluded dates for the recurrence count
+              considered_count += 1
             end
           end
 
@@ -285,9 +318,8 @@ module ActiveIcalendarEvents
                !overridden_dates.include?(event_start_considered)
       end
 
-      if !excluding_dates.include?(event_start_considered)
-        considered_count += 1
-      end
+      # We consider both active dates and excluded dates for the recurrence count
+      considered_count += 1
 
       if by_day.nil? || by_day.empty?
         event_start_considered = event_start_considered + interval.month
@@ -296,8 +328,7 @@ module ActiveIcalendarEvents
         event_start_considered =
           get_nth_day_in_month(event_start_considered.beginning_of_month + interval.month,
                                by_day.first)
-        event_end_considered =
-          (event_start_considered.to_time + (event_end.to_time - event_start.to_time)).to_datetime
+        event_end_considered = event_start_considered + (event_end.to_time - event_start.to_time).seconds
       end
     end
 
@@ -324,9 +355,8 @@ module ActiveIcalendarEvents
                !overridden_dates.include?(event_start_considered)
       end
 
-      if !excluding_dates.include?(event_start_considered)
-        considered_count += 1
-      end
+      # We consider both active dates and excluded dates for the recurrence count
+      considered_count += 1
 
       event_start_considered = event_start_considered + interval.years
       event_end_considered = event_end_considered + interval.years
@@ -357,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,
@@ -379,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,
@@ -391,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,
@@ -404,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,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active-icalendar-events
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.1.3
 platform: ruby
 authors:
 - William Starling
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-12-26 00:00:00.000000000 Z
+date: 2021-12-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport