RubyGems - tzinfo-data - Versions diffs - 1.2015.6 → 1.2015.7 - Mend

tzinfo-data 1.2015.6 → 1.2015.7

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (13) hide show

checksums.yaml +8 -8
checksums.yaml.gz.sig +0 -0
data.tar.gz.sig +0 -0
data/lib/tzinfo/data/definitions/America/Fort_Nelson.rb +169 -0
data/lib/tzinfo/data/definitions/Europe/Istanbul.rb +1 -1
data/lib/tzinfo/data/definitions/Pacific/Fiji.rb +21 -21
data/lib/tzinfo/data/definitions/Pacific/Norfolk.rb +5 -0
data/lib/tzinfo/data/indexes/countries.rb +1 -0
data/lib/tzinfo/data/indexes/timezones.rb +1 -0
data/lib/tzinfo/data/tzdataparser.rb +46 -11
data/lib/tzinfo/data/version.rb +2 -2
metadata +14 -13
metadata.gz.sig +0 -0

checksums.yaml CHANGED Viewed

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZjMzMTM2NDIyZWY0ZWNiMTAwZDhiODZjMmE5NjJhM2E1NzJiYzY5Mg==
+    MDU3MzEzOTRmYWI3YTYzZTNkNzY3YzA5YzYyZDJlOWU3YzZhNWI2Nw==
   data.tar.gz: !binary |-
-    YTU5YzI1MDg4YTlmNmUzNzlkOTU4OWEwYzA0NmQ1NTU0YzZlMzgzYw==
+    MmFjMDVhNjAyZTNlNDA4MGE1ZjFjZTYyMmMxZDUyMmNhMzdhZWI0NA==
 SHA512:
   metadata.gz: !binary |-
-    NjE5N2IxOWMwNzgzMWZiMGU0YzgyMjkxNTM1ZjNhMzE1NTI2OGI1OTY2YWRl
-    ZDk2Zjg2ZWQ2ZDYxMzlmZGFjYzk5MjgzMjg1NjdkZDc1N2IzOWUxYzBiODJl
-    OTA4MTg5ZmRjNDk0M2Q3ZTQ2ZThkNzM2YmUzZjNiYmVlMzhjZWM=
+    MDFkNGJjOTU2MWFhOTUzNmU1NjdlMWFlODA5YTE4NmE2NDVkOTUwZGQ4NWYz
+    MWE2YmI3NDY2NDAzOTQwZGQ4OGI4NWMyZGY4YTMyNTBiYWFkZTA4NTIwZjc5
+    ZWJmNjViOWJiYzYzZjZkNGUyZjkxNjYyMTQ2NjI2ZTNkMGU5MDQ=
   data.tar.gz: !binary |-
-    OWYwZjM5MmQ0MzliYWUyOGNlYTc3MWZmZWJjZjE2MTBiNzYwNWY1Y2MwYWVk
-    ODFhYzQzYjA2OWM5ODdkZGMxMDkzZTA5YjU3MGM2NGQ2MjdjNjU4NmRiN2Zm
-    MzdkYmExNzQ0NTEyZjBmOWMxNjFlZWY4NDQ3NjY1YmE3ODc4NTE=
+    NGMxNDlhNjBkNzFjYzEwNjkxNTgyYWNhYjg0MzcwMDRkNmI2Njg0ZDY5YzQw
+    ZWNhOGMwY2YzNzc5OGFhNWUxYWE5ZWEwMDY5NGM4MTU2MDIyYjM3OThjNDFh
+    M2ExNjIxZDViZjA1MmRjYTliYjljMGNhNDM2NjM2ZmNiMGQ5NzA=

checksums.yaml.gz.sig CHANGED Viewed

Binary file

data.tar.gz.sig CHANGED Viewed

Binary file

data/lib/tzinfo/data/definitions/America/Fort_Nelson.rb ADDED Viewed

