tilia-vobject 4.0.0.pre.alpha5 → 4.0.2

data/test/v_object/property/binary_test.rb

@@ -4,8 +4,10 @@ module Tilia
   module VObject
     class BinaryTest < Minitest::Test
       def test_mime_dir
-        vcard = Tilia::VObject::Component::VCard.new
-        assert_raises(ArgumentError) { vcard.add('PHOTO', ['a', 'b']) }
+        vcard = Tilia::VObject::Component::VCard.new('VERSION' => '3.0')
+        assert_raises(ArgumentError) do
+          vcard.add('PHOTO', ['a', 'b'])
+        end
       end
     end
   end

data/test/v_object/property/i_calendar/date_time_test.rb

@@ -224,7 +224,9 @@ module Tilia
 
       def test_get_date_time_date_invalid
         elem = @vcal.create_property('DTSTART', 'bla')
-        assert_raises(RuntimeError) { elem.date_time }
+        assert_raises(InvalidDataException) do
+          elem.date_time
+        end
       end
 
       def test_get_date_time_weird_tz

data/test/v_object/property/uri_test.rb

@@ -0,0 +1,23 @@
+require 'test_helper'
+
+module Tilia
+  module VObject
+    class UriTest < Minitest::Test
+      def test_always_encode_uri_v_calendar
+        # Apple iCal has issues with URL properties that don't have
+        # VALUE=URI specified. We added a workaround to vobject that
+        # ensures VALUE=URI always appears for these.
+        input = <<ICS
+BEGIN:VCALENDAR
+VERSION:2.0
+BEGIN:VEVENT
+URL:http://example.org/
+END:VEVENT
+END:VCALENDAR
+ICS
+        output = Reader.read(input).serialize
+        assert(output.index('URL;VALUE=URI:http://example.org/'))
+      end
+    end
+  end
+end

data/test/v_object/recur/event_iterator/by_month_in_daily_test.rb

@@ -29,7 +29,7 @@ ICS
         vcal = Tilia::VObject::Reader.read(ics)
         assert_kind_of(Tilia::VObject::Component::VCalendar, vcal)
 
-        vcal.expand(Time.zone.parse('2013-09-28'), Time.zone.parse('2014-09-11'))
+        vcal = vcal.expand(Time.zone.parse('2013-09-28'), Time.zone.parse('2014-09-11'))
 
         dates = []
         vcal['VEVENT'].each do |event|

data/test/v_object/recur/event_iterator/by_set_pos_hang_test.rb

@@ -25,7 +25,7 @@ ICS
         vcal = Tilia::VObject::Reader.read(ics)
         assert_kind_of(Tilia::VObject::Component::VCalendar, vcal)
 
-        vcal.expand(Time.zone.parse('2015-01-01'), Time.zone.parse('2016-01-01'))
+        vcal = vcal.expand(Time.zone.parse('2015-01-01'), Time.zone.parse('2016-01-01'))
 
         dates = []
         vcal['VEVENT'].each do |event|

data/test/v_object/recur/event_iterator/expand_floating_times_test.rb

@@ -2,7 +2,7 @@ require 'test_helper'
 
 module Tilia
   module VObject
-    class ExpandFloatingTimesTest < Minitest::Test
+    class ExpandFloatingTimesTest < TestCase
       def test_expand
         input = <<ICS
 BEGIN:VCALENDAR
@@ -19,9 +19,7 @@ ICS
         vcal = Tilia::VObject::Reader.read(input)
         assert_kind_of(Tilia::VObject::Component::VCalendar, vcal)
 
-        vcal.expand(Time.zone.parse('2015-01-01'), Time.zone.parse('2015-01-31'))
-
-        result = vcal.serialize
+        vcal = vcal.expand(Time.zone.parse('2015-01-01'), Time.zone.parse('2015-01-31'))
 
         output = <<ICS
 BEGIN:VCALENDAR
@@ -51,7 +49,7 @@ RECURRENCE-ID:20150130T090000Z
 END:VEVENT
 END:VCALENDAR
 ICS
-        assert_equal(output, result.delete("\r"))
+        assert_v_obj_equals(output, vcal)
       end
 
       def test_expand_with_reference_timezone
@@ -70,9 +68,11 @@ ICS
         vcal = Tilia::VObject::Reader.read(input)
         assert_kind_of(Tilia::VObject::Component::VCalendar, vcal)
 
-        vcal.expand(Time.zone.parse('2015-01-01'), Time.zone.parse('2015-01-31'), ActiveSupport::TimeZone.new('Europe/Berlin'))
-
-        result = vcal.serialize
+        vcal = vcal.expand(
+          Time.zone.parse('2015-01-01'),
+          Time.zone.parse('2015-01-31'),
+          ActiveSupport::TimeZone.new('Europe/Berlin')
+        )
 
         output = <<ICS
 BEGIN:VCALENDAR
