icalendar 2.8.0 → 2.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: becd9ceba3342d0b602f1bb8a33858fb2176ceafd457a0fbca76d24ff7800dc7
-  data.tar.gz: f11054752ca18d026b1339e936ab30d4f1ff61219ecfd94d3f913b3de6b14106
+  metadata.gz: 4a4c654b36ffe5a09f521ad3c012686f12e582ba5d380242c646334f47153360
+  data.tar.gz: 184399a11e6e8a39b18ceeef59de8a9b9f7cd581f0c7169cce5c7dca63575e3b
 SHA512:
-  metadata.gz: 8262dd28d571778ecc7dd638d6df2a44e4c26bea2221183d82a644c777d100a75027c83ac83fd53c801d43cd75b9521be104111900d6653119a0593a281b8203
-  data.tar.gz: 1dea941db6e27188b9ab0d769a0df2335fdc2bc492a4ca6339a5e4a90e0d91f9821282aaed13b2cc4f8a4921e24a3d20f14aa34fea97c50c6326d3a1dc29f3cc
+  metadata.gz: 61837b5d19193d80d72f37edff89290fc2e5ffa0c6b9ee500036de58b0fbd9aacb5e0e9bc9f1a0a4e1ce7a3ad494ed0147e87bf697b54523d8b799e9eaa275fa
+  data.tar.gz: 00d54cc0ab4b7fc6acf616a537b426d110ddbe65dda1d6ab8ec938ba2df64e87def99023916c6193ab25d1885a2a60e8a1706617ed5a6e0adb5cb34671dae1ec

data/.github/workflows/main.yml

@@ -17,12 +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,3 +1,16 @@
+=== Unreleased
+
+=== 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
+ * Add helper methods for other Calendar method verbs
+ * bugfix: Require stringio before use in Parser - vwyu
+ 
 === 2.8.0 2022-07-10
  * Fix compatibility with ActiveSupport 7 - Pat Allan
  * Set default action of "DISPLAY" on alarms - Rikson

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 }

data/lib/icalendar/alarm.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Icalendar
 
   class Alarm < Component

data/lib/icalendar/calendar.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Icalendar
 
   class Calendar < Component
@@ -31,6 +33,42 @@ module Icalendar
 
     def publish
       self.ip_method = 'PUBLISH'
+      self
+    end
+
+    def request
+      self.ip_method = 'REQUEST'
+      self
+    end
+
+    def reply
+      self.ip_method = 'REPLY'
+      self
+    end
+
+    def add
+      self.ip_method = 'ADD'
+      self
+    end
+
+    def cancel
+      self.ip_method = 'CANCEL'
+      self
+    end
+
+    def refresh
+      self.ip_method = 'REFRESH'
+      self
+    end
+
+    def counter
+      self.ip_method = 'COUNTER'
+      self
+    end
+
+    def decline_counter
+      self.ip_method = 'DECLINECOUNTER'
+      self
     end
 
   end

data/lib/icalendar/component.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'securerandom'
 
 module Icalendar
@@ -53,10 +55,14 @@ module Icalendar
       end.compact.join "\r\n"
     end
 
+    ICAL_PROP_NAME_GSUB_REGEX = /\Aip_/.freeze
+
     def ical_prop_name(prop_name)
-      prop_name.gsub(/\Aip_/, '').gsub('_', '-').upcase
+      prop_name.gsub(ICAL_PROP_NAME_GSUB_REGEX, '').gsub('_', '-').upcase
     end
 
+    ICAL_FOLD_LONG_LINE_SCAN_REGEX = /\P{M}\p{M}*/u.freeze
+
     def ical_fold(long_line, indent = "\x20")
       # rfc2445 says:
       # Lines of text SHOULD NOT be longer than 75 octets, excluding the line
@@ -74,7 +80,7 @@ module Icalendar
 
       return long_line if long_line.bytesize <= Icalendar::MAX_LINE_LENGTH
 
