tzinfo 0.3.54 → 0.3.55

data/lib/tzinfo/definitions/Pacific/Easter.rb

@@ -115,69 +115,69 @@ module TZInfo
           tz.transition 2017, 8, :o5, 1502596800
           tz.transition 2018, 5, :o4, 1526180400
           tz.transition 2018, 8, :o5, 1534046400
-          tz.transition 2019, 5, :o4, 1557630000
-          tz.transition 2019, 8, :o5, 1565496000
-          tz.transition 2020, 5, :o4, 1589079600
-          tz.transition 2020, 8, :o5, 1596945600
-          tz.transition 2021, 5, :o4, 1620529200
-          tz.transition 2021, 8, :o5, 1629000000
-          tz.transition 2022, 5, :o4, 1652583600
-          tz.transition 2022, 8, :o5, 1660449600
-          tz.transition 2023, 5, :o4, 1684033200
-          tz.transition 2023, 8, :o5, 1691899200
-          tz.transition 2024, 5, :o4, 1715482800
-          tz.transition 2024, 8, :o5, 1723348800
-          tz.transition 2025, 5, :o4, 1746932400
-          tz.transition 2025, 8, :o5, 1754798400
-          tz.transition 2026, 5, :o4, 1778382000
-          tz.transition 2026, 8, :o5, 1786248000
-          tz.transition 2027, 5, :o4, 1809831600
-          tz.transition 2027, 8, :o5, 1818302400
-          tz.transition 2028, 5, :o4, 1841886000
-          tz.transition 2028, 8, :o5, 1849752000
-          tz.transition 2029, 5, :o4, 1873335600
-          tz.transition 2029, 8, :o5, 1881201600
-          tz.transition 2030, 5, :o4, 1904785200
-          tz.transition 2030, 8, :o5, 1912651200
-          tz.transition 2031, 5, :o4, 1936234800
-          tz.transition 2031, 8, :o5, 1944100800
-          tz.transition 2032, 5, :o4, 1967684400
-          tz.transition 2032, 8, :o5, 1976155200
-          tz.transition 2033, 5, :o4, 1999738800
-          tz.transition 2033, 8, :o5, 2007604800
-          tz.transition 2034, 5, :o4, 2031188400
-          tz.transition 2034, 8, :o5, 2039054400
-          tz.transition 2035, 5, :o4, 2062638000
-          tz.transition 2035, 8, :o5, 2070504000
-          tz.transition 2036, 5, :o4, 2094087600
-          tz.transition 2036, 8, :o5, 2101953600
-          tz.transition 2037, 5, :o4, 2125537200
-          tz.transition 2037, 8, :o5, 2133403200
-          tz.transition 2038, 5, :o4, 19724421, 8
-          tz.transition 2038, 8, :o5, 7396952, 3
-          tz.transition 2039, 5, :o4, 19727389, 8
-          tz.transition 2039, 8, :o5, 7398044, 3
-          tz.transition 2040, 5, :o4, 19730301, 8
-          tz.transition 2040, 8, :o5, 7399136, 3
-          tz.transition 2041, 5, :o4, 19733213, 8
-          tz.transition 2041, 8, :o5, 7400228, 3
-          tz.transition 2042, 5, :o4, 19736125, 8
-          tz.transition 2042, 8, :o5, 7401320, 3
-          tz.transition 2043, 5, :o4, 19739037, 8
-          tz.transition 2043, 8, :o5, 7402412, 3
-          tz.transition 2044, 5, :o4, 19742005, 8
-          tz.transition 2044, 8, :o5, 7403525, 3
-          tz.transition 2045, 5, :o4, 19744917, 8
-          tz.transition 2045, 8, :o5, 7404617, 3
-          tz.transition 2046, 5, :o4, 19747829, 8
-          tz.transition 2046, 8, :o5, 7405709, 3
-          tz.transition 2047, 5, :o4, 19750741, 8
-          tz.transition 2047, 8, :o5, 7406801, 3
-          tz.transition 2048, 5, :o4, 19753653, 8
-          tz.transition 2048, 8, :o5, 7407893, 3
-          tz.transition 2049, 5, :o4, 19756565, 8
-          tz.transition 2049, 8, :o5, 7409006, 3
-          tz.transition 2050, 5, :o4, 19759533, 8
+          tz.transition 2019, 4, :o4, 1554606000
+          tz.transition 2019, 9, :o5, 1567915200
+          tz.transition 2020, 4, :o4, 1586055600
+          tz.transition 2020, 9, :o5, 1599364800
+          tz.transition 2021, 4, :o4, 1617505200
+          tz.transition 2021, 9, :o5, 1630814400
+          tz.transition 2022, 4, :o4, 1648954800
+          tz.transition 2022, 9, :o5, 1662264000
+          tz.transition 2023, 4, :o4, 1680404400
+          tz.transition 2023, 9, :o5, 1693713600
+          tz.transition 2024, 4, :o4, 1712458800
+          tz.transition 2024, 9, :o5, 1725768000
+          tz.transition 2025, 4, :o4, 1743908400
+          tz.transition 2025, 9, :o5, 1757217600
+          tz.transition 2026, 4, :o4, 1775358000
+          tz.transition 2026, 9, :o5, 1788667200
+          tz.transition 2027, 4, :o4, 1806807600
+          tz.transition 2027, 9, :o5, 1820116800
+          tz.transition 2028, 4, :o4, 1838257200
+          tz.transition 2028, 9, :o5, 1851566400
+          tz.transition 2029, 4, :o4, 1870311600
+          tz.transition 2029, 9, :o5, 1883016000
+          tz.transition 2030, 4, :o4, 1901761200
+          tz.transition 2030, 9, :o5, 1915070400
+          tz.transition 2031, 4, :o4, 1933210800
+          tz.transition 2031, 9, :o5, 1946520000
+          tz.transition 2032, 4, :o4, 1964660400
+          tz.transition 2032, 9, :o5, 1977969600
+          tz.transition 2033, 4, :o4, 1996110000
+          tz.transition 2033, 9, :o5, 2009419200
+          tz.transition 2034, 4, :o4, 2027559600
+          tz.transition 2034, 9, :o5, 2040868800
+          tz.transition 2035, 4, :o4, 2059614000
+          tz.transition 2035, 9, :o5, 2072318400
+          tz.transition 2036, 4, :o4, 2091063600
+          tz.transition 2036, 9, :o5, 2104372800
+          tz.transition 2037, 4, :o4, 2122513200
+          tz.transition 2037, 9, :o5, 2135822400
+          tz.transition 2038, 4, :o4, 19724141, 8
+          tz.transition 2038, 9, :o5, 7397015, 3
+          tz.transition 2039, 4, :o4, 19727053, 8
+          tz.transition 2039, 9, :o5, 7398107, 3
+          tz.transition 2040, 4, :o4, 19730021, 8
+          tz.transition 2040, 9, :o5, 7399199, 3
+          tz.transition 2041, 4, :o4, 19732933, 8
+          tz.transition 2041, 9, :o5, 7400312, 3
+          tz.transition 2042, 4, :o4, 19735845, 8
+          tz.transition 2042, 9, :o5, 7401404, 3
+          tz.transition 2043, 4, :o4, 19738757, 8
+          tz.transition 2043, 9, :o5, 7402496, 3
+          tz.transition 2044, 4, :o4, 19741669, 8
+          tz.transition 2044, 9, :o5, 7403588, 3
+          tz.transition 2045, 4, :o4, 19744581, 8
+          tz.transition 2045, 9, :o5, 7404680, 3
+          tz.transition 2046, 4, :o4, 19747549, 8
+          tz.transition 2046, 9, :o5, 7405772, 3
+          tz.transition 2047, 4, :o4, 19750461, 8
+          tz.transition 2047, 9, :o5, 7406885, 3
+          tz.transition 2048, 4, :o4, 19753373, 8
+          tz.transition 2048, 9, :o5, 7407977, 3
+          tz.transition 2049, 4, :o4, 19756285, 8
+          tz.transition 2049, 9, :o5, 7409069, 3
+          tz.transition 2050, 4, :o4, 19759197, 8
         end
       end
     end

