icalendar 2.4.1 → 2.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 617189d256108d77d8cbf965621d324794e5ceb6
-  data.tar.gz: 10041e3a5a825c812dc849d6ddc2997b5fcc5776
+SHA256:
+  metadata.gz: becd9ceba3342d0b602f1bb8a33858fb2176ceafd457a0fbca76d24ff7800dc7
+  data.tar.gz: f11054752ca18d026b1339e936ab30d4f1ff61219ecfd94d3f913b3de6b14106
 SHA512:
-  metadata.gz: ae3cf91f03aec36792d2f8a90b82265a71b66971bb535c6e41018bb6c611680e49d2535a0d165535011fffc85101447d545873d1f389960a4adb95e528891b59
-  data.tar.gz: 59bb0240f2ff661a885792bacc976b273c2b10d234bc3cb32ca5c1f26031418d4f4ac58f6971dc1a2c6957c9074408674c557b98686dee83bdc6e24123efa1d5
+  metadata.gz: 8262dd28d571778ecc7dd638d6df2a44e4c26bea2221183d82a644c777d100a75027c83ac83fd53c801d43cd75b9521be104111900d6653119a0593a281b8203
+  data.tar.gz: 1dea941db6e27188b9ab0d769a0df2335fdc2bc492a4ca6339a5e4a90e0d91f9821282aaed13b2cc4f8a4921e24a3d20f14aa34fea97c50c6326d3a1dc29f3cc

data/.github/workflows/main.yml

@@ -0,0 +1,32 @@
+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
+
+    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/.gitignore

@@ -6,3 +6,4 @@ pkg/
 .bundle
 coverage/
 tags
+.idea

data/History.txt

@@ -1,3 +1,42 @@
+=== 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
+
+=== 2.7.0 2020-09-12
+ * Handle custom component names, with and without X- prefix
+ * Fix Component lookup to avoid namespace collisions
+
+=== 2.6.1 2019-12-07
+ * Improve performance when generating large ICS files - Alex Balhatchet
+
+=== 2.6.0 2019-11-26
+ * Improve performance for calculating timezone offsets - Justin Howard
+ * Make it possible to de/serialize with Marshal - Pawel Niewiadomski
+ * Avoid FrozenError when running with frozen_string_literal
+ * Update minimum Ruby version to supported versions
+
+=== 2.5.3 2019-03-04
+ * Improve parsing performance - nehresma
+ * Support tzinfo 2.0 - Misty De Meo
+
+=== 2.5.2 2018-12-08
+ * Remove usage of the global TimezoneStore instance, in favor of a local variable in the parser
+ * Deprecate TimezoneStore class methods
+
+=== 2.5.1 2018-10-30
+ * Fix usage without ActiveSupport installed.
+
+=== 2.5.0 2018-09-10
+ * Set timezone information from VTIMEZONE components in cases that ActiveSupport can't figure it out (or isn't installed)
+ * Prevent rewinding the Parser IO input during parsing - Niels Laukens
+ * Update tested/supported ruby versions & documentation updates.
+
 === 2.4.1 2016-09-03
  * Fix parsing multiple calendars or components in same file - Patrick Schnetger
  * Fix multi-byte folding bug - Niels Laukens

data/README.md

@@ -1,28 +1,11 @@
 iCalendar -- Internet calendaring, Ruby style
 ===
 
