icalendar 2.9.0 → 2.10.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0f083428b61c781e197d459b5ba375139056f75e95b1b99e596169106a57ed20
-  data.tar.gz: acb3cdb07b0dc052664fc67619fa6301951daf70ac83a0430a839a0bdd3a5923
+  metadata.gz: 7b9f7e30ef6614ad4175a9d282d1b03b57f140f98a2962b4e0268aa015f8f942
+  data.tar.gz: 7ebabfddd0f3d8e8e05e1ef82d2389007c1419c727c5404d2ec2c1c09565a8bb
 SHA512:
-  metadata.gz: 595032415b8465be6f662f136a56dd6f4dd8af27e888c7a7b27ad1c688b3963466e34a949daa0111a65ea89037b33ea01d8f2ea24991f5d9a3869647521b6c7c
-  data.tar.gz: ac464077d0c421d27b39270f1d12af23b59383e3e8351b68ec41a8385cc26670ca31b2f8dba72212e8db0996ea4a9e7c4a1b7b6a9b1b34d632169fae5a715725
+  metadata.gz: 8d3221e4e5bd2120014ae11fe80a8e0a3b36af37b10aadd18f3bc6022e296efa47ea27d09572900bb6d6419fff64054caa6709e6b14e5182d32a188d0130b7f0
+  data.tar.gz: 5d7d996d53a12543de0830fdb8214e2ae39df4c19c649e81cd95ceb8d30d61f1f178b7a9a4f4e37adb591609eeac7e89d930cf5ffc24951c9cbfcb0b815c2a03

data/.github/workflows/main.yml

@@ -17,13 +17,12 @@ jobs:
     strategy:
       matrix:
         ruby:
-          - 2.7.6
-          - 3.0.4
-          - 3.1.2
+          - 3.0.6
+          - 3.1.4
           - 3.2.2
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
     - name: Set up Ruby
       uses: ruby/setup-ruby@v1
       with:

data/History.txt

@@ -1,5 +1,13 @@
 === 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
+ * Move Values classes that shouldn't be directly used into Helpers module
+
 === 2.9.0 2023-08-11
  * Always include the VALUE of Event URLs for improved compatibility - Sean Kelley
  * Improved parse performance - Thomas Cannon

data/icalendar.gemspec

@@ -20,6 +20,10 @@ variety of calendaring applications.
 ActiveSupport is required for TimeWithZone support, but not required for general use.
   EOM
 
+  s.metadata = {
+    'changelog_uri' => 'https://github.com/icalendar/icalendar/blob/main/History.txt'
+  }
+
   s.files = `git ls-files`.split "\n"
   s.test_files = `git ls-files -- {test,spec,features}/*`.split "\n"
   s.executables = `git ls-files -- bin/*`.split("\n").map { |f| File.basename f }
@@ -34,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
@@ -48,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/has_properties.rb

@@ -148,7 +148,7 @@ module Icalendar
 
         define_method "#{prop}=" do |value|
           mapped = map_property_value value, klass, true, new_property
-          if mapped.is_a? Icalendar::Values::Array
+          if mapped.is_a? Icalendar::Values::Helpers::Array
             instance_variable_set property_var, mapped.to_a.compact
           else
             instance_variable_set property_var, [mapped].compact
@@ -179,7 +179,7 @@ module Icalendar
       if value.nil? || value.is_a?(Icalendar::Value)
         value
       elsif value.is_a? ::Array
-        Icalendar::Values::Array.new value, klass, params, {delimiter: (multi_valued ? ',' : ';')}
+        Icalendar::Values::Helpers::Array.new value, klass, params, {delimiter: (multi_valued ? ',' : ';')}
       else
         klass.new value, params
       end

data/lib/icalendar/parser.rb

@@ -84,7 +84,7 @@ module Icalendar
       klass = get_wrapper_class component, fields
       if wrap_in_array? klass, fields[:value], multi_property
         delimiter = fields[:value].match(WRAP_PROPERTY_VALUE_DELIMETER_REGEX)[1]
