icalendar-recurrence 1.1.2 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 9a2ae1e548eb6c46fa2693f5951f3528e99b8abb
-  data.tar.gz: 0aaecc9ba2d1c7aa887f820d9dfe94348c472f28
+SHA256:
+  metadata.gz: 0ae33082e4e2cfe166c0dfa58e2ff01b2833fd40dafa6272d4add3cc48d76381
+  data.tar.gz: e2052acd29e364ddad718774c56d17b43cb7e75e27fd09e73f26a16e0da50e8d
 SHA512:
-  metadata.gz: f28af3cd81e7afde47cee2c16032ad1c6eee436064081fb3280355007ab0e063c60dceb2a7383e4c11df26ca347b6487bde78670ac1c34f508fef7a538178fdd
-  data.tar.gz: ff86db8785368cd0d38f84f06dc5c371298eeb6b642ce8331d3b5bd43645151eaba17475d1b25e92aedb16b8604842c10689ba571e0f40bed7a770ea28c74ccf
+  metadata.gz: 82818e3411bff13fdb16786d99b875270ad3066ed993ac5cdd31f270c2bb743392dc828c0ec436f5fb0cdb17c1613717498743ed7984e17d4d7a6958c7ec7e4d
+  data.tar.gz: 10be0f14a28212d383643bf9b2ddd65e851079032426dfc5f7ae3f4c2081ec0e08211d1be58d5b57b3e604d7fcc7d98528792cf8b9321ea8f58c8c321ceb45c1

data/.github/workflows/main.yml

@@ -0,0 +1,32 @@
+name: Ruby
+
+on:
+  push:
+    branches:
+      - main
+      - master
+  pull_request:
+    branches:
+      - main
+      - master
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    strategy:
+      matrix:
+        ruby:
+          - 3.0.6
+          - 3.1.4
+          - 3.2.2
+
+    steps:
+    - uses: actions/checkout@v4
+    - name: Set up Ruby
+      uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: ${{ matrix.ruby }}
+        bundler-cache: true
+    - name: Run rspec tests
+      run: bundle exec rake spec

data/.gitignore

@@ -1,5 +1,7 @@
 *.gem
 *.rbc
+.ruby-version
+.DS_Store
 .bundle
 .config
 .yardoc
@@ -14,4 +16,4 @@ rdoc
 spec/reports
 test/tmp
 test/version_tmp
-tmp
+tmp

data/CHANGELOG.md

@@ -1,5 +1,14 @@
 # icalendar-recurrence CHANGELOG
 
