icalendar 2.7.1 → 2.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fbeadc87a1316894e02896fd63e7f7644a1ab5bf3a542b0d5a02c59aabf2d603
-  data.tar.gz: 3aaf09d7984fed57644d091fa76285084d9fbf3568e6078939e7887d6f44f50a
+  metadata.gz: 0f083428b61c781e197d459b5ba375139056f75e95b1b99e596169106a57ed20
+  data.tar.gz: acb3cdb07b0dc052664fc67619fa6301951daf70ac83a0430a839a0bdd3a5923
 SHA512:
-  metadata.gz: e6134ff7d12c820d7ee10a316108c1d7a9db274cccd366b93a49fa491931038edd78eb37789a24962cc6370c83fd34d67508dd24b574e8d1fa235e815c1fa22d
-  data.tar.gz: 0bad8ab7548493a133686dab3a6d36a58aeecddb8642da83cef5a2184d0d08e97dc59307fc6fdd9574935319044ccb5ffa50f9c936aa60e5637a2430e78eb446
+  metadata.gz: 595032415b8465be6f662f136a56dd6f4dd8af27e888c7a7b27ad1c688b3963466e34a949daa0111a65ea89037b33ea01d8f2ea24991f5d9a3869647521b6c7c
+  data.tar.gz: ac464077d0c421d27b39270f1d12af23b59383e3e8351b68ec41a8385cc26670ca31b2f8dba72212e8db0996ea4a9e7c4a1b7b6a9b1b34d632169fae5a715725

data/.github/workflows/main.yml

@@ -0,0 +1,33 @@
+name: Ruby
+
+on:
+  push:
+    branches:
+      - main
+      - master
+  pull_request:
+    branches:
+      - main
+      - master
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    strategy:
+      matrix:
+        ruby:
+          - 2.7.6
+          - 3.0.4
+          - 3.1.2
+          - 3.2.2
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up Ruby
+      uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: ${{ matrix.ruby }}
+        bundler-cache: true
+    - name: Run rspec tests
+      run: bundle exec rake spec

data/History.txt

@@ -1,3 +1,17 @@
+=== Unreleased
+
+=== 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
+ * Add license information to gemspec - Robert Reiz
+ * Support RFC7986 properties - Daniele Frisanco
+
 === 2.7.1 2021-03-14
  * Recover from bad line-wrapping code that splits in the middle of Unicode code points
  * Add a verbose option to the Parser to quiet some of the chattier log entries

data/icalendar.gemspec

@@ -6,6 +6,7 @@ Gem::Specification.new do |s|
 
   s.name = "icalendar"
   s.version = Icalendar::VERSION
+  s.licenses = ['BSD-2-Clause', 'GPL-3.0-only', 'icalendar']
 
   s.homepage = "https://github.com/icalendar/icalendar"
   s.platform = Gem::Platform::RUBY

data/lib/icalendar/alarm.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Icalendar
 
   class Alarm < Component
@@ -22,6 +24,7 @@ module Icalendar
 
     def initialize
       super 'alarm'
+      self.action = 'DISPLAY'
     end
 
     def valid?(strict = false)

data/lib/icalendar/calendar.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Icalendar
 
   class Calendar < Component
@@ -5,6 +7,16 @@ module Icalendar
     required_property :prodid
     optional_single_property :calscale
     optional_single_property :ip_method
+    optional_property :ip_name
+    optional_property :description
+    optional_single_property :uid
+    optional_single_property :last_modified, Icalendar::Values::DateTime, true
+    optional_single_property :url, Icalendar::Values::Uri, true
+    optional_property :categories
+    optional_single_property :refresh_interval, Icalendar::Values::Duration, true
+    optional_single_property :source, Icalendar::Values::Uri, true
+    optional_single_property :color
+    optional_property :image, Icalendar::Values::Uri, false, true
 
     component :timezone, :tzid
     component :event
@@ -21,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
@@ -12,6 +14,7 @@ module Icalendar
     mutually_exclusive_properties :dtend, :duration
 
     optional_single_property :ip_class
+    optional_single_property :color
     optional_single_property :created, Icalendar::Values::DateTime
     optional_single_property :description
     optional_single_property :geo, Icalendar::Values::Float
@@ -23,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
@@ -37,6 +40,8 @@ module Icalendar
     optional_property :related_to
     optional_property :resources
     optional_property :rdate, Icalendar::Values::DateTime
+    optional_property :conference, Icalendar::Values::Uri, false, true
+    optional_property :image, Icalendar::Values::Uri, false, true
 
     component :alarm, false
 

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
@@ -104,29 +106,29 @@ module Icalendar
       def required_property(prop, klass = Icalendar::Values::Text, validator = nil)
         validator ||= ->(component, value) { !value.nil? }
         self.required_properties[prop] = validator
