icalendar 2.10.0 → 2.10.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4a4c654b36ffe5a09f521ad3c012686f12e582ba5d380242c646334f47153360
-  data.tar.gz: 184399a11e6e8a39b18ceeef59de8a9b9f7cd581f0c7169cce5c7dca63575e3b
+  metadata.gz: 7b9f7e30ef6614ad4175a9d282d1b03b57f140f98a2962b4e0268aa015f8f942
+  data.tar.gz: 7ebabfddd0f3d8e8e05e1ef82d2389007c1419c727c5404d2ec2c1c09565a8bb
 SHA512:
-  metadata.gz: 61837b5d19193d80d72f37edff89290fc2e5ffa0c6b9ee500036de58b0fbd9aacb5e0e9bc9f1a0a4e1ce7a3ad494ed0147e87bf697b54523d8b799e9eaa275fa
-  data.tar.gz: 00d54cc0ab4b7fc6acf616a537b426d110ddbe65dda1d6ab8ec938ba2df64e87def99023916c6193ab25d1885a2a60e8a1706617ed5a6e0adb5cb34671dae1ec
+  metadata.gz: 8d3221e4e5bd2120014ae11fe80a8e0a3b36af37b10aadd18f3bc6022e296efa47ea27d09572900bb6d6419fff64054caa6709e6b14e5182d32a188d0130b7f0
+  data.tar.gz: 5d7d996d53a12543de0830fdb8214e2ae39df4c19c649e81cd95ceb8d30d61f1f178b7a9a4f4e37adb591609eeac7e89d930cf5ffc24951c9cbfcb0b815c2a03

data/History.txt

@@ -1,5 +1,8 @@
 === Unreleased
 
+=== 2.10.1 2023-12-01
+ * Parsing now handles VTIMEZONE blocks defined after their TZID is used in events and other components
+
 === 2.10.0 2023-11-01
  * Add changelog metadata to gemspec - Juri Hahn
  * Attempt to rescue timezone info when given a nonstandard tzid with no VTIMEZONE

data/icalendar.gemspec

@@ -38,13 +38,13 @@ ActiveSupport is required for TimeWithZone support, but not required for general
 
   # test with all groups of tzinfo dependencies
   # tzinfo 2.x
-  # s.add_development_dependency 'tzinfo', '~> 2.0'
-  # s.add_development_dependency 'tzinfo-data', '~> 1.2020'
-  # tzinfo 1.x
-  s.add_development_dependency 'activesupport', '~> 6.0'
-  s.add_development_dependency 'i18n', '~> 1.8'
-  s.add_development_dependency 'tzinfo', '~> 1.2'
+  s.add_development_dependency 'activesupport', '~> 7.1'
+  s.add_development_dependency 'tzinfo', '~> 2.0'
   s.add_development_dependency 'tzinfo-data', '~> 1.2020'
+  # tzinfo 1.x
+  # s.add_development_dependency 'activesupport', '~> 6.0'
+  # s.add_development_dependency 'tzinfo', '~> 1.2'
+  # s.add_development_dependency 'tzinfo-data', '~> 1.2020'
   # tzinfo 0.x
   # s.add_development_dependency 'tzinfo', '~> 0.3'
   # end tzinfo
@@ -52,4 +52,5 @@ ActiveSupport is required for TimeWithZone support, but not required for general
   s.add_development_dependency 'timecop', '~> 0.9'
   s.add_development_dependency 'rspec', '~> 3.8'
   s.add_development_dependency 'simplecov', '~> 0.16'
+  s.add_development_dependency 'byebug'
 end

data/lib/icalendar/parser.rb

@@ -211,7 +211,7 @@ module Icalendar
             param_value = param_value.gsub(PVALUE_GSUB_REGEX, '')
             params[param_name] << param_value
             if param_name == 'tzid'
-              params['x-tz-info'] = timezone_store.retrieve param_value
+              params['x-tz-store'] = timezone_store
             end
           end
         end

data/lib/icalendar/timezone.rb

@@ -108,15 +108,17 @@ module Icalendar
 
     def standard_for(local)
       possible = standards.map do |std|
-        [std.previous_occurrence(local.to_time), std]
-      end
+        prev = std.previous_occurrence(local.to_time)
+        [prev, std] unless prev.nil?
+      end.compact
       possible.sort_by(&:first).last
     end
 
     def daylight_for(local)
       possible = daylights.map do |day|
-        [day.previous_occurrence(local.to_time), day]
-      end
+        prev = day.previous_occurrence(local.to_time)
+        [prev, day] unless prev.nil?
+      end.compact
       possible.sort_by(&:first).last
     end
   end

data/lib/icalendar/values/date.rb

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

data/lib/icalendar/values/helpers/time_with_zone.rb

@@ -20,22 +20,45 @@ module Icalendar
   module Values
     module Helpers
       module TimeWithZone
-        attr_reader :tz_utc
+        attr_reader :tz_utc, :timezone_store
 
         def initialize(value, params = {})
           params = Icalendar::DowncasedHash(params)
           @tz_utc = params['tzid'] == 'UTC'