@@ -102,7 +102,7 @@ RECURRENCE-ID:20150130T080000Z
 END:VEVENT
 END:VCALENDAR
 ICS
-        assert_equal(output, result.delete("\r"))
+        assert_v_obj_equals(output, vcal)
       end
     end
   end

data/test/v_object/recur/event_iterator/handle_r_date_expand_test.rb

@@ -0,0 +1,51 @@
+require 'test_helper'
+
+module Tilia
+  module VObject
+    # This is a unittest for Issue #53.
+    class HandleRDateExpandTest < Minitest::Test
+      def test_expand
+        input = <<ICS
+BEGIN:VCALENDAR
+VERSION:2.0
+BEGIN:VEVENT
+UID:2CD5887F7CF4600F7A3B1F8065099E40-240BDA7121B61224
+DTSTAMP;VALUE=DATE-TIME:20151014T110604Z
+CREATED;VALUE=DATE-TIME:20151014T110245Z
+LAST-MODIFIED;VALUE=DATE-TIME:20151014T110541Z
+DTSTART;VALUE=DATE-TIME;TZID=Europe/Berlin:20151012T020000
+DTEND;VALUE=DATE-TIME;TZID=Europe/Berlin:20151012T013000
+SUMMARY:Test
+SEQUENCE:2
+RDATE;VALUE=DATE-TIME;TZID=Europe/Berlin:20151015T020000,20151017T020000,20
+ 151018T020000,20151020T020000
+TRANSP:OPAQUE
+CLASS:PUBLIC
+END:VEVENT
+END:VCALENDAR
+ICS
+
+        vcal = VObject::Reader.read(input)
+        assert_kind_of(Component::VCalendar, vcal)
+
+        vcal = vcal.expand(Time.zone.parse('2015-01-01'), Time.zone.parse('2015-12-01'))
+
+        result = vcal['VEVENT'].to_a
+
+        assert_equal(5, result.size)
+
+        utc = ActiveSupport::TimeZone.new('UTC')
+        expected = [
+          utc.parse('2015-10-12'),
+          utc.parse('2015-10-15'),
+          utc.parse('2015-10-17'),
+          utc.parse('2015-10-18'),
+          utc.parse('2015-10-20')
+        ]
+
+        result = result.map { |ev| ev['DTSTART'].date_time }
+        assert_equal(expected, result)
+      end
+    end
+  end
+end

data/test/v_object/recur/event_iterator/incorrect_expand_test.rb

@@ -3,7 +3,7 @@ require 'test_helper'
 module Tilia
   module VObject
     # This is a unittest for Issue #53.
-    class IncorrectExpandTest < Minitest::Test
+    class IncorrectExpandTest < TestCase
       def test_expand
         input = <<ICS
 BEGIN:VCALENDAR
@@ -26,9 +26,7 @@ ICS
         vcal = Tilia::VObject::Reader.read(input)
         assert_kind_of(Tilia::VObject::Component::VCalendar, vcal)
 
-        vcal.expand(Time.zone.parse('2011-01-01'), Time.zone.parse('2014-01-01'))
-
-        result = vcal.serialize
+        vcal = vcal.expand(Time.zone.parse('2011-01-01'), Time.zone.parse('2014-01-01'))
 
         output = <<ICS
 BEGIN:VCALENDAR
@@ -46,7 +44,7 @@ RECURRENCE-ID:20130712T050000Z
 END:VEVENT
 END:VCALENDAR
 ICS
-        assert_equal(output, result.delete("\r"))
+        assert_v_obj_equals(output, vcal)
       end
     end
   end

data/test/v_object/recur/event_iterator/infinite_loop_problem_test.rb

@@ -65,7 +65,9 @@ module Tilia
         ev['RRULE'] = 'FREQ=YEARLY;INTERVAL=0'
         @vcal.add(ev)
 
-        assert_raises(ArgumentError) { Tilia::VObject::Recur::EventIterator.new(@vcal, 'uuid') }
+        assert_raises(InvalidDataException) do
+          Tilia::VObject::Recur::EventIterator.new(@vcal, 'uuid')
+        end
         # it.fast_forward(ActiveSupport::TimeZone.new('UTC').parse('2013-01-01 23:00:00'))
 
         # if we got this far.. it means we are no longer infinitely looping

data/test/v_object/{issue26_test.rb → recur/event_iterator/issue26_test.rb}

@@ -18,7 +18,9 @@ ICS
         vcal = Tilia::VObject::Reader.read(input)
         assert_kind_of(Tilia::VObject::Component::VCalendar, vcal)
 
