tzinfo 0.3.28 → 0.3.29

data/lib/tzinfo/definitions/Europe/Volgograd.rb

@@ -77,86 +77,7 @@ module TZInfo
           tz.transition 2009, 10, :o7, 1256425200
           tz.transition 2010, 3, :o6, 1269730800
           tz.transition 2010, 10, :o7, 1288479600
-          tz.transition 2011, 3, :o6, 1301180400
-          tz.transition 2011, 10, :o7, 1319929200
-          tz.transition 2012, 3, :o6, 1332630000
-          tz.transition 2012, 10, :o7, 1351378800
-          tz.transition 2013, 3, :o6, 1364684400
-          tz.transition 2013, 10, :o7, 1382828400
-          tz.transition 2014, 3, :o6, 1396134000
-          tz.transition 2014, 10, :o7, 1414278000
-          tz.transition 2015, 3, :o6, 1427583600
-          tz.transition 2015, 10, :o7, 1445727600
-          tz.transition 2016, 3, :o6, 1459033200
-          tz.transition 2016, 10, :o7, 1477782000
-          tz.transition 2017, 3, :o6, 1490482800
-          tz.transition 2017, 10, :o7, 1509231600
-          tz.transition 2018, 3, :o6, 1521932400
-          tz.transition 2018, 10, :o7, 1540681200
-          tz.transition 2019, 3, :o6, 1553986800
-          tz.transition 2019, 10, :o7, 1572130800
-          tz.transition 2020, 3, :o6, 1585436400
-          tz.transition 2020, 10, :o7, 1603580400
-          tz.transition 2021, 3, :o6, 1616886000
-          tz.transition 2021, 10, :o7, 1635634800
-          tz.transition 2022, 3, :o6, 1648335600
-          tz.transition 2022, 10, :o7, 1667084400
-          tz.transition 2023, 3, :o6, 1679785200
-          tz.transition 2023, 10, :o7, 1698534000
-          tz.transition 2024, 3, :o6, 1711839600
-          tz.transition 2024, 10, :o7, 1729983600
-          tz.transition 2025, 3, :o6, 1743289200
-          tz.transition 2025, 10, :o7, 1761433200
-          tz.transition 2026, 3, :o6, 1774738800
-          tz.transition 2026, 10, :o7, 1792882800
-          tz.transition 2027, 3, :o6, 1806188400
-          tz.transition 2027, 10, :o7, 1824937200
-          tz.transition 2028, 3, :o6, 1837638000
-          tz.transition 2028, 10, :o7, 1856386800
-          tz.transition 2029, 3, :o6, 1869087600
-          tz.transition 2029, 10, :o7, 1887836400
-          tz.transition 2030, 3, :o6, 1901142000
-          tz.transition 2030, 10, :o7, 1919286000
-          tz.transition 2031, 3, :o6, 1932591600
-          tz.transition 2031, 10, :o7, 1950735600
-          tz.transition 2032, 3, :o6, 1964041200
-          tz.transition 2032, 10, :o7, 1982790000
-          tz.transition 2033, 3, :o6, 1995490800
-          tz.transition 2033, 10, :o7, 2014239600
-          tz.transition 2034, 3, :o6, 2026940400
-          tz.transition 2034, 10, :o7, 2045689200
-          tz.transition 2035, 3, :o6, 2058390000
-          tz.transition 2035, 10, :o7, 2077138800
-          tz.transition 2036, 3, :o6, 2090444400
-          tz.transition 2036, 10, :o7, 2108588400
-          tz.transition 2037, 3, :o6, 2121894000
-          tz.transition 2037, 10, :o7, 2140038000
-          tz.transition 2038, 3, :o6, 59172251, 24
-          tz.transition 2038, 10, :o7, 59177459, 24
-          tz.transition 2039, 3, :o6, 59180987, 24
-          tz.transition 2039, 10, :o7, 59186195, 24
-          tz.transition 2040, 3, :o6, 59189723, 24
-          tz.transition 2040, 10, :o7, 59194931, 24
-          tz.transition 2041, 3, :o6, 59198627, 24
-          tz.transition 2041, 10, :o7, 59203667, 24
-          tz.transition 2042, 3, :o6, 59207363, 24
-          tz.transition 2042, 10, :o7, 59212403, 24
-          tz.transition 2043, 3, :o6, 59216099, 24
-          tz.transition 2043, 10, :o7, 59221139, 24
-          tz.transition 2044, 3, :o6, 59224835, 24
-          tz.transition 2044, 10, :o7, 59230043, 24
-          tz.transition 2045, 3, :o6, 59233571, 24
-          tz.transition 2045, 10, :o7, 59238779, 24
-          tz.transition 2046, 3, :o6, 59242307, 24
-          tz.transition 2046, 10, :o7, 59247515, 24
-          tz.transition 2047, 3, :o6, 59251211, 24
-          tz.transition 2047, 10, :o7, 59256251, 24
-          tz.transition 2048, 3, :o6, 59259947, 24
-          tz.transition 2048, 10, :o7, 59264987, 24
-          tz.transition 2049, 3, :o6, 59268683, 24
-          tz.transition 2049, 10, :o7, 59273891, 24
-          tz.transition 2050, 3, :o6, 59277419, 24
-          tz.transition 2050, 10, :o7, 59282627, 24
+          tz.transition 2011, 3, :o4, 1301180400
         end
       end
     end

