omnievent-icalendar 0.1.0.pre2 → 0.1.0.pre3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4fa79ecad05173ba82fe902d262b306f62efc15e422c61913041f0fbfc307444
-  data.tar.gz: 96479a4d9592eb0933e04e3343ce0514b2bd4402ecf712c40b2ff5e406cfa864
+  metadata.gz: 478361c4c57731a099c80c38f58324a9596e5868b6b24f50e3c404382b56b3b9
+  data.tar.gz: fa69074455c32057662f0d1e66496b6337bdde8c529bcae4c5eaa8e392916896
 SHA512:
-  metadata.gz: 3539a526615916b232c394ae6399f9532a9d324d731c29baf19e06bbea75c2c383a310a43791d9991fa20855716ffd477a9fd38dae7d204b7ea9fabd364aea75
-  data.tar.gz: 64defa9e542f040b0bcc169d69cfc7bd2ae264ac80f158f1a76d840ba57e589f9dc3e7864d26c6fe228ed9caade086647d68e782e9722fc80996e06040c115b3
+  metadata.gz: 7aa84afb2b0062dde09e598554fb68ac416fbff767ce3aa923b2bfd737048f2b64811d61bb4552c39165348cf1aa4f2fe0f7dbf8643c59095b1b1e2cd34dd6ff
+  data.tar.gz: 96b84d19fbd6dcb7de58ffc6043a091c4eecf660dcfcb9c4d60799fbaf37997d00953f590309ee21737287a6db151c962e370aafe62c1276342f824f5e05cf21

data/.rspec

@@ -1,3 +1,4 @@
 --format documentation
 --color
+--exclude-pattern vendor/**/*_spec.rb
 --require spec_helper

data/CHANGELOG.md

@@ -7,3 +7,7 @@
 ## [0.1.0.pre2] - 2022-10-21
 
 - Add recurrence support
+
+## [0.1.0.pre3] - 2022-11-20
+
+- Fix various recurrence issues

data/Gemfile.lock

@@ -1,12 +1,12 @@
 PATH
   remote: .
   specs:
-    omnievent-icalendar (0.1.0.pre2)
+    omnievent-icalendar (0.1.0.pre3)
       addressable (~> 2.7)
       icalendar
       icalendar-recurrence (~> 1.1)
       omnievent
-      open-uri
+      open-uri (= 0.1.0)
 
 GEM
   remote: https://rubygems.org/
@@ -18,7 +18,6 @@ GEM
     concurrent-ruby (1.1.10)
     crack (0.4.5)
       rexml
-    date (3.2.2)
     diff-lcs (1.5.0)
     hashdiff (1.0.1)
     hashie (5.0.0)
@@ -34,51 +33,44 @@ GEM
       hashie (>= 3.4.6)
       iso-639 (~> 0.3.5)
       tzinfo (~> 2.0)
-    open-uri (0.2.0)
-      stringio
-      time
-      uri
+    open-uri (0.1.0)
     parallel (1.22.1)
     parser (3.1.2.1)
       ast (~> 2.4.1)
     public_suffix (5.0.0)
     rainbow (3.1.1)
     rake (13.0.6)
-    regexp_parser (2.6.0)
+    regexp_parser (2.6.1)
     rexml (3.2.5)
-    rspec (3.11.0)
-      rspec-core (~> 3.11.0)
-      rspec-expectations (~> 3.11.0)
-      rspec-mocks (~> 3.11.0)
-    rspec-core (3.11.0)
-      rspec-support (~> 3.11.0)
-    rspec-expectations (3.11.1)
+    rspec (3.12.0)
+      rspec-core (~> 3.12.0)
+      rspec-expectations (~> 3.12.0)
+      rspec-mocks (~> 3.12.0)
+    rspec-core (3.12.0)
+      rspec-support (~> 3.12.0)
+    rspec-expectations (3.12.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.11.0)
-    rspec-mocks (3.11.1)
+      rspec-support (~> 3.12.0)
+    rspec-mocks (3.12.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.11.0)
-    rspec-support (3.11.1)
-    rubocop (1.36.0)
+      rspec-support (~> 3.12.0)
+    rspec-support (3.12.0)
+    rubocop (1.39.0)
       json (~> 2.3)
       parallel (~> 1.10)
       parser (>= 3.1.2.1)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
       rexml (>= 3.2.5, < 4.0)