-        assert_raises(ArgumentError) { Tilia::VObject::Recur::EventIterator.new(vcal, 'bae5d57a98') }
+        assert_raises(InvalidDataException) do
+          Tilia::VObject::Recur::EventIterator.new(vcal, 'bae5d57a98')
+        end
       end
     end
   end

data/test/v_object/recur/event_iterator/main_test.rb

@@ -31,17 +31,23 @@ module Tilia
         ev.add(dt_start)
         vcal.add(ev)
 
-        assert_raises(ArgumentError) { Tilia::VObject::Recur::EventIterator.new(vcal, ev['UID'].to_s) }
+        assert_raises(InvalidDataException) do
+          Tilia::VObject::Recur::EventIterator.new(vcal, ev['UID'].to_s)
+        end
       end
 
       def test_v_calendar_no_uid
         vcal = Tilia::VObject::Component::VCalendar.new
-        assert_raises(ArgumentError) { Tilia::VObject::Recur::EventIterator.new(vcal) }
+        assert_raises(ArgumentError) do
+          Tilia::VObject::Recur::EventIterator.new(vcal)
+        end
       end
 
       def test_v_calendar_invalid_uid
         vcal = Tilia::VObject::Component::VCalendar.new
-        assert_raises(ArgumentError) { Tilia::VObject::Recur::EventIterator.new(vcal, 'foo') }
+        assert_raises(ArgumentError) do
+          Tilia::VObject::Recur::EventIterator.new(vcal, 'foo')
+        end
       end
 
       def test_hourly

data/test/v_object/recur/event_iterator/max_instances_test.rb

@@ -0,0 +1,38 @@
+require 'test_helper'
+
+module Tilia
+  module VObject
+    class MaxInstancesTest < TestCase
+      def setup
+        @max_recurrences = Settings.max_recurrences
+        Settings.max_recurrences = 4
+
+        super
+      end
+
+      def teardown
+        Settings.max_recurrences = @max_recurrences
+        super
+      end
+
+      def test_exceed_max_recurrences
+        input = <<ICS
+BEGIN:VCALENDAR
+VERSION:2.0
+BEGIN:VEVENT
+UID:foobar
+DTSTART:20140803T120000Z
+RRULE:FREQ=WEEKLY
+SUMMARY:Original
+END:VEVENT
+END:VCALENDAR
+ICS
+
+        vcal = Reader.read(input)
+        assert_raises(Recur::MaxInstancesExceededException) do
+          vcal.expand(Time.zone.parse('2014-08-01'), Time.zone.parse('2014-09-01'))
+        end
+      end
+    end
+  end
+end

data/test/v_object/recur/event_iterator/missing_overridden_test.rb

@@ -2,7 +2,7 @@ require 'test_helper'
 
 module Tilia
   module VObject
-    class MissingOverriddenTest < Minitest::Test
+    class MissingOverriddenTest < TestCase
       def test_expand
         input = <<ICS
 BEGIN:VCALENDAR
@@ -26,9 +26,7 @@ ICS
         vcal = Tilia::VObject::Reader.read(input)
         assert_kind_of(Tilia::VObject::Component::VCalendar, vcal)
 
-        vcal.expand(Time.zone.parse('2011-01-01'), Time.zone.parse('2015-01-01'))
-
-        result = vcal.serialize
+        vcal = vcal.expand(Time.zone.parse('2011-01-01'), Time.zone.parse('2015-01-01'))
 
         output = <<ICS
 BEGIN:VCALENDAR
@@ -48,7 +46,7 @@ SUMMARY:B
 END:VEVENT
 END:VCALENDAR
 ICS
-        assert_equal(output, result.delete("\r"))
+        assert_v_obj_equals(output, vcal)
       end
     end
   end

data/test/v_object/recur/event_iterator/no_instances_test.rb

@@ -22,10 +22,12 @@ END:VEVENT
 END:VCALENDAR
 ICS
 
-        vcal = Tilia::VObject::Reader.read(input)
-        assert_kind_of(Tilia::VObject::Component::VCalendar, vcal)
+        vcal = Reader.read(input)
+        assert_kind_of(Component::VCalendar, vcal)
 
-        assert_raises(Tilia::VObject::Recur::NoInstancesException) { Tilia::VObject::Recur::EventIterator.new(vcal, 'foo') }
+        assert_raises(Recur::NoInstancesException) do
+          Recur::EventIterator.new(vcal, 'foo')
+        end
       end
     end
   end

data/test/v_object/recur/event_iterator/override_first_event_test.rb

@@ -2,10 +2,11 @@ require 'test_helper'
 
 module Tilia
   module VObject