@@ -0,0 +1,169 @@
+# encoding: UTF-8
+# This file contains data derived from the IANA Time Zone Database
+# (http://www.iana.org/time-zones).
+module TZInfo
+  module Data
+    module Definitions
+      module America
+        module Fort_Nelson
+          include TimezoneDefinition
+          timezone 'America/Fort_Nelson' do |tz|
+            tz.offset :o0, -29447, 0, :LMT
+            tz.offset :o1, -28800, 0, :PST
+            tz.offset :o2, -28800, 3600, :PDT
+            tz.offset :o3, -28800, 3600, :PWT
+            tz.offset :o4, -28800, 3600, :PPT
+            tz.offset :o5, -25200, 0, :MST
+            tz.transition 1884, 1, :o1, -2713880953, 208152879047, 86400
+            tz.transition 1918, 4, :o2, -1632060000, 29060375, 12
+            tz.transition 1918, 10, :o1, -1615129200, 19375151, 8
+            tz.transition 1942, 2, :o3, -880207200, 29164799, 12
+            tz.transition 1945, 8, :o4, -769395600, 58360379, 24
+            tz.transition 1945, 9, :o1, -765385200, 19453831, 8
+            tz.transition 1947, 4, :o2, -715788000, 29187635, 12
+            tz.transition 1947, 9, :o1, -702486000, 19459655, 8
+            tz.transition 1948, 4, :o2, -684338400, 29192003, 12
+            tz.transition 1948, 9, :o1, -671036400, 19462567, 8
+            tz.transition 1949, 4, :o2, -652888800, 29196371, 12
+            tz.transition 1949, 9, :o1, -639586800, 19465479, 8
+            tz.transition 1950, 4, :o2, -620834400, 29200823, 12
+            tz.transition 1950, 9, :o1, -608137200, 19468391, 8
+            tz.transition 1951, 4, :o2, -589384800, 29205191, 12
+            tz.transition 1951, 9, :o1, -576082800, 19471359, 8
+            tz.transition 1952, 4, :o2, -557935200, 29209559, 12
+            tz.transition 1952, 9, :o1, -544633200, 19474271, 8
+            tz.transition 1953, 4, :o2, -526485600, 29213927, 12
+            tz.transition 1953, 9, :o1, -513183600, 19477183, 8
+            tz.transition 1954, 4, :o2, -495036000, 29218295, 12
+            tz.transition 1954, 9, :o1, -481734000, 19480095, 8
+            tz.transition 1955, 4, :o2, -463586400, 29222663, 12
+            tz.transition 1955, 9, :o1, -450284400, 19483007, 8
+            tz.transition 1956, 4, :o2, -431532000, 29227115, 12
+            tz.transition 1956, 9, :o1, -418230000, 19485975, 8
+            tz.transition 1957, 4, :o2, -400082400, 29231483, 12
+            tz.transition 1957, 9, :o1, -386780400, 19488887, 8
+            tz.transition 1958, 4, :o2, -368632800, 29235851, 12
+            tz.transition 1958, 9, :o1, -355330800, 19491799, 8
+            tz.transition 1959, 4, :o2, -337183200, 29240219, 12
+            tz.transition 1959, 9, :o1, -323881200, 19494711, 8
+            tz.transition 1960, 4, :o2, -305733600, 29244587, 12
+            tz.transition 1960, 9, :o1, -292431600, 19497623, 8
+            tz.transition 1961, 4, :o2, -273679200, 29249039, 12
+            tz.transition 1961, 9, :o1, -260982000, 19500535, 8
+            tz.transition 1962, 4, :o2, -242229600, 29253407, 12
+            tz.transition 1962, 10, :o1, -226508400, 19503727, 8
+            tz.transition 1963, 4, :o2, -210780000, 29257775, 12
+            tz.transition 1963, 10, :o1, -195058800, 19506639, 8
+            tz.transition 1964, 4, :o2, -179330400, 29262143, 12
+            tz.transition 1964, 10, :o1, -163609200, 19509551, 8
+            tz.transition 1965, 4, :o2, -147880800, 29266511, 12
+            tz.transition 1965, 10, :o1, -131554800, 19512519, 8
+            tz.transition 1966, 4, :o2, -116431200, 29270879, 12
+            tz.transition 1966, 10, :o1, -100105200, 19515431, 8
+            tz.transition 1967, 4, :o2, -84376800, 29275331, 12
+            tz.transition 1967, 10, :o1, -68655600, 19518343, 8
+            tz.transition 1968, 4, :o2, -52927200, 29279699, 12
+            tz.transition 1968, 10, :o1, -37206000, 19521255, 8
+            tz.transition 1969, 4, :o2, -21477600, 29284067, 12
+            tz.transition 1969, 10, :o1, -5756400, 19524167, 8
+            tz.transition 1970, 4, :o2, 9972000
+            tz.transition 1970, 10, :o1, 25693200
+            tz.transition 1971, 4, :o2, 41421600
+            tz.transition 1971, 10, :o1, 57747600
+            tz.transition 1972, 4, :o2, 73476000
+            tz.transition 1972, 10, :o1, 89197200
+            tz.transition 1973, 4, :o2, 104925600
+            tz.transition 1973, 10, :o1, 120646800
+            tz.transition 1974, 4, :o2, 136375200
+            tz.transition 1974, 10, :o1, 152096400
+            tz.transition 1975, 4, :o2, 167824800
+            tz.transition 1975, 10, :o1, 183546000
+            tz.transition 1976, 4, :o2, 199274400
+            tz.transition 1976, 10, :o1, 215600400
+            tz.transition 1977, 4, :o2, 230724000
+            tz.transition 1977, 10, :o1, 247050000
+            tz.transition 1978, 4, :o2, 262778400
+            tz.transition 1978, 10, :o1, 278499600
+            tz.transition 1979, 4, :o2, 294228000
+            tz.transition 1979, 10, :o1, 309949200
+            tz.transition 1980, 4, :o2, 325677600
+            tz.transition 1980, 10, :o1, 341398800
+            tz.transition 1981, 4, :o2, 357127200
+            tz.transition 1981, 10, :o1, 372848400
+            tz.transition 1982, 4, :o2, 388576800
+            tz.transition 1982, 10, :o1, 404902800
+            tz.transition 1983, 4, :o2, 420026400
+            tz.transition 1983, 10, :o1, 436352400
+            tz.transition 1984, 4, :o2, 452080800
+            tz.transition 1984, 10, :o1, 467802000
+            tz.transition 1985, 4, :o2, 483530400
+            tz.transition 1985, 10, :o1, 499251600
+            tz.transition 1986, 4, :o2, 514980000
+            tz.transition 1986, 10, :o1, 530701200
+            tz.transition 1987, 4, :o2, 544615200
+            tz.transition 1987, 10, :o1, 562150800
+            tz.transition 1988, 4, :o2, 576064800
+            tz.transition 1988, 10, :o1, 594205200
+            tz.transition 1989, 4, :o2, 607514400
+            tz.transition 1989, 10, :o1, 625654800
+            tz.transition 1990, 4, :o2, 638964000
+            tz.transition 1990, 10, :o1, 657104400
+            tz.transition 1991, 4, :o2, 671018400
+            tz.transition 1991, 10, :o1, 688554000
+            tz.transition 1992, 4, :o2, 702468000
+            tz.transition 1992, 10, :o1, 720003600
+            tz.transition 1993, 4, :o2, 733917600
+            tz.transition 1993, 10, :o1, 752058000
+            tz.transition 1994, 4, :o2, 765367200
+            tz.transition 1994, 10, :o1, 783507600
+            tz.transition 1995, 4, :o2, 796816800
+            tz.transition 1995, 10, :o1, 814957200
+            tz.transition 1996, 4, :o2, 828871200
+            tz.transition 1996, 10, :o1, 846406800
+            tz.transition 1997, 4, :o2, 860320800
+            tz.transition 1997, 10, :o1, 877856400
+            tz.transition 1998, 4, :o2, 891770400
+            tz.transition 1998, 10, :o1, 909306000
+            tz.transition 1999, 4, :o2, 923220000
+            tz.transition 1999, 10, :o1, 941360400
+            tz.transition 2000, 4, :o2, 954669600
+            tz.transition 2000, 10, :o1, 972810000
+            tz.transition 2001, 4, :o2, 986119200
+            tz.transition 2001, 10, :o1, 1004259600
+            tz.transition 2002, 4, :o2, 1018173600
+            tz.transition 2002, 10, :o1, 1035709200
+            tz.transition 2003, 4, :o2, 1049623200
+            tz.transition 2003, 10, :o1, 1067158800
+            tz.transition 2004, 4, :o2, 1081072800
+            tz.transition 2004, 10, :o1, 1099213200
+            tz.transition 2005, 4, :o2, 1112522400
+            tz.transition 2005, 10, :o1, 1130662800
+            tz.transition 2006, 4, :o2, 1143972000
+            tz.transition 2006, 10, :o1, 1162112400
+            tz.transition 2007, 3, :o2, 1173607200
+            tz.transition 2007, 11, :o1, 1194166800
+            tz.transition 2008, 3, :o2, 1205056800
+            tz.transition 2008, 11, :o1, 1225616400
+            tz.transition 2009, 3, :o2, 1236506400
+            tz.transition 2009, 11, :o1, 1257066000
+            tz.transition 2010, 3, :o2, 1268560800
+            tz.transition 2010, 11, :o1, 1289120400
+            tz.transition 2011, 3, :o2, 1300010400
+            tz.transition 2011, 11, :o1, 1320570000
+            tz.transition 2012, 3, :o2, 1331460000
+            tz.transition 2012, 11, :o1, 1352019600
+            tz.transition 2013, 3, :o2, 1362909600
+            tz.transition 2013, 11, :o1, 1383469200
+            tz.transition 2014, 3, :o2, 1394359200
+            tz.transition 2014, 11, :o1, 1414918800
+            tz.transition 2015, 3, :o5, 1425808800
+          end
+        end
+      end
+    end
+  end
+end