data/lib/tzinfo/definitions/Pacific/Fiji.rb

@@ -35,7 +35,7 @@ module TZInfo
           tz.transition 2017, 11, :o2, 1509804000
           tz.transition 2018, 1, :o1, 1515852000
           tz.transition 2018, 11, :o2, 1541253600
-          tz.transition 2019, 1, :o1, 1547906400
+          tz.transition 2019, 1, :o1, 1547301600
           tz.transition 2019, 11, :o2, 1572703200
           tz.transition 2020, 1, :o1, 1579356000
           tz.transition 2020, 10, :o2, 1604152800
@@ -57,7 +57,7 @@ module TZInfo
           tz.transition 2028, 11, :o2, 1856959200
           tz.transition 2029, 1, :o1, 1863007200
           tz.transition 2029, 11, :o2, 1888408800
-          tz.transition 2030, 1, :o1, 1895061600
+          tz.transition 2030, 1, :o1, 1894456800
           tz.transition 2030, 11, :o2, 1919858400
           tz.transition 2031, 1, :o1, 1926511200
           tz.transition 2031, 11, :o2, 1951308000
@@ -69,7 +69,7 @@ module TZInfo
           tz.transition 2034, 11, :o2, 2046261600
           tz.transition 2035, 1, :o1, 2052309600
           tz.transition 2035, 11, :o2, 2077711200