-      chars = long_line.scan(/\P{M}\p{M}*/u) # split in graphenes
+      chars = long_line.scan(ICAL_FOLD_LONG_LINE_SCAN_REGEX) # split in graphenes
       folded = ['']
       bytes = 0
       while chars.count > 0

data/lib/icalendar/downcased_hash.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'delegate'
 
 module Icalendar

data/lib/icalendar/event.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Icalendar
 
   class Event < Component
@@ -24,7 +26,7 @@ module Icalendar
     optional_single_property :status
     optional_single_property :summary
     optional_single_property :transp
-    optional_single_property :url, Icalendar::Values::Uri
+    optional_single_property :url, Icalendar::Values::Uri, true
     optional_single_property :recurrence_id, Icalendar::Values::DateTime
 
     optional_property :rrule, Icalendar::Values::Recur, true

data/lib/icalendar/freebusy.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Icalendar
 
   class Freebusy < Component

data/lib/icalendar/has_components.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Icalendar
 
   module HasComponents
@@ -32,13 +34,16 @@ module Icalendar
       custom_components[component_name.downcase.gsub("-", "_")] || []
     end
 
+    METHOD_MISSING_ADD_REGEX = /^add_(x_\w+)$/.freeze
+    METHOD_MISSING_X_FLAG_REGEX = /^x_/.freeze
+
     def method_missing(method, *args, &block)
       method_name = method.to_s
-      if method_name =~ /^add_(x_\w+)$/
+      if method_name =~ METHOD_MISSING_ADD_REGEX
         component_name = $1
         custom = args.first || Component.new(component_name, component_name.upcase)
         add_custom_component(component_name, custom, &block)
-      elsif method_name =~ /^x_/ && custom_component(method_name).size > 0
+      elsif method_name =~ METHOD_MISSING_X_FLAG_REGEX && custom_component(method_name).size > 0
         custom_component method_name
       else
         super

data/lib/icalendar/has_properties.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Icalendar
 
   module HasProperties
@@ -146,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
@@ -177,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/journal.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Icalendar
 
   class Journal < Component

data/lib/icalendar/logger.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'delegate'
 require 'logger'
 

data/lib/icalendar/marshable.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Icalendar
   module Marshable
     def self.included(base)

data/lib/icalendar/parser.rb

@@ -1,4 +1,7 @@
+# frozen_string_literal: true
+
 require 'icalendar/timezone_store'
+require 'stringio'
 
 module Icalendar
 
@@ -6,6 +9,8 @@ module Icalendar
     attr_writer :component_class
     attr_reader :source, :strict, :timezone_store, :verbose
 
+    CLEAN_BAD_WRAPPING_GSUB_REGEX = /\r?\n[ \t]/.freeze
+
     def self.clean_bad_wrapping(source)
       content = if source.respond_to? :read
         source.read
@@ -18,7 +23,7 @@ module Icalendar
       end
       encoding = content.encoding
       content.force_encoding(Encoding::ASCII_8BIT)
-      content.gsub(/\r?\n[ \t]/, "").force_encoding(encoding)
+      content.gsub(CLEAN_BAD_WRAPPING_GSUB_REGEX, "").force_encoding(encoding)
     end
 
     def initialize(source, strict = false, verbose = false)
@@ -71,11 +76,15 @@ module Icalendar
       end
     end
 
+    WRAP_PROPERTY_VALUE_DELIMETER_REGEX = /(?<!\\)([,;])/.freeze
+    WRAP_PROPERTY_VALUE_SPLIT_REGEX = /(?<!\\)[;,]/.freeze
+
+
     def wrap_property_value(component, fields, multi_property)
       klass = get_wrapper_class component, fields
       if wrap_in_array? klass, fields[:value], multi_property