-        single_property prop, klass
+        single_property prop, klass, false
       end
 
       def required_multi_property(prop, klass = Icalendar::Values::Text, validator = nil)
         validator ||= ->(component, value) { !value.compact.empty? }
         self.required_properties[prop] = validator
-        multi_property prop, klass
+        multi_property prop, klass, false
       end
 
-      def optional_single_property(prop, klass = Icalendar::Values::Text)
-        single_property prop, klass
+      def optional_single_property(prop, klass = Icalendar::Values::Text, new_property = false)
+        single_property prop, klass, new_property
       end
 
       def mutually_exclusive_properties(*properties)
         self.mutex_properties << properties
       end
 
-      def optional_property(prop, klass = Icalendar::Values::Text, suggested_single = false)
+      def optional_property(prop, klass = Icalendar::Values::Text, suggested_single = false, new_property = false)
         self.suggested_single_properties << prop if suggested_single
-        multi_property prop, klass
+        multi_property prop, klass, new_property
       end
 
-      def single_property(prop, klass)
+      def single_property(prop, klass, new_property)
         self.single_properties << prop.to_s
         self.default_property_types[prop.to_s] = klass
 
@@ -135,17 +137,17 @@ module Icalendar
         end
 
         define_method "#{prop}=" do |value|
-          instance_variable_set "@#{prop}", map_property_value(value, klass, false)
+          instance_variable_set "@#{prop}", map_property_value(value, klass, false, new_property)
         end
       end
 
-      def multi_property(prop, klass)
+      def multi_property(prop, klass, new_property)
         self.multiple_properties << prop.to_s
         self.default_property_types[prop.to_s] = klass
         property_var = "@#{prop}"
 
         define_method "#{prop}=" do |value|
-          mapped = map_property_value value, klass, true
+          mapped = map_property_value value, klass, true, new_property
           if mapped.is_a? Icalendar::Values::Array
             instance_variable_set property_var, mapped.to_a.compact
           else
@@ -162,20 +164,24 @@ module Icalendar
         end
 
         define_method "append_#{prop}" do |value|
-          send(prop) << map_property_value(value, klass, true)
+          send(prop) << map_property_value(value, klass, true, new_property)
         end
       end
     end
 
     private
 
-    def map_property_value(value, klass, multi_valued)
+    def map_property_value(value, klass, multi_valued, new_property)
+      params = {}
+      if new_property
+        params.merge!('VALUE': klass.value_type)
+      end
       if value.nil? || value.is_a?(Icalendar::Value)
         value
       elsif value.is_a? ::Array
-        Icalendar::Values::Array.new value, klass, {}, {delimiter: (multi_valued ? ',' : ';')}
+        Icalendar::Values::Array.new value, klass, params, {delimiter: (multi_valued ? ',' : ';')}
       else
-        klass.new value
+        klass.new value, params
       end
     end
 

data/lib/icalendar/journal.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Icalendar
 
   class Journal < Component
@@ -6,6 +8,7 @@ module Icalendar
     required_property :uid
 
     optional_single_property :ip_class
+    optional_single_property :color
     optional_single_property :created, Icalendar::Values::DateTime
     optional_single_property :dtstart, Icalendar::Values::DateTime
     optional_single_property :last_modified, Icalendar::Values::DateTime
@@ -27,6 +30,7 @@ module Icalendar
     optional_property :request_status
     optional_property :related_to
     optional_property :rdate, Icalendar::Values::DateTime
+    optional_property :image, Icalendar::Values::Uri, false, true
 
     def initialize
       super 'journal'

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)
@@ -50,7 +55,7 @@ module Icalendar
 
     def parse_property(component, fields = nil)
       fields = next_fields if fields.nil?
-      prop_name = %w(class method).include?(fields[:name]) ? "ip_#{fields[:name]}" : fields[:name]
+      prop_name = %w(class method name).include?(fields[:name]) ? "ip_#{fields[:name]}" : fields[:name]
       multi_property = component.class.multiple_properties.include? prop_name
       prop_value = wrap_property_value component, fields, multi_property
       begin
@@ -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::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
@@ -12,6 +14,7 @@ module Icalendar
     mutually_exclusive_properties :due, :duration
 
     optional_single_property :ip_class
+    optional_single_property :color
     optional_single_property :completed, Icalendar::Values::DateTime
     optional_single_property :created, Icalendar::Values::DateTime
     optional_single_property :description
@@ -38,6 +41,8 @@ module Icalendar
     optional_property :related_to
     optional_property :resources
     optional_property :rdate, Icalendar::Values::DateTime
+    optional_property :conference, Icalendar::Values::Uri, false, true
+    optional_property :image, Icalendar::Values::Uri, false, true
 
     component :alarm, false
 
@@ -49,4 +54,4 @@ module Icalendar
 
   end
 
-end
+end

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

data/lib/icalendar/values/active_support_time_with_zone_adapter.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Icalendar
   module Values
     class ActiveSupportTimeWithZoneAdapter < ActiveSupport::TimeWithZone

