icalendar 2.12.4 → 2.12.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6a9a656fd81bc80eb43cf61e14d95a3b582f66bae80417da16a7e5d621910581
-  data.tar.gz: df88f0f0a1619dbdcba157316aba616019d146fe74e46aba6d7603dc30b40c26
+  metadata.gz: 278fc513495386d4f80933b71c9ebb97195f6d9d365a2da920dd60f6375553d8
+  data.tar.gz: c6b6c63d1c24c7726b6e816cd350e5d7260c11a6e4475b8b886bd4658bfca15a
 SHA512:
-  metadata.gz: a0ad4eb07a4123fba9260916530046bd008a9f076a26a276f09a31cce789aa0801a38fff3d553b7b11fcb3de072c72aff758921ad601d7e643b808495425b0df
-  data.tar.gz: 06bab135b068613fdf8c4d10554a327a35b2072eb5e37c5e7bc7509b8e62b05e596153cfa8985065b2739e99eb7bc90dd8282c173972929900aa763d58e218b1
+  metadata.gz: 3e9e9a916e27b8b6adad3f65beaa9658ebd7a786a2d78b10e83d405a5520228e5ad2bbc1ad07dbeeec2dbd86b726f2edf9b08834bf13dc09e1c82248dd389c5f
+  data.tar.gz: b993e6df56b6f1219675c40cb2219514951771c6bbeacdd371e237677133e458f4938dbeb144452c98e70ccc2a5e28145fc3c1b6dc54a66030dedac4f8cee070

data/.github/workflows/main.yml

@@ -18,8 +18,6 @@ jobs:
       fail-fast: false
       matrix:
         ruby:
-          - 3.1
-          - 3.2
           - 3.3
           - 3.4
           - "4.0"

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 ## Unreleased
 
+## 2.12.5 - 2026-09-25
+- Generate timezone transition onsets and recurrence dates using the previous UTC offset. - Ben Abulafia
+- Limit parsing depth
+- Remove TZID from DATE values - Henry Blyth
+
 ## 2.12.4 - 2026-07-31
 - TEXT unescape fix - Vincent Gao
 

data/lib/icalendar/parser.rb

@@ -6,8 +6,9 @@ require 'stringio'
 module Icalendar
 
   class Parser
-    attr_writer :component_class
+    attr_writer :component_class, :parse_depth_limit
     attr_reader :source, :strict, :timezone_store, :verbose
+    attr_accessor :parse_depth
 
     CLEAN_BAD_WRAPPING_GSUB_REGEX = /\r?\n[ \t]/.freeze
 
@@ -39,6 +40,7 @@ module Icalendar
       read_in_data
       @strict = strict
       @verbose = verbose
+      @parse_depth = 0
       @timezone_store = TimezoneStore.new
     end
 
@@ -139,9 +141,16 @@ module Icalendar
       @component_class ||= Icalendar::Calendar
     end
 
+    def parse_depth_limit
+      # a valid ics file should only have 3 levels. Leaving some room for non-compliant custom components
+      @parse_depth_limit ||= 5
+    end
+
     PARSE_COMPONENT_KLASS_NAME_GSUB_REGEX = /\AV/.freeze
 
     def parse_component(component)
+      self.parse_depth += 1
+      raise ParseError.new("ics file nested too deeply") if parse_depth > parse_depth_limit
       while (fields = next_fields)
         if fields[:name] == 'end'
           klass_name = fields[:value].gsub(PARSE_COMPONENT_KLASS_NAME_GSUB_REGEX, '').downcase.capitalize
@@ -161,6 +170,7 @@ module Icalendar
           parse_property component, fields
         end
       end
+      self.parse_depth -= 1
       component
     end
 

data/lib/icalendar/tzinfo.rb

@@ -63,7 +63,8 @@ module Icalendar
     end
 
     def rrule
-      start = (respond_to?(:local_start_at) ? local_start_at : local_start).to_datetime
+      # RFC 5545 defines the onset in local time using TZOFFSETFROM.
+      start = (respond_to?(:local_end_at) ? local_end_at : local_end).to_datetime
       # this is somewhat of a hack, but seems to work ok
       # assumes that no timezone transition is in law as "4th X of the month"
       # but only as 1st X, 2nd X, 3rd X, or Last X
@@ -78,7 +79,7 @@ module Icalendar
     end
 
     def dtstart
-      (respond_to?(:local_start_at) ? local_start_at : local_start).to_datetime.strftime '%Y%m%dT%H%M%S'
+      (respond_to?(:local_end_at) ? local_end_at : local_end).to_datetime.strftime '%Y%m%dT%H%M%S'
     end
   end
 

data/lib/icalendar/values/date.rb

@@ -10,6 +10,7 @@ module Icalendar
 
       def initialize(value, params = {}, *args)
         params.delete 'tzid'
+        params.delete :tzid
         if value.is_a? String
           begin
             parsed_date = ::Date.strptime(value, FORMAT)

data/lib/icalendar/version.rb

@@ -2,6 +2,6 @@
 
 module Icalendar
 
-  VERSION = '2.12.4'
+  VERSION = '2.12.5'
 
 end

data/spec/fixtures/invalid_nesting.ics