-        Icalendar::Values::Array.new fields[:value].split(WRAP_PROPERTY_VALUE_SPLIT_REGEX),
+        Icalendar::Values::Helpers::Array.new fields[:value].split(WRAP_PROPERTY_VALUE_SPLIT_REGEX),
                                      klass,
                                      fields[:params],
                                      delimiter: delimiter
@@ -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/value.rb

@@ -72,7 +72,7 @@ module Icalendar
 end
 
 # helpers; not actual iCalendar value type
-require_relative 'values/array'
+require_relative 'values/helpers/array'
 require_relative 'values/date_or_date_time'
 
 # iCalendar value types

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/date_time.rb

@@ -1,13 +1,13 @@
 # frozen_string_literal: true
 
 require 'date'
-require_relative 'time_with_zone'
+require_relative 'helpers/time_with_zone'
 
 module Icalendar
   module Values
 
     class DateTime < Value
-      include TimeWithZone
+      include Helpers::TimeWithZone
 
       FORMAT = '%Y%m%dT%H%M%S'
 

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

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+module Icalendar
+  module Values
+    module Helpers 
+      class ActiveSupportTimeWithZoneAdapter < ActiveSupport::TimeWithZone
+        # ActiveSupport::TimeWithZone implements a #to_a method that will cause
+        # unexpected behavior in components with multi_property DateTime
+        # properties when the setters for those properties are invoked with an
+        # Icalendar::Values::DateTime that is delegating for an
+        # ActiveSupport::TimeWithZone. To avoid this behavior, undefine #to_a.
+        undef_method :to_a
+      end
+    end
+  end
+end

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

@@ -0,0 +1,62 @@
+# frozen_string_literal: true
+
+module Icalendar
+  module Values
+    module Helpers
+
+      class Array < Value
+
+        attr_reader :value_delimiter
+
+        def initialize(value, klass, params = {}, options = {})
+          @value_delimiter = options[:delimiter] || ','
+          mapped = if value.is_a? ::Array
+                    value.map do |v|
+                      if v.is_a? Icalendar::Values::Helpers::Array
+                        Icalendar::Values::Helpers::Array.new v.value, klass, v.ical_params, delimiter: v.value_delimiter
+                      elsif v.is_a? ::Array
+                        Icalendar::Values::Helpers::Array.new v, klass, params, delimiter: value_delimiter
+                      elsif v.is_a? Icalendar::Value
+                        v
+                      else
+                        klass.new v, params
+                      end
+                    end
+                  else
+                    [klass.new(value, params)]
+                  end
+          super mapped
+        end
+
+        def params_ical
+          value.each do |v|
+            ical_params.merge! v.ical_params
+          end
+          super
+        end
+
+        def value_ical
+          value.map do |v|
+            v.value_ical
+          end.join value_delimiter
+        end
+
+        def valid?
+          klass = value.first.class
+          !value.all? { |v| v.class == klass }
+        end
+
+        def value_type
+          value.first.value_type
+        end
+
+        private
+
+        def needs_value_type?(default_type)
+          value.first.class != default_type
+        end
+      end
+
+    end
+  end
+end

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

@@ -0,0 +1,86 @@
+# frozen_string_literal: true
+
+begin
+  require 'active_support/time'
+
+  if defined?(ActiveSupport::TimeWithZone)
+    require_relative 'active_support_time_with_zone_adapter'
+  end
+rescue NameError
+  # ActiveSupport v7+ needs the base require to be run first before loading
+  # specific parts of it.
+  # https://guides.rubyonrails.org/active_support_core_extensions.html#stand-alone-active-support
+  require 'active_support'
+  retry
+rescue LoadError
+  # tis ok, just a bit less fancy
+end
+
+module Icalendar
+  module Values
+    module Helpers
+      module TimeWithZone
+        attr_reader :tz_utc, :timezone_store
+
+        def initialize(value, params = {})
+          params = Icalendar::DowncasedHash(params)
+          @tz_utc = params['tzid'] == 'UTC'
+          @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
+
+        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 !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
+                ::Time.new value.year, value.month, value.day, value.hour, value.min, value.sec, offset
+              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
+          end
+        end
+
+        def set_offset?
+          !!@offset_value
+        end
+      end
+    end
+  end
+end