data/lib/tzinfo/data/definitions/Europe/Istanbul.rb CHANGED Viewed

@@ -144,7 +144,7 @@ module TZInfo
             tz.transition 2014, 3, :o3, 1396227600
             tz.transition 2014, 10, :o2, 1414285200
             tz.transition 2015, 3, :o3, 1427590800
-            tz.transition 2015, 10, :o2, 1445734800
+            tz.transition 2015, 11, :o2, 1446944400
             tz.transition 2016, 3, :o3, 1459040400
             tz.transition 2016, 10, :o2, 1477789200
             tz.transition 2017, 3, :o3, 1490490000

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

@@ -33,9 +33,9 @@ module TZInfo
             tz.transition 2014, 11, :o2, 1414850400
             tz.transition 2015, 1, :o1, 1421503200
             tz.transition 2015, 10, :o2, 1446300000
-            tz.transition 2016, 1, :o1, 1453557600
+            tz.transition 2016, 1, :o1, 1452952800
             tz.transition 2016, 11, :o2, 1478354400
-            tz.transition 2017, 1, :o1, 1485007200
+            tz.transition 2017, 1, :o1, 1484402400
             tz.transition 2017, 11, :o2, 1509804000
             tz.transition 2018, 1, :o1, 1516456800
             tz.transition 2018, 11, :o2, 1541253600
