active-icalendar-events 0.1.0 → 0.1.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/lib/active-icalendar-events.rb +10 -15
- metadata +1 -1
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 6d892e9c6fe0c2ed7de91e9f085aa7e812901b6ddce53184928d6be5482a2a3b
|
|
4
|
+
data.tar.gz: 3ab320fe7a381d9361a50a629eeafdcae8e581b7695cdbc514b140e77fb11171
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 8a702e4fdec5d0474469d5445ab6eb218a54cebfce69d40872c7c75e5a3328666e1e6e917e6073ea379effc52bc6fc660c662e09442f332d1cf955997b23d3d8
|
|
7
|
+
data.tar.gz: 5956bb66a7955f25126cd861fb77e0386d8ee2cd073c7d36468007a4879185b4b0b8ce9599f2dbc62e87516bdbb2263e36ed706c68afc397c5a2145757bd11ce
|
|
@@ -138,9 +138,8 @@ module ActiveIcalendarEvents
|
|
|
138
138
|
!overridden_dates.include?(event_start_considered)
|
|
139
139
|
end
|
|
140
140
|
|
|
141
|
-
|
|
142
|
-
|
|
143
|
-
end
|
|
141
|
+
# We consider both active dates and excluded dates for the recurrence count
|
|
142
|
+
considered_count += 1
|
|
144
143
|
|
|
145
144
|
event_start_considered = event_start_considered + interval.days
|
|
146
145
|
event_end_considered = event_end_considered + interval.days
|
|
@@ -174,9 +173,8 @@ module ActiveIcalendarEvents
|
|
|
174
173
|
!overridden_dates.include?(event_start_considered)
|
|
175
174
|
end
|
|
176
175
|
|
|
177
|
-
|
|
178
|
-
|
|
179
|
-
end
|
|
176
|
+
# We consider both active dates and excluded dates for the recurrence count
|
|
177
|
+
considered_count += 1
|
|
180
178
|
else
|
|
181
179
|
week_event_start_considered =
|
|
182
180
|
event_start_considered.monday? ? event_start_considered :
|
|
@@ -199,9 +197,8 @@ module ActiveIcalendarEvents
|
|
|
199
197
|
!overridden_dates.include?(week_event_start_considered)
|
|
200
198
|
end
|
|
201
199
|
|
|
202
|
-
|
|
203
|
-
|
|
204
|
-
end
|
|
200
|
+
# We consider both active dates and excluded dates for the recurrence count
|
|
201
|
+
considered_count += 1
|
|
205
202
|
end
|
|
206
203
|
end
|
|
207
204
|
|
|
@@ -284,9 +281,8 @@ module ActiveIcalendarEvents
|
|
|
284
281
|
!overridden_dates.include?(event_start_considered)
|
|
285
282
|
end
|
|
286
283
|
|
|
287
|
-
|
|
288
|
-
|
|
289
|
-
end
|
|
284
|
+
# We consider both active dates and excluded dates for the recurrence count
|
|
285
|
+
considered_count += 1
|
|
290
286
|
|
|
291
287
|
if by_day.nil? || by_day.empty?
|
|
292
288
|
event_start_considered = event_start_considered + interval.month
|
|
@@ -322,9 +318,8 @@ module ActiveIcalendarEvents
|
|
|
322
318
|
!overridden_dates.include?(event_start_considered)
|
|
323
319
|
end
|
|
324
320
|
|
|
325
|
-
|
|
326
|
-
|
|
327
|
-
end
|
|
321
|
+
# We consider both active dates and excluded dates for the recurrence count
|
|
322
|
+
considered_count += 1
|
|
328
323
|
|
|
329
324
|
event_start_considered = event_start_considered + interval.years
|
|
330
325
|
event_end_considered = event_end_considered + interval.years
|