icalendar 2.5.1 → 2.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1a5b21473741cf53f97e0855df7898df74760fd9c4941dea1a9876cb91dfdc95
-  data.tar.gz: 743ad24dbf1057eee1a676c3de5184a52e481d5c88a8d96bb16bccb8fc002a12
+  metadata.gz: b22d9bc37f8f10ba08d5b8aa155dfb1b97a9876c800c547271f43ce15f09b89d
+  data.tar.gz: 91260efab7eafc852e509258fa0163cd1ac2c41352b9482fcae85a45547fa325
 SHA512:
-  metadata.gz: 3e139149e08d9d8bc25dfb0fd03a6e0e029ecfc31112751128f2f020767207ee8b17b2d9e000f9197dbca0650171836e1ef5c470e8f613684ba6dea88013dda6
-  data.tar.gz: 4a9ff7fcdc3f81b9252cef04f8211a90e71142b94e093b2b95dcbf15b631b576fbcd5ef937cb38ba62a94e22565d8d6f8583b42ceee34d51fc8e42de139ca932
+  metadata.gz: a6466ed9d1ae91fd9007b42a8d9001879e601ea5f03c338fceb5dcda03b3b32e27ca115cb3a359560b9c04c8944891a174d3bade9596f84d2ca12808dad3046d
+  data.tar.gz: a587f1166316ad6a87602d3026144c3d3e9ca09a6d3ef2a40a0664aa77cd497817894df6d53503f6cdcfd95a99fcc2e66c6a8688af19870de2a199cf9b47511d

data/.gitignore

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

data/.travis.yml

@@ -3,17 +3,15 @@ before_install:
   - gem install bundler
 language: ruby
 rvm:
+  - 2.7
+  - 2.6
   - 2.5
-  - 2.4
-  - 2.3
-  - 2.2
   - jruby-19mode
-  - rbx-3
   - ruby-head
   - jruby-head
+  - truffleruby-head
 matrix:
   allow_failures:
-    - rvm: 2.2
     - rvm: ruby-head
     - rvm: jruby-head
 script: bundle exec rake spec

data/History.txt

@@ -1,3 +1,24 @@
+=== 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.
 

data/README.md

@@ -1,7 +1,7 @@
 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>
@@ -115,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|

data/icalendar.gemspec

@@ -24,22 +24,23 @@ 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 = '>= 2.2.0'
+  s.required_ruby_version = '>= 2.4.0'
 
   s.add_dependency 'ice_cube', '~> 0.16'
 
-  s.add_development_dependency 'rake', '~> 12.0'
-  s.add_development_dependency 'bundler', '~> 1.16'
+  s.add_development_dependency 'rake', '~> 13.0'
+  s.add_development_dependency 'bundler', '~> 2.0'
 
-  # test with both groups of tzinfo dependencies
+  # test with all groups of tzinfo dependencies
+  # tzinfo 2.x
+  # s.add_development_dependency 'tzinfo', '~> 2.0'
+  # s.add_development_dependency 'tzinfo-data', '~> 1.2020'
   # tzinfo 1.x
-  s.add_development_dependency 'activesupport', '~> 5.2'
-  s.add_development_dependency 'i18n', '~> 1.1'
+  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.2018'
+  s.add_development_dependency 'tzinfo-data', '~> 1.2020'
   # tzinfo 0.x
-  # s.add_development_dependency 'activesupport', '~> 4.0'
-  # s.add_development_dependency 'i18n', '~> 0.7'
   # s.add_development_dependency 'tzinfo', '~> 0.3'
   # end tzinfo
 

data/lib/icalendar.rb

@@ -13,7 +13,7 @@ module Icalendar
   end
 
   def self.parse(source, single = false)
-    warn "**** DEPRECATION WARNING ****\nIcalendar.parse will be removed. Please switch to Icalendar::Calendar.parse."
+    warn "**** DEPRECATION WARNING ****\nIcalendar.parse will be removed in 3.0. Please switch to Icalendar::Calendar.parse."
     calendars = Parser.new(source).parse
     single ? calendars.first : calendars
   end
@@ -22,6 +22,7 @@ end
 
 require 'icalendar/has_properties'
 require 'icalendar/has_components'
+require 'icalendar/marshable'
 require 'icalendar/component'
 require 'icalendar/value'
 require 'icalendar/alarm'