@@ -43,11 +43,11 @@ module TZInfo
             tz.transition 2019, 11, :o2, 1572703200
             tz.transition 2020, 1, :o1, 1579356000
             tz.transition 2020, 10, :o2, 1604152800
-            tz.transition 2021, 1, :o1, 1611410400
+            tz.transition 2021, 1, :o1, 1610805600
             tz.transition 2021, 11, :o2, 1636207200
-            tz.transition 2022, 1, :o1, 1642860000
+            tz.transition 2022, 1, :o1, 1642255200
             tz.transition 2022, 11, :o2, 1667656800
-            tz.transition 2023, 1, :o1, 1674309600
+            tz.transition 2023, 1, :o1, 1673704800
             tz.transition 2023, 11, :o2, 1699106400
             tz.transition 2024, 1, :o1, 1705759200
             tz.transition 2024, 11, :o2, 1730556000
@@ -55,9 +55,9 @@ module TZInfo
             tz.transition 2025, 11, :o2, 1762005600
             tz.transition 2026, 1, :o1, 1768658400
             tz.transition 2026, 10, :o2, 1793455200
-            tz.transition 2027, 1, :o1, 1800712800
+            tz.transition 2027, 1, :o1, 1800108000
             tz.transition 2027, 11, :o2, 1825509600
-            tz.transition 2028, 1, :o1, 1832162400
+            tz.transition 2028, 1, :o1, 1831557600
             tz.transition 2028, 11, :o2, 1856959200
             tz.transition 2029, 1, :o1, 1863612000
             tz.transition 2029, 11, :o2, 1888408800
@@ -67,9 +67,9 @@ module TZInfo
             tz.transition 2031, 11, :o2, 1951308000
             tz.transition 2032, 1, :o1, 1957960800
             tz.transition 2032, 11, :o2, 1983362400
-            tz.transition 2033, 1, :o1, 1990015200
+            tz.transition 2033, 1, :o1, 1989410400
             tz.transition 2033, 11, :o2, 2014812000
-            tz.transition 2034, 1, :o1, 2021464800
+            tz.transition 2034, 1, :o1, 2020860000
             tz.transition 2034, 11, :o2, 2046261600
             tz.transition 2035, 1, :o1, 2052914400
             tz.transition 2035, 11, :o2, 2077711200