data/lib/tzinfo/indexes/countries.rb

@@ -24,9 +24,6 @@ module TZInfo
       country 'AM', 'Armenia' do |c|
         c.timezone 'Asia/Yerevan', 2411, 60, 89, 2
       end
-      country 'AN', 'Netherlands Antilles' do |c|
-        c.timezone 'America/Curacao', 731, 60, -69, 1
-      end
       country 'AO', 'Angola' do |c|
         c.timezone 'Africa/Luanda', -44, 5, 397, 30
       end
@@ -125,6 +122,9 @@ module TZInfo
       country 'BO', 'Bolivia' do |c|
         c.timezone 'America/La_Paz', -33, 2, -1363, 20
       end
+      country 'BQ', 'Bonaire Sint Eustatius & Saba' do |c|
+        c.timezone 'America/Kralendijk', 14581, 1200, -20483, 300
+      end
       country 'BR', 'Brazil' do |c|
         c.timezone 'America/Noronha', -77, 20, -389, 12, 'Atlantic islands'
         c.timezone 'America/Belem', -29, 20, -2909, 60, 'Amapa, E Para'
@@ -236,6 +236,9 @@ module TZInfo
       country 'CV', 'Cape Verde' do |c|
         c.timezone 'Atlantic/Cape_Verde', 179, 12, -1411, 60
       end
+      country 'CW', 'Curacao' do |c|
+        c.timezone 'America/Curacao', 731, 60, -69, 1
+      end
       country 'CX', 'Christmas Island' do |c|
         c.timezone 'Indian/Christmas', -125, 12, 6343, 60
       end
@@ -754,6 +757,9 @@ module TZInfo
       country 'SV', 'El Salvador' do |c|
         c.timezone 'America/El_Salvador', 137, 10, -446, 5
       end
+      country 'SX', 'Sint Maarten' do |c|
+        c.timezone 'America/Lower_Princes', 12997, 720, -22697, 360
+      end
       country 'SY', 'Syria' do |c|
         c.timezone 'Asia/Damascus', 67, 2, 363, 10
       end

data/lib/tzinfo/indexes/timezones.rb

@@ -143,10 +143,12 @@ module TZInfo
       timezone 'America/Kentucky/Louisville'
       timezone 'America/Kentucky/Monticello'
       linked_timezone 'America/Knox_IN'
+      linked_timezone 'America/Kralendijk'
       timezone 'America/La_Paz'
       timezone 'America/Lima'
       timezone 'America/Los_Angeles'
       linked_timezone 'America/Louisville'
+      linked_timezone 'America/Lower_Princes'
       timezone 'America/Maceio'
       timezone 'America/Managua'
       timezone 'America/Manaus'

data/lib/tzinfo/timezone.rb

@@ -68,6 +68,26 @@ module TZInfo
     # Whether the timezones index has been loaded yet.
     @@index_loaded = false
     
+    # Default value of the dst parameter of the local_to_utc and 
+    # period_for_local methods.
+    @@default_dst = nil
+    
+    # Sets the default value of the optional dst parameter of the 
+    # local_to_utc and period_for_local methods. Can be set to nil, true or 
+    # false.
+    #
+    # The value of default_dst defaults to nil if unset.
+    def self.default_dst=(value)
+      @@default_dst = value.nil? ? nil : !!value
+    end
+    
+    # Gets the default value of the optional dst parameter of the 
+    # local_to_utc and period_for_local methods. Can be set to nil, true or 
+    # false.
+    def self.default_dst
+      @@default_dst
+    end
+    
     # Returns a timezone by its identifier (e.g. "Europe/London", 
     # "America/Chicago" or "UTC").
     #