data/lib/icalendar/component.rb

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

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,7 +39,7 @@ 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)
@@ -49,9 +49,9 @@ module Icalendar
       elsif self.class.multiple_properties.include? property_name
         send "append_#{property_name}", value
       elsif value.is_a? Icalendar::Value
-        custom_properties[property_name] << 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
 

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

@@ -4,7 +4,7 @@ module Icalendar
 
   class Parser
     attr_writer :component_class
-    attr_reader :source, :strict
+    attr_reader :source, :strict, :timezone_store
 
     def initialize(source, strict = false)
       if source.respond_to? :gets
@@ -18,6 +18,7 @@ module Icalendar
       end
       read_in_data
       @strict = strict
+      @timezone_store = TimezoneStore.new
     end
 
     def parse
@@ -81,8 +82,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
@@ -102,17 +103,17 @@ module Icalendar
       while (fields = next_fields)
         if fields[:name] == 'end'
           klass_name = fields[:value].gsub(/\AV/, '').downcase.capitalize
-          TimezoneStore.store(component) if klass_name == 'Timezone'
+          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
@@ -162,10 +163,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,

data/lib/icalendar/timezone.rb

@@ -14,10 +14,40 @@ module Icalendar
           optional_property :comment
           optional_property :rdate, Icalendar::Values::DateTime
           optional_property :tzname
+
+          transient_variable :@cached_occurrences
+          transient_variable :@occurrences
+        end
+      end
+
+      def occurrences
+        @occurrences ||= IceCube::Schedule.new(dtstart.to_time) do |s|
+          rrule.each do |rule|
+            s.add_recurrence_rule IceCube::Rule.from_ical(rule.value_ical)
+          end
+          rdate.each do |date|
+            s.add_recurrence_time date.to_time
+          end
+        end.all_occurrences_enumerator
+      end
+
+      def previous_occurrence(from)
+        from = IceCube::TimeUtil.match_zone(from, dtstart.to_time)
+
+        @cached_occurrences ||= []
+        while @cached_occurrences.empty? || @cached_occurrences.last <= from
+          begin
+            @cached_occurrences << occurrences.next
+          rescue StopIteration
+            break
+          end
         end
+
+        @cached_occurrences.reverse_each.find { |occurrence| occurrence < from }
       end
     end
     class Daylight < Component
+      include Marshable
       include TzProperties
 
       def initialize
@@ -25,6 +55,7 @@ module Icalendar
       end
     end
     class Standard < Component
+      include Marshable
       include TzProperties
 
       def initialize
@@ -75,30 +106,14 @@ module Icalendar
 
     def standard_for(local)
       possible = standards.map do |std|
-        schedule = IceCube::Schedule.new(std.dtstart.to_time) do |s|
-          std.rrule.each do |rule|
-            s.add_recurrence_rule IceCube::Rule.from_ical(rule.value_ical)
-          end
-          std.rdate.each do |date|
-            s.add_recurrence_date date
-          end
-        end
-        [schedule.previous_occurrence(local.to_time), std]
+        [std.previous_occurrence(local.to_time), std]
       end
       possible.sort_by(&:first).last
     end
 
     def daylight_for(local)
       possible = daylights.map do |day|
-        schedule = IceCube::Schedule.new(day.dtstart.to_time) do |s|
-          day.rrule.each do |rule|
-            s.add_recurrence_rule IceCube::Rule.from_ical(rule.value_ical)
-          end
-          day.rdate.each do |date|
-            s.add_recurrence_date date
-          end
-        end
-        [schedule.previous_occurrence(local.to_time), day]
+        [day.previous_occurrence(local.to_time), day]
       end
       possible.sort_by(&:first).last
     end

data/lib/icalendar/timezone_store.rb

@@ -9,14 +9,17 @@ module Icalendar
     end
 
     def self.instance
+      warn "**** DEPRECATION WARNING ****\nTimezoneStore.instance will be removed in 3.0. Please instantiate a TimezoneStore object."
       @instance ||= new
     end
 
     def self.store(timezone)
+      warn "**** DEPRECATION WARNING ****\nTimezoneStore.store will be removed in 3.0. Please use instance methods."
       instance.store timezone
     end
 
     def self.retrieve(tzid)
+      warn "**** DEPRECATION WARNING ****\nTimezoneStore.retrieve will be removed in 3.0. Please use instance methods."
       instance.retrieve tzid
     end
 

data/lib/icalendar/tzinfo.rb