-          x_tz_info = params.delete 'x-tz-info'
+          @timezone_store = params.delete 'x-tz-store'
+          super (offset_value(value, params) || value), params
+        end
+
+        def __getobj__
+          orig_value = super
+          if set_offset?
+            orig_value
+          else
+            offset = offset_value(orig_value, ical_params)
+            __setobj__(offset) unless offset.nil?
+            offset || orig_value
+          end
+        end
 
-          offset_value = unless params['tzid'].nil?
+        def params_ical
+          ical_params.delete 'tzid' if tz_utc
+          super
+        end
+
+        private
+
+        def offset_value(value, params)
+          @offset_value = unless params.nil? || params['tzid'].nil?
             tzid = params['tzid'].is_a?(::Array) ? params['tzid'].first : params['tzid']
             support_classes_defined = defined?(ActiveSupport::TimeZone) && defined?(ActiveSupportTimeWithZoneAdapter)
             if support_classes_defined && (tz = ActiveSupport::TimeZone[tzid])
+              Icalendar.logger.debug("Plan a - parsing #{value}/#{tzid} as ActiveSupport::TimeWithZone")
               # plan a - use ActiveSupport::TimeWithZone
               ActiveSupportTimeWithZoneAdapter.new(nil, tz, value)
-            elsif !x_tz_info.nil?
+            elsif !timezone_store.nil? && !(x_tz_info = timezone_store.retrieve(tzid)).nil?
               # plan b - use definition from provided `VTIMEZONE`
               offset = x_tz_info.offset_for_local(value).to_s
+              Icalendar.logger.debug("Plan b - parsing #{value} with offset: #{offset}")
               if value.respond_to?(:change)
                 value.change offset: offset
               else
@@ -43,17 +66,19 @@ module Icalendar
               end
             elsif support_classes_defined && (tz = ActiveSupport::TimeZone[tzid.split.first])
               # plan c - try to find an ActiveSupport::TimeWithZone based on the first word of the tzid
+              Icalendar.logger.debug("Plan c - parsing #{value}/#{tz.tzinfo.name} as ActiveSupport::TimeWithZone")
               params['tzid'] = [tz.tzinfo.name]
               ActiveSupportTimeWithZoneAdapter.new(nil, tz, value)
+            else
+              # plan d - just ignore the tzid
+              Icalendar.logger.info("Ignoring timezone #{tzid} for time #{value}")
+              nil
             end
-            # plan d - just ignore the tzid
           end
-          super((offset_value || value), params)
         end
 
-        def params_ical
-          ical_params.delete 'tzid' if tz_utc
-          super
+        def set_offset?
+          !!@offset_value
         end
       end
     end

data/lib/icalendar/version.rb

@@ -2,6 +2,6 @@
 
 module Icalendar
 
-  VERSION = '2.10.0'
+  VERSION = '2.10.1'
 
 end

data/spec/fixtures/reversed_timezone.ics

