icalendar 2.10.3 → 2.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '091658a5c785f876d990794ef88444d4ea39e047aaf533ca3e93bfc8549c2495'
-  data.tar.gz: 1292b5e139aae74264694245d9a722bc42e501abe6620b341b12d4922ac3cac8
+  metadata.gz: 8a3ae780c56015cbd4ff657ce042c086038f2f922069fa40eaaeaeedd3b7144c
+  data.tar.gz: 88d669f06da7a9b91c3c8a92dd08e11e70b8712a2c4b05a752427abc1ed56435
 SHA512:
-  metadata.gz: 698656b8f89e982eb58c80cce76c4a8512df6ebdbcc37779eeeb2c57daaf3f180fe0226c3a8bdb66155438e2f71afa6df76b537d8a4cb528646211c850a1e70d
-  data.tar.gz: acd49ceb561f8f5a61be057c3ea00b938a6907a4af9826afd27fe2f484e256d1ff97869d5777ac58e79e55834ed97cc7c56136fb38d6b54f500959dc054c8d22
+  metadata.gz: 250a5156dbb7f7ec7cd7f9fddd51982676d81b5a41ae2815c85b41f3f114e3b3c812c07794463d3563f85a93d8097075a19bb7d37b2ca4694682cc8804ff9be7
+  data.tar.gz: 11c71867043fd1fd94cc6199e470b9ff4ce55c7c5e2455d0435b46676b4017743cec130de8f5383faf66eee4e28a400b6b807bf76eb1c781fd47604b7276a4c5

data/.github/workflows/main.yml

@@ -21,6 +21,7 @@ jobs:
           - 3.1
           - 3.2
           - 3.3
+          - 3.4
 
     steps:
     - uses: actions/checkout@v4

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 ## Unreleased
 
+## 2.11.0 - 2025-04-12
+ - Require gems for ruby 3.4 that used to be in stdlib - Go Sueyoshi
+ - Refactor how timezone offsets are calculated - Pat Allan
+    - 'tzid' param is always returned as an array when accessing `ical_params` directly, rather than matching whatever the input parsed. ICS output remains unchanged
+
 ## 2.10.3 - 2024-09-21
  - Override Icalendar::Value.== so that value objects can be compared to each other.
  - Correctly load activesupport before activesupport/time

data/icalendar.gemspec

@@ -31,7 +31,9 @@ ActiveSupport is required for TimeWithZone support, but not required for general
 
   s.required_ruby_version = '>= 2.4.0'
 
+  s.add_dependency 'base64'
   s.add_dependency 'ice_cube', '~> 0.16'
+  s.add_dependency 'logger'
   s.add_dependency 'ostruct'
 
   s.add_development_dependency 'rake', '~> 13.0'

data/lib/icalendar/offset/active_support_exact.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+module Icalendar
+  class Offset
+    class ActiveSupportExact < Icalendar::Offset
+      def valid?
+        support_classes_defined? && tz
+      end
+
+      def normalized_value
+        Icalendar.logger.debug("Plan a - parsing #{value}/#{tzid} as ActiveSupport::TimeWithZone")
+        # plan a - use ActiveSupport::TimeWithZone
+        Icalendar::Values::Helpers::ActiveSupportTimeWithZoneAdapter.new(nil, tz, value)
+      end
+
+      private
+
+      def tz
+        @tz ||= ActiveSupport::TimeZone[tzid]
+      end
+    end
+  end
+end

data/lib/icalendar/offset/active_support_partial.rb

@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+module Icalendar
+  class Offset
+    class ActiveSupportPartial < Offset
+      def valid?
+        support_classes_defined? && tz
+      end
+
+      def normalized_value
+        # 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")
+        Icalendar::Values::Helpers::ActiveSupportTimeWithZoneAdapter.new(nil, tz, value)
+      end
+
+      def normalized_tzid
+        [tz.tzinfo.name]
+      end
+
+      private
+
+      def tz
+        @tz ||= ActiveSupport::TimeZone[tzid.split.first]
+      end
+    end
+  end
+end

data/lib/icalendar/offset/null.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+module Icalendar
+  class Offset
+    class Null < Offset
+      def valid?
+        true
+      end
+
+      def normalized_value
+        # plan d - just ignore the tzid
+        Icalendar.logger.info("Ignoring timezone #{tzid} for time #{value}")
+        nil
+      end
+    end
+  end
+end