@@ -61,7 +61,7 @@ module Icalendar
     end
 
     def rrule
-      start = local_start.to_datetime
+      start = (respond_to?(:local_start_at) ? local_start_at : local_start).to_datetime
       # this is somewhat of a hack, but seems to work ok
       # assumes that no timezone transition is in law as "4th X of the month"
       # but only as 1st X, 2nd X, 3rd X, or Last X
@@ -76,7 +76,7 @@ module Icalendar
     end
 
     def dtstart
-      local_start.to_datetime.strftime '%Y%m%dT%H%M%S'
+      (respond_to?(:local_start_at) ? local_start_at : local_start).to_datetime.strftime '%Y%m%dT%H%M%S'
     end
   end
 

data/lib/icalendar/values/array.rb

@@ -22,7 +22,7 @@ module Icalendar
                  else
                    [klass.new(value, params)]
                  end
-        super mapped, params
+        super mapped
       end
 
       def params_ical

data/lib/icalendar/values/date.rb

@@ -7,6 +7,8 @@ module Icalendar
       FORMAT = '%Y%m%d'
 
       def initialize(value, params = {})
+        params.delete 'tzid'
+        params.delete 'x-tz-info'
         if value.is_a? String
           begin
             parsed_date = ::Date.strptime(value, FORMAT)

data/lib/icalendar/values/time_with_zone.rb

@@ -18,6 +18,7 @@ module Icalendar
       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']
@@ -25,12 +26,12 @@ module Icalendar
               defined?(ActiveSupportTimeWithZoneAdapter) &&
               (tz = ActiveSupport::TimeZone[tzid])
             ActiveSupportTimeWithZoneAdapter.new(nil, tz, value)
-          elsif (tz = TimezoneStore.retrieve(tzid))
-            offset = tz.offset_for_local(value).to_s
+          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)
+              ::Time.new value.year, value.month, value.day, value.hour, value.min, value.sec, offset
             end
           end
         end

data/lib/icalendar/values/utc_offset.rb

@@ -37,8 +37,7 @@ module Icalendar
       end
 
       def parse_fields(value)