data/lib/icalendar/values/time.rb

@@ -1,13 +1,13 @@
 # frozen_string_literal: true
 
 require 'date'
-require_relative 'time_with_zone'
+require_relative 'helpers/time_with_zone'
 
 module Icalendar
   module Values
 
     class Time < Value
-      include TimeWithZone
+      include Helpers::TimeWithZone
 
       FORMAT = '%H%M%S'
 

data/lib/icalendar/version.rb

@@ -2,6 +2,6 @@
 
 module Icalendar
 
-  VERSION = '2.9.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' }
 

data/spec/roundtrip_spec.rb

@@ -14,7 +14,7 @@ describe Icalendar do
       event = Icalendar::Event.new
       parsed = Icalendar::Calendar.parse(source).first
       event.rdate = parsed.events.first.rdate
-      expect(event.rdate.first).to be_kind_of Icalendar::Values::Array
+      expect(event.rdate.first).to be_kind_of Icalendar::Values::Helpers::Array
       expect(event.rdate.first.params_ical).to eq ";TZID=US-Mountain"
     end
   end

data/spec/values/date_time_spec.rb

@@ -27,6 +27,22 @@ describe Icalendar::Values::DateTime do
           expect(subject.value.utc.hour).to eq 23
         end
       end
+
+      context 'nonstandard format tzid local time' do
+        let(:value) { '20230901T230404' }
+        let(:params) { {'tzid' => 'Singapore Standard Time'} }
+
+        it 'parses the value as local time' do
+          expect(subject.value.hour).to eq 23
+          expect(subject.value.utc_offset).to eq 28800
+          expect(subject.value.utc.hour).to eq 15
+        end
+
+        it 'updates the tzid' do
+          # use an array because that's how output from the parser will end up
+          expect(subject.ical_params['tzid']).to eq ['Asia/Singapore']
+        end
+      end
     end
 
   else

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: icalendar
 version: !ruby/object:Gem::Version
-  version: 2.9.0
+  version: 2.10.1
 platform: ruby
 authors:
 - Ryan Ahearn
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-08-11 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
@@ -187,8 +187,6 @@ files:
 - lib/icalendar/todo.rb
 - lib/icalendar/tzinfo.rb
 - lib/icalendar/value.rb
-- lib/icalendar/values/active_support_time_with_zone_adapter.rb
-- lib/icalendar/values/array.rb
 - lib/icalendar/values/binary.rb
 - lib/icalendar/values/boolean.rb
 - lib/icalendar/values/cal_address.rb
@@ -197,12 +195,14 @@ files:
 - lib/icalendar/values/date_time.rb
 - lib/icalendar/values/duration.rb
 - lib/icalendar/values/float.rb
+- lib/icalendar/values/helpers/active_support_time_with_zone_adapter.rb
+- lib/icalendar/values/helpers/array.rb
+- lib/icalendar/values/helpers/time_with_zone.rb
 - lib/icalendar/values/integer.rb
 - lib/icalendar/values/period.rb
 - lib/icalendar/values/recur.rb
 - lib/icalendar/values/text.rb
 - lib/icalendar/values/time.rb
-- lib/icalendar/values/time_with_zone.rb
 - lib/icalendar/values/uri.rb
 - lib/icalendar/values/utc_offset.rb
 - lib/icalendar/version.rb
@@ -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
@@ -247,7 +248,8 @@ licenses:
 - BSD-2-Clause
 - GPL-3.0-only
 - icalendar
-metadata: {}
+metadata:
+  changelog_uri: https://github.com/icalendar/icalendar/blob/main/History.txt
 post_install_message: 'ActiveSupport is required for TimeWithZone support, but not
   required for general use.
 
@@ -266,7 +268,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.3.26
 signing_key:
 specification_version: 4
 summary: A ruby implementation of the iCalendar specification (RFC-5545).
@@ -281,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

