active-icalendar-events 0.0.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0dd12f4342f70824ee8f51ec64c712bb2277948f6e12a077cba2f6b2768c2273
-  data.tar.gz: af303b6d8d5fa6148528c404a7142c7e5627cf2a76f1402714a8166952b44f1b
+  metadata.gz: 981c99140882554d70998f2b1225ce89cb47b80fb7471172c62c215204aecdb5
+  data.tar.gz: 5d58a68cb6195024aedb6a0d461c8c03a98a1f88ad5d4c0f0250e4fe08e5d077
 SHA512:
-  metadata.gz: 38d5c9328f3c6c3817f2f2d47fd47de1143a4e472498fdcc15349d17977f2016ce121e2b1198db4987f294bd7ebc25995f18ce9fd8144606fde7a58565d63e6f
-  data.tar.gz: 6b4effda0225339f70f23faab8df05da8933fbd379c81cf46556e814e4fe58375513c91a4c365fc6d1143c83eb57b40e448322e8930f18fc37a6a0f61a1d8fb5
+  metadata.gz: 426bb70b73ab75023013c15040498a1fc69605c5c39f08d06a83457e8e29467074064c7058083dd7223d4afad2be5a3d5c281d8a289b79d36560eff124b57ad4
+  data.tar.gz: be2600c740997701ffeab23b6eb51e844cefe31912f8c7baa9b383501a4505e50381e52c0fa844be76aad25ca2591403770999809ff0e7d0f88974f15b435083

data/lib/active-icalendar-events.rb

@@ -1,8 +1,5 @@
 #!/usr/bin/env ruby
 
-require 'bundler'
-Bundler.require
-
 require 'active_support'
 require 'active_support/core_ext'
 require 'date'
@@ -90,15 +87,27 @@ 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
+
       {
-        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,
@@ -141,9 +150,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
@@ -177,15 +185,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
@@ -203,9 +209,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
 
@@ -288,9 +293,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
@@ -299,8 +303,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
 
@@ -327,9 +330,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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active-icalendar-events
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.1.2
 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