+## 1.2.0 (November 1, 2023)
+
+- Fix exception date handling across DST boundaries (PR #25)
+- Add `:parent` to the Occurrence class, to match constructor for Icalendar::Component (PR #23)
+- Add `Event#all_occurrences` method (PR #28)
+- Move TZInfo to a runtime dependency (PR #31)
+- Handle `RDATE` recurrence rules (PR #33)
+- Use built-in `.utc` method for occurrence time in all cases (PR #35 & #37)
+
 ## 1.1.2 (September 23, 2016)
 
 - Loosen dependency on ice_cube gem to allow minor upgrades (issue #16)

data/README.md

@@ -20,11 +20,15 @@ and run `bundle install` from your shell.
 require 'date' # for parse method
 require 'icalendar/recurrence'
 
-calendars = Icalendar.parse(File.read(path_to_ics)) # parse an ICS file
+calendars = Icalendar::Calendar.parse(File.read(path_to_ics)) # parse an ICS file
 event = Array(calendars).first.events.first # retrieve the first event
 event.occurrences_between(Date.parse("2014-01-01"), Date.parse("2014-02-01")) # get all occurrence for one month
 ```
 
+### Get all occurrences
+
+To get all occurrences you can use `all_occurrences`. This only works when you have specified an ending using `until` or `count` in your RRULE.
+
 ### Working with occurrences
 
 An event occurrence is a simple struct object with `start_time` and `end_time` methods.
@@ -67,7 +71,7 @@ EOF
 
 # An event that occurs every day, starting January 1, 2014 with one excluded 
 # date. January 28, 2014 will not appear in the occurrences.
-calendars = Icalendar.parse(ics_string)
+calendars = Icalendar::Calendar.parse(ics_string)
 every_day_except_jan_28 = Array(calendars).first.events.first
 puts "Every day except January 28, 2014, occurrences from 2014-01-01 to 2014-02-01:"
 puts every_day_except_jan_28.occurrences_between(Date.parse("2014-01-01"), Date.parse("2014-02-01"))

data/icalendar-recurrence.gemspec

@@ -18,14 +18,14 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_runtime_dependency 'icalendar', '~> 2.0'
-  spec.add_runtime_dependency 'ice_cube', '~> 0.13'
+  spec.add_runtime_dependency 'ice_cube', '~> 0.16'
+  spec.add_runtime_dependency 'tzinfo', '~> 2.0'
 
-  spec.add_development_dependency 'activesupport', '~> 4.0'
+  spec.add_development_dependency 'activesupport', '~> 7.1'
   spec.add_development_dependency 'awesome_print'
   spec.add_development_dependency 'pry'
-  spec.add_development_dependency 'bundler', '~> 1.3'
-  spec.add_development_dependency 'rake', '~> 10.2'
-  spec.add_development_dependency 'rspec', '~> 2.14'
-  spec.add_development_dependency 'timecop', '~> 0.6.3'
-  spec.add_development_dependency 'tzinfo', '~> 0.3'
+  spec.add_development_dependency 'bundler', '~> 2.0'
+  spec.add_development_dependency 'rake', '>= 12.3.3'
+  spec.add_development_dependency 'rspec', '~> 3.12'
+  spec.add_development_dependency 'timecop', '~> 0.9'
 end

data/lib/icalendar/recurrence/event_extensions.rb

@@ -13,8 +13,12 @@ module Icalendar
         dtend
       end
 
-      def occurrences_between(begin_time, closing_time)
-        schedule.occurrences_between(begin_time, closing_time)
+      def occurrences_between(begin_time, closing_time, spans: false)
+        schedule.occurrences_between(begin_time, closing_time, spans: spans)
+      end
+
+      def all_occurrences
+        schedule.all_occurrences
       end
 
       def schedule
@@ -33,4 +37,4 @@ module Icalendar
   class Event
     include Icalendar::Recurrence::EventExtensions
   end
-end
+end

data/lib/icalendar/recurrence/schedule.rb

@@ -2,7 +2,7 @@ require 'ice_cube'
 
 module Icalendar
   module Recurrence
-    class Occurrence < Struct.new(:start_time, :end_time)
+    class Occurrence < Struct.new(:start_time, :end_time, :parent)
     end
 
     class Schedule
@@ -32,8 +32,8 @@ module Icalendar
         end
       end
 
-      def occurrences_between(begin_time, closing_time)
-        ice_cube_occurrences = ice_cube_schedule.occurrences_between(TimeUtil.to_time(begin_time), TimeUtil.to_time(closing_time))
+      def occurrences_between(begin_time, closing_time, spans: false)
+        ice_cube_occurrences = ice_cube_schedule.occurrences_between(TimeUtil.to_time(begin_time), TimeUtil.to_time(closing_time), spans: spans)
 
         ice_cube_occurrences.map do |occurrence|
           convert_ice_cube_occurrence(occurrence)
@@ -49,20 +49,10 @@ module Icalendar
       end
 
       def convert_ice_cube_occurrence(ice_cube_occurrence)
-        if timezone
-          begin
-            tz = TZInfo::Timezone.get(timezone)
-            start_time = tz.local_to_utc(ice_cube_occurrence.start_time)
-            end_time = tz.local_to_utc(ice_cube_occurrence.end_time)
-          rescue TZInfo::InvalidTimezoneIdentifier => e
-            warn "Unknown TZID specified in ical event (#{timezone.inspect}), ignoring (will likely cause event to be at wrong time!)"
-          end
-        end
+        start_time = ice_cube_occurrence.start_time.utc
+        end_time = ice_cube_occurrence.end_time.utc
 
-        start_time ||= ice_cube_occurrence.start_time
-        end_time ||= ice_cube_occurrence.end_time
-
-        Icalendar::Recurrence::Occurrence.new(start_time, end_time)
+        Icalendar::Recurrence::Occurrence.new(start_time, end_time, @event)
       end
 
       def ice_cube_schedule
@@ -75,14 +65,25 @@ module Icalendar
           schedule.add_recurrence_rule(ice_cube_recurrence_rule)
         end
 
-        event.exdate.each do |exception_date|
-          exception_date = Time.parse(exception_date) if exception_date.is_a?(String)
-          schedule.add_exception_time(TimeUtil.to_time(exception_date))
+        event.exdate.each do |exception_date_or_dates|
+          Array(exception_date_or_dates).each do |exception_date|
+            # exception times should have the same tz offset as the event start or they'll be ignored as different times
+            # ignored if ActiveSupport::TimeWithZone is available
+            schedule.add_exception_time(TimeUtil.to_time(exception_date, moment: start_time))
+          end
+        end
+
+        event.rdate.each do |extra_date_or_dates|
+          Array(extra_date_or_dates).each do |extra_date|
+            # exception times should have the same tz offset as the event start or they'll be ignored as different times
+            # ignored if ActiveSupport::TimeWithZone is available
+            schedule.add_recurrence_time(TimeUtil.to_time(extra_date, moment: start_time))
+          end
         end
 
         schedule
       end
-      
+
       def convert_duration_to_seconds(ical_duration)
         return 0 unless ical_duration
 

data/lib/icalendar/recurrence/time_util.rb

@@ -1,11 +1,17 @@
 require 'tzinfo'
+begin
+  require 'active_support/time'
+rescue LoadError
+  # that's ok, will just fall back to Time
+end
 
 module Icalendar
   module Recurrence
     module TimeUtil
-      def datetime_to_time(datetime)
+      def datetime_to_time(datetime, options = {})
         raise ArgumentError, "Unsupported DateTime object passed (must be Icalendar::Values::DateTime#{datetime.class} passed instead)" unless supported_datetime_object?(datetime)
-        offset = timezone_offset(datetime.ical_params["tzid"], moment: datetime.to_date)
+        options[:moment] ||= datetime.to_date
+        offset = timezone_offset(datetime.ical_params["tzid"], options)
         offset ||= datetime.strftime("%:z")
 
         Time.new(datetime.year, datetime.month, datetime.mday, datetime.hour, datetime.min, datetime.sec, offset)
@@ -16,11 +22,13 @@ module Icalendar
         Time.new(date.year, date.month, date.mday)
       end
 
-      def to_time(time_object)
+      def to_time(time_object, options = {})
         if supported_time_object?(time_object)
           time_object
+        elsif supported_icalendar_object?(time_object)
+          time_object.value
         elsif supported_datetime_object?(time_object)
-          datetime_to_time(time_object)
+          datetime_to_time(time_object, options)
         elsif supported_date_object?(time_object)
           date_to_time(time_object)
         elsif time_object.is_a?(String)
@@ -41,8 +49,7 @@ module Icalendar
       #
       def timezone_offset(tzid, options = {})
         tzid = Array(tzid).first
-        options = {moment: Time.now}.merge(options)
-        moment = options.fetch(:moment)
+        moment = options.fetch(:moment, Time.now)
         utc_moment = to_time(moment.clone).utc
         tzid = tzid.to_s.gsub(/^(["'])|(["'])$/, "")
         utc_offset =  TZInfo::Timezone.get(tzid).period_for_utc(utc_moment).utc_total_offset # this seems to work, but I feel like there is a lurking bug
@@ -50,7 +57,7 @@ module Icalendar
         hour_offset = "+#{hour_offset}" if hour_offset >= 0
         match = hour_offset.to_s.match(/(\+|-)(\d+)/)
         "#{match[1]}#{match[2].rjust(2, "0")}:00"
-      rescue TZInfo::InvalidTimezoneIdentifier => e
+      rescue TZInfo::InvalidTimezoneIdentifier
         nil
       end
 
@@ -67,8 +74,16 @@ module Icalendar
         time_object.is_a?(Icalendar::Values::DateTime)
       end
 
+      def supported_icalendar_object?(time_object)
+        time_object.is_a?(Icalendar::Values::DateTime) && supported_activesupport_object?(time_object.value)
+      end
+
       def supported_time_object?(time_object)
-        time_object.is_a?(Time)
+        time_object.is_a?(Time) || supported_activesupport_object?(time_object)
+      end
+
+      def supported_activesupport_object?(time_object)
+        defined?(ActiveSupport::TimeWithZone) && time_object.is_a?(ActiveSupport::TimeWithZone)
       end
 
       # Replaces the existing offset with one associated with given TZID. Does

data/lib/icalendar/recurrence/version.rb

@@ -1,5 +1,5 @@
 module Icalendar
   module Recurrence
-    VERSION = "1.1.2"
+    VERSION = "1.2.0"
   end
 end

data/spec/lib/recurrence_spec.rb

@@ -52,9 +52,31 @@ describe "Event#occurrences_between" do
     end
   end
 
+  context "event repeating every thursday with multiple exceptions" do
+    context "exclusions are on a single line" do
+      let(:event) { example_event :multiple_exception } # has exclusions in array form
+      it "properly calculates recurrence, including exclusion dates" do
+        occurrences = event.occurrences_between(start_time, start_time + 1.months)
+
+        expect(occurrences.length).to eq(1)
+        expect(occurrences.first.start_time).to eq(Time.parse("2017-11-16 13:40:00 UTC"))
+      end
+    end
+
+    context "exclusions are on multiple lines" do
+      let(:event) { example_event :multiple_exception_multiple_line } # has multiple single exclusions
+      it "properly calculates recurrence, including exclusion dates" do
+        occurrences = event.occurrences_between(start_time, start_time + 1.months)
+
+        expect(occurrences.length).to eq(1)
+        expect(occurrences.first.start_time).to eq(Time.parse("2017-11-16 13:40:00 UTC"))
+      end
+    end
+  end
+
   context "event repeating bimonthly (DST example)" do
     let(:event) { example_event :on_third_every_two_months }
-    
+
     it "occurs twice over 60 days" do
       occurrences = event.occurrences_between(start_time, start_time + 60.days)
 
@@ -64,6 +86,36 @@ describe "Event#occurrences_between" do
     end
   end
 
+  context "event repeating weekly with exdates" do
+    let(:event) { example_event :dst_exdate }
+
+    it "properly skips christmas and new years" do
+      occurrences = event.occurrences_between(start_time, start_time + 4.months)
+
+      expect(occurrences.length).to eq(14)
+      christmas_day = Date.new 2019, 12, 25
+      expect(occurrences.all? { |o| o.start_time.to_date != christmas_day }).to eq(true)
+      new_years_day = Date.new 2020, 1, 1
+      expect(occurrences.all? { |o| o.start_time.to_date != new_years_day }).to eq(true)
+    end
+  end
+
+  context "event repeating weekly with rdates" do
+    let(:event) { example_event :dst_rdate }
+
+    it "properly includes specified rdates" do
+      occurrences = event.occurrences_between(start_time, start_time + 4.months)
+      extra_day_after_period = Date.new 2020, 02, 01
+      occurrence = occurrences.find { |o| o.start_time.to_date == extra_day_after_period }
+
+      expect(occurrences.length).to eq(17)
+      expect(occurrence).to_not be_nil
+
+      expect(occurrence.start_time).to eq(Time.new 2020, 02, 01, 19, 0, 0, "+00:00")
+      expect(occurrence.end_time).to eq(Time.new 2020, 02, 01, 21, 0, 0, "+00:00")
+    end
+  end
+
   context "event repeating yearly" do
     let(:event) { example_event :first_of_every_year }
 
@@ -81,7 +133,7 @@ describe "Event#occurrences_between" do
 
     it "occurrs 10 times over two weeks" do
       occurrences = event.occurrences_between(start_time, start_time + 13.days)
-      
+
       expect(occurrences.length).to eq(10)
       expect(occurrences.map(&:start_time)).to include(Time.parse("2014-01-10"))
       expect(occurrences.map(&:start_time)).to_not include(Time.parse("2014-01-11"))
@@ -118,13 +170,13 @@ describe "Event#occurrences_between" do
 
   context "event repeating on first saturday of month event" do
     let(:event) { example_event :first_saturday_of_month }
-    
+
     it "occurs twice over two months" do
       occurrences = event.occurrences_between(start_time, start_time + 55.days)
 
       expected_start_times = [
-        Time.parse("2014-01-04 at 12am").force_zone("America/Los_Angeles"),
-        Time.parse("2014-02-01 at 12am").force_zone("America/Los_Angeles"),
+        Time.parse("2014-01-04 at 10am").force_zone("America/Los_Angeles"),
+        Time.parse("2014-02-01 at 10am").force_zone("America/Los_Angeles"),
       ]
 
       expect(occurrences.length).to eq(2)
@@ -151,4 +203,29 @@ describe "Event#occurrences_between" do
       expect(occurrences.first.start_time).to eq(Time.parse("20140114T180000Z"))
     end
   end
+end
+
+describe "Event#all_occurrences" do
+  let(:start_time) { event.start_time }
+
+  context "event repeating once a month for three months" do
+    let(:event) { example_event :one_day_a_month_for_three_months }
+
+    it "get all 3 occurences" do
+      occurrences = event.all_occurrences
+
+      expect(occurrences.length).to eq(3)
+    end
+  end
+
+  context "event repeating yearly" do
+    let(:event) { example_event :first_of_every_year }
+
+    it "can not get all occurences when not using count or until" do
+      expect {
+        event.all_occurrences
+      }.to raise_error(ArgumentError)
+    end
+  end
+
 end

data/spec/lib/schedule_spec.rb

@@ -13,6 +13,20 @@ describe Icalendar::Recurrence::Schedule do
       expect(example_occurrence).to respond_to :end_time
     end
 
+    it "returns occurrences within range, including duration spanning #start_time " do
+      schedule = Schedule.new(example_event(:week_long))
+      occurrences = schedule.occurrences_between(Time.parse("2014-01-13T09:00:00-08:00"), Date.parse("2014-01-20"), spans: true)
+
+      expect(schedule.start_time).to eq(Time.parse("2014-01-13T08:00:00-08:00"))
+      expect(occurrences.count).to eq(7)
+    end
+
+    it 'returns object whose event method matches the origin event' do
+      # Simple test to make sure the event carried over; different __id__
+      expect(example_occurrence.parent.custom_properties).to eq example_event(:daily).custom_properties
+      expect(example_occurrence.parent.name).to eq example_event(:daily).name
+    end
+
     context "timezoned event" do
       let(:example_occurrence) do
         timezoned_event = example_event :first_saturday_of_month
@@ -20,7 +34,7 @@ describe Icalendar::Recurrence::Schedule do
         example_occurrence = schedule.occurrences_between(Date.parse("2014-02-01"), Date.parse("2014-03-01")).first
       end
 
-      it "#occurrences_between return object that responds to #start_time and #end_time (timezoned example)" do
+      it "returns object that responds to #start_time and #end_time (timezoned example)" do
         expect(example_occurrence).to respond_to :start_time
         expect(example_occurrence).to respond_to :end_time
       end

data/spec/spec_helper.rb

@@ -12,7 +12,6 @@ include Icalendar::Recurrence
 include Helpers
 
 RSpec.configure do |config|
-  config.treat_symbols_as_metadata_keys_with_true_values = true
   config.run_all_when_everything_filtered = true
   config.filter_run :focus
   config.order = 'random'

data/spec/support/fixtures/dst_exdate_event.ics

@@ -0,0 +1,44 @@
+BEGIN:VCALENDAR
+PRODID:-//Google Inc//Google Calendar 70.9054//EN
+VERSION:2.0
+CALSCALE:GREGORIAN
+METHOD:PUBLISH
+X-WR-CALNAME:Minimal example
+X-WR-TIMEZONE:Europe/Berlin
+X-WR-CALDESC:Example for #221
+BEGIN:VTIMEZONE
+TZID:Europe/Berlin
+X-LIC-LOCATION:Europe/Berlin
+BEGIN:DAYLIGHT
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0200
+TZNAME:CEST
+DTSTART:19700329T020000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU
+END:DAYLIGHT
+BEGIN:STANDARD
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0100
+TZNAME:CET
+DTSTART:19701025T030000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU
+END:STANDARD
+END:VTIMEZONE
+BEGIN:VEVENT
+DTSTART;TZID=Europe/Berlin:20191016T100000
+DTEND;TZID=Europe/Berlin:20191016T120000
+RRULE:FREQ=WEEKLY;WKST=MO;UNTIL=20200129T225959Z;BYDAY=WE
+EXDATE;TZID=Europe/Berlin:20200101T100000
+EXDATE;TZID=Europe/Berlin:20191225T100000
+DTSTAMP:20191121T083508Z
+UID:01234567890123456789@google.com
+CREATED:20191001T090000Z
+DESCRIPTION:This repeating event should not occur on the specified EXDATEs
+LAST-MODIFIED:20191001T090000Z
+LOCATION:Room 1
+SEQUENCE:1
+STATUS:CONFIRMED
+SUMMARY:A repeating event
+TRANSP:OPAQUE
+END:VEVENT
+END:VCALENDAR

data/spec/support/fixtures/dst_rdate_event.ics

@@ -0,0 +1,43 @@
+BEGIN:VCALENDAR
+PRODID:-//Google Inc//Google Calendar 70.9054//EN
+VERSION:2.0
+CALSCALE:GREGORIAN
+METHOD:PUBLISH
+X-WR-CALNAME:Minimal example
+X-WR-TIMEZONE:Europe/Berlin
+X-WR-CALDESC:Example for #221
+BEGIN:VTIMEZONE
+TZID:Europe/Berlin
+X-LIC-LOCATION:Europe/Berlin
+BEGIN:DAYLIGHT
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0200
+TZNAME:CEST
+DTSTART:19700329T020000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU
+END:DAYLIGHT
+BEGIN:STANDARD
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0100
+TZNAME:CET
+DTSTART:19701025T030000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU
+END:STANDARD
+END:VTIMEZONE
+BEGIN:VEVENT
+DTSTART;TZID=Europe/Berlin:20191016T100000
+DTEND;TZID=Europe/Berlin:20191016T120000
+RRULE:FREQ=WEEKLY;WKST=MO;UNTIL=20200129T225959Z;BYDAY=WE
+RDATE;TZID=Europe/Berlin:20200201T200000
+DTSTAMP:20191121T083508Z
+UID:01234567890123456789@google.com
+CREATED:20191001T090000Z
+DESCRIPTION:This repeating event should additionally occur on the specified RDATESs
+LAST-MODIFIED:20191001T090000Z
+LOCATION:Room 1
+SEQUENCE:1
+STATUS:CONFIRMED
+SUMMARY:A repeating event
+TRANSP:OPAQUE
+END:VEVENT
+END:VCALENDAR

data/spec/support/fixtures/first_saturday_of_month_event.ics

@@ -29,8 +29,8 @@ DESCRIPTION:\nScheduled maintenance \n
 X-MS-OLK-SENDER:mailto:foo@example.ca
 ORGANIZER;SENT-BY="mailto:foo@example.ca":mailto:itadmin@example.ca
 X-MS-OLK-SENDER:mailto:foo@example.ca
-DTSTART;TZID="America/Los_Angeles":20140104T000000
-DTEND;TZID="America/Los_Angeles":20140104T040000
+DTSTART;TZID="America/Los_Angeles":20140104T100000
+DTEND;TZID="America/Los_Angeles":20140104T110000
 STATUS:CONFIRMED
 CLASS:PUBLIC
 X-MICROSOFT-CDO-INTENDEDSTATUS:BUSY

data/spec/support/fixtures/multiple_exception_event.ics

@@ -0,0 +1,20 @@
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//Apple Inc.//Mac OS X 10.12.6//EN
+BEGIN:VEVENT
+UID:AA000000-AAAA-CCCC-DDDD-CC7176000000
+DTSTART;TZID=Asia/Dubai:20171019T174000
+DTEND;TZID=Asia/Dubai:20171019T181000
+CREATED:20170830T130728Z
+DTSTAMP:20171016T185512Z
+EXDATE;TZID=Asia/Dubai:20171102T174000,20171026T174000,20171019T174000,20
+ 171109T174000
+LAST-MODIFIED:20171016T185511Z
+RRULE:FREQ=WEEKLY;UNTIL=20171215T195959Z;BYDAY=TH
+SEQUENCE:0
+SUMMARY:Exception with timezone
+TRANSP:OPAQUE
+X-APPLE-TRAVEL-ADVISORY-BEHAVIOR:AUTOMATIC
+END:VEVENT
+END:VCALENDAR

data/spec/support/fixtures/multiple_exception_multiple_line_event.ics

@@ -0,0 +1,22 @@
+BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//Apple Inc.//Mac OS X 10.12.6//EN
+BEGIN:VEVENT
+UID:AA000000-AAAA-CCCC-DDDD-CC7176000000
+DTSTART;TZID=Asia/Dubai:20171019T174000
+DTEND;TZID=Asia/Dubai:20171019T181000
+CREATED:20170830T130728Z
+DTSTAMP:20171016T185512Z
+EXDATE;TZID=Asia/Dubai:20171102T174000
+EXDATE;TZID=Asia/Dubai:20171026T174000
+EXDATE;TZID=Asia/Dubai:20171019T174000
+EXDATE;TZID=Asia/Dubai:20171109T174000
+LAST-MODIFIED:20171016T185511Z
+RRULE:FREQ=WEEKLY;UNTIL=20171215T195959Z;BYDAY=TH
+SEQUENCE:0
+SUMMARY:Exception with timezone
+TRANSP:OPAQUE
+X-APPLE-TRAVEL-ADVISORY-BEHAVIOR:AUTOMATIC
+END:VEVENT
+END:VCALENDAR

data/spec/support/fixtures/week_long_event.ics

@@ -0,0 +1,23 @@
+BEGIN:VCALENDAR
+X-WR-CALNAME:Example Calendar
+X-WR-CALID:f512e378-050c-4366-809a-ef471ce45b09:297138
+PRODID:Zimbra-Calendar-Provider
+VERSION:2.0
+METHOD:PUBLISH
+BEGIN:VEVENT
+UID:28aad2ac-af09-44d0-b07d-6f49177c086f
+RRULE:FREQ=DAILY;UNTIL=20140120T075959Z;INTERVAL=1
+SUMMARY:All week\, then done
+X-ALT-DESC;FMTTYPE=text/html:<html><body></body></html>
+ORGANIZER;CN=Jordan Raine:mailto:jraine@sfu.ca
+DTSTART;TZID="America/Los_Angeles":20140113T080000
+DTEND;TZID="America/Los_Angeles":20140113T120000
+STATUS:CONFIRMED
+CLASS:PUBLIC
+X-MICROSOFT-CDO-INTENDEDSTATUS:BUSY
+TRANSP:OPAQUE
+LAST-MODIFIED:20140117T200033Z
+DTSTAMP:20140117T200033Z
+SEQUENCE:0
+END:VEVENT
+END:VCALENDAR

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: icalendar-recurrence
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.2.0
 platform: ruby
 authors:
 - Jordan Raine
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-04-20 00:00:00.000000000 Z
+date: 2023-11-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: icalendar
@@ -30,28 +30,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.13'
+        version: '0.16'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.13'
+        version: '0.16'
+- !ruby/object:Gem::Dependency
+  name: tzinfo
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '7.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '7.1'
 - !ruby/object:Gem::Dependency
   name: awesome_print
   requirement: !ruby/object:Gem::Requirement
@@ -86,80 +100,66 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.2'
+        version: 12.3.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.2'
+        version: 12.3.3
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.14'
+        version: '3.12'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.14'
+        version: '3.12'
 - !ruby/object:Gem::Dependency
   name: timecop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.3
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.6.3
-- !ruby/object:Gem::Dependency
-  name: tzinfo
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '0.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
-description: 
+        version: '0.9'
+description:
 email:
 - jnraine@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/main.yml"
 - ".gitignore"
 - ".rspec"
-- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
 - Guardfile
@@ -179,6 +179,8 @@ files:
 - spec/lib/time_util_spec.rb
 - spec/spec_helper.rb
 - spec/support/fixtures/daily_event.ics
+- spec/support/fixtures/dst_exdate_event.ics
+- spec/support/fixtures/dst_rdate_event.ics
 - spec/support/fixtures/embedded_timezone_event.ics
 - spec/support/fixtures/every_monday_event.ics
 - spec/support/fixtures/every_other_day_event.ics
@@ -189,16 +191,19 @@ files:
 - spec/support/fixtures/first_sunday_of_january_yearly_event.ics
 - spec/support/fixtures/monday_until_friday_event.ics
 - spec/support/fixtures/multi_day_weekly_event.ics
+- spec/support/fixtures/multiple_exception_event.ics
+- spec/support/fixtures/multiple_exception_multiple_line_event.ics
 - spec/support/fixtures/on_third_every_two_months_event.ics
 - spec/support/fixtures/one_day_a_month_for_three_months_event.ics
 - spec/support/fixtures/utc_event.ics
+- spec/support/fixtures/week_long_event.ics
 - spec/support/fixtures/weekly_with_count_event.ics
 - spec/support/helpers.rb
 homepage: https://github.com/icalendar/icalendar-recurrence
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -213,9 +218,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.2
-signing_key: 
+rubygems_version: 3.4.10
+signing_key:
 specification_version: 4
 summary: Provides recurrence to icalendar gem.
 test_files:
@@ -224,6 +228,8 @@ test_files:
 - spec/lib/time_util_spec.rb
 - spec/spec_helper.rb
 - spec/support/fixtures/daily_event.ics
+- spec/support/fixtures/dst_exdate_event.ics
+- spec/support/fixtures/dst_rdate_event.ics
 - spec/support/fixtures/embedded_timezone_event.ics
 - spec/support/fixtures/every_monday_event.ics
 - spec/support/fixtures/every_other_day_event.ics
@@ -234,8 +240,11 @@ test_files:
 - spec/support/fixtures/first_sunday_of_january_yearly_event.ics
 - spec/support/fixtures/monday_until_friday_event.ics
 - spec/support/fixtures/multi_day_weekly_event.ics
+- spec/support/fixtures/multiple_exception_event.ics
+- spec/support/fixtures/multiple_exception_multiple_line_event.ics
 - spec/support/fixtures/on_third_every_two_months_event.ics
 - spec/support/fixtures/one_day_a_month_for_three_months_event.ics
 - spec/support/fixtures/utc_event.ics
+- spec/support/fixtures/week_long_event.ics
 - spec/support/fixtures/weekly_with_count_event.ics
 - spec/support/helpers.rb

data/.travis.yml

@@ -1,9 +0,0 @@
-language: ruby
-sudo: false
-rvm:
-  - 2.4.1
-  - 2.3.4
-  - 2.1.7
-  - 2.0.0
-  - 1.9.3
-script: bundle exec rspec