@@ -77,11 +77,11 @@ module TZInfo
             tz.transition 2036, 11, :o2, 2109160800
             tz.transition 2037, 1, :o1, 2115813600
             tz.transition 2037, 10, :o2, 2140610400
-            tz.transition 2038, 1, :o1, 2147868000, 29585365, 12
+            tz.transition 2038, 1, :o1, 2147263200
             tz.transition 2038, 11, :o2, 2172664800, 29588809, 12
-            tz.transition 2039, 1, :o1, 2179317600, 29589733, 12
+            tz.transition 2039, 1, :o1, 2178712800, 29589649, 12
             tz.transition 2039, 11, :o2, 2204114400, 29593177, 12
-            tz.transition 2040, 1, :o1, 2210767200, 29594101, 12
+            tz.transition 2040, 1, :o1, 2210162400, 29594017, 12
             tz.transition 2040, 11, :o2, 2235564000, 29597545, 12
             tz.transition 2041, 1, :o1, 2242216800, 29598469, 12
             tz.transition 2041, 11, :o2, 2267013600, 29601913, 12
@@ -89,9 +89,9 @@ module TZInfo
             tz.transition 2042, 11, :o2, 2298463200, 29606281, 12
             tz.transition 2043, 1, :o1, 2305116000, 29607205, 12
             tz.transition 2043, 10, :o2, 2329912800, 29610649, 12
-            tz.transition 2044, 1, :o1, 2337170400, 29611657, 12
+            tz.transition 2044, 1, :o1, 2336565600, 29611573, 12
             tz.transition 2044, 11, :o2, 2361967200, 29615101, 12
-            tz.transition 2045, 1, :o1, 2368620000, 29616025, 12
+            tz.transition 2045, 1, :o1, 2368015200, 29615941, 12
             tz.transition 2045, 11, :o2, 2393416800, 29619469, 12
             tz.transition 2046, 1, :o1, 2400069600, 29620393, 12
             tz.transition 2046, 11, :o2, 2424866400, 29623837, 12
@@ -99,11 +99,11 @@ module TZInfo
             tz.transition 2047, 11, :o2, 2456316000, 29628205, 12
             tz.transition 2048, 1, :o1, 2462968800, 29629129, 12
             tz.transition 2048, 10, :o2, 2487765600, 29632573, 12
-            tz.transition 2049, 1, :o1, 2495023200, 29633581, 12
+            tz.transition 2049, 1, :o1, 2494418400, 29633497, 12
             tz.transition 2049, 11, :o2, 2519820000, 29637025, 12
-            tz.transition 2050, 1, :o1, 2526472800, 29637949, 12
+            tz.transition 2050, 1, :o1, 2525868000, 29637865, 12
             tz.transition 2050, 11, :o2, 2551269600, 29641393, 12
-            tz.transition 2051, 1, :o1, 2557922400, 29642317, 12
+            tz.transition 2051, 1, :o1, 2557317600, 29642233, 12
             tz.transition 2051, 11, :o2, 2582719200, 29645761, 12
             tz.transition 2052, 1, :o1, 2589372000, 29646685, 12
             tz.transition 2052, 11, :o2, 2614168800, 29650129, 12
@@ -111,9 +111,9 @@ module TZInfo
             tz.transition 2053, 11, :o2, 2645618400, 29654497, 12
             tz.transition 2054, 1, :o1, 2652271200, 29655421, 12
             tz.transition 2054, 10, :o2, 2677068000, 29658865, 12
-            tz.transition 2055, 1, :o1, 2684325600, 29659873, 12
+            tz.transition 2055, 1, :o1, 2683720800, 29659789, 12
             tz.transition 2055, 11, :o2, 2709122400, 29663317, 12
-            tz.transition 2056, 1, :o1, 2715775200, 29664241, 12
+            tz.transition 2056, 1, :o1, 2715170400, 29664157, 12
             tz.transition 2056, 11, :o2, 2740572000, 29667685, 12
             tz.transition 2057, 1, :o1, 2747224800, 29668609, 12
             tz.transition 2057, 11, :o2, 2772021600, 29672053, 12
@@ -123,9 +123,9 @@ module TZInfo
             tz.transition 2059, 11, :o2, 2834920800, 29680789, 12
             tz.transition 2060, 1, :o1, 2841573600, 29681713, 12
             tz.transition 2060, 11, :o2, 2866975200, 29685241, 12