@@ -0,0 +1,47 @@
+BEGIN:VCALENDAR
+VERSION:2.0
+PRODID:bsprodidfortestabc123
+BEGIN:VEVENT
+UID:bsuidfortestabc123
+ORGANIZER:mailto:joebob@random.net
+ATTACH:http://bush.sucks.org/impeach/him.rhtml
+ATTACH:http://corporations-dominate.existence.net/why.rhtml
+SUMMARY:This is a really long summary
+  to test the method of unfolding lines\,
+  so I'm just going to ma
+ ke it
+  a whol
+ e
+  bunch of lines.
+CLASS:PRIVATE
+PRIORITY:2
+CUSTOMFIELD:Not properly noted as custom with X- prefix.
+GEO:37.386013;-122.0829322
+DTSTART;TZID=US-Mountain:20050120T170000
+DTEND:20050120T184500
+DTSTAMP:20050118T211523Z
+NAME:SomeName
+BEGIN:X-NESTING
+BEGIN:X-NESTING
+BEGIN:X-NESTING
+BEGIN:X-NESTING
+BEGIN:X-NESTING
+BEGIN:X-NESTING
+BEGIN:X-NESTING
+BEGIN:X-NESTING
+BEGIN:X-NESTING
+BEGIN:X-NESTING
+BEGIN:X-NESTING
+END:X-NESTING
+END:X-NESTING
+END:X-NESTING
+END:X-NESTING
+END:X-NESTING
+END:X-NESTING
+END:X-NESTING
+END:X-NESTING
+END:X-NESTING
+END:X-NESTING
+END:X-NESTING
+END:VEVENT
+END:VCALENDAR

data/spec/parser_spec.rb

@@ -87,6 +87,14 @@ describe Icalendar::Parser do
     end
   end
 
+  describe '#parse with invalid nesting' do
+    let(:fn) { 'invalid_nesting.ics' }
+
+    it 'raises a ParseError' do
+      expect { subject.parse }.to raise_error Icalendar::Parser::ParseError
+    end
+  end
+
   describe '#parse with bad line' do
     let(:fn) { 'single_event_bad_line.ics' }
 

data/spec/tzinfo_spec.rb

@@ -25,6 +25,49 @@ describe 'TZInfo::Timezone' do
     specify { expect(subject.standards.first.rrule.first.value_ical).to eq "FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10" }
   end
 
+  describe 'transition onset' do
+    let(:date) { DateTime.new 2021, 7, 1 }
+
+    {
+      'Europe/Stockholm' => {
+        daylight: ['20210328T020000', '+0100', '20210328T010000Z'],
+        standard: ['20211031T030000', '+0200', '20211031T010000Z']
+      },
+      'Australia/Lord_Howe' => {
+        daylight: ['20211003T020000', '+1030', '20211002T153000Z'],
+        standard: ['20210404T020000', '+1100', '20210403T150000Z']
+      }
+    }.each do |identifier, transitions|
+      context identifier do
+        let(:tz) { TZInfo::Timezone.get identifier }
+
+        transitions.each do |kind, (local, offset, utc)|
+          it "serializes the #{kind} onset using the previous offset" do
+            calendar = Icalendar::Calendar.new
+            calendar.add_timezone subject
+            parsed = Icalendar::Calendar.parse(calendar.to_ical).first.timezones.first
+            component = parsed.public_send("#{kind}s").first
+
+            expect(component.dtstart.value_ical).to eq local
+            expect(component.tzoffsetfrom.value_ical).to eq offset
+            onset = DateTime.strptime("#{component.dtstart.value_ical}#{offset}", '%Y%m%dT%H%M%S%z')
+            expect(onset.new_offset(0).strftime('%Y%m%dT%H%M%SZ')).to eq utc
+          end
+        end
+      end
+    end
+
+    context 'when the clock change crosses midnight' do
+      let(:tz) { TZInfo::Timezone.get 'America/Santiago' }
+
+      it 'uses the previous-offset date for both DTSTART and the recurrence rule' do
+        standard = subject.standards.first
+        expect(standard.dtstart.value_ical).to eq '20210404T000000'
+        expect(standard.rrule.first.value_ical).to eq 'FREQ=YEARLY;BYDAY=1SU;BYMONTH=4'
+      end
+    end
+  end
+
   describe 'no end transition' do
     let(:tz) { TZInfo::Timezone.get 'Asia/Shanghai' }
     let(:date) { DateTime.now }
@@ -34,7 +77,7 @@ describe 'TZInfo::Timezone' do
 BEGIN:VTIMEZONE
 TZID:Asia/Shanghai
 BEGIN:STANDARD
-DTSTART:19910915T010000
+DTSTART:19910915T020000
 TZOFFSETFROM:+0900
 TZOFFSETTO:+0800
 TZNAME:CST

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: icalendar
 version: !ruby/object:Gem::Version
-  version: 2.12.4
+  version: 2.12.5
 platform: ruby
 authors:
 - Ryan Ahearn
@@ -261,6 +261,7 @@ files:
 - spec/fixtures/bad_wrapping.ics
 - spec/fixtures/custom_component.ics
 - spec/fixtures/event.ics
+- spec/fixtures/invalid_nesting.ics
 - spec/fixtures/nondefault_values.ics
 - spec/fixtures/nonstandard.ics
 - spec/fixtures/recurrence.ics
@@ -320,7 +321,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.6
+rubygems_version: 4.0.16
 specification_version: 4
 summary: A ruby implementation of the iCalendar specification (RFC-5545).
 test_files:
@@ -331,6 +332,7 @@ test_files:
 - spec/fixtures/bad_wrapping.ics
 - spec/fixtures/custom_component.ics
 - spec/fixtures/event.ics
+- spec/fixtures/invalid_nesting.ics
 - spec/fixtures/nondefault_values.ics
 - spec/fixtures/nonstandard.ics
 - spec/fixtures/recurrence.ics