Deal with difference between local test environment and Travis. Do not set the UTC in to_ical by default.

Author: barelyknown

lib/ice_cube/parsers/ical_parser.rb

@@ -5,16 +5,15 @@ def self.schedule_from_ical(ical_string, options = {})
       ical_string.each_line do |line|
         (property, value) = line.split(':')
         (property, tzid) = property.split(';')
-        tz = _tz_from_tzid(tzid)
         case property
         when 'DTSTART'
-          data[:start_time] = Time.parse(value).in_time_zone(tz)
+          data[:start_time] = _parse_in_tzid(value, tzid)
         when 'DTEND'
-          data[:end_time] = Time.parse(value).in_time_zone(tz)
+          data[:end_time] = _parse_in_tzid(value, tzid)
         when 'EXDATE'
           data[:extimes] ||= []
           data[:extimes] += value.split(',').map do |v|
-            Time.parse(value).in_time_zone(tz)
+            _parse_in_tzid(v, tzid)
           end
         when 'DURATION'
           data[:duration] # FIXME
@@ -25,12 +24,12 @@ def self.schedule_from_ical(ical_string, options = {})
       Schedule.from_hash data
     end
 
-    def self._tz_from_tzid(tzid)
-      time_zone_name = case tzid
-      when /TZID=/ then tzid.split("=")[1]
-      else "UTC"
+    def self._parse_in_tzid(value, tzid)
+      t = Time.parse(value)
+      if tzid
+        t = t.in_time_zone(ActiveSupport::TimeZone[tzid.split("=")[1]])
       end
-      ActiveSupport::TimeZone[time_zone_name]
+      t
     end
 
     def self.rule_from_ical(ical)

spec/examples/from_ical_spec.rb

@@ -137,9 +137,9 @@ def sorted_ical(ical)
           schedule = IceCube::Schedule.from_ical(ical_string_with_time_zones)
           expect(schedule.start_time.time_zone).to eq ActiveSupport::TimeZone.new("America/Denver")
         end
-        it "sets the time zone of the end time to UTC if none provided" do
+        it "uses the system time if a time zone is not explicity provided" do
           schedule = IceCube::Schedule.from_ical(ical_string_with_time_zones)
-          expect(schedule.end_time.time_zone).to eq ActiveSupport::TimeZone.new("UTC")
+          expect(schedule.end_time).not_to respond_to :time_zone
         end
         it "sets the time zone of the exception times" do
           schedule = IceCube::Schedule.from_ical(ical_string_with_time_zones)

spec/examples/hourly_rule_spec.rb

@@ -39,13 +39,14 @@ module IceCube
       end
 
       it 'should not skip times in DST end hour' do
-        schedule = Schedule.new(t0 = Time.local(2013, 11, 3, 0, 0, 0))
+        tz = ActiveSupport::TimeZone["America/Vancouver"]
+        schedule = Schedule.new(t0 = tz.local(2013, 11, 3, 0, 0, 0))
         schedule.add_recurrence_rule Rule.hourly
         expect(schedule.first(4)).to eq [
-          Time.local(2013, 11, 3, 0, 0, 0),             # -0700
-          Time.local(2013, 11, 3, 1, 0, 0),             # -0700
-          Time.local(2013, 11, 3, 2, 0, 0) - ONE_HOUR,  # -0800
-          Time.local(2013, 11, 3, 2, 0, 0),             # -0800
+          tz.local(2013, 11, 3, 0, 0, 0),             # -0700
+          tz.local(2013, 11, 3, 1, 0, 0),             # -0700
+          tz.local(2013, 11, 3, 2, 0, 0) - ONE_HOUR,  # -0800
+          tz.local(2013, 11, 3, 2, 0, 0),             # -0800
         ]
       end