-            tz.transition 2061, 1, :o1, 2873628000, 29686165, 12
+            tz.transition 2061, 1, :o1, 2873023200, 29686081, 12
             tz.transition 2061, 11, :o2, 2898424800, 29689609, 12
-            tz.transition 2062, 1, :o1, 2905077600, 29690533, 12
+            tz.transition 2062, 1, :o1, 2904472800, 29690449, 12
             tz.transition 2062, 11, :o2, 2929874400, 29693977, 12
             tz.transition 2063, 1, :o1, 2936527200, 29694901, 12
             tz.transition 2063, 11, :o2, 2961324000, 29698345, 12

data/lib/tzinfo/data/definitions/Pacific/Norfolk.rb CHANGED Viewed

@@ -14,9 +14,14 @@ module TZInfo
             tz.offset :o0, 40312, 0, :LMT
             tz.offset :o1, 40320, 0, :NMT
             tz.offset :o2, 41400, 0, :NFT
+            tz.offset :o3, 41400, 3600, :NFST
+            tz.offset :o4, 39600, 0, :NFT
             tz.transition 1900, 12, :o1, -2177493112, 26086158361, 10800
             tz.transition 1950, 12, :o2, -599656320, 73009411, 30
+            tz.transition 1974, 10, :o3, 152029800
+            tz.transition 1975, 3, :o2, 162912600
+            tz.transition 2015, 10, :o4, 1443882600
           end
         end
       end

data/lib/tzinfo/data/indexes/countries.rb CHANGED Viewed

@@ -190,6 +190,7 @@ module TZInfo
           c.timezone 'America/Inuvik', 246059, 3600, -8023, 60, 'Mountain Time - west Northwest Territories'
           c.timezone 'America/Creston', 491, 10, -6991, 60, 'Mountain Standard Time - Creston, British Columbia'
           c.timezone 'America/Dawson_Creek', 1793, 30, -3607, 30, 'Mountain Standard Time - Dawson Creek & Fort Saint John, British Columbia'
+          c.timezone 'America/Fort_Nelson', 294, 5, -1227, 10, 'Mountain Standard Time - Fort Nelson, British Columbia'
           c.timezone 'America/Vancouver', 739, 15, -7387, 60, 'Pacific Time - west British Columbia'
           c.timezone 'America/Whitehorse', 3643, 60, -2701, 20, 'Pacific Time - south Yukon'
           c.timezone 'America/Dawson', 961, 15, -1673, 12, 'Pacific Time - north Yukon'

data/lib/tzinfo/data/indexes/timezones.rb CHANGED Viewed

@@ -120,6 +120,7 @@ module TZInfo
         timezone 'America/Eirunepe'
         timezone 'America/El_Salvador'
         linked_timezone 'America/Ensenada'
+        timezone 'America/Fort_Nelson'
         linked_timezone 'America/Fort_Wayne'
         timezone 'America/Fortaleza'
         timezone 'America/Glace_Bay'

data/lib/tzinfo/data/tzdataparser.rb CHANGED Viewed

@@ -718,7 +718,7 @@ module TZInfo
             if observance.rule_set.count == 0
               std_offset = observance.std_offset
-              start_zone_id = observance.format.expand(std_offset, nil)
+              start_zone_id = observance.format.expand(utc_offset, std_offset, nil)
               if use_start
                 transitions << TZDataTransition.new(start_time, utc_offset, std_offset, start_zone_id)
@@ -763,23 +763,23 @@ module TZInfo
                     if earliest.at < start_time
                       start_utc_offset = observance.utc_offset
                       start_std_offset = std_offset
-                      start_zone_id = observance.format.expand(earliest.rule.save, earliest.rule.letter)
+                      start_zone_id = observance.format.expand(start_utc_offset, earliest.rule.save, earliest.rule.letter)
                       next
                     end
                     if start_zone_id.nil? && start_utc_offset + start_std_offset == observance.utc_offset + std_offset
-                      start_zone_id = observance.format.expand(earliest.rule.save, earliest.rule.letter)
+                      start_zone_id = observance.format.expand(start_utc_offset, earliest.rule.save, earliest.rule.letter)
                     end
                   end
-                  zone_id = observance.format.expand(earliest.rule.save, earliest.rule.letter)
+                  zone_id = observance.format.expand(observance.utc_offset, earliest.rule.save, earliest.rule.letter)
                   transitions << TZDataTransition.new(earliest.at, observance.utc_offset, earliest.rule.save, zone_id)
                 end
               }
             end
             if use_start
