icalendar 2.6.1 → 2.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4fd1e657ab9c20d0576627a5d04bcc6991205bf8f086ad8150e5bcbc179f6c49
-  data.tar.gz: 2a29f3a0da940f8c2caa83bc49e2cfad4cb2fa31b72a64c1b7f200a65571bfb9
+  metadata.gz: b22d9bc37f8f10ba08d5b8aa155dfb1b97a9876c800c547271f43ce15f09b89d
+  data.tar.gz: 91260efab7eafc852e509258fa0163cd1ac2c41352b9482fcae85a45547fa325
 SHA512:
-  metadata.gz: '02840f7036575111fdfce4253131e15b574a38f1f48061229863a52514d661943e119c859a983df0ce3d16818e86a34cbcd9b7e2813fb4b91e38d09d8be5e9e2'
-  data.tar.gz: 59eb643eafb0a108da246806fe737c58e5592e0baf14af7d04ccd131ebc03e164bd3433ce2eced74e9d2054fa648a52aad64252d3eaecdc6df7a367ebbdf2107
+  metadata.gz: a6466ed9d1ae91fd9007b42a8d9001879e601ea5f03c338fceb5dcda03b3b32e27ca115cb3a359560b9c04c8944891a174d3bade9596f84d2ca12808dad3046d
+  data.tar.gz: a587f1166316ad6a87602d3026144c3d3e9ca09a6d3ef2a40a0664aa77cd497817894df6d53503f6cdcfd95a99fcc2e66c6a8688af19870de2a199cf9b47511d

data/.travis.yml

@@ -3,12 +3,13 @@ before_install:
   - gem install bundler
 language: ruby
 rvm:
+  - 2.7
   - 2.6
   - 2.5
-  - 2.4
   - jruby-19mode
   - ruby-head
   - jruby-head
+  - truffleruby-head
 matrix:
   allow_failures:
     - rvm: ruby-head

data/History.txt

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

data/icalendar.gemspec

@@ -28,20 +28,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/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/parser.rb

@@ -82,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
@@ -106,14 +106,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/version.rb

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

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.7.0
 platform: ruby
 authors:
 - Ryan Ahearn
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-12-07 00:00:00.000000000 Z
+date: 2020-09-12 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
@@ -210,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
@@ -261,8 +262,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.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