icalendar 2.4.1 → 2.8.0

data/spec/fixtures/single_event_bad_organizer.ics

@@ -0,0 +1,22 @@
+BEGIN:VCALENDAR
+VERSION:2.0
+PRODID:bsprodidfortestabc123
+CALSCALE:GREGORIAN
+BEGIN:VEVENT
+DTSTAMP:20050118T211523Z
+UID:bsuidfortestabc123
+DTSTART;TZID=US-Mountain:20050120T170000
+DTEND;TZID=US-Mountain:20050120T184500
+CLASS:PRIVATE
+GEO:37.386013;-122.0829322
+ORGANIZER;CN=Joe Bob\: Magician:mailto:joebob@random.net
+PRIORITY:2
+SUMMARY:This is a really long summary to test the method of unfolding lines
+ \, so I'm just going to make it a whole bunch of lines. With a twist: a "
+ ö" takes up multiple bytes\, and should be wrapped to the next line.
+ATTACH:http://bush.sucks.org/impeach/him.rhtml
+ATTACH:http://corporations-dominate.existence.net/why.rhtml
+RDATE;TZID=US-Mountain:20050121T170000,20050122T170000
+X-TEST-COMPONENT;QTEST="Hello, World":Shouldn't double double quotes
+END:VEVENT
+END:VCALENDAR

data/spec/fixtures/single_event_organizer_parsed.ics

@@ -0,0 +1,22 @@
+BEGIN:VCALENDAR
+VERSION:2.0
+PRODID:bsprodidfortestabc123
+CALSCALE:GREGORIAN
+BEGIN:VEVENT
+DTSTAMP:20050118T211523Z
+UID:bsuidfortestabc123
+DTSTART;TZID=US-Mountain:20050120T170000
+DTEND;TZID=US-Mountain:20050120T184500
+CLASS:PRIVATE
+GEO:37.386013;-122.0829322
+ORGANIZER;CN=Joe Bob\:magician:mailto:joebob@random.net
+PRIORITY:2
+SUMMARY:This is a really long summary to test the method of unfolding lines
+ \, so I'm just going to make it a whole bunch of lines. With a twist: a "
+ ö" takes up multiple bytes\, and should be wrapped to the next line.
+ATTACH:http://bush.sucks.org/impeach/him.rhtml
+ATTACH:http://corporations-dominate.existence.net/why.rhtml
+RDATE;TZID=US-Mountain:20050121T170000,20050122T170000
+X-TEST-COMPONENT;QTEST="Hello, World":Shouldn't double double quotes
+END:VEVENT
+END:VCALENDAR

data/spec/fixtures/tzid_search.ics

@@ -0,0 +1,31 @@
+BEGIN:VCALENDAR
+METHOD:PUBLISH
+VERSION:2.0
+CALSCALE:GREGORIAN
+BEGIN:VTIMEZONE
+TZID:(GMT-05:00) Eastern Time (US & Canada)
+BEGIN:STANDARD
+DTSTART:16011104T010000
+RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=11
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0500
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:16010311T030000
+RRULE:FREQ=YEARLY;BYDAY=2SU;BYMONTH=3
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
+END:DAYLIGHT
+END:VTIMEZONE
+BEGIN:VEVENT
+CREATED:20120104T225934Z
+UID:23D50AF6-23D4-4CB5-85C6-4826F3F19999
+DTEND;TZID="(GMT-05:00) Eastern Time (US & Canada)":20180104T130000
+RRULE:FREQ=WEEKLY;INTERVAL=1
+TRANSP:OPAQUE
+SUMMARY:Recurring on Wed
+DTSTART;TZID="(GMT-05:00) Eastern Time (US & Canada)":20180104T100000
+DTSTAMP:20120104T231637Z
+SEQUENCE:6
+END:VEVENT
+END:VCALENDAR

data/spec/parser_spec.rb

@@ -9,9 +9,10 @@ describe Icalendar::Parser do
       let(:fn) { 'single_event.ics' }
 
       it 'returns an array of calendars' do
-        expect(subject.parse).to be_instance_of Array
-        expect(subject.parse.count).to eq 1
-        expect(subject.parse[0]).to be_instance_of Icalendar::Calendar
+        parsed = subject.parse
+        expect(parsed).to be_instance_of Array
+        expect(parsed.count).to eq 1
+        expect(parsed[0]).to be_instance_of Icalendar::Calendar
       end
 
       it 'properly splits multi-valued lines' do
@@ -38,9 +39,10 @@ describe Icalendar::Parser do
       before { subject.component_class = Icalendar::Event }
 
       it 'returns an array of events' do
-        expect(subject.parse).to be_instance_of Array
-        expect(subject.parse.count).to be 1
-        expect(subject.parse[0]).to be_instance_of Icalendar::Event
+        parsed = subject.parse
+        expect(parsed).to be_instance_of Array
+        expect(parsed.count).to be 1
+        expect(parsed[0]).to be_instance_of Icalendar::Event
       end
     end
     context 'events.ics' do