data/lib/icalendar/values/array.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Icalendar
   module Values
 
@@ -52,7 +54,6 @@ module Icalendar
       def needs_value_type?(default_type)
         value.first.class != default_type
       end
-
     end
 
   end

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,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'date'
 require_relative 'time_with_zone'
 

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/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,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'date'
 require_relative 'time_with_zone'
 

data/lib/icalendar/values/time_with_zone.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'icalendar/timezone_store'
 
 begin
@@ -6,6 +8,12 @@ begin
   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

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.7.1'
+  VERSION = '2.9.0'
 
 end

data/lib/icalendar.rb

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

data/spec/alarm_spec.rb

@@ -6,14 +6,15 @@ describe Icalendar::Alarm do
   describe '#valid?' do
     subject do
       described_class.new.tap do |a|
-        a.action = 'AUDIO'
         a.trigger = Icalendar::Values::DateTime.new(Time.now.utc)
       end
     end
     context 'neither duration or repeat is set' do
+      before(:each) { subject.action = 'AUDIO' }
       it { should be_valid }
     end
     context 'both duration and repeat are set' do
+      before(:each) { subject.action = 'AUDIO' }
       before(:each) do
         subject.duration = 'PT15M'
         subject.repeat = 4
@@ -29,8 +30,12 @@ describe Icalendar::Alarm do
       it { should_not be_valid }
     end
 
+    context 'DISPLAY is set as default action' do
+      it 'must be DISPLAY' do
+        expect(subject.action).to eq 'DISPLAY'
+      end
+    end
     context 'display action' do
-      before(:each) { subject.action = 'DISPLAY' }
       it 'requires description' do
         expect(subject).to_not be_valid
         subject.description = 'Display Text'

data/spec/calendar_spec.rb

@@ -123,6 +123,16 @@ describe Icalendar::Calendar do
   describe '#to_ical' do
     before(:each) do
       Timecop.freeze DateTime.new(2013, 12, 26, 5, 0, 0, '+0000')
+      subject.ip_name = 'Company Vacation Days'
+      subject.description = 'The description'
+      subject.last_modified = "20140101T000000Z"
+      subject.url = 'https://example.com'
+      subject.color = 'red'
+      subject.image = 'https://example.com/image.png'
+      subject.uid = '5FC53010-1267-4F8E-BC28-1D7AE55A7C99'
+      subject.categories = 'MEETING'
+      subject.refresh_interval = 'P1W'
+      subject.source = 'https://example.com/holidays.ics'
       subject.event do |e|
         e.summary = 'An event'
         e.dtstart = "20140101T000000Z"
@@ -145,6 +155,15 @@ BEGIN:VCALENDAR
 VERSION:2.0
 PRODID:icalendar-ruby
 CALSCALE:GREGORIAN
+LAST-MODIFIED;VALUE=DATE-TIME:20140101T000000Z
+URL;VALUE=URI:https://example.com
+REFRESH-INTERVAL;VALUE=DURATION:P1W
+SOURCE;VALUE=URI:https://example.com/holidays.ics
+COLOR:red
+NAME:Company Vacation Days
+DESCRIPTION:The description
+CATEGORIES:MEETING
+IMAGE;VALUE=URI:https://example.com/image.png
 BEGIN:VEVENT
 DTSTAMP:20131226T050000Z
 DTSTART:20140101T000000Z
@@ -171,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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: icalendar
 version: !ruby/object:Gem::Version
-  version: 2.7.1
+  version: 2.9.0
 platform: ruby
 authors:
 - Ryan Ahearn
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-03-15 00:00:00.000000000 Z
+date: 2023-08-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ice_cube
@@ -160,9 +160,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/main.yml"
 - ".gitignore"
 - ".rspec"
-- ".travis.yml"
 - Gemfile
 - History.txt
 - LICENSE
@@ -243,7 +243,10 @@ files:
 - spec/values/text_spec.rb
 - spec/values/utc_offset_spec.rb
 homepage: https://github.com/icalendar/icalendar
-licenses: []
+licenses:
+- BSD-2-Clause
+- GPL-3.0-only
+- icalendar
 metadata: {}
 post_install_message: 'ActiveSupport is required for TimeWithZone support, but not
   required for general use.
@@ -263,7 +266,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.11
+rubygems_version: 3.3.7
 signing_key:
 specification_version: 4
 summary: A ruby implementation of the iCalendar specification (RFC-5545).

data/.travis.yml

@@ -1,17 +0,0 @@
-sudo: false
-before_install:
-  - gem install bundler
-language: ruby
-rvm:
-  - 2.7
-  - 2.6
-  - 2.5
-  - jruby-19mode
-  - ruby-head
-  - jruby-head
-  - truffleruby-head
-matrix:
-  allow_failures:
-    - rvm: ruby-head
-    - rvm: jruby-head
-script: bundle exec rake spec