-          tz.transition 2036, 1, :o1, 2084364000
+          tz.transition 2036, 1, :o1, 2083759200
           tz.transition 2036, 11, :o2, 2109160800
           tz.transition 2037, 1, :o1, 2115813600
           tz.transition 2037, 10, :o2, 2140610400
@@ -79,7 +79,7 @@ module TZInfo
           tz.transition 2039, 11, :o2, 29593177, 12
           tz.transition 2040, 1, :o1, 29594017, 12
           tz.transition 2040, 11, :o2, 29597545, 12
-          tz.transition 2041, 1, :o1, 29598469, 12
+          tz.transition 2041, 1, :o1, 29598385, 12
           tz.transition 2041, 11, :o2, 29601913, 12
           tz.transition 2042, 1, :o1, 29602837, 12
           tz.transition 2042, 11, :o2, 29606281, 12
@@ -91,7 +91,7 @@ module TZInfo
           tz.transition 2045, 11, :o2, 29619469, 12
           tz.transition 2046, 1, :o1, 29620309, 12
           tz.transition 2046, 11, :o2, 29623837, 12
-          tz.transition 2047, 1, :o1, 29624761, 12
+          tz.transition 2047, 1, :o1, 29624677, 12
           tz.transition 2047, 11, :o2, 29628205, 12
           tz.transition 2048, 1, :o1, 29629129, 12
           tz.transition 2048, 10, :o2, 29632573, 12

data/lib/tzinfo/definitions/Pacific/Honolulu.rb

@@ -10,14 +10,17 @@ module TZInfo
           tz.offset :o0, -37886, 0, :LMT
           tz.offset :o1, -37800, 0, :HST
           tz.offset :o2, -37800, 3600, :HDT
-          tz.offset :o3, -36000, 0, :HST
+          tz.offset :o3, -37800, 3600, :HWT
+          tz.offset :o4, -37800, 3600, :HPT
+          tz.offset :o5, -36000, 0, :HST
           
           tz.transition 1896, 1, :o1, 104266329343, 43200
           tz.transition 1933, 4, :o2, 116505265, 48
           tz.transition 1933, 5, :o1, 116506291, 48
-          tz.transition 1942, 2, :o2, 116659201, 48
+          tz.transition 1942, 2, :o3, 116659201, 48
+          tz.transition 1945, 8, :o4, 58360379, 24
           tz.transition 1945, 9, :o1, 116722991, 48
-          tz.transition 1947, 6, :o3, 116752561, 48
+          tz.transition 1947, 6, :o5, 116752561, 48
         end
       end
     end

data/lib/tzinfo/indexes/countries.rb