-              start_zone_id = observance.format.expand(nil, nil) if start_zone_id.nil? && observance.format.fixed?
+              start_zone_id = observance.format.expand(nil, nil, nil) if start_zone_id.nil? && observance.format.fixed?
               raise 'Could not determine time zone abbreviation to use just after until time' if start_zone_id.nil?
               transitions << TZDataTransition.new(start_time, start_utc_offset, start_std_offset, start_zone_id)
             end
@@ -1201,7 +1201,7 @@ module TZInfo
           @type = :alternate
           @standard_abbrev = $1
           @daylight_abbrev = $2
-        elsif spec =~ /%s/
+        elsif spec =~ /%[sz]/
           @type = :subst
           @abbrev = spec
         else
@@ -1210,8 +1210,9 @@ module TZInfo
         end
       end
-      # Expands given the current daylight savings offset and Rule string.
-      def expand(std_offset, rule_string)
+      # Expands given the base offset to UTC, the current daylight savings
+      # offset and rule string.
+      def expand(utc_offset, std_offset, rule_string)
         if @type == :alternate
           if std_offset == 0
             @standard_abbrev
@@ -1219,14 +1220,16 @@ module TZInfo
             @daylight_abbrev
           end
         elsif @type == :subst
-          sprintf(@abbrev, rule_string)
+          @abbrev.gsub(/%([sz])/) do
+            $1 == 's' ? rule_string : format_offset(utc_offset + std_offset)
+          end
         else
           @abbrev
         end
       end
-      # True if a string from the rule is required to expand this format.
-      def requires_rule_string?
+      # True if the format requires substitutions (%s or %z).
+      def subst?
         @type == :subst
       end
@@ -1234,6 +1237,38 @@ module TZInfo
       def fixed?
         @type == :fixed
       end
+      private
+        # Formats an offset according to the rules for %z.
+        def format_offset(offset)
+          if offset < 0
+            offset = -offset
+            sign = '-'
+          else
+            sign = '+'
+          end
+          offset, seconds = offset.divmod(60)
+          offset, minutes = offset.divmod(60)
+          if offset > 99
+            # unsupported
+            '%z'
+          else
+            result = "#{sign}#{offset.to_s.rjust(2, '0')}"
+            if minutes != 0 || seconds != 0
+              result << minutes.to_s.rjust(2, '0')
+              if seconds != 0
+                result << seconds.to_s.rjust(2, '0')
+              end
+            end
+            result
+          end
+        end
     end
     # A location (latitude + longitude)

data/lib/tzinfo/data/version.rb CHANGED Viewed

@@ -1,7 +1,7 @@
 module TZInfo
   module Data
     # TZInfo::Data version number.
-    VERSION = '1.2015.6'
+    VERSION = '1.2015.7'
     # TZInfo::Data version information.
     module Version
@@ -14,7 +14,7 @@ module TZInfo
       # The version of the {IANA Time Zone Database}[http://www.iana.org/time-zones]
       # used to generate this version of TZInfo::Data.
-      TZDATA = '2015f'
+      TZDATA = '2015g'
     end
   end
 end

metadata CHANGED Viewed

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tzinfo-data
 version: !ruby/object:Gem::Version
-  version: 1.2015.6
+  version: 1.2015.7
 platform: ruby
 authors:
 - Philip Ross
@@ -12,8 +12,8 @@ cert_chain:
   LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSURkRENDQWx5Z0F3SUJB
   Z0lCQVRBTkJna3Foa2lHOXcwQkFRVUZBREJBTVJJd0VBWURWUVFEREFsd2FH
   bHMKTG5KdmMzTXhGVEFUQmdvSmtpYUprL0lzWkFFWkZnVm5iV0ZwYkRFVE1C
-  RUdDZ21TSm9tVDhpeGtBUmtXQTJOdgpiVEFlRncweE5EQTVNamd4T1RBNE1E
-  ZGFGdzB4TlRBNU1qZ3hPVEE0TURkYU1FQXhFakFRQmdOVkJBTU1DWEJvCmFX
+  RUdDZ21TSm9tVDhpeGtBUmtXQTJOdgpiVEFlRncweE5URXdNRE14TkRJMU1U
+  aGFGdzB4TmpFd01ESXhOREkxTVRoYU1FQXhFakFRQmdOVkJBTU1DWEJvCmFX
   d3VjbTl6Y3pFVk1CTUdDZ21TSm9tVDhpeGtBUmtXQldkdFlXbHNNUk13RVFZ
   S0NaSW1pWlB5TEdRQkdSWUQKWTI5dE1JSUJJakFOQmdrcWhraUc5dzBCQVFF
   RkFBT0NBUThBTUlJQkNnS0NBUUVBa1p6QitxZmhteVkrWFJ2VQp1MzEwTE1U