data/lib/icalendar/values/active_support_time_with_zone_adapter.rb

@@ -1,14 +0,0 @@
-# frozen_string_literal: true
-
-module Icalendar
-  module Values
-    class ActiveSupportTimeWithZoneAdapter < ActiveSupport::TimeWithZone
-      # ActiveSupport::TimeWithZone implements a #to_a method that will cause
-      # unexpected behavior in components with multi_property DateTime
-      # properties when the setters for those properties are invoked with an
-      # Icalendar::Values::DateTime that is delegating for an
-      # ActiveSupport::TimeWithZone. To avoid this behavior, undefine #to_a.
-      undef_method :to_a
-    end
-  end
-end

data/lib/icalendar/values/array.rb

@@ -1,60 +0,0 @@
-# frozen_string_literal: true
-
-module Icalendar
-  module Values
-
-    class Array < Value
-
-      attr_reader :value_delimiter
-
-      def initialize(value, klass, params = {}, options = {})
-        @value_delimiter = options[:delimiter] || ','
-        mapped = if value.is_a? ::Array
-                   value.map do |v|
-                     if v.is_a? Icalendar::Values::Array
-                       Icalendar::Values::Array.new v.value, klass, v.ical_params, delimiter: v.value_delimiter
-                     elsif v.is_a? ::Array
-                       Icalendar::Values::Array.new v, klass, params, delimiter: value_delimiter
-                     elsif v.is_a? Icalendar::Value
-                       v
-                     else
-                       klass.new v, params
-                     end
-                   end
-                 else
-                   [klass.new(value, params)]
-                 end
-        super mapped
-      end
-
-      def params_ical
-        value.each do |v|
-          ical_params.merge! v.ical_params
-        end
-        super
-      end
-
-      def value_ical
-        value.map do |v|
-          v.value_ical
-        end.join value_delimiter
-      end
-
-      def valid?
-        klass = value.first.class
-        !value.all? { |v| v.class == klass }
-      end
-
-      def value_type
-        value.first.value_type
-      end
-
-      private
-
-      def needs_value_type?(default_type)
-        value.first.class != default_type
-      end
-    end
-
-  end
-end

data/lib/icalendar/values/time_with_zone.rb

@@ -1,55 +0,0 @@
-# frozen_string_literal: true
-
-require 'icalendar/timezone_store'
-
-begin
-  require 'active_support/time'
-
-  if defined?(ActiveSupport::TimeWithZone)
-    require 'icalendar/values/active_support_time_with_zone_adapter'
-  end
-rescue NameError
-  # ActiveSupport v7+ needs the base require to be run first before loading
-  # specific parts of it.
-  # https://guides.rubyonrails.org/active_support_core_extensions.html#stand-alone-active-support
-  require 'active_support'
-  retry
-rescue LoadError
-  # tis ok, just a bit less fancy
-end
-
-module Icalendar
-  module Values
-    module TimeWithZone
-      attr_reader :tz_utc
-
-      def initialize(value, params = {})
-        params = Icalendar::DowncasedHash(params)
-        @tz_utc = params['tzid'] == 'UTC'
-        x_tz_info = params.delete 'x-tz-info'
-
-        offset_value = unless params['tzid'].nil?
-          tzid = params['tzid'].is_a?(::Array) ? params['tzid'].first : params['tzid']
-          if defined?(ActiveSupport::TimeZone) &&
-              defined?(ActiveSupportTimeWithZoneAdapter) &&
-              (tz = ActiveSupport::TimeZone[tzid])
-            ActiveSupportTimeWithZoneAdapter.new(nil, tz, value)
-          elsif !x_tz_info.nil?
-            offset = x_tz_info.offset_for_local(value).to_s
-            if value.respond_to?(:change)
-              value.change offset: offset
-            else
-              ::Time.new value.year, value.month, value.day, value.hour, value.min, value.sec, offset
-            end
-          end
-        end
-        super((offset_value || value), params)
-      end
-
-      def params_ical
-        ical_params.delete 'tzid' if tz_utc
-        super
-      end
-    end
-  end
-end