-        value.gsub!(/\s+/, '')
-        md = /\A(?<behind>[+-])(?<hours>\d{2})(?<minutes>\d{2})(?<seconds>\d{2})?\z/.match value
+        md = /\A(?<behind>[+-])(?<hours>\d{2})(?<minutes>\d{2})(?<seconds>\d{2})?\z/.match value.gsub(/\s+/, '')
         {
           behind: (md[:behind] == '-'),
           hours: md[:hours].to_i,

data/lib/icalendar/version.rb

@@ -1,5 +1,5 @@
 module Icalendar
 
-  VERSION = '2.5.1'
+  VERSION = '2.7.0'
 
 end

data/spec/calendar_spec.rb

@@ -2,6 +2,12 @@ require 'spec_helper'
 
 describe Icalendar::Calendar do
 
+  context 'marshalling' do
+    it 'can be de/serialized' do
+      Marshal.load(Marshal.dump(subject))
+    end
+  end
+
   context 'values' do
     let(:property) { 'my-value' }
 

data/spec/event_spec.rb

@@ -113,6 +113,13 @@ describe Icalendar::Event do
     end
   end
 
+  describe "#custom_property" do
+    it "returns a default for missing properties" do
+      expect(subject.x_doesnt_exist).to eq([])
+      expect(subject.custom_property "x_doesnt_exist").to eq([])
+    end
+  end
+
   describe '.parse' do
     let(:source) { File.read File.join(File.dirname(__FILE__), 'fixtures', fn) }
     let(:fn) { 'event.ics' }

data/spec/fixtures/custom_component.ics

@@ -0,0 +1,158 @@
+BEGIN:VCALENDAR
+PRODID:-//Atlassian Confluence//Calendar Plugin 1.0//EN
+VERSION:2.0
+CALSCALE:GREGORIAN
+X-WR-CALNAME:Grimsell testkalender
+X-WR-CALDESC:
+X-WR-TIMEZONE:Europe/Stockholm
+X-MIGRATED-FOR-USER-KEY:true
+METHOD:PUBLISH
+BEGIN:VTIMEZONE
+TZID:Europe/Stockholm
+TZURL:http://tzurl.org/zoneinfo/Europe/Stockholm
+SEQUENCE:9206
+BEGIN:DAYLIGHT
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0200
+TZNAME:CEST
+DTSTART:19810329T020000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU
+END:DAYLIGHT
+BEGIN:STANDARD
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0100
+TZNAME:CET
+DTSTART:19961027T030000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU
+END:STANDARD
+BEGIN:STANDARD
+TZOFFSETFROM:+011212
+TZOFFSETTO:+010014
+TZNAME:SET
+DTSTART:18790101T000000
+RDATE:18790101T000000
+END:STANDARD
+BEGIN:STANDARD
+TZOFFSETFROM:+010014
+TZOFFSETTO:+0100
+TZNAME:CET
+DTSTART:19000101T000000
+RDATE:19000101T000000
+END:STANDARD
+BEGIN:DAYLIGHT
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0200
+TZNAME:CEST
+DTSTART:19160514T230000
+RDATE:19160514T230000
+RDATE:19800406T020000
+END:DAYLIGHT
+BEGIN:STANDARD
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0100
+TZNAME:CET
+DTSTART:19161001T010000
+RDATE:19161001T010000
+RDATE:19800928T030000
+RDATE:19810927T030000
+RDATE:19820926T030000
+RDATE:19830925T030000
+RDATE:19840930T030000
+RDATE:19850929T030000
+RDATE:19860928T030000
+RDATE:19870927T030000
+RDATE:19880925T030000
+RDATE:19890924T030000
+RDATE:19900930T030000
+RDATE:19910929T030000
+RDATE:19920927T030000
+RDATE:19930926T030000
+RDATE:19940925T030000
+RDATE:19950924T030000
+END:STANDARD
+BEGIN:STANDARD
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0100
+TZNAME:CET
+DTSTART:19800101T000000
+RDATE:19800101T000000
+END:STANDARD
+END:VTIMEZONE
+BEGIN:VEVENT
+DTSTAMP:20151203T104347Z
+SUMMARY:Kaffepaus
+UID:20151203T101856Z-1543254179@intranet.idainfront.se
+DESCRIPTION:
+ORGANIZER;X-CONFLUENCE-USER-KEY=ff80818141e4d3b60141e4d4b75700a2;CN=Magnu
+ s Grimsell;CUTYPE=INDIVIDUAL:mailto:magnus.grimsell@idainfront.se
+CREATED:20151203T101856Z
+LAST-MODIFIED:20151203T101856Z
+SEQUENCE:1
+X-CONFLUENCE-SUBCALENDAR-TYPE:other
+TRANSP:OPAQUE
+STATUS:CONFIRMED
+DTSTART:20151203T090000Z
+DTEND:20151203T091500Z
+END:VEVENT
+BEGIN:X-EVENT-SERIES
+SUMMARY:iipax - Sprints
+DESCRIPTION:
+X-CONFLUENCE-SUBCALENDAR-TYPE:jira-agile-sprint
+URL:jira://8112ef9a-343e-30e6-b469-4f993bf0371d?projectKey=II&dateFieldNa
+ me=sprint
+END:X-EVENT-SERIES
+BEGIN:VEVENT
+DTSTAMP:20151203T104348Z
+DTSTART;TZID=Europe/Stockholm:20130115T170800
+DTEND;TZID=Europe/Stockholm:20130204T170800
+UID:3cb4df4b-eb18-43fd-934a-16c15acfb4b1-3@jira.idainfront.se
+X-GREENHOPPER-SPRINT-CLOSED:false
+X-GREENHOPPER-SPRINT-EDITABLE:true
+X-JIRA-PROJECT;X-JIRA-PROJECT-KEY=II:iipax
+X-GREENHOPPER-SPRINT-VIEWBOARDS-URL:https://jira.idainfront.se/secure/GHG
+ oToBoard.jspa?sprintId=3
+SEQUENCE:0
+X-CONFLUENCE-SUBCALENDAR-TYPE:jira-agile-sprint
+TRANSP:OPAQUE
+STATUS:CONFIRMED
+DESCRIPTION:https://jira.idainfront.se/secure/GHGoToBoard.jspa?sprintId=3
+
+SUMMARY:iipax - Callisto-6
+END:VEVENT
+BEGIN:VEVENT
+DTSTAMP:20151203T104348Z
+DTSTART;TZID=Europe/Stockholm:20130219T080000
+DTEND;TZID=Europe/Stockholm:20130319T095900
+UID:3cb4df4b-eb18-43fd-934a-16c15acfb4b1-5@jira.idainfront.se
+X-GREENHOPPER-SPRINT-CLOSED:false
+X-GREENHOPPER-SPRINT-EDITABLE:true
+X-JIRA-PROJECT;X-JIRA-PROJECT-KEY=II:iipax
+X-GREENHOPPER-SPRINT-VIEWBOARDS-URL:https://jira.idainfront.se/secure/GHG
+ oToBoard.jspa?sprintId=5
+SEQUENCE:0
+X-CONFLUENCE-SUBCALENDAR-TYPE:jira-agile-sprint
+TRANSP:OPAQUE
+STATUS:CONFIRMED
+DESCRIPTION:https://jira.idainfront.se/secure/GHGoToBoard.jspa?sprintId=5
+
+SUMMARY:iipax - Bulbasaur
+END:VEVENT
+BEGIN:VEVENT
+DTSTAMP:20151203T104348Z
+DTSTART;TZID=Europe/Stockholm:20130326T105900
+DTEND;TZID=Europe/Stockholm:20130419T105900
+UID:3cb4df4b-eb18-43fd-934a-16c15acfb4b1-7@jira.idainfront.se
+X-GREENHOPPER-SPRINT-CLOSED:true
+X-GREENHOPPER-SPRINT-EDITABLE:true
+X-JIRA-PROJECT;X-JIRA-PROJECT-KEY=II:iipax
+X-GREENHOPPER-SPRINT-VIEWBOARDS-URL:https://jira.idainfront.se/secure/GHG
+ oToBoard.jspa?sprintId=7
+SEQUENCE:0
+X-CONFLUENCE-SUBCALENDAR-TYPE:jira-agile-sprint
+TRANSP:OPAQUE
+STATUS:CONFIRMED
+DESCRIPTION:https://jira.idainfront.se/secure/GHGoToBoard.jspa?sprintId=7
+
+SUMMARY:iipax - Ivysaur
+END:VEVENT
+END:VCALENDAR

data/spec/parser_spec.rb

@@ -66,6 +66,16 @@ describe Icalendar::Parser do
         expect(event.dtstart.utc).to eq Time.parse("20180104T150000Z")
       end
     end
+    context 'custom_component.ics' do
+      let(:fn) { 'custom_component.ics' }
+
+      it 'correctly handles custom named components' do
+        parsed = subject.parse
+        calendar = parsed.first
+        expect(calendar.custom_component('x_event_series').size).to eq 1
+        expect(calendar.custom_component('X-EVENT-SERIES').size).to eq 1
+      end
+    end
   end
 
   describe '#parse with bad line' do

data/spec/roundtrip_spec.rb

@@ -15,7 +15,7 @@ describe Icalendar do
       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.ical_params).to eq 'tzid' => ['US-Mountain']
