icalendar 2.6.1 → 2.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4fd1e657ab9c20d0576627a5d04bcc6991205bf8f086ad8150e5bcbc179f6c49
-  data.tar.gz: 2a29f3a0da940f8c2caa83bc49e2cfad4cb2fa31b72a64c1b7f200a65571bfb9
+  metadata.gz: becd9ceba3342d0b602f1bb8a33858fb2176ceafd457a0fbca76d24ff7800dc7
+  data.tar.gz: f11054752ca18d026b1339e936ab30d4f1ff61219ecfd94d3f913b3de6b14106
 SHA512:
-  metadata.gz: '02840f7036575111fdfce4253131e15b574a38f1f48061229863a52514d661943e119c859a983df0ce3d16818e86a34cbcd9b7e2813fb4b91e38d09d8be5e9e2'
-  data.tar.gz: 59eb643eafb0a108da246806fe737c58e5592e0baf14af7d04ccd131ebc03e164bd3433ce2eced74e9d2054fa648a52aad64252d3eaecdc6df7a367ebbdf2107
+  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/History.txt

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

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|
@@ -220,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.x
+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
@@ -28,20 +29,19 @@ ActiveSupport is required for TimeWithZone support, but not required for general
 
   s.add_dependency 'ice_cube', '~> 0.16'
 
-  s.add_development_dependency 'rake', '~> 12.0'
+  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.2018'
+  # 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 'i18n', '~> 0.7'
   # s.add_development_dependency 'tzinfo', '~> 0.3'
   # end tzinfo
 

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)
@@ -101,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

@@ -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

@@ -104,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
 
@@ -135,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
@@ -162,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/parser.rb

@@ -4,9 +4,24 @@ module Icalendar
 
   class Parser
     attr_writer :component_class
-    attr_reader :source, :strict, :timezone_store
+    attr_reader :source, :strict, :timezone_store, :verbose
 
-    def initialize(source, strict = false)
+    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, verbose = false)
       if source.respond_to? :gets
         @source = source
       elsif source.respond_to? :to_s
@@ -18,6 +33,7 @@ module Icalendar
       end
       read_in_data
       @strict = strict
+      @verbose = verbose
       @timezone_store = TimezoneStore.new
     end
 
@@ -34,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
@@ -49,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
@@ -82,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
@@ -93,6 +109,10 @@ module Icalendar
       !!@strict
     end
 
+    def verbose?
+      @verbose
+    end
+
     private
 
     def component_class
@@ -106,14 +126,14 @@ module Icalendar
           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

data/lib/icalendar/todo.rb

@@ -12,6 +12,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 +39,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 +52,4 @@ module Icalendar
 
   end
 
-end
+end

data/lib/icalendar/values/array.rb

@@ -52,7 +52,6 @@ module Icalendar
       def needs_value_type?(default_type)
         value.first.class != default_type
       end
-
     end
 
   end

data/lib/icalendar/values/time_with_zone.rb

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

@@ -1,5 +1,5 @@
 module Icalendar
 
-  VERSION = '2.6.1'
+  VERSION = '2.8.0'
 
 end

data/lib/icalendar.rb

@@ -33,3 +33,4 @@ require 'icalendar/freebusy'
 require 'icalendar/timezone'
 require 'icalendar/calendar'
 require 'icalendar/parser'
+require 'icalendar/version'

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
@@ -170,4 +189,13 @@ END:VCALENDAR
       expect(subject.ip_method).to eq 'PUBLISH'
     end
   end
+
+  describe '.parse' do
+    let(:source) { File.read File.join(File.dirname(__FILE__), 'fixtures', 'bad_wrapping.ics') }
+
+    it 'correctly parses a bad file' do
+      actual = described_class.parse(source)
+      expect(actual[0]).to be_a(described_class)
+    end
+  end
 end

data/spec/fixtures/bad_wrapping.ics

@@ -0,0 +1,14 @@
+BEGIN:VCALENDAR
+VERSION:2.0
+PRODID:manual
+CALSCALE:GREGORIAN
+BEGIN:VEVENT
+DTSTAMP:20200902T223352Z
+UID:6e7d7fe5-6735-4cdd-bfe4-761dfcecd7a7
+DTSTART;VALUE=DATE:20200902
+DTEND;VALUE=DATE:20200903
+DESCRIPTION:Event description that puts a UTF-8 multi-octet sequence right�
+ �here.
+SUMMARY:UTF-8 multi-octet sequence test
+END:VEVENT
+END:VCALENDAR

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

@@ -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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: icalendar
 version: !ruby/object:Gem::Version
-  version: 2.6.1
+  version: 2.8.0
 platform: ruby
 authors:
 - Ryan Ahearn
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-12-07 00:00:00.000000000 Z
+date: 2022-07-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ice_cube
@@ -30,14 +30,14 @@ 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
@@ -58,28 +58,28 @@ dependencies:
     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
@@ -160,9 +160,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/main.yml"
 - ".gitignore"
 - ".rspec"
-- ".travis.yml"
 - Gemfile
 - History.txt
 - LICENSE
@@ -210,6 +210,8 @@ files:
 - spec/calendar_spec.rb
 - spec/downcased_hash_spec.rb
 - spec/event_spec.rb
+- spec/fixtures/bad_wrapping.ics
+- spec/fixtures/custom_component.ics
 - spec/fixtures/event.ics
 - spec/fixtures/nondefault_values.ics
 - spec/fixtures/nonstandard.ics
@@ -241,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.
@@ -261,8 +266,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.3.7
+signing_key:
 specification_version: 4
 summary: A ruby implementation of the iCalendar specification (RFC-5545).
 test_files:
@@ -270,6 +275,8 @@ test_files:
 - spec/calendar_spec.rb
 - spec/downcased_hash_spec.rb
 - spec/event_spec.rb
+- spec/fixtures/bad_wrapping.ics
+- spec/fixtures/custom_component.ics
 - spec/fixtures/event.ics
 - spec/fixtures/nondefault_values.ics
 - spec/fixtures/nonstandard.ics

data/.travis.yml

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