-[![Build Status](https://travis-ci.org/icalendar/icalendar.svg?branch=master)](https://travis-ci.org/icalendar/icalendar)
+[![Build Status](https://travis-ci.com/icalendar/icalendar.svg?branch=master)](https://travis-ci.com/icalendar/icalendar)
 [![Code Climate](https://codeclimate.com/github/icalendar/icalendar.png)](https://codeclimate.com/github/icalendar/icalendar)
 
 <http://github.com/icalendar/icalendar>
 
-2.x Status
----
-
-iCalendar 2.0 is under active development, and can be followed in the
-[master branch](https://github.com/icalendar/icalendar/tree/master).
-
-iCalendar 1.x (currently the 1.x branch) will still survive for a
-while, but will only be accepting bug fixes from this point forward
-unless someone else wants to take over more active maintainership of
-the 1.x series.
-
-### 2.0 Goals ###
-
-* Implements [RFC 5545](http://tools.ietf.org/html/rfc5545)
-* More obvious access to parameters and values
-* Cleaner & easier timezone support
-
 ### Upgrade from 1.x ###
 
 Better documentation is still to come, but in the meantime the changes needed to move from 1.x to 2.0 are summarized by the [diff needed to update the README](https://github.com/icalendar/icalendar/commit/bc3701e004c915a250054030a9375d1e7618857f)
@@ -92,11 +75,11 @@ event.summary.ical_params #=> {'altrep' => 'http://my.language.net', 'language'
 
 #### Support for Dates or DateTimes
 
-Sometimes we don't care if an event's start or end are `Date` or `DateTime` objects. For this, we can use `DateOrDateTime.new(value).call`
+Sometimes we don't care if an event's start or end are `Date` or `DateTime` objects. For this, we can use `DateOrDateTime.new(value)`. Calling `.call` on the returned `DateOrDateTime` will immediately return the underlying `Date` or `DateTime` object.
 
 ```ruby
 event = cal.event do |e|
-  e.dtstart = Icalendar::Values::DateOrDateTime.new('20140924').call
+  e.dtstart = Icalendar::Values::DateOrDateTime.new('20140924')
   e.dtend   = Icalendar::Values::DateOrDateTime.new('20140925').call
   e.summary = 'This is an all-day event, because DateOrDateTime will return Dates'
 end
@@ -132,7 +115,7 @@ cal.event do |e|
     a.attendee        = %w(mailto:me@my-domain.com mailto:me-too@my-domain.com) # one or more email recipients (required)
     a.append_attendee "mailto:me-three@my-domain.com"
     a.trigger         = "-PT15M" # 15 minutes before
-    a.append_attach   Icalendar::Values::Uri.new "ftp://host.com/novo-procs/felizano.exe", "fmttype" => "application/binary" # email attachments (optional)
+    a.append_attach   Icalendar::Values::Uri.new("ftp://host.com/novo-procs/felizano.exe", "fmttype" => "application/binary") # email attachments (optional)
   end
 
   e.alarm do |a|
@@ -237,7 +220,8 @@ end
 iCalendar has some basic support for creating VTIMEZONE blocks from timezone information pulled from `tzinfo`.
 You must require `tzinfo` support manually to take advantage.
 
-iCalendar has been tested and works with `tzinfo` versions 0.3 and 1.1
+iCalendar has been tested and works with `tzinfo` versions 0.3, 1.x, and 2.x. The `tzinfo-data` gem may also
+be required depending on your version of `tzinfo` and potentially your operating system.
 
 #### Example ####
 

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
@@ -16,11 +17,6 @@ for the generation and parsing of .ics files, which are used by a
 variety of calendaring applications.
   EOD
   s.post_install_message = <<-EOM
-HEADS UP! iCalendar 2.0 is not backwards-compatible with 1.x. Please see the README for the new syntax
-
-HEADS UP! icalendar 2.2.0 switches to non-strict parsing as default. Please see the README if you
-rely on strict parsing for information on how to enable it.
-
 ActiveSupport is required for TimeWithZone support, but not required for general use.
   EOM
 
@@ -29,24 +25,27 @@ ActiveSupport is required for TimeWithZone support, but not required for general
   s.executables = `git ls-files -- bin/*`.split("\n").map { |f| File.basename f }
   s.require_paths = ['lib']
 
-  s.required_ruby_version = '>= 1.9.2'
+  s.required_ruby_version = '>= 2.4.0'
 
-  s.add_development_dependency 'rake', '~> 10.0'
-  s.add_development_dependency 'bundler', '~> 1.3'
+  s.add_dependency 'ice_cube', '~> 0.16'
 
-  # test with both groups of tzinfo dependencies
+  s.add_development_dependency 'rake', '~> 13.0'
+  s.add_development_dependency 'bundler', '~> 2.0'
+
+  # 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 'tzinfo', '~> 1.1'
-  s.add_development_dependency 'tzinfo-data', '~> 1.2014'
+  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 'tzinfo-data', '~> 1.2020'
   # tzinfo 0.x
   # s.add_development_dependency 'tzinfo', '~> 0.3'
   # end tzinfo
 
-  s.add_development_dependency 'activesupport', '~> 3.2'
-  # lock i18n to < 0.7 to maintain ruby 1.9.2 compatibility
-  s.add_development_dependency 'i18n', '< 0.7.0'
-
-  s.add_development_dependency 'timecop', '~> 0.7.0'
-  s.add_development_dependency 'rspec', '~> 3.0'
-  s.add_development_dependency 'simplecov', '~> 0.8'
+  s.add_development_dependency 'timecop', '~> 0.9'
+  s.add_development_dependency 'rspec', '~> 3.8'
+  s.add_development_dependency 'simplecov', '~> 0.16'
 end

data/lib/icalendar/alarm.rb

@@ -22,6 +22,7 @@ module Icalendar
 
     def initialize
       super 'alarm'
+      self.action = 'DISPLAY'
     end
 
     def valid?(strict = false)

data/lib/icalendar/calendar.rb

@@ -5,6 +5,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

data/lib/icalendar/component.rb

@@ -11,9 +11,10 @@ module Icalendar
     attr_accessor :parent
 
     def self.parse(source)
-      parser = Parser.new(source)
-      parser.component_class = self
-      parser.parse
+      _parse source
+    rescue ArgumentError
+      source.rewind if source.respond_to?(:rewind)
+      _parse Parser.clean_bad_wrapping(source)
     end
 
     def initialize(name, ical_name = nil)
@@ -71,6 +72,8 @@ module Icalendar
       # than 75 octets, but you need to split between characters, not bytes.
       # This is challanging with Unicode composing accents, for example.
 
+      return long_line if long_line.bytesize <= Icalendar::MAX_LINE_LENGTH
+
       chars = long_line.scan(/\P{M}\p{M}*/u) # split in graphenes
       folded = ['']
       bytes = 0
@@ -99,6 +102,14 @@ module Icalendar
       end
       collection.empty? ? nil : collection.join.chomp("\r\n")
     end
+
+    class << self
+      private def _parse(source)
+        parser = Parser.new(source)
+        parser.component_class = self
+        parser.parse
+      end
+    end
   end
 
 end

data/lib/icalendar/event.rb

@@ -12,6 +12,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
@@ -37,6 +38,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/has_components.rb

@@ -10,7 +10,7 @@ module Icalendar
     end
 
     def initialize(*args)
-      @custom_components = Hash.new { |h, k| h[k] = [] }
+      @custom_components = Hash.new
       super
     end
 
@@ -21,21 +21,33 @@ module Icalendar
       c
     end
 
+    def add_custom_component(component_name, c)
+      c.parent = self
+      yield c if block_given?
+      (custom_components[component_name.downcase.gsub("-", "_")] ||= []) << c
+      c
+    end
+
+    def custom_component(component_name)
+      custom_components[component_name.downcase.gsub("-", "_")] || []
+    end
+
     def method_missing(method, *args, &block)
       method_name = method.to_s
       if method_name =~ /^add_(x_\w+)$/
         component_name = $1
         custom = args.first || Component.new(component_name, component_name.upcase)
-        custom_components[component_name] << custom
-        yield custom if block_given?
-        custom
+        add_custom_component(component_name, custom, &block)
+      elsif method_name =~ /^x_/ && custom_component(method_name).size > 0
+        custom_component method_name
       else
         super
       end
     end
 
     def respond_to_missing?(method_name, include_private = false)
-      method_name.to_s.start_with?('add_x_') || super
+      string_method = method_name.to_s
+      string_method.start_with?('add_x_') || custom_component(string_method).size > 0 || super
     end
 
     module ClassMethods

data/lib/icalendar/has_properties.rb

@@ -10,7 +10,7 @@ module Icalendar
     end
 
     def initialize(*args)
-      @custom_properties = Hash.new { |h, k| h[k] = [] }
+      @custom_properties = Hash.new
       super
     end
 
@@ -39,15 +39,19 @@ module Icalendar
     end
 
     def custom_property(property_name)
-      custom_properties[property_name.downcase]
+      custom_properties[property_name.downcase] || []
     end
 
     def append_custom_property(property_name, value)
       property_name = property_name.downcase
-      if value.is_a? Icalendar::Value
-        custom_properties[property_name] << value
+      if self.class.single_properties.include? property_name
+        send "#{property_name}=", value
+      elsif self.class.multiple_properties.include? property_name
+        send "append_#{property_name}", value
+      elsif value.is_a? Icalendar::Value
+        (custom_properties[property_name] ||= []) << value
       else
-        custom_properties[property_name] << Icalendar::Values::Text.new(value)
+        (custom_properties[property_name] ||= []) << Icalendar::Values::Text.new(value)
       end
     end
 
@@ -100,29 +104,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
 
@@ -131,17 +135,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
@@ -158,20 +162,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

@@ -6,6 +6,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 +28,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/marshable.rb

@@ -0,0 +1,34 @@
+module Icalendar
+  module Marshable
+    def self.included(base)
+      base.extend ClassMethods
+    end
+
+    def marshal_dump
+      instance_variables
+        .reject { |ivar| self.class.transient_variables.include?(ivar) }
+        .each_with_object({}) do |ivar, serialized|
+
+        serialized[ivar] = instance_variable_get(ivar)
+      end
+    end
+
+    def marshal_load(serialized)
+      serialized.each do |ivar, value|
+        unless self.class.transient_variables.include?(ivar)
+          instance_variable_set(ivar, value)
+        end
+      end
+    end
+
+    module ClassMethods
+      def transient_variables
+        @transient_variables ||= [:@transient_variables]
+      end
+
+      def transient_variable(name)
+        transient_variables.push(name.to_sym)
+      end
+    end
+  end
+end

data/lib/icalendar/parser.rb

@@ -1,10 +1,27 @@
+require 'icalendar/timezone_store'
+
 module Icalendar
 
   class Parser
     attr_writer :component_class
-    attr_reader :source, :strict
+    attr_reader :source, :strict, :timezone_store, :verbose
+
+    def self.clean_bad_wrapping(source)
+      content = if source.respond_to? :read
+        source.read
+      elsif source.respond_to? :to_s
+        source.to_s
+      else
+        msg = 'Icalendar::Parser.clean_bad_wrapping must be called with a String or IO object'
+        Icalendar.fatal msg
+        fail ArgumentError, msg
+      end
+      encoding = content.encoding
+      content.force_encoding(Encoding::ASCII_8BIT)
+      content.gsub(/\r?\n[ \t]/, "").force_encoding(encoding)
+    end
 
-    def initialize(source, strict = false)
+    def initialize(source, strict = false, verbose = false)
       if source.respond_to? :gets
         @source = source
       elsif source.respond_to? :to_s
@@ -16,11 +33,11 @@ module Icalendar
       end
       read_in_data
       @strict = strict
+      @verbose = verbose
+      @timezone_store = TimezoneStore.new
     end
 
     def parse
-      source.rewind
-      read_in_data
       components = []
       while (fields = next_fields)
         component = component_class.new
@@ -33,7 +50,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
@@ -48,7 +65,7 @@ module Icalendar
           Icalendar.logger.error "No method \"#{method_name}\" for component #{component}"
           raise nme
         else
-          Icalendar.logger.warn "No method \"#{method_name}\" for component #{component}. Appending to custom."
+          Icalendar.logger.warn "No method \"#{method_name}\" for component #{component}. Appending to custom." if verbose?
           component.append_custom_property prop_name, prop_value
         end
       end
@@ -81,8 +98,8 @@ module Icalendar
       if !fields[:params]['value'].nil?
         klass_name = fields[:params].delete('value').first
         unless klass_name.upcase == klass.value_type
-          klass_name = klass_name.downcase.gsub(/(?:\A|-)(.)/) { |m| m[-1].upcase }
-          klass = Icalendar::Values.const_get klass_name if Icalendar::Values.const_defined?(klass_name)
+          klass_name = "Icalendar::Values::#{klass_name.downcase.gsub(/(?:\A|-)(.)/) { |m| m[-1].upcase }}"
+          klass = Object.const_get klass_name if Object.const_defined?(klass_name)
         end
       end
       klass
@@ -92,6 +109,10 @@ module Icalendar
       !!@strict
     end
 
+    def verbose?
+      @verbose
+    end
+
     private
 
     def component_class
@@ -101,16 +122,18 @@ module Icalendar
     def parse_component(component)
       while (fields = next_fields)
         if fields[:name] == 'end'
+          klass_name = fields[:value].gsub(/\AV/, '').downcase.capitalize
+          timezone_store.store(component) if klass_name == 'Timezone'
           break
         elsif fields[:name] == 'begin'
-          klass_name = fields[:value].gsub(/\AV/, '').downcase.capitalize
+          klass_name = fields[:value].gsub(/\AV/, '').gsub("-", "_").downcase.capitalize
           Icalendar.logger.debug "Adding component #{klass_name}"
-          if Icalendar.const_defined? klass_name
-            component.add_component parse_component(Icalendar.const_get(klass_name).new)
-          elsif Icalendar::Timezone.const_defined? klass_name
-            component.add_component parse_component(Icalendar::Timezone.const_get(klass_name).new)
+          if Object.const_defined? "Icalendar::#{klass_name}"
+            component.add_component parse_component(Object.const_get("Icalendar::#{klass_name}").new)
+          elsif Object.const_defined? "Icalendar::Timezone::#{klass_name}"
+            component.add_component parse_component(Object.const_get("Icalendar::Timezone::#{klass_name}").new)
           else
-            component.add_component parse_component(Component.new klass_name.downcase, fields[:value])
+            component.add_custom_component klass_name, parse_component(Component.new klass_name.downcase, fields[:value])
           end
         else
           parse_property component, fields
@@ -160,10 +183,20 @@ module Icalendar
         param_name = match[0].downcase
         params[param_name] ||= []
         match[1].scan %r{#{PVALUE}} do |param_value|
-          params[param_name] << param_value.gsub(/\A"|"\z/, '') if param_value.size > 0
+          if param_value.size > 0
+            param_value = param_value.gsub(/\A"|"\z/, '')
+            params[param_name] << param_value
+            if param_name == 'tzid'
+              params['x-tz-info'] = timezone_store.retrieve param_value
+            end
+          end
         end
       end
-      Icalendar.logger.debug "Found fields: #{parts.inspect} with params: #{params.inspect}"
+      # Building the string to send to the logger is expensive.
+      # Only do it if the logger is at the right log level.
+      if ::Logger::DEBUG >= Icalendar.logger.level
+        Icalendar.logger.debug "Found fields: #{parts.inspect} with params: #{params.inspect}"
+      end
       {
         name: parts[:name].downcase.gsub('-', '_'),
         params: params,