Skip to content

Bugfix for Ambiguous Local Time #6

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
dustacio wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Bugfix for Ambiguous Local Time #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 7 additions & 4 deletions lib/ri_cal/component/t_z_info_timezone.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
# -*- coding: utf-8 -*-
#- ©2009 Rick DeNatale, All rights reserved. Refer to the file README.txt for the license
#
# A wrapper class for a Timezone implemented by the TZInfo Gem
Expand Down Expand Up @@ -111,8 +112,8 @@ def initialize(tzinfo_timezone) #:nodoc:
end

# convert time from this time zone to utc time
def local_to_utc(time)
@tzinfo_timezone.local_to_utc(time.to_ri_cal_ruby_value)
def local_to_utc(time, dst_ambiguity=nil)
@tzinfo_timezone.local_to_utc(time.to_ri_cal_ruby_value, dst_ambiguity)
end

# convert time from utc time to this time zone
Expand All @@ -126,7 +127,9 @@ def identifier
end

def export_local_to(export_stream, local_start, local_end) #:nodoc:
export_utc_to(export_stream, local_to_utc(local_start.to_ri_cal_ruby_value), local_to_utc(local_end.to_ri_cal_ruby_value))
export_utc_to(export_stream,
local_to_utc(local_start.to_ri_cal_ruby_value, true),
local_to_utc(local_end.to_ri_cal_ruby_value, false))
end

def to_rfc2445_string(utc_start, utc_end) #:nodoc:
Expand All @@ -150,4 +153,4 @@ def export_utc_to(export_stream, utc_start, utc_end) #:nodoc:
periods.export_to(export_stream)
export_stream.puts "END:VTIMEZONE\n"
end
end
end
11 changes: 10 additions & 1 deletion spec/ri_cal/component/t_z_info_timezone_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
# -*- coding: utf-8 -*-
#- ©2009 Rick DeNatale, All rights reserved. Refer to the file README.txt for the license

require File.join(File.dirname(__FILE__), %w[.. .. spec_helper])
Expand Down Expand Up @@ -57,4 +58,12 @@
end
end
end
end

it "should not raise an error with Ambigous times" do
tz = RiCal::Component::TZInfoTimezone.new(TZInfo::Timezone.get("America/New_York"))
local_start = DateTime.parse("2011-11-06T01:30:00+00:00")
# This time appears twice. Because at 2:00 am the clock falls back to 1:00 am again
local_end = DateTime.parse("Nov 30, 2012")
lambda { tz.export_local_to(StringIO.new, local_start, local_end) }.should_not raise_error(TZInfo::AmbiguousTime)
end
end