active-icalendar-events 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 66faac211abc46fa695ee95745004e6223cd07be003036c26d7fcbf91c2b0818
-  data.tar.gz: c526790a49ab6a346eafe16592775e9d04afc5084fa8eae1ba20ca4bc44a1522
+  metadata.gz: 6d892e9c6fe0c2ed7de91e9f085aa7e812901b6ddce53184928d6be5482a2a3b
+  data.tar.gz: 3ab320fe7a381d9361a50a629eeafdcae8e581b7695cdbc514b140e77fb11171
 SHA512:
-  metadata.gz: b075bbe5774a836656ebb7849d052f26a03ec321a335b181424fedecb4929e32e1f41eb11cb39d56f5922cb3fad2a986eb0fc938f074c34ca1f9b95fecc590a6
-  data.tar.gz: 5b8fa60c24e61314eee6e8d829ae02988ae9a57940d152de5ded2f6e62d96f6442df7a0c6d7c0a7e567735224668d50909d99121e7389430a8b392152b88884f
+  metadata.gz: 8a702e4fdec5d0474469d5445ab6eb218a54cebfce69d40872c7c75e5a3328666e1e6e917e6073ea379effc52bc6fc660c662e09442f332d1cf955997b23d3d8
+  data.tar.gz: 5956bb66a7955f25126cd861fb77e0386d8ee2cd073c7d36468007a4879185b4b0b8ce9599f2dbc62e87516bdbb2263e36ed706c68afc397c5a2145757bd11ce

data/lib/active-icalendar-events.rb

@@ -138,9 +138,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 +173,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 +197,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
 
@@ -284,9 +281,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
@@ -322,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
 
       event_start_considered = event_start_considered + interval.years
       event_end_considered = event_end_considered + interval.years

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.1
 platform: ruby
 authors:
 - William Starling