-    class OverrideFirstEventTest < Minitest::Test
+    class OverrideFirstEventTest < TestCase
       def test_override_first_event
         input = <<ICS
 BEGIN:VCALENDAR
+VERSION:2.0
 BEGIN:VEVENT
 UID:foobar
 DTSTART:20140803T120000Z
@@ -22,10 +23,11 @@ END:VCALENDAR
 ICS
 
         vcal = Tilia::VObject::Reader.read(input)
-        vcal.expand(Time.zone.parse('2014-08-01'), Time.zone.parse('2014-09-01'))
+        vcal = vcal.expand(Time.zone.parse('2014-08-01'), Time.zone.parse('2014-09-01'))
 
         expected = <<ICS
 BEGIN:VCALENDAR
+VERSION:2.0
 BEGIN:VEVENT
 UID:foobar
 RECURRENCE-ID:20140803T120000Z
@@ -59,14 +61,13 @@ END:VEVENT
 END:VCALENDAR
 ICS
 
-        new_ics = vcal.serialize
-        new_ics = new_ics.delete("\r")
-        assert_equal(expected, new_ics)
+        assert_v_obj_equals(expected, vcal)
       end
 
       def test_remove_first_event
         input = <<ICS
 BEGIN:VCALENDAR
+VERSION:2.0
 BEGIN:VEVENT
 UID:foobar
 DTSTART:20140803T120000Z
@@ -78,10 +79,11 @@ END:VCALENDAR
 ICS
 
         vcal = Tilia::VObject::Reader.read(input)
-        vcal.expand(Time.zone.parse('2014-08-01'), Time.zone.parse('2014-08-19'))
+        vcal = vcal.expand(Time.zone.parse('2014-08-01'), Time.zone.parse('2014-08-19'))
 
         expected = <<ICS
 BEGIN:VCALENDAR
+VERSION:2.0
 BEGIN:VEVENT
 UID:foobar
 DTSTART:20140810T120000Z
@@ -97,9 +99,7 @@ END:VEVENT
 END:VCALENDAR
 ICS
 
-        new_ics = vcal.serialize
-        new_ics = new_ics.delete("\r")
-        assert_equal(expected, new_ics)
+        assert_v_obj_equals(expected, vcal)
       end
     end
   end

data/test/v_object/recur/r_date_iterator_test.rb

@@ -18,6 +18,24 @@ module Tilia
         refute(it.infinite?)
       end
 
+      def test_timezone
+        tz = ActiveSupport::TimeZone.new('Europe/Berlin')
+        it = Recur::RDateIterator.new('20140901T000000,20141001T000000', tz.parse('2014-08-01 00:00:00'))
+
+        expected = [
+          tz.parse('2014-08-01 00:00:00'),
+          tz.parse('2014-09-01 00:00:00'),
+          tz.parse('2014-10-01 00:00:00')
+        ]
+
+        assert_equal(
+          expected,
+          it.to_a
+        )
+
+        refute(it.infinite?)
+      end
+
       def test_fast_forward
         utc = ActiveSupport::TimeZone.new('UTC')
         it = Tilia::VObject::Recur::RDateIterator.new('20140901T000000Z,20141001T000000Z', utc.parse('2014-08-01 00:00:00'))

data/test/v_object/recur/r_rule_iterator_test.rb

@@ -496,7 +496,7 @@ module Tilia
       # this means we increase the current day (or week, month) by 0, this also
       # results in an infinite loop.
       def test_zero_interval
-        assert_raises(ArgumentError) do
+        assert_raises(InvalidDataException) do
           parse(
             'FREQ=YEARLY;INTERVAL=0',
             '2012-08-24 14:57:00',
@@ -507,7 +507,7 @@ module Tilia
       end
 
       def test_invalid_freq
-        assert_raises(ArgumentError) do
+        assert_raises(InvalidDataException) do
           parse(
             'FREQ=SMONTHLY;INTERVAL=3;UNTIL=20111025T000000Z',
             '2011-10-07',
@@ -517,7 +517,7 @@ module Tilia
       end
 
       def test_by_day_bad_offset
-        assert_raises(ArgumentError) do
+        assert_raises(InvalidDataException) do
           parse(
             'FREQ=WEEKLY;INTERVAL=1;COUNT=4;BYDAY=0MO;WKST=SA',
             '2014-08-01 00:00:00',
@@ -581,7 +581,7 @@ module Tilia
       end
 
       def test_unsupported_part
-        assert_raises(ArgumentError) do
+        assert_raises(InvalidDataException) do
           parse(
             'FREQ=DAILY;BYWODAN=1',
             '2014-08-02 00:15:00',