+      expect(event.rdate.first.params_ical).to eq ";TZID=US-Mountain"
     end
   end
 
@@ -135,6 +135,15 @@ describe Icalendar do
         ical = subject.parse.first.to_ical
         expect(ical).to include 'CUSTOMFIELD:Not properly noted as custom with X- prefix.'
       end
+
+      context 'custom components' do
+        let(:source) { File.read File.join(File.dirname(__FILE__), 'fixtures', 'custom_component.ics') }
+
+        it 'can output the custom component' do
+          ical = subject.parse.first.to_ical
+          expect(ical).to include 'BEGIN:X-EVENT-SERIES'
+        end
+      end
     end
   end
 end

data/spec/timezone_spec.rb

@@ -28,4 +28,52 @@ describe Icalendar::Timezone do
       it { should_not be_valid }
     end
   end
+
+  context 'marshalling' do
+    context 'with standard/daylight components' do
+      before do
+        subject.standard do |standard|
+          standard.rrule = Icalendar::Values::Recur.new("FREQ=YEARLY;INTERVAL=1;BYDAY=-1SU;BYMONTH=10")
+          standard.dtstart = Icalendar::Values::DateTime.new("16010101T030000")
+          standard.tzoffsetfrom = Icalendar::Values::UtcOffset.new("+0200")
+          standard.tzoffsetto = Icalendar::Values::UtcOffset.new("+0100")
+        end
+
+        subject.daylight do |daylight|
+          daylight.rrule = Icalendar::Values::Recur.new("FREQ=YEARLY;INTERVAL=1;BYDAY=-1SU;BYMONTH=3")
+          daylight.dtstart = Icalendar::Values::DateTime.new("16010101T020000")
+          daylight.tzoffsetfrom = Icalendar::Values::UtcOffset.new("+0100")
+          daylight.tzoffsetto = Icalendar::Values::UtcOffset.new("+0200")
+        end
+      end
+
+      it 'can be de/serialized' do
+        first_standard = subject.standards.first
+        first_daylight = subject.daylights.first
+
+        expect(first_standard.valid?).to be_truthy
+        expect(first_daylight.valid?).to be_truthy
+
+        # calling previous_occurrence intializes @cached_occurrences with a time that's not handled by ruby marshaller
+        first_occurence_for = Time.new(1601, 10, 31)
+
+        standard_previous_occurrence = first_standard.previous_occurrence(first_occurence_for)
+        expect(standard_previous_occurrence).not_to be_nil
+
+        daylight_previous_occurrence = first_daylight.previous_occurrence(first_occurence_for)
+        expect(daylight_previous_occurrence).not_to be_nil
+
+        deserialized = nil
+
+        expect { deserialized = Marshal.load(Marshal.dump(subject)) }.not_to raise_exception
+
+        expect(deserialized.standards.first.previous_occurrence(first_occurence_for)).to eq(standard_previous_occurrence)
+        expect(deserialized.daylights.first.previous_occurrence(first_occurence_for)).to eq(daylight_previous_occurrence)
+      end
+    end
+
+    it 'can be de/serialized' do
+      expect { Marshal.load(Marshal.dump(subject)) }.not_to raise_exception
+    end
+  end
 end