-        delimiter = fields[:value].match(/(?<!\\)([,;])/)[1]
-        Icalendar::Values::Array.new fields[:value].split(/(?<!\\)[;,]/),
+        delimiter = fields[:value].match(WRAP_PROPERTY_VALUE_DELIMETER_REGEX)[1]
+        Icalendar::Values::Helpers::Array.new fields[:value].split(WRAP_PROPERTY_VALUE_SPLIT_REGEX),
                                      klass,
                                      fields[:params],
                                      delimiter: delimiter
@@ -88,17 +97,22 @@ module Icalendar
       retry
     end
 
+    WRAP_IN_ARRAY_REGEX_1 = /(?<!\\)[,;]/.freeze
+    WRAP_IN_ARRAY_REGEX_2 = /(?<!\\);/.freeze
+
     def wrap_in_array?(klass, value, multi_property)
       klass.value_type != 'RECUR' &&
-        ((multi_property && value =~ /(?<!\\)[,;]/) || value =~ /(?<!\\);/)
+        ((multi_property && value =~ WRAP_IN_ARRAY_REGEX_1) || value =~ WRAP_IN_ARRAY_REGEX_2)
     end
 
+    GET_WRAPPER_CLASS_GSUB_REGEX = /(?:\A|-)(.)/.freeze
+
     def get_wrapper_class(component, fields)
       klass = component.class.default_property_types[fields[:name]]
       if !fields[:params]['value'].nil?
         klass_name = fields[:params].delete('value').first
         unless klass_name.upcase == klass.value_type
-          klass_name = "Icalendar::Values::#{klass_name.downcase.gsub(/(?:\A|-)(.)/) { |m| m[-1].upcase }}"
+          klass_name = "Icalendar::Values::#{klass_name.downcase.gsub(GET_WRAPPER_CLASS_GSUB_REGEX) { |m| m[-1].upcase }}"
           klass = Object.const_get klass_name if Object.const_defined?(klass_name)
         end
       end
@@ -119,14 +133,16 @@ module Icalendar
       @component_class ||= Icalendar::Calendar
     end
 
+    PARSE_COMPONENT_KLASS_NAME_GSUB_REGEX = /\AV/.freeze
+
     def parse_component(component)
       while (fields = next_fields)
         if fields[:name] == 'end'
-          klass_name = fields[:value].gsub(/\AV/, '').downcase.capitalize
+          klass_name = fields[:value].gsub(PARSE_COMPONENT_KLASS_NAME_GSUB_REGEX, '').downcase.capitalize
           timezone_store.store(component) if klass_name == 'Timezone'
           break
         elsif fields[:name] == 'begin'
-          klass_name = fields[:value].gsub(/\AV/, '').gsub("-", "_").downcase.capitalize
+          klass_name = fields[:value].gsub(PARSE_COMPONENT_KLASS_NAME_GSUB_REGEX, '').gsub("-", "_").downcase.capitalize
           Icalendar.logger.debug "Adding component #{klass_name}"
           if Object.const_defined? "Icalendar::#{klass_name}"
             component.add_component parse_component(Object.const_get("Icalendar::#{klass_name}").new)
@@ -146,13 +162,16 @@ module Icalendar
       @data = source.gets and @data.chomp!
     end
 
+    NEXT_FIELDS_TAB_REGEX = /\A[ \t].+\z/.freeze
+    NEXT_FIELDS_WHITESPACE_REGEX = /\A\s*\z/.freeze
+
     def next_fields
       line = @data or return nil
       loop do
         read_in_data
-        if @data =~ /\A[ \t].+\z/
+        if @data =~ NEXT_FIELDS_TAB_REGEX
           line << @data[1, @data.size]
-        elsif @data !~ /\A\s*\z/
+        elsif @data !~ NEXT_FIELDS_WHITESPACE_REGEX
           break
         end
       end
@@ -167,24 +186,29 @@ module Icalendar
     VALUE = '.*'
     LINE = "(?<name>#{NAME})(?<params>(?:;#{PARAM})*):(?<value>#{VALUE})"
     BAD_LINE = "(?<name>#{NAME})(?<params>(?:;#{PARAM})*)"