@@ -544,7 +544,7 @@ module TZInfo
         c.timezone 'Asia/Choibalsan', 721, 15, 229, 2, 'Dornod, Sukhbaatar'
       end
       country 'MO', 'Macau' do |c|
-        c.timezone 'Asia/Macau', 667, 30, 1363, 12
+        c.timezone 'Asia/Macau', 7991, 360, 2725, 24
       end
       country 'MP', 'Northern Mariana Islands' do |c|
         c.timezone 'Pacific/Saipan', 76, 5, 583, 4

data/lib/tzinfo/tzdataparser.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2005-2017 Philip Ross
+# Copyright (c) 2005-2018 Philip Ross
 # 
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
@@ -227,7 +227,7 @@ module TZInfo
       def get_rules(ref)
         if ref == '-'
           @no_rules
-        elsif ref =~ /^[0-9]+:[0-9]+$/
+        elsif ref =~ /^-?[0-9]+:[0-9]+$/
           TZDataFixedOffsetRules.new(TZDataParser.parse_offset(ref))
         else
           rule_set = @rule_sets[ref]
@@ -993,8 +993,8 @@ module TZInfo
     end
   end
   
-  # A tz data time definition - an hour, minute, second and reference. Reference
-  # is either :utc, :standard or :wall_clock.
+  # A tz data time definition - a sign (1 or -1), hour, minute, second and
+  # reference (:utc, :standard or :wall_clock).
   #
   # @private
   class TZDataTime #:nodoc:
@@ -1004,15 +1004,16 @@ module TZInfo
     attr_reader :ref
     
     def initialize(spec)
-      raise "Invalid time: #{spec}" if spec !~ /^([0-9]+)(:([0-9]+)(:([0-9]+))?)?([wguzs])?$/
+      raise "Invalid time: #{spec}" if spec !~ /^(-?)([0-9]+)(:([0-9]+)(:([0-9]+))?)?([wguzs])?$/
       
-      @hour = $1.to_i
-      @minute = $3.nil? ? 0 : $3.to_i
-      @second = $5.nil? ? 0 : $5.to_i
+      @sign = $1 == '-' ? -1 : 1
+      @hour = $2.to_i
+      @minute = $4.nil? ? 0 : $4.to_i
+      @second = $6.nil? ? 0 : $6.to_i
       
-      if $6 == 's'
+      if $7 == 's'
         @ref = :standard
-      elsif $6 == 'g' || $6 == 'u' || $6 == 'z'
+      elsif $7 == 'g' || $7 == 'u' || $7 == 'z'
         @ref = :utc
       else
         @ref = :wall_clock
@@ -1021,7 +1022,12 @@ module TZInfo
     
     # Converts the time to UTC given a utc_offset and std_offset.
     def to_utc(utc_offset, std_offset, year, month, day)      
-      result = DateTime.new(year, month, day, @hour, @minute, @second)
+      result = if @hour > 24 || @hour == 24 && (@minute > 0 || @second > 0) || @sign != 1
+        DateTime.new(year, month, day, 0, 0, 0) + Rational(@sign * (@second + (@minute + @hour * 60) * 60), 86400)
+      else
+        DateTime.new(year, month, day, @hour, @minute, @second)
+      end
+
       offset = 0
       offset = offset + utc_offset if @ref == :standard || @ref == :wall_clock            
       offset = offset + std_offset if @ref == :wall_clock       

data/tzinfo.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = 'tzinfo'
-  s.version = '0.3.54'
+  s.version = '0.3.55'
   s.author = 'Philip Ross'
   s.email = 'phil.ross@gmail.com'
   s.homepage = 'http://tzinfo.github.io'

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: tzinfo
 version: !ruby/object:Gem::Version 
-  hash: 127
+  hash: 125
   prerelease: false
   segments: 
   - 0
   - 3
-  - 54
-  version: 0.3.54
+  - 55
+  version: 0.3.55
 platform: ruby
 authors: 
 - Philip Ross
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2018-03-24 16:00:00 -07:00
+date: 2018-10-26 16:00:00 -07:00
 default_executable: 
 dependencies: []