@@ -28,16 +28,16 @@ cert_chain:
   UUVBd0lFc0RBZEJnTlZIUTRFRmdRVQpENW56TzkvTUc0QjZ5Z2NoL1B2NlBG
   OVE1eDh3SGdZRFZSMFJCQmN3RllFVGNHaHBiQzV5YjNOelFHZHRZV2xzCkxt
   TnZiVEFlQmdOVkhSSUVGekFWZ1JOd2FHbHNMbkp2YzNOQVoyMWhhV3d1WTI5
-  dE1BMEdDU3FHU0liM0RRRUIKQlFVQUE0SUJBUUNJNFVjbG4wVzQyNUhPYzJt
-  SWFYa0FpSFdOczFGdi9yQ1ByQkl3QlloalN0VllVRVBDSWhFZgpNUkNxcGVP
-  b2czK2IzMVNNSXFxSFFjTm5qWTkvWUhlSkNRNXZzUnlOL0E3K25hZlErUGpJ
-  K0U1SElsNUJkOEhrCm5iaXprY3ZNL3FFOHcySVd1YWRUUnpHemVCb2x6VnA0
-  Z2wvR0xQOXdUMUgrY1RqQzd6Q2pnYnhud003ekxueEEKRjRYY0tHQXJBTVlk
-  OEdnSFVUVndNc1lQNFhrTTNDR1d0dWs4cG1nQ28yQ0taQTRQRHJXWWl1byt2
-  dHdGc2dZSgpoS2U2N0JETnlHNER4SlR1NnRQOTc5WlhhbkNZRURXbXhKTVNt
-  NEloOXRPYkhyeVpjNnhwMVNzTTRqUFI2TWJ0Ck9XcFc5aUdRSGtmQ2t0ancr
-  YllkREtWSzhjMFdVNVBOCi0tLS0tRU5EIENFUlRJRklDQVRFLS0tLS0K
-date: 2015-08-12 00:00:00.000000000 Z
+  dE1BMEdDU3FHU0liM0RRRUIKQlFVQUE0SUJBUUFYU2FkSTZJRWFsZ0dGMG5r
+  M2xhTk5salNOMmM0WW5IOUJYTGpia3FNdUtLekNIM045QkpJdwp1YWpyYWFZ
+  RjRQT2U0Ull3b2ZqZ0ZEK3BJSmN5VGhiV0Y4UTBxSFFTQXltK2I4U3RsREtJ
+  cWRuVTJXVktqcFNVCi9lNHdJRlF0aE1meEcwYmxCTmVEVEVBbmxEZzhmOWxo
+  UlVDNlUvdnRBZmF5WkdSWkFMbEJ4ZjFoTFR1UU04RHEKQlRvQUJPTklOSUp3
+  alV6VUVPeDladFRkcWkvbnlsZHFwc0htK3QyQVl4R2FzVVNrQUVmcFZFQ1lu
+  ZjlRcE4xNgp0SmJ3UGRTZkZFQTA2VTFMVlRZYmwwYkhmbXFZVFplYjlDRmxH
+  TWpMWVNMMk5GRVNuNW9oenQ2aUwreWJQSFg2CjZNWnAybHBaMXZ6RExMTXJG
+  NDF4bWR4R1JPdFVyY3l5Ci0tLS0tRU5EIENFUlRJRklDQVRFLS0tLS0K
+date: 2015-10-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tzinfo
@@ -177,6 +177,7 @@ files:
 - lib/tzinfo/data/definitions/America/Eirunepe.rb
 - lib/tzinfo/data/definitions/America/El_Salvador.rb
 - lib/tzinfo/data/definitions/America/Ensenada.rb
+- lib/tzinfo/data/definitions/America/Fort_Nelson.rb
 - lib/tzinfo/data/definitions/America/Fort_Wayne.rb
 - lib/tzinfo/data/definitions/America/Fortaleza.rb
 - lib/tzinfo/data/definitions/America/Glace_Bay.rb

metadata.gz.sig CHANGED Viewed

Binary file