+    LINE_REGEX = %r{#{LINE}}.freeze
+    BAD_LINE_REGEX = %r{#{BAD_LINE}}.freeze
+    PARAM_REGEX = %r{#{PARAM}}.freeze
+    PVALUE_REGEX = %r{#{PVALUE}}.freeze
+    PVALUE_GSUB_REGEX = /\A"|"\z/.freeze
 
     def parse_fields(input)
-      if parts = %r{#{LINE}}.match(input)
+      if parts = LINE_REGEX.match(input)
         value = parts[:value]
       else
-        parts = %r{#{BAD_LINE}}.match(input) unless strict?
+        parts = BAD_LINE_REGEX.match(input) unless strict?
         parts or fail "Invalid iCalendar input line: #{input}"
         # Non-strict and bad line so use a value of empty string
         value = ''
       end
 
       params = {}
-      parts[:params].scan %r{#{PARAM}} do |match|
+      parts[:params].scan PARAM_REGEX do |match|
         param_name = match[0].downcase
         params[param_name] ||= []
-        match[1].scan %r{#{PVALUE}} do |param_value|
+        match[1].scan PVALUE_REGEX do |param_value|
           if param_value.size > 0
-            param_value = param_value.gsub(/\A"|"\z/, '')
+            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

data/lib/icalendar/timezone.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'ice_cube'
 
 module Icalendar

data/lib/icalendar/timezone_store.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'delegate'
 require 'icalendar/downcased_hash'
 

data/lib/icalendar/todo.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Icalendar
 
   class Todo < Component

data/lib/icalendar/tzinfo.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 =begin
   Copyright (C) 2008 Sean Dague
 

data/lib/icalendar/value.rb

@@ -1,3 +1,6 @@
+# frozen_string_literal: true
+
+
 require 'delegate'
 require 'icalendar/downcased_hash'
 
@@ -31,8 +34,11 @@ module Icalendar
       end
     end
 
+    VALUE_TYPE_GSUB_REGEX_1 = /\A.*::/.freeze
+    VALUE_TYPE_GSUB_REGEX_2 = /(?<!\A)[A-Z]/.freeze
+
     def self.value_type
-      name.gsub(/\A.*::/, '').gsub(/(?<!\A)[A-Z]/, '-\0').upcase
+      name.gsub(VALUE_TYPE_GSUB_REGEX_1, '').gsub(VALUE_TYPE_GSUB_REGEX_2, '-\0').upcase
     end
 
     def value_type
@@ -54,9 +60,11 @@ module Icalendar
       "#{name.to_s.gsub('_', '-').upcase}=#{param_value}"
     end
 
+    ESCAPE_PARAM_VALUE_REGEX = /[;:,]/.freeze
+
     def escape_param_value(value)
       v = value.to_s.gsub('"', "'")
-      v =~ /[;:,]/ ? %("#{v}") : v
+      v =~ ESCAPE_PARAM_VALUE_REGEX ? %("#{v}") : v
     end
 
   end
@@ -64,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/binary.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'base64'
 
 module Icalendar
@@ -21,9 +23,11 @@ module Icalendar
 
       private
 
+      BASE_64_REGEX = /\A(?:[A-Za-z0-9+\/]{4})*(?:[A-Za-z0-9+\/]{4}|[A-Za-z0-9+\/]{3}=|[A-Za-z0-9+\/]{2}==)\z/.freeze
+
       def base64?
         value.is_a?(String) &&
-            value =~ /\A(?:[A-Za-z0-9+\/]{4})*(?:[A-Za-z0-9+\/]{4}|[A-Za-z0-9+\/]{3}=|[A-Za-z0-9+\/]{2}==)\z/
+            value =~ BASE_64_REGEX
       end
     end
 

data/lib/icalendar/values/boolean.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Icalendar
   module Values
 

data/lib/icalendar/values/cal_address.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Icalendar
   module Values
 

data/lib/icalendar/values/date.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'date'
 
 module Icalendar

data/lib/icalendar/values/date_time.rb

@@ -1,11 +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/duration.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'ostruct'
 
 module Icalendar
@@ -36,14 +38,21 @@ module Icalendar
         hours > 0 || minutes > 0 || seconds > 0
       end
 
+      DURATION_PAST_REGEX = /\A([+-])P/.freeze
+      DURATION_WEEKS_REGEX = /(\d+)W/.freeze
+      DURATION_DAYS_REGEX = /(\d+)D/.freeze
+      DURATION_HOURS_REGEX = /(\d+)H/.freeze
+      DURATION_MINUTES_REGEX = /(\d+)M/.freeze
+      DURATION_SECONDS_REGEX = /(\d+)S/.freeze
+
       def parse_fields(value)
         {
-          past: (value =~ /\A([+-])P/ ? $1 == '-' : false),
-          weeks: (value =~ /(\d+)W/ ? $1.to_i : 0),
-          days: (value =~ /(\d+)D/ ? $1.to_i : 0),
-          hours: (value =~ /(\d+)H/ ? $1.to_i : 0),
-          minutes: (value =~ /(\d+)M/ ? $1.to_i : 0),
-          seconds: (value =~ /(\d+)S/ ? $1.to_i : 0)
+          past: (value =~ DURATION_PAST_REGEX ? $1 == '-' : false),
+          weeks: (value =~ DURATION_WEEKS_REGEX ? $1.to_i : 0),
+          days: (value =~ DURATION_DAYS_REGEX ? $1.to_i : 0),
+          hours: (value =~ DURATION_HOURS_REGEX ? $1.to_i : 0),
+          minutes: (value =~ DURATION_MINUTES_REGEX ? $1.to_i : 0),
+          seconds: (value =~ DURATION_SECONDS_REGEX ? $1.to_i : 0)
         }
       end
     end

data/lib/icalendar/values/float.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Icalendar
   module Values
 

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,61 @@
+# 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
+
+        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']
+            support_classes_defined = defined?(ActiveSupport::TimeZone) && defined?(ActiveSupportTimeWithZoneAdapter)
+            if support_classes_defined && (tz = ActiveSupport::TimeZone[tzid])
+              # plan a - use ActiveSupport::TimeWithZone
+              ActiveSupportTimeWithZoneAdapter.new(nil, tz, value)
+            elsif !x_tz_info.nil?
+              # plan b - use definition from provided `VTIMEZONE`
+              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
+            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
+              params['tzid'] = [tz.tzinfo.name]
+              ActiveSupportTimeWithZoneAdapter.new(nil, tz, value)
+            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
+        end
+      end
+    end
+  end
+end

data/lib/icalendar/values/integer.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Icalendar
   module Values
 

data/lib/icalendar/values/period.rb

@@ -1,12 +1,16 @@
+# frozen_string_literal: true
+
 module Icalendar
   module Values
 
     class Period < Value
 
+      PERIOD_LAST_PART_REGEX = /\A[+-]?P.+\z/.freeze
+
       def initialize(value, params = {})
         parts = value.split '/'
         period_start = Icalendar::Values::DateTime.new parts.first
-        if parts.last =~ /\A[+-]?P.+\z/
+        if parts.last =~ PERIOD_LAST_PART_REGEX
           period_end = Icalendar::Values::Duration.new parts.last
         else
           period_end = Icalendar::Values::DateTime.new parts.last

data/lib/icalendar/values/recur.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'ostruct'
 
 module Icalendar
@@ -44,22 +46,37 @@ module Icalendar
 
       private
 
+      PARSE_FIELDS_FREQUENCY_REGEX = /FREQ=(SECONDLY|MINUTELY|HOURLY|DAILY|WEEKLY|MONTHLY|YEARLY)/i.freeze
+      PARSE_FIELDS_UNTIL_REGEX = /UNTIL=([^;]*)/i.freeze
+      PARSE_FIELDS_COUNT_REGEX = /COUNT=(\d+)/i.freeze
+      PARSE_FIELDS_INTERVAL_REGEX = /INTERVAL=(\d+)/i.freeze
+      PARSE_FIELDS_BY_SECOND_REGEX = /BYSECOND=(#{NUM_LIST})(?:;|\z)/i.freeze
+      PARSE_FIELDS_BY_MINUTE_REGEX = /BYMINUTE=(#{NUM_LIST})(?:;|\z)/i.freeze
+      PARSE_FIELDS_BY_HOUR_REGEX = /BYHOUR=(#{NUM_LIST})(?:;|\z)/i.freeze
+      PARSE_FIELDS_BY_DAY_REGEX = /BYDAY=(#{WEEKDAY}(?:,#{WEEKDAY})*)(?:;|\z)/i.freeze
+      PARSE_FIELDS_BY_MONTH_DAY_REGEX = /BYMONTHDAY=(#{MONTHDAY}(?:,#{MONTHDAY})*)(?:;|\z)/i.freeze
+      PARSE_FIELDS_BY_YEAR_DAY_REGEX = /BYYEARDAY=(#{YEARDAY}(?:,#{YEARDAY})*)(?:;|\z)/i.freeze
+      PARSE_FIELDS_BY_WEEK_NUMBER_REGEX = /BYWEEKNO=(#{MONTHDAY}(?:,#{MONTHDAY})*)(?:;|\z)/i.freeze
+      PARSE_FIELDS_BY_MONTH_REGEX = /BYMONTH=(#{NUM_LIST})(?:;|\z)/i.freeze
+      PARSE_FIELDS_BY_SET_POSITON_REGEX = /BYSETPOS=(#{YEARDAY}(?:,#{YEARDAY})*)(?:;|\z)/i.freeze
+      PARSE_FIELDS_BY_WEEK_START_REGEX = /WKST=(#{DAYNAME})/i.freeze
+
       def parse_fields(value)
         {
-          frequency: (value =~ /FREQ=(SECONDLY|MINUTELY|HOURLY|DAILY|WEEKLY|MONTHLY|YEARLY)/i ? $1.upcase : nil),
-          until: (value =~ /UNTIL=([^;]*)/i ? $1 : nil),
-          count: (value =~ /COUNT=(\d+)/i ? $1.to_i : nil),
-          interval: (value =~ /INTERVAL=(\d+)/i ? $1.to_i : nil),
-          by_second: (value =~ /BYSECOND=(#{NUM_LIST})(?:;|\z)/i ? $1.split(',').map { |i| i.to_i } : nil),
-          by_minute: (value =~ /BYMINUTE=(#{NUM_LIST})(?:;|\z)/i ? $1.split(',').map { |i| i.to_i } : nil),
-          by_hour: (value =~ /BYHOUR=(#{NUM_LIST})(?:;|\z)/i ? $1.split(',').map { |i| i.to_i } : nil),
-          by_day: (value =~ /BYDAY=(#{WEEKDAY}(?:,#{WEEKDAY})*)(?:;|\z)/i ? $1.split(',') : nil),
-          by_month_day: (value =~ /BYMONTHDAY=(#{MONTHDAY}(?:,#{MONTHDAY})*)(?:;|\z)/i ? $1.split(',') : nil),
-          by_year_day: (value =~ /BYYEARDAY=(#{YEARDAY}(?:,#{YEARDAY})*)(?:;|\z)/i ? $1.split(',') : nil),
-          by_week_number: (value =~ /BYWEEKNO=(#{MONTHDAY}(?:,#{MONTHDAY})*)(?:;|\z)/i ? $1.split(',') : nil),
-          by_month: (value =~ /BYMONTH=(#{NUM_LIST})(?:;|\z)/i ? $1.split(',').map { |i| i.to_i } : nil),
-          by_set_position: (value =~ /BYSETPOS=(#{YEARDAY}(?:,#{YEARDAY})*)(?:;|\z)/i ? $1.split(',') : nil),
-          week_start: (value =~ /WKST=(#{DAYNAME})/i ? $1.upcase : nil)
+          frequency: (value =~ PARSE_FIELDS_FREQUENCY_REGEX ? $1.upcase : nil),
+          until: (value =~ PARSE_FIELDS_UNTIL_REGEX ? $1 : nil),
+          count: (value =~ PARSE_FIELDS_COUNT_REGEX ? $1.to_i : nil),
+          interval: (value =~ PARSE_FIELDS_INTERVAL_REGEX ? $1.to_i : nil),
+          by_second: (value =~ PARSE_FIELDS_BY_SECOND_REGEX ? $1.split(',').map { |i| i.to_i } : nil),
+          by_minute: (value =~ PARSE_FIELDS_BY_MINUTE_REGEX ? $1.split(',').map { |i| i.to_i } : nil),
+          by_hour: (value =~ PARSE_FIELDS_BY_HOUR_REGEX ? $1.split(',').map { |i| i.to_i } : nil),
+          by_day: (value =~ PARSE_FIELDS_BY_DAY_REGEX ? $1.split(',') : nil),
+          by_month_day: (value =~ PARSE_FIELDS_BY_MONTH_DAY_REGEX ? $1.split(',') : nil),
+          by_year_day: (value =~ PARSE_FIELDS_BY_YEAR_DAY_REGEX ? $1.split(',') : nil),
+          by_week_number: (value =~ PARSE_FIELDS_BY_WEEK_NUMBER_REGEX ? $1.split(',') : nil),
+          by_month: (value =~ PARSE_FIELDS_BY_MONTH_REGEX ? $1.split(',').map { |i| i.to_i } : nil),
+          by_set_position: (value =~ PARSE_FIELDS_BY_SET_POSITON_REGEX ? $1.split(',') : nil),
+          week_start: (value =~ PARSE_FIELDS_BY_WEEK_START_REGEX ? $1.upcase : nil)
         }
       end
     end

data/lib/icalendar/values/text.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Icalendar
   module Values
     class Text < Value
@@ -9,12 +11,14 @@ module Icalendar
         super value, params
       end
 
+      VALUE_ICAL_CARRIAGE_RETURN_GSUB_REGEX = /\r?\n/.freeze
+
       def value_ical
         value.dup.tap do |v|
           v.gsub!('\\') { '\\\\' }
           v.gsub!(';', '\;')
           v.gsub!(',', '\,')
-          v.gsub!(/\r?\n/, '\n')
+          v.gsub!(VALUE_ICAL_CARRIAGE_RETURN_GSUB_REGEX, '\n')
         end
       end
     end

data/lib/icalendar/values/time.rb

@@ -1,11 +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/values/uri.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'uri'
 
 module Icalendar

data/lib/icalendar/values/utc_offset.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'ostruct'
 
 module Icalendar
@@ -36,8 +38,11 @@ module Icalendar
         hours == 0 && minutes == 0 && seconds == 0
       end
 
+      PARSE_FIELDS_MD_REGEX = /\A(?<behind>[+-])(?<hours>\d{2})(?<minutes>\d{2})(?<seconds>\d{2})?\z/.freeze
+      PARSE_FIELDS_WHITESPACE_GSUB_REGEX = /\s+/.freeze
+
       def parse_fields(value)
-        md = /\A(?<behind>[+-])(?<hours>\d{2})(?<minutes>\d{2})(?<seconds>\d{2})?\z/.match value.gsub(/\s+/, '')
+        md = PARSE_FIELDS_MD_REGEX.match value.gsub(PARSE_FIELDS_WHITESPACE_GSUB_REGEX, '')
         {
           behind: (md[:behind] == '-'),
           hours: md[:hours].to_i,

data/lib/icalendar/version.rb

@@ -1,5 +1,7 @@
+# frozen_string_literal: true
+
 module Icalendar
 
-  VERSION = '2.8.0'
+  VERSION = '2.10.0'
 
 end

data/lib/icalendar.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'icalendar/logger'
 
 module Icalendar

data/spec/calendar_spec.rb

@@ -190,6 +190,55 @@ END:VCALENDAR
     end
   end
 
+  describe '#request' do
+    it 'sets ip_method to "REQUEST"' do
+      subject.request
+      expect(subject.ip_method).to eq 'REQUEST'
+    end
+  end
+
+  describe '#reply' do
+    it 'sets ip_method to "REPLY"' do
+      subject.reply
+      expect(subject.ip_method).to eq 'REPLY'
+    end
+  end
+
+  describe '#add' do
+    it 'sets ip_method to "ADD"' do
+      subject.add
+      expect(subject.ip_method).to eq 'ADD'
+    end
+  end
+
+  describe '#cancel' do
+    it 'sets ip_method to "CANCEL"' do
+      subject.cancel
+      expect(subject.ip_method).to eq 'CANCEL'
+    end
+  end
+
+  describe '#refresh' do
+    it 'sets ip_method to "REFRESH"' do
+      subject.refresh
+      expect(subject.ip_method).to eq 'REFRESH'
+    end
+  end
+
+  describe '#counter' do
+    it 'sets ip_method to "COUNTER"' do
+      subject.counter
+      expect(subject.ip_method).to eq 'COUNTER'
+    end
+  end
+
+  describe '#decline_counter' do
+    it 'sets ip_method to "DECLINECOUNTER"' do
+      subject.decline_counter
+      expect(subject.ip_method).to eq 'DECLINECOUNTER'
+    end
+  end
+
   describe '.parse' do
     let(:source) { File.read File.join(File.dirname(__FILE__), 'fixtures', 'bad_wrapping.ics') }
 

data/spec/event_spec.rb

@@ -51,8 +51,8 @@ describe Icalendar::Event do
   context 'suggested single values' do
     before(:each) do
       subject.dtstart = DateTime.now
-      subject.append_rrule double('RRule').as_null_object
-      subject.append_rrule double('RRule').as_null_object
+      subject.append_rrule 'RRule'
+      subject.append_rrule 'RRule'
     end
 
     it 'is valid by default' do
@@ -156,6 +156,7 @@ describe Icalendar::Event do
       subject.dtend = "20131227T033000Z"
       subject.summary = 'My event, my ical, my test'
       subject.geo = [41.230896,-74.411774]
+      subject.url = 'https://example.com'
       subject.x_custom_property = 'customize'
     end
 
@@ -163,6 +164,7 @@ describe Icalendar::Event do
     it { expect(subject.to_ical).to include 'DTEND:20131227T033000Z' }
     it { expect(subject.to_ical).to include 'SUMMARY:My event\, my ical\, my test' }
     it { expect(subject.to_ical).to include 'X-CUSTOM-PROPERTY:customize' }
+    it { expect(subject.to_ical).to include 'URL;VALUE=URI:https://example.com' }
     it { expect(subject.to_ical).to include 'GEO:41.230896;-74.411774' }
 
     context 'simple organizer' do

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.8.0
+  version: 2.10.0
 platform: ruby
 authors:
 - Ryan Ahearn
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-07-11 00:00:00.000000000 Z
+date: 2023-11-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ice_cube
@@ -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
@@ -247,7 +247,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 +267,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.4.10
 signing_key:
 specification_version: 4
 summary: A ruby implementation of the iCalendar specification (RFC-5545).

data/lib/icalendar/values/active_support_time_with_zone_adapter.rb

@@ -1,12 +0,0 @@
-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,58 +0,0 @@
-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,53 +0,0 @@
-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