data/spec/tzinfo_spec.rb

@@ -29,7 +29,6 @@ describe 'TZInfo::Timezone' do
     let(:tz) { TZInfo::Timezone.get 'Asia/Shanghai' }
     let(:date) { DateTime.now }
 
-    # TODO only run this test with tzinfo ≥ 1.0
     it 'only creates a standard component' do
       expect(subject.to_ical).to eq <<-EXPECTED.gsub "\n", "\r\n"
 BEGIN:VTIMEZONE

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: icalendar
 version: !ruby/object:Gem::Version
-  version: 2.5.1
+  version: 2.7.0
 platform: ruby
 authors:
 - Ryan Ahearn
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-10-30 00:00:00.000000000 Z
+date: 2020-09-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ice_cube
@@ -30,56 +30,56 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.0'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.0'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '6.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '6.0'
 - !ruby/object:Gem::Dependency
   name: i18n
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '1.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '1.8'
 - !ruby/object:Gem::Dependency
   name: tzinfo
   requirement: !ruby/object:Gem::Requirement
@@ -100,14 +100,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2018'
+        version: '1.2020'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2018'
+        version: '1.2020'
 - !ruby/object:Gem::Dependency
   name: timecop
   requirement: !ruby/object:Gem::Requirement
@@ -180,6 +180,7 @@ files:
 - lib/icalendar/has_properties.rb
 - lib/icalendar/journal.rb
 - lib/icalendar/logger.rb
+- lib/icalendar/marshable.rb
 - lib/icalendar/parser.rb
 - lib/icalendar/timezone.rb
 - lib/icalendar/timezone_store.rb
@@ -209,6 +210,7 @@ files:
 - spec/calendar_spec.rb
 - spec/downcased_hash_spec.rb
 - spec/event_spec.rb
+- spec/fixtures/custom_component.ics
 - spec/fixtures/event.ics
 - spec/fixtures/nondefault_values.ics
 - spec/fixtures/nonstandard.ics
@@ -245,7 +247,7 @@ metadata: {}
 post_install_message: 'ActiveSupport is required for TimeWithZone support, but not
   required for general use.
 
-'
+  '
 rdoc_options: []
 require_paths:
 - lib
@@ -253,16 +255,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.2.0
+      version: 2.4.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
-signing_key: 
+rubygems_version: 3.1.2
+signing_key:
 specification_version: 4
 summary: A ruby implementation of the iCalendar specification (RFC-5545).
 test_files:
@@ -270,6 +271,7 @@ test_files:
 - spec/calendar_spec.rb
 - spec/downcased_hash_spec.rb
 - spec/event_spec.rb
+- spec/fixtures/custom_component.ics
 - spec/fixtures/event.ics
 - spec/fixtures/nondefault_values.ics
 - spec/fixtures/nonstandard.ics