-      rubocop-ast (>= 1.20.1, < 2.0)
+      rubocop-ast (>= 1.23.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.21.0)
+    rubocop-ast (1.23.0)
       parser (>= 3.1.1.0)
     ruby-progressbar (1.11.0)
-    stringio (3.0.2)
-    time (0.2.0)
-      date
     tzinfo (2.0.5)
       concurrent-ruby (~> 1.0)
     unicode-display_width (2.3.0)
-    uri (0.11.0)
     webmock (3.18.1)
       addressable (>= 2.8.0)
       crack (>= 0.3.2)

data/lib/omnievent/icalendar/version.rb

@@ -2,6 +2,6 @@
 
 module OmniEvent
   module Icalendar
-    VERSION = "0.1.0.pre2"
+    VERSION = "0.1.0.pre3"
   end
 end

data/lib/omnievent/strategies/icalendar.rb

@@ -95,10 +95,8 @@ module OmniEvent
       end
 
       def format_uid(event)
-        # See https://datatracker.ietf.org/doc/html/rfc5545#section-3.8.4.4
         event_uid = event.uid.to_s
         event_uid += "#{options.uid_delimiter}#{event.recurrence_id}" if event.recurrence_id
-        event_uid += "#{options.uid_delimiter}#{event.sequence}" if event.sequence
         event_uid
       end
 
@@ -116,23 +114,53 @@ module OmniEvent
       end
 
       def expand_recurrences(events)
-        events.each_with_object([]) do |event, res|
-          schedule = ::Icalendar::Recurrence::Schedule.new(event)
-
-          occurrences = if options.from_time && options.to_time
-                          schedule.occurrences_between(options.from_time, options.to_time)
-                        else
-                          schedule.all_occurrences
-                        end
-
-          occurrences.each do |occurrence|
-            occurrence_event = event.clone
-            occurrence_event.recurrence_id = occurrence.start_time
-            occurrence_event.dtstart = occurrence.start_time
-            occurrence_event.dtend = occurrence.end_time
-            res << occurrence_event
+        result = []
+
+        events.each do |event|
+          if recurrence?(event)
+            schedule = ::Icalendar::Recurrence::Schedule.new(event)
+            exceptions = events.select { |e| e.recurrence_id && (e.uid == event.uid) }
+
+            extract_occurences(schedule).each do |occurrence|
+              next if exception?(exceptions, occurrence)
+
+              occurrence_event = event.clone
+              occurrence_event.recurrence_id = occurrence.start_time
+              occurrence_event.dtstart = occurrence.start_time
+              occurrence_event.dtend = occurrence.end_time
+
+              result << occurrence_event
+            end
+          else
+            siblings = events
+                       .select { |e| e.recurrence_id.to_i == event.recurrence_id.to_i }
+                       .sort_by(&:sequence)
+
+            result << event if siblings.none? || (siblings.last.sequence == event.sequence)
           end
         end
+
+        result.sort_by(&:dtstart)
+      end
+
+      def extract_occurences(schedule)
+        if options.from_time && options.to_time
+          schedule.occurrences_between(options.from_time, options.to_time)
+        else
+          schedule.all_occurrences
+        end
+      end
+
+      def recurrence?(event)
+        present?(event.rrule) || present?(event.rdate)
+      end
+
+      def present?(property)
+        !!property && property.any?
+      end
+
+      def exception?(exceptions, occurrence)
+        exceptions.any? { |e| e.recurrence_id.to_i == occurrence.start_time.to_i }
       end
     end
   end

data/omnievent-icalendar.gemspec

@@ -32,7 +32,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "icalendar"
   spec.add_dependency "icalendar-recurrence", "~> 1.1"
   spec.add_dependency "omnievent"
-  spec.add_dependency "open-uri"
+  spec.add_dependency "open-uri", "0.1.0"
   spec.add_development_dependency "byebug"
   spec.add_development_dependency "webmock"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: omnievent-icalendar
 version: !ruby/object:Gem::Version
-  version: 0.1.0.pre2
+  version: 0.1.0.pre3
 platform: ruby
 authors:
 - Angus McLeod
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-10-21 00:00:00.000000000 Z
+date: 2022-11-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -70,16 +70,16 @@ dependencies:
   name: open-uri
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.1.0
 - !ruby/object:Gem::Dependency
   name: byebug
   requirement: !ruby/object:Gem::Requirement