active-icalendar-events 0.1.0 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 66faac211abc46fa695ee95745004e6223cd07be003036c26d7fcbf91c2b0818
-  data.tar.gz: c526790a49ab6a346eafe16592775e9d04afc5084fa8eae1ba20ca4bc44a1522
+  metadata.gz: ee9cc0c47ee4498afaf37e853db464fca142261bbf29aaa17439f66508c2610c
+  data.tar.gz: a3e5972072dbb410c1949cc2d53a7e7db741e55d9619ed628cc97c2ed2a3d1bf
 SHA512:
-  metadata.gz: b075bbe5774a836656ebb7849d052f26a03ec321a335b181424fedecb4929e32e1f41eb11cb39d56f5922cb3fad2a986eb0fc938f074c34ca1f9b95fecc590a6
-  data.tar.gz: 5b8fa60c24e61314eee6e8d829ae02988ae9a57940d152de5ded2f6e62d96f6442df7a0c6d7c0a7e567735224668d50909d99121e7389430a8b392152b88884f
+  metadata.gz: 4f9dbc20940280b719b5d4770e2e2de94544d5671a4b9aa1b6eceb41a126077d44e8d101eabd599f9885de7112d658000b199d8e305900d730b1f173565e94f8
+  data.tar.gz: f269876565330984d37d22c592dbef52102d774c387399698af734136347bb90387bea64a6dd25e6b0f64745a946e48d1efb593576966d31e7ec281d3e17cf34

data/lib/active-icalendar-events.rb

@@ -92,13 +92,50 @@ module ActiveIcalendarEvents
 
   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,
-        event_start: e.dtstart,
-        event_end: e.dtend,
+        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,9 +210,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
       else
         week_event_start_considered =
           event_start_considered.monday? ? event_start_considered :
@@ -199,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
 
@@ -217,6 +251,11 @@ module ActiveIcalendarEvents
     false
   end
 
+  # Get the beginning of the month, maintaining the timestamp
+  def beginning_of_month(datetime)
+    datetime - (datetime.day - 1).days
+  end
+
   def get_nth_day_in_month(datetime, day)
     matches = day.match /^([0-9]+)([A-Z]+)$/
     if matches.nil?
@@ -244,7 +283,7 @@ module ActiveIcalendarEvents
                   raise RuntimeError, "Unexpected day code used"
                 end
 
-    target_day = datetime.beginning_of_month
+    target_day = beginning_of_month(datetime)
 
     if target_day.strftime("%^a").chop != day_code
       target_day = target_day.next_occurring(day_label)
@@ -284,16 +323,15 @@ 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
         event_end_considered = event_end_considered + interval.month
       else
         event_start_considered =
-          get_nth_day_in_month(event_start_considered.beginning_of_month + interval.month,
+          get_nth_day_in_month(beginning_of_month(event_start_considered) + interval.month,
                                by_day.first)
         event_end_considered = event_start_considered + (event_end.to_time - event_start.to_time).seconds
       end
@@ -322,9 +360,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
@@ -355,18 +392,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,
@@ -377,7 +409,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,
@@ -389,7 +421,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,
@@ -402,7 +434,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.0
+  version: 0.1.4
 platform: ruby
 authors:
 - William Starling