@@ -0,0 +1,143 @@
+BEGIN:VCALENDAR
+VERSION:2.0
+X-WR-CALNAME:My Calendar
+X-APPLE-CALENDAR-COLOR:#44A703
+BEGIN:VEVENT
+CREATED:20231026T211915Z
+DTEND;TZID=NONSTANDARDTZ:20231025T180000
+DTSTAMP:20231026T211916Z
+DTSTART;TZID=NONSTANDARDTZ:20231025T163000
+LAST-MODIFIED:20231026T211915Z
+LOCATION:Somewhere
+SEQUENCE:0
+SUMMARY:Summary summary summary
+UID:some-unique-uid
+END:VEVENT
+BEGIN:VTIMEZONE
+TZID:NONSTANDARDTZ
+X-LIC-LOCATION:NONSTANDARDTZ
+BEGIN:STANDARD
+DTSTART:18831118T120702
+RDATE:18831118T120702
+TZNAME:PST
+TZOFFSETFROM:-075258
+TZOFFSETTO:-0800
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19180331T020000
+RRULE:FREQ=YEARLY;UNTIL=19190330T100000Z;BYMONTH=3;BYDAY=-1SU
+TZNAME:PDT
+TZOFFSETFROM:-0800
+TZOFFSETTO:-0700
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19181027T020000
+RRULE:FREQ=YEARLY;UNTIL=19191026T090000Z;BYMONTH=10;BYDAY=-1SU
+TZNAME:PST
+TZOFFSETFROM:-0700
+TZOFFSETTO:-0800
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19420209T020000
+RDATE:19420209T020000
+TZNAME:PWT
+TZOFFSETFROM:-0800
+TZOFFSETTO:-0700
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+DTSTART:19450814T160000
+RDATE:19450814T160000
+TZNAME:PPT
+TZOFFSETFROM:-0700
+TZOFFSETTO:-0700
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19450930T020000
+RDATE:19450930T020000
+RDATE:19490101T020000
+TZNAME:PST
+TZOFFSETFROM:-0700
+TZOFFSETTO:-0800
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19460101T000000
+RDATE:19460101T000000
+RDATE:19670101T000000
+TZNAME:PST
+TZOFFSETFROM:-0800
+TZOFFSETTO:-0800
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19480314T020100
+RDATE:19480314T020100
+RDATE:19740106T020000
+RDATE:19750223T020000
+TZNAME:PDT
+TZOFFSETFROM:-0800
+TZOFFSETTO:-0700
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+DTSTART:19500430T010000
+RRULE:FREQ=YEARLY;UNTIL=19660424T090000Z;BYMONTH=4;BYDAY=-1SU
+TZNAME:PDT
+TZOFFSETFROM:-0800
+TZOFFSETTO:-0700
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19500924T020000
+RRULE:FREQ=YEARLY;UNTIL=19610924T090000Z;BYMONTH=9;BYDAY=-1SU
+TZNAME:PST
+TZOFFSETFROM:-0700
+TZOFFSETTO:-0800
+END:STANDARD
+BEGIN:STANDARD
+DTSTART:19621028T020000
+RRULE:FREQ=YEARLY;UNTIL=19661030T090000Z;BYMONTH=10;BYDAY=-1SU
+TZNAME:PST
+TZOFFSETFROM:-0700
+TZOFFSETTO:-0800
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19670430T020000
+RRULE:FREQ=YEARLY;UNTIL=19730429T100000Z;BYMONTH=4;BYDAY=-1SU
+TZNAME:PDT
+TZOFFSETFROM:-0800
+TZOFFSETTO:-0700
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:19671029T020000
+RRULE:FREQ=YEARLY;UNTIL=20061029T090000Z;BYMONTH=10;BYDAY=-1SU
+TZNAME:PST
+TZOFFSETFROM:-0700
+TZOFFSETTO:-0800
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19760425T020000
+RRULE:FREQ=YEARLY;UNTIL=19860427T100000Z;BYMONTH=4;BYDAY=-1SU
+TZNAME:PDT
+TZOFFSETFROM:-0800
+TZOFFSETTO:-0700
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+DTSTART:19870405T020000
+RRULE:FREQ=YEARLY;UNTIL=20060402T100000Z;BYMONTH=4;BYDAY=1SU
+TZNAME:PDT
+TZOFFSETFROM:-0800
+TZOFFSETTO:-0700
+END:DAYLIGHT
+BEGIN:DAYLIGHT
+DTSTART:20070311T020000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=2SU
+TZNAME:PDT
+TZOFFSETFROM:-0800
+TZOFFSETTO:-0700
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:20071104T020000
+RRULE:FREQ=YEARLY;BYMONTH=11;BYDAY=1SU
+TZNAME:PST
+TZOFFSETFROM:-0700
+TZOFFSETTO:-0800
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR

data/spec/parser_spec.rb

@@ -5,6 +5,15 @@ describe Icalendar::Parser do
   let(:source) { File.read File.join(File.dirname(__FILE__), 'fixtures', fn) }
 
   describe '#parse' do
+    context 'reversed_timezone.ics' do
+      let(:fn) { 'reversed_timezone.ics' }
+
+      it 'correctly parses the event timezone' do
+        event = subject.parse.first.events.first
+        expect(event.dtstart.utc_offset).to eq -25200
+      end
+    end
+
     context 'single_event.ics' do
       let(:fn) { 'single_event.ics' }
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: icalendar
 version: !ruby/object:Gem::Version
-  version: 2.10.0
+  version: 2.10.1
 platform: ruby
 authors:
 - Ryan Ahearn
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-11-01 00:00:00.000000000 Z
+date: 2023-12-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ice_cube
@@ -58,42 +58,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '7.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '6.0'
-- !ruby/object:Gem::Dependency
-  name: i18n
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.8'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.8'
+        version: '7.1'
 - !ruby/object:Gem::Dependency
   name: tzinfo
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: tzinfo-data
   requirement: !ruby/object:Gem::Requirement
@@ -150,6 +136,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.16'
+- !ruby/object:Gem::Dependency
+  name: byebug
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: |
   Implements the iCalendar specification (RFC-5545) in Ruby.  This allows
   for the generation and parsing of .ics files, which are used by a
@@ -216,6 +216,7 @@ files:
 - spec/fixtures/nondefault_values.ics
 - spec/fixtures/nonstandard.ics
 - spec/fixtures/recurrence.ics
+- spec/fixtures/reversed_timezone.ics
 - spec/fixtures/single_event.ics
 - spec/fixtures/single_event_bad_dtstart.ics
 - spec/fixtures/single_event_bad_line.ics
@@ -267,7 +268,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.10
+rubygems_version: 3.3.26
 signing_key:
 specification_version: 4
 summary: A ruby implementation of the iCalendar specification (RFC-5545).
@@ -282,6 +283,7 @@ test_files:
 - spec/fixtures/nondefault_values.ics
 - spec/fixtures/nonstandard.ics
 - spec/fixtures/recurrence.ics
+- spec/fixtures/reversed_timezone.ics
 - spec/fixtures/single_event.ics
 - spec/fixtures/single_event_bad_dtstart.ics
 - spec/fixtures/single_event_bad_line.ics