@@ -328,7 +348,12 @@ module TZInfo
     # array of the periods that need to be resolved. The block can select and
     # return a single period or return nil or an empty array
     # to cause an AmbiguousTime exception to be raised.
-    def period_for_local(local, dst = nil)            
+    #
+    # The default value of the dst parameter can be specified by setting
+    # Timezone.default_dst. If default_dst is not set, or is set to nil, then
+    # an AmbiguousTime exception will be raised in ambiguous situations unless
+    # a block is given to resolve the ambiguity.
+    def period_for_local(local, dst = Timezone.default_dst)
       results = periods_for_local(local)
       
       if results.empty?
@@ -406,7 +431,12 @@ module TZInfo
     # array of the periods that need to be resolved. The block can return a
     # single period to use to convert the time or return nil or an empty array
     # to cause an AmbiguousTime exception to be raised.
-    def local_to_utc(local, dst = nil)
+    #
+    # The default value of the dst parameter can be specified by setting
+    # Timezone.default_dst. If default_dst is not set, or is set to nil, then
+    # an AmbiguousTime exception will be raised in ambiguous situations unless
+    # a block is given to resolve the ambiguity.
+    def local_to_utc(local, dst = Timezone.default_dst)
       TimeOrDateTime.wrap(local) {|wrapped|
         if block_given?
           period = period_for_local(wrapped, dst) {|periods| yield periods }

data/test/tc_timezone.rb

@@ -42,6 +42,29 @@ class TCTimezone < Test::Unit::TestCase
       end
   end
   
+  def setup
+    @orig_default_dst = Timezone.default_dst
+  end
+  
+  def teardown
+    Timezone.default_dst = @orig_default_dst
+  end
+  
+  def test_default_dst_initial_value
+    assert_nil(Timezone.default_dst)
+  end
+  
+  def test_set_default_dst
+    Timezone.default_dst = true
+    assert_equal(true, Timezone.default_dst)
+    Timezone.default_dst = false
+    assert_equal(false, Timezone.default_dst)
+    Timezone.default_dst = nil
+    assert_nil(Timezone.default_dst)
+    Timezone.default_dst = 0
+    assert_equal(true, Timezone.default_dst)
+  end
+  
   def test_get_valid_1
     tz = Timezone.get('Europe/London')
     
@@ -383,6 +406,52 @@ class TCTimezone < Test::Unit::TestCase
     assert_raises(PeriodNotFound) { i_tz.period_for_local(i) }
   end
   
+  def test_period_for_local_default_dst_set_true
+    Timezone.default_dst = true
+    
+    o1 = TimezoneOffsetInfo.new(-18000, 0, :EST)
+    o2 = TimezoneOffsetInfo.new(-18000, 3600, :EDT)
+    
+    t1 = TimezoneTransitionInfo.new(o2, o1, 1081062000)
+    t2 = TimezoneTransitionInfo.new(o1, o2, 1099202400)
+    t3 = TimezoneTransitionInfo.new(o2, o1, 1112511600)
+    
+    p1 = TimezonePeriod.new(t1, t2)
+    p2 = TimezonePeriod.new(t2, t3)
+    
+    dt = DateTime.new(2004,10,31,1,30,0)
+    
+    tz = TestTimezone.new('America/New_York', nil, [p1, p2], dt)
+    
+    assert_equal(p1, tz.period_for_local(dt))
+    assert_equal(p1, tz.period_for_local(dt, true))
+    assert_equal(p2, tz.period_for_local(dt, false))
+    assert_raises(AmbiguousTime) { tz.period_for_local(dt, nil) }
+  end
+  
+  def test_period_for_local_default_dst_set_false
+    Timezone.default_dst = false
+    
+    o1 = TimezoneOffsetInfo.new(-18000, 0, :EST)
+    o2 = TimezoneOffsetInfo.new(-18000, 3600, :EDT)
+    
+    t1 = TimezoneTransitionInfo.new(o2, o1, 1081062000)
+    t2 = TimezoneTransitionInfo.new(o1, o2, 1099202400)
+    t3 = TimezoneTransitionInfo.new(o2, o1, 1112511600)
+    
+    p1 = TimezonePeriod.new(t1, t2)
+    p2 = TimezonePeriod.new(t2, t3)
+    
+    dt = DateTime.new(2004,10,31,1,30,0)
+    
+    tz = TestTimezone.new('America/New_York', nil, [p1, p2], dt)
+    
+    assert_equal(p2, tz.period_for_local(dt))
+    assert_equal(p1, tz.period_for_local(dt, true))
+    assert_equal(p2, tz.period_for_local(dt, false))
+    assert_raises(AmbiguousTime) { tz.period_for_local(dt, nil) }
+  end
+  
   def test_period_for_local_dst_flag_resolved
     o1 = TimezoneOffsetInfo.new(-18000, 0, :EST)
     o2 = TimezoneOffsetInfo.new(-18000, 3600, :EDT)
@@ -648,6 +717,52 @@ class TCTimezone < Test::Unit::TestCase
     assert_raises(PeriodNotFound) { i_tz.local_to_utc(i) }
   end
   
+  def test_local_to_utc_default_dst_set_true
+    Timezone.default_dst = true
+  
+    o1 = TimezoneOffsetInfo.new(-18000, 0, :EST)
+    o2 = TimezoneOffsetInfo.new(-18000, 3600, :EDT)
+    
+    t1 = TimezoneTransitionInfo.new(o2, o1, 1081062000)
+    t2 = TimezoneTransitionInfo.new(o1, o2, 1099202400)
+    t3 = TimezoneTransitionInfo.new(o2, o1, 1112511600)
+    
+    p1 = TimezonePeriod.new(t1, t2)
+    p2 = TimezonePeriod.new(t2, t3)
+    
+    dt = DateTime.new(2004,10,31,1,30,0)    
+    tz = TestTimezone.new('America/New_York', nil, [p1, p2], dt)
+    
+    assert_equal(DateTime.new(2004,10,31,5,30,0), tz.local_to_utc(dt))    
+    assert_equal(DateTime.new(2004,10,31,5,30,0), tz.local_to_utc(dt, true))
+    assert_equal(DateTime.new(2004,10,31,6,30,0), tz.local_to_utc(dt, false))
+    assert_raises(AmbiguousTime) { tz.local_to_utc(dt, nil) }
+    assert_equal(DateTime.new(2004,10,31,5,30,0), tz.local_to_utc(dt) {|periods| raise BlockCalled, 'should not be called' })
+  end
+  
+  def test_local_to_utc_default_dst_set_false
+    Timezone.default_dst = false
+  
+    o1 = TimezoneOffsetInfo.new(-18000, 0, :EST)
+    o2 = TimezoneOffsetInfo.new(-18000, 3600, :EDT)
+    
+    t1 = TimezoneTransitionInfo.new(o2, o1, 1081062000)
+    t2 = TimezoneTransitionInfo.new(o1, o2, 1099202400)
+    t3 = TimezoneTransitionInfo.new(o2, o1, 1112511600)
+    
+    p1 = TimezonePeriod.new(t1, t2)
+    p2 = TimezonePeriod.new(t2, t3)
+    
+    dt = DateTime.new(2004,10,31,1,30,0)    
+    tz = TestTimezone.new('America/New_York', nil, [p1, p2], dt)
+        
+    assert_equal(DateTime.new(2004,10,31,6,30,0), tz.local_to_utc(dt))
+    assert_equal(DateTime.new(2004,10,31,6,30,0), tz.local_to_utc(dt, false))
+    assert_equal(DateTime.new(2004,10,31,5,30,0), tz.local_to_utc(dt, true))
+    assert_raises(AmbiguousTime) { tz.local_to_utc(dt, nil) }
+    assert_equal(DateTime.new(2004,10,31,6,30,0), tz.local_to_utc(dt) {|periods| raise BlockCalled, 'should not be called' })
+  end
+  
   def test_local_to_utc_dst_flag_resolved
     o1 = TimezoneOffsetInfo.new(-18000, 0, :EST)
     o2 = TimezoneOffsetInfo.new(-18000, 3600, :EDT)

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: tzinfo
 version: !ruby/object:Gem::Version 
-  hash: 43
+  hash: 41
   prerelease: 
   segments: 
   - 0
   - 3
-  - 28
-  version: 0.3.28
+  - 29
+  version: 0.3.29
 platform: ruby
 authors: 
 - Philip Ross
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-12 16:00:00 -07:00
+date: 2011-06-26 16:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -464,6 +464,8 @@ files:
 - lib/tzinfo/definitions/America/Matamoros.rb
 - lib/tzinfo/definitions/America/Bahia_Banderas.rb
 - lib/tzinfo/definitions/America/Metlakatla.rb
+- lib/tzinfo/definitions/America/Lower_Princes.rb
+- lib/tzinfo/definitions/America/Kralendijk.rb
 - lib/tzinfo/definitions/Arctic/Longyearbyen.rb
 - lib/tzinfo/definitions/Antarctica/DumontDUrville.rb
 - lib/tzinfo/definitions/Antarctica/Palmer.rb