data/lib/icalendar/offset/time_zone_store.rb

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+module Icalendar
+  class Offset
+    class TimeZoneStore < Offset
+      def valid?
+        timezone_store && tz_info
+      end
+
+      def normalized_value
+        # plan b - use definition from provided `VTIMEZONE`
+        offset = 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
+      end
+
+      private
+
+      def tz_info
+        @tz_info ||= timezone_store.retrieve(tzid)
+      end
+    end
+  end
+end

data/lib/icalendar/offset.rb

@@ -0,0 +1,42 @@
+# frozen_string_literal: true
+
+module Icalendar
+  class Offset
+    def self.build(value, params, timezone_store)
+      return nil if params.nil? || params['tzid'].nil?
+
+      tzid = Array(params['tzid']).first
+
+      [
+        Icalendar::Offset::ActiveSupportExact,
+        Icalendar::Offset::TimeZoneStore,
+        Icalendar::Offset::ActiveSupportPartial,
+        Icalendar::Offset::Null
+      ].lazy.map { |klass| klass.new(tzid, value, timezone_store) }.detect(&:valid?)
+    end
+
+    def initialize(tzid, value, timezone_store)
+      @tzid = tzid
+      @value = value
+      @timezone_store = timezone_store
+    end
+
+    def normalized_tzid
+      Array(tzid)
+    end
+
+    private
+
+    attr_reader :tzid, :value, :timezone_store
+
+    def support_classes_defined?
+      defined?(ActiveSupport::TimeZone) &&
+        defined?(Icalendar::Values::Helpers::ActiveSupportTimeWithZoneAdapter)
+    end
+  end
+end
+
+require_relative "offset/active_support_exact"
+require_relative "offset/active_support_partial"
+require_relative "offset/null"
+require_relative "offset/time_zone_store"

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

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require "icalendar/offset"
+
 begin
   require 'active_support'
   require 'active_support/time'
@@ -21,7 +23,13 @@ module Icalendar
           params = Icalendar::DowncasedHash(params)
           @tz_utc = params['tzid'] == 'UTC'
           @timezone_store = params.delete 'x-tz-store'
-          super (offset_value(value, params) || value), params
+
+          offset = Icalendar::Offset.build(value, params, timezone_store)
+
+          @offset_value = offset&.normalized_value
+          params['tzid'] = offset.normalized_tzid if offset
+
+          super (@offset_value || value), params
         end
 
         def __getobj__
@@ -29,9 +37,9 @@ module Icalendar
           if set_offset?
             orig_value
           else
-            offset = offset_value(orig_value, ical_params)
-            __setobj__(offset) unless offset.nil?
-            offset || orig_value
+            new_value = Icalendar::Offset.build(orig_value, ical_params, timezone_store)&.normalized_value
+            __setobj__(new_value) unless new_value.nil?
+            new_value || orig_value
           end
         end
 
@@ -42,36 +50,6 @@ module Icalendar
 
         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

data/lib/icalendar/version.rb

@@ -2,6 +2,6 @@
 
 module Icalendar
 
-  VERSION = '2.10.3'
+  VERSION = '2.11.0'
 
 end

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: icalendar
 version: !ruby/object:Gem::Version
-  version: 2.10.3
+  version: 2.11.0
 platform: ruby
 authors:
 - Ryan Ahearn
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-09-21 00:00:00.000000000 Z
+date: 2025-04-12 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: base64
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: ice_cube
   requirement: !ruby/object:Gem::Requirement
@@ -24,6 +38,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.16'
+- !ruby/object:Gem::Dependency
+  name: logger
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: ostruct
   requirement: !ruby/object:Gem::Requirement
@@ -195,6 +223,11 @@ files:
 - lib/icalendar/journal.rb
 - lib/icalendar/logger.rb
 - lib/icalendar/marshable.rb
+- lib/icalendar/offset.rb
+- lib/icalendar/offset/active_support_exact.rb
+- lib/icalendar/offset/active_support_partial.rb
+- lib/icalendar/offset/null.rb
+- lib/icalendar/offset/time_zone_store.rb
 - lib/icalendar/parser.rb
 - lib/icalendar/timezone.rb
 - lib/icalendar/timezone_store.rb