@@ -55,15 +57,35 @@ describe Icalendar::Parser do
         expect(events.last.uid).to eq("uid-1234-uid-4321")
       end
     end
+    context 'tzid_search.ics' do
+      let(:fn) { 'tzid_search.ics' }
+
+      it 'correctly sets the weird tzid' do
+        parsed = subject.parse
+        event = parsed.first.events.first
+        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
     let(:fn) { 'single_event_bad_line.ics' }
 
     it 'returns an array of calendars' do
-      expect(subject.parse).to be_instance_of Array
-      expect(subject.parse.count).to eq 1
-      expect(subject.parse[0]).to be_instance_of Icalendar::Calendar
+      parsed = subject.parse
+      expect(parsed).to be_instance_of Array
+      expect(parsed.count).to eq 1
+      expect(parsed[0]).to be_instance_of Icalendar::Calendar
     end
 
     it 'properly splits multi-valued lines' do

data/spec/roundtrip_spec.rb

@@ -15,7 +15,21 @@ 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
+
+  describe 'cleanly handle facebook organizers' do
+    let(:source) { File.read File.join(File.dirname(__FILE__), 'fixtures', 'single_event_bad_organizer.ics') }
+    let(:source_lowered_uri) { File.read File.join(File.dirname(__FILE__), 'fixtures', 'single_event_organizer_parsed.ics') }
+    it 'will generate the same file as it parsed' do
+      ical = Icalendar::Calendar.parse(source).first.to_ical
+      source_equal = ical == source
+      # rbx-3 parses the organizer as a URI, which strips the space and lowercases everything after the first :
+      # this is correct behavior, according to the icalendar spec, so we're not fudging the parser to accomodate
+      # facebook not properly wrapping the CN param in dquotes
+      source_lowered_equal = ical == source_lowered_uri
+      expect(source_equal || source_lowered_equal).to be true
     end
   end
 
@@ -67,18 +81,18 @@ describe Icalendar do
     it 'sorts time events by start time' do
       events = subject.sort_by(&:dtstart)
 
-      expect(events.first.dtstart).to eq ::DateTime.new(2014, 7, 14, 9, 0, 0, '-4')
+      expect(events.first.dtstart.to_datetime).to eq ::DateTime.new(2014, 7, 14, 9, 0, 0, '-4')
 
-      expect(events.last.dtstart).to eq ::DateTime.new(2014, 7, 14, 9, 1, 0, '-4')
-      expect(events.last.dtend).to eq ::DateTime.new(2014, 7, 14, 9, 59, 0, '-4')
+      expect(events.last.dtstart.to_datetime).to eq ::DateTime.new(2014, 7, 14, 9, 1, 0, '-4')
+      expect(events.last.dtend.to_datetime).to eq ::DateTime.new(2014, 7, 14, 9, 59, 0, '-4')
     end
 
     it 'sorts time events by end time' do
       events = subject.sort_by(&:dtend)
 
-      expect(events.first.dtstart).to eq ::DateTime.new(2014, 7, 14, 9, 1, 0, '-4')
-      expect(events.first.dtend).to eq ::DateTime.new(2014, 7, 14, 9, 59, 0, '-4')
-      expect(events.last.dtstart).to eq ::DateTime.new(2014, 7, 14, 9, 0, 0, '-4')
+      expect(events.first.dtstart.to_datetime).to eq ::DateTime.new(2014, 7, 14, 9, 1, 0, '-4')
+      expect(events.first.dtend.to_datetime).to eq ::DateTime.new(2014, 7, 14, 9, 59, 0, '-4')
+      expect(events.last.dtstart.to_datetime).to eq ::DateTime.new(2014, 7, 14, 9, 0, 0, '-4')
     end
   end
 
@@ -89,8 +103,8 @@ describe Icalendar do
     it 'sorts time events' do
       events = subject.sort_by(&:dtstart)
 
-      expect(events.first.dtstart).to eq ::Date.new(2014, 7, 14)
-      expect(events.last.dtstart).to eq ::DateTime.new(2014, 7, 14, 9, 0, 0, '-4')
+      expect(events.first.dtstart.to_date).to eq ::Date.new(2014, 7, 14)
+      expect(events.last.dtstart.to_datetime).to eq ::DateTime.new(2014, 7, 14, 9, 0, 0, '-4')
     end
   end
 
@@ -121,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

@@ -34,7 +34,7 @@ describe 'TZInfo::Timezone' do
 BEGIN:VTIMEZONE
 TZID:Asia/Shanghai
 BEGIN:STANDARD
-DTSTART:19910914T230000
+DTSTART:19910915T010000
 TZOFFSETFROM:+0900
 TZOFFSETTO:+0800
 TZNAME:CST

data/spec/values/date_or_date_time_spec.rb

@@ -38,4 +38,14 @@ describe Icalendar::Values::DateOrDateTime do
       end
     end
   end
+
+  describe "#to_ical" do
+    let(:event) { Icalendar::Event.new }
+    let(:time_stamp) { Time.now.strftime Icalendar::Values::DateTime::FORMAT }
+
+    it "should call parse behind the scenes" do
+      event.dtstart = described_class.new time_stamp, "tzid" => "UTC"
+      expect(event.to_ical).to include "DTSTART:#{time_stamp}Z"
+    end
+  end
 end

metadata

@@ -1,141 +1,155 @@
 --- !ruby/object:Gem::Specification
 name: icalendar
 version: !ruby/object:Gem::Version
-  version: 2.4.1
+  version: 2.8.0
 platform: ruby
 authors:
 - Ryan Ahearn
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-09-04 00:00:00.000000000 Z
+date: 2022-07-11 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: ice_cube
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.16'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.16'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
-  name: tzinfo
+  name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '6.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '6.0'
 - !ruby/object:Gem::Dependency
-  name: tzinfo-data
+  name: i18n
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2014'
+        version: '1.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2014'
+        version: '1.8'
 - !ruby/object:Gem::Dependency
-  name: activesupport
+  name: tzinfo
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '1.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '1.2'
 - !ruby/object:Gem::Dependency
-  name: i18n
+  name: tzinfo-data
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.0
+        version: '1.2020'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.0
+        version: '1.2020'
 - !ruby/object:Gem::Dependency
   name: timecop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.0
+        version: '0.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.0
+        version: '0.9'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.8'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '0.16'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '0.16'
 description: |
   Implements the iCalendar specification (RFC-5545) in Ruby.  This allows
   for the generation and parsing of .ics files, which are used by a
@@ -146,12 +160,12 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/main.yml"
 - ".gitignore"
 - ".rspec"
-- ".travis.yml"
-- COPYING
 - Gemfile
 - History.txt
+- LICENSE
 - README.md
 - Rakefile
 - icalendar.gemspec
@@ -166,8 +180,10 @@ 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
 - lib/icalendar/todo.rb
 - lib/icalendar/tzinfo.rb
 - lib/icalendar/value.rb
@@ -194,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
@@ -201,11 +219,14 @@ files:
 - spec/fixtures/single_event.ics
 - spec/fixtures/single_event_bad_dtstart.ics
 - spec/fixtures/single_event_bad_line.ics
+- spec/fixtures/single_event_bad_organizer.ics
+- spec/fixtures/single_event_organizer_parsed.ics
 - spec/fixtures/timezone.ics
 - spec/fixtures/two_date_time_events.ics
 - spec/fixtures/two_day_events.ics
 - spec/fixtures/two_events.ics
 - spec/fixtures/two_time_events.ics
+- spec/fixtures/tzid_search.ics
 - spec/freebusy_spec.rb
 - spec/journal_spec.rb
 - spec/parser_spec.rb
@@ -222,15 +243,15 @@ 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: |
-  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.
+post_install_message: 'ActiveSupport is required for TimeWithZone support, but not
+  required for general use.
 
-  ActiveSupport is required for TimeWithZone support, but not required for general use.
+  '
 rdoc_options: []
 require_paths:
 - lib
@@ -238,16 +259,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.9.2
+      version: 2.4.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.6
-signing_key: 
+rubygems_version: 3.3.7
+signing_key:
 specification_version: 4
 summary: A ruby implementation of the iCalendar specification (RFC-5545).
 test_files:
@@ -255,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
@@ -262,11 +284,14 @@ test_files:
 - spec/fixtures/single_event.ics
 - spec/fixtures/single_event_bad_dtstart.ics
 - spec/fixtures/single_event_bad_line.ics
+- spec/fixtures/single_event_bad_organizer.ics
+- spec/fixtures/single_event_organizer_parsed.ics
 - spec/fixtures/timezone.ics
 - spec/fixtures/two_date_time_events.ics
 - spec/fixtures/two_day_events.ics
 - spec/fixtures/two_events.ics
 - spec/fixtures/two_time_events.ics
+- spec/fixtures/tzid_search.ics
 - spec/freebusy_spec.rb
 - spec/journal_spec.rb
 - spec/parser_spec.rb

data/.travis.yml

@@ -1,18 +0,0 @@
-sudo: false
-before_install:
-  - gem install bundler
-language: ruby
-rvm:
-  - 2.3.1
-  - 2.2
-  - 2.1
-  - 2.0
-  - jruby-19mode
-  - rbx-2
-  - ruby-head
-  - jruby-head
-matrix:
-  allow_failures:
-    - rvm: ruby-head
-    - rvm: jruby-head
-script: bundle exec rake spec