timezone 1.3.3 → 1.3.29

data/data/US/Michigan

@@ -5,7 +5,11 @@
 3999600:EPT:1:-14400
 81046800:EST:0:-18000
 13302000:EDT:1:-14400
-775962000:EST:0:-18000
+590540460:EST:0:-18000
+11840340:EDT:1:-14400
+15728400:EST:0:-18000
+15721200:EDT:1:-14400
+142131600:EST:0:-18000
 15721200:EDT:1:-14400
 6051600:EST:0:-18000
 25398000:EDT:1:-14400

data/data/WET

@@ -1,11 +1,76 @@
-228877199:WET:0:0
-15120000:WEST:1:3600
+-1830384001:LMT:0:-2205
+140828400:WET:0:0
+11754000:WEST:1:3600
+10368000:WET:0:0
+19695600:WEST:1:3600
+11840400:WET:0:0
+19695600:WEST:1:3600
+11840400:WET:0:0
+19695600:WEST:1:3600
+11926800:WET:0:0
+19695600:WEST:1:3600
+11840400:WET:0:0
+19695600:WEST:1:3600
+79056000:WET:0:0
+14774400:WEST:1:3600
+48384000:WET:0:0
+14515200:WEST:1:3600
 16329600:WET:0:0
+15120000:WEST:1:3600
+16934400:WET:0:0
+15120000:WEST:1:3600
+16934400:WET:0:0
+14515200:WEST:1:3600
+48384000:WET:0:0
+14515200:WEST:1:3600
+15724800:WET:0:0
+15724800:WEST:1:3600
+47779200:WET:0:0
 15724800:WEST:1:3600
+15120000:WET:0:0
+16329600:WEST:1:3600
+16934400:WET:0:0
+14515200:WEST:1:3600
+15724800:WET:0:0
+15724800:WEST:1:3600
+15120000:WET:0:0
+16329600:WEST:1:3600
+16934400:WET:0:0
+18748800:WEST:1:3600
+8467200:WET:0:0
+19526400:WEST:1:3600
+15552000:WET:0:0
+15811200:WEST:1:3600
+13824000:WET:0:0
+3625200:WEST:1:3600
+9676800:WEMT:1:7200
+6051600:WEST:1:3600
+12096000:WET:0:0
+3020400:WEST:1:3600
+11491200:WEMT:1:7200
+5446800:WEST:1:3600
+11491200:WET:0:0
+3625200:WEST:1:3600
+10886400:WEMT:1:7200
+5446800:WEST:1:3600
+11491200:WET:0:0
+3625200:WEST:1:3600
+10886400:WEMT:1:7200
+5446800:WEST:1:3600
+13910400:WET:0:0
+15724800:WEST:1:3600
+15735600:WET:0:0
+15724800:WEST:1:3600
+15724800:WET:0:0
+15724800:WEST:1:3600
+15724800:WET:0:0
+15724800:WEST:1:3600
+15724800:WET:0:0
+15724800:WEST:1:3600
+15724800:WET:0:0
+16329600:WEST:1:3600
 15724800:WET:0:0
 15724800:WEST:1:3600
-16329600:WET:0:0
-15120000:WEST:1:3600
 15724800:WET:0:0
 15724800:WEST:1:3600
 15724800:WET:0:0
@@ -34,9 +99,46 @@
 15724800:WEST:1:3600
 15724800:WET:0:0
 15724800:WEST:1:3600
+315093600:CET:0:3600
+15724800:WET:0:0
+15724800:WEST:1:3600
+16333200:WET:0:0
+15724800:WEST:1:3600
 15724800:WET:0:0
 15724800:WEST:1:3600
 16329600:WET:0:0
+15120000:WEST:1:3600
+15721200:WET:0:0
+15724800:WEST:1:3600
+15724800:WET:0:0
+15724800:WEST:1:3600
+15724800:WET:0:0
+15724800:WEST:1:3600
+15724800:WET:0:0
+16329600:WEST:1:3600
+15724800:WET:0:0
+15724800:WEST:1:3600
+15728400:WET:0:0
+15724800:WEST:1:3600
+15724800:WET:0:0
+15724800:WEST:1:3600
+15724800:WET:0:0
+15724800:WEST:1:3600
+15724800:WET:0:0
+15724800:WEST:1:3600
+15724800:WET:0:0
+16329600:WEST:1:3600
+15724800:WET:0:0
+15724800:WEST:1:3600
+15724800:WET:0:0
+15724800:WEST:1:3600
+15724800:CET:0:3600
+15724800:CEST:1:7200
+15724800:CET:0:3600
+15724800:CEST:1:7200
+15724800:CET:0:3600
+15724800:CEST:1:7200
+16329600:CET:0:3600
 18144000:WEST:1:3600
 13305600:WET:0:0
 18144000:WEST:1:3600

data/lib/timezone/error.rb

@@ -12,16 +12,22 @@ module Timezone
   module Error
     # Top-level error. All other timezone errors subclass this one.
     class Base < StandardError; end
+
     # Indicates an invalid timezone name.
     class InvalidZone < Base; end
+
     # Indicates a lookup failure.
     class Lookup < Base; end
+
     # Indicates an error during lookup using the geonames API.
     class GeoNames < Lookup; end
+
     # Indicates an error during lookup using the google API.
     class Google < Lookup; end
+
     # Indicates a missing stub during a test lookup.
     class Test < Lookup; end
+
     # Indicates an invalid configuration.
     class InvalidConfig < Base; end
   end

data/lib/timezone/loader.rb

@@ -2,18 +2,21 @@
 
 require 'timezone/error'
 
-module Timezone # rubocop:disable Style/Documentation
+module Timezone
   # Responsible for loading and parsing timezone data from files.
   module Loader
-    ZONE_FILE_PATH = File.expand_path(File.dirname(__FILE__) + '/../../data')
+    ZONE_FILE_PATH = File.expand_path("#{File.dirname(__FILE__)}/../../data")
     SOURCE_BIT = 0
 
+    @rules = {} # cache of loaded rules
+
     class << self
       def load(name)
-        raise ::Timezone::Error::InvalidZone unless valid?(name)
+        @rules.fetch(name) do
+          raise ::Timezone::Error::InvalidZone unless valid?(name)
 
-        @rules ||= {}
-        @rules[name] ||= parse_zone_data(get_zone_data(name))
+          @rules[name] = parse_zone_data(get_zone_data(name))
+        end
       end
 
       def names

data/lib/timezone/lookup/geonames.rb

@@ -55,6 +55,7 @@ module Timezone
         return unless data['gmtOffset'].is_a? Numeric
 
         return 'Etc/UTC' if data['gmtOffset'].zero?
+
         "Etc/GMT#{format('%+d', -data['gmtOffset'])}"
       end
 

data/lib/timezone/lookup/google.rb

@@ -14,7 +14,7 @@ module Timezone
     class Google < ::Timezone::Lookup::Basic
       # Indicates that no time zone data could be found for the specified
       # <lat, lng>. This can occur if the query is incomplete or ambiguous.
-      NO_TIMEZONE_INFORMATION = 'ZERO_RESULTS'.freeze
+      NO_TIMEZONE_INFORMATION = 'ZERO_RESULTS'
 
       def initialize(config)
         if config.api_key.nil?
@@ -34,7 +34,8 @@ module Timezone
           raise(Timezone::Error::Google, '403 Forbidden')
         end
 
-        return unless response.code =~ /^2\d\d$/
+        return unless /^2\d\d$/.match?(response.code)
+
         data = JSON.parse(response.body)
 
         return if data['status'] == NO_TIMEZONE_INFORMATION

data/lib/timezone/lookup.rb

@@ -4,12 +4,13 @@ require 'timezone/lookup/geonames'
 require 'timezone/lookup/google'
 require 'timezone/lookup/test'
 require 'timezone/net_http_client'
+require 'ostruct'
 
 module Timezone
   # Configure timezone lookups.
   module Lookup
     class << self
-      MISSING_LOOKUP = 'No lookup configured'.freeze
+      MISSING_LOOKUP = 'No lookup configured'
       private_constant :MISSING_LOOKUP
 
       # Returns the lookup object
@@ -45,7 +46,7 @@ module Timezone
         test: ::Timezone::Lookup::Test
       }.freeze
 
-      INVALID_LOOKUP = 'Invalid lookup specified'.freeze
+      INVALID_LOOKUP = 'Invalid lookup specified'
 
       attr_reader :config
 

data/lib/timezone/parser.rb

@@ -9,30 +9,45 @@ module Timezone
     MIN_YEAR = -500
     MAX_YEAR = 2039
 
-    LINE = /\s*(.+)\s*=\s*(.+)\s*isdst=(\d+)\s*gmtoff=([\+\-]*\d+)/
+    LINE = /\s*(.+)\s*=\s*(.+)\s*isdst=(\d+)\s*gmtoff=([+\-]*\d+)/.freeze
 
-    ZONEINFO_DIR = '/usr/share/zoneinfo'.freeze
+    # Bookkeeping files that we do not want to parse.
+    IGNORE = ['leapseconds', 'posixrules', 'tzdata.zi'].freeze
 
-    attr_reader :zoneinfo
-
-    def initialize(zoneinfo = ZONEINFO_DIR)
-      @zoneinfo = zoneinfo
+    def initialize(root)
+      @config = Config.new(root)
     end
 
     def perform
       FileUtils.rm_rf('data')
 
-      Dir["#{zoneinfo}/posix/**/*"].each do |file|
+      Dir["#{@config.zoneinfo}/**/*"].each do |file|
         next if File.directory?(file)
+        next if file.end_with?('.tab')
+        next if IGNORE.include?(File.basename(file))
+
         parse(file)
       end
     end
 
+    # Represents a timezone database config.
+    class Config
+      def initialize(root)
+        @root = root
+        @zoneinfo = File.join(@root, 'usr/share/zoneinfo')
+        @zdump = File.join(@root, 'usr/bin/zdump')
+      end
+
+      attr_reader :root, :zoneinfo, :zdump
+    end
+
+    private_constant :Config
+
     # Represents a single timezone data file line for a reference timezone.
     class RefLine
-      def initialize(zone)
+      def initialize(config, file)
         first =
-          `zdump -i posix/#{zone}`
+          `#{config.zdump} -i #{file}`
             .split("\n")
             .reject(&:empty?)
             .reject { |line| line.start_with?('TZ=') }
@@ -51,7 +66,7 @@ module Timezone
       def parse_offset(offset)
         arity = offset.start_with?('-') ? -1 : 1
 
-        match = offset.match(/^[\-\+](\d{2})$/)
+        match = offset.match(/^[\-+](\d{2})$/)
         arity * match[1].to_i * 60 * 60
       end
     end
@@ -62,10 +77,10 @@ module Timezone
     class Line
       attr_accessor :source, :name, :dst, :offset
 
-      SOURCE_FORMAT = '%a %b %e %H:%M:%S %Y %Z'.freeze
+      SOURCE_FORMAT = '%a %b %e %H:%M:%S %Y %Z'
 
       def initialize(match)
-        self.source = Time.strptime(match[1] + 'C', SOURCE_FORMAT).to_i
+        self.source = Time.strptime("#{match[1]}C", SOURCE_FORMAT).to_i
         self.name = match[2].split(' ').last
         self.dst = match[3].to_i
         self.offset = match[4].to_i
@@ -85,15 +100,15 @@ module Timezone
     private
 
     def parse(file)
-      zone = file.gsub("#{zoneinfo}/posix/", '')
+      zone = file.gsub("#{@config.zoneinfo}/", '')
       print "Parsing #{zone}... "
-      data = zdump(zone)
+      data = zdump(file)
 
       last = 0
       result = []
 
       data.split("\n").each do |line|
-        match = line.gsub('posix/' + zone + ' ', '').match(LINE)
+        match = line.gsub(/^#{file}\s+/, '').match(LINE)
         next if match.nil?
 
         line = Line.new(match)
@@ -112,14 +127,14 @@ module Timezone
         result << line
       end
 
-      result << RefLine.new(zone) if result.empty?
+      result << RefLine.new(@config, file) if result.empty?
 
       write(zone, result)
       puts 'DONE'
     end
 
-    def zdump(zone)
-      `zdump -v -c #{MIN_YEAR},#{MAX_YEAR} posix/#{zone}`
+    def zdump(file)
+      `#{@config.zdump} -V -c #{MIN_YEAR},#{MAX_YEAR} #{file}`
     end
 
     def write(zone, data)

data/lib/timezone/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Timezone
-  VERSION = '1.3.3'.freeze
+  VERSION = '1.3.29'
 end

data/lib/timezone/zone.rb

@@ -6,7 +6,6 @@ require 'time'
 
 require 'timezone/loader'
 require 'timezone/error'
-require 'timezone/loader'
 
 module Timezone
   # This object represents a real-world timezone. Each instance provides
@@ -179,10 +178,6 @@ module Timezone
 
     private
 
-    def private_rules
-      @rules ||= Loader.load(name)
-    end
-
     def sanitize(time)
       time.to_time
     end
@@ -200,11 +195,15 @@ module Timezone
 
     def rule_for_local(local)
       local = local.to_i
+      rules = Loader.load(name)
 
       # For each rule, convert the local time into the UTC equivalent for
       # that rule offset, and then check if the UTC time matches the rule.
-      index = binary_search(local) { |t, r| match?(t - r[OFFSET_BIT], r) }
-      match = private_rules[index]
+      index =
+        binary_search(rules, local) do |t, r|
+          match?(t - r[OFFSET_BIT], r)
+        end
+      match = rules[index]
 
       utc = local - match[OFFSET_BIT]
 
@@ -213,7 +212,7 @@ module Timezone
       return RuleSet.new(:missing, [match]) if rule_for_utc(utc) != match
 
       # If the match is the last rule, then return it.
-      return RuleSet.new(:single, [match]) if index == private_rules.length - 1
+      return RuleSet.new(:single, [match]) if index == rules.length - 1
 
       # If the UTC equivalent time falls within the last hour(s) of the time
       # change which were replayed during a fall-back in time, then return
@@ -234,10 +233,10 @@ module Timezone
       last_hour =
         match[SOURCE_BIT] -
         match[OFFSET_BIT] +
-        private_rules[index + 1][OFFSET_BIT]
+        rules[index + 1][OFFSET_BIT]
 
       if utc > last_hour
-        RuleSet.new(:double, private_rules[index..(index + 1)])
+        RuleSet.new(:double, rules[index..(index + 1)])
       else
         RuleSet.new(:single, [match])
       end
@@ -245,27 +244,28 @@ module Timezone
 
     def rule_for_utc(time)
       time = time.to_i
+      rules = Loader.load(name)
 
-      private_rules[binary_search(time) { |t, r| match?(t, r) }]
+      rules[binary_search(rules, time) { |t, r| match?(t, r) }]
     end
 
     # Find the first rule that matches using binary search.
-    def binary_search(time, from = 0, to = nil, &block)
-      to = private_rules.length - 1 if to.nil?
+    def binary_search(rules, time, from = 0, to = nil, &block)
+      to = rules.length - 1 if to.nil?
 
       return from if from == to
 
       mid = (from + to).div(2)
 
-      unless yield(time, private_rules[mid])
-        return binary_search(time, mid + 1, to, &block)
+      unless yield(time, rules[mid])
+        return binary_search(rules, time, mid + 1, to, &block)
       end
 
       return mid if mid.zero?
 
-      return mid unless yield(time, private_rules[mid - 1])
+      return mid unless yield(time, rules[mid - 1])
 
-      binary_search(time, from, mid - 1, &block)
+      binary_search(rules, time, from, mid - 1, &block)
     end
   end
 end

data/test/test_timezone.rb

@@ -32,13 +32,11 @@ class TestTimezone < ::Minitest::Test
   end
 
   def test_fetch_warning
-    warning = false
-
-    Timezone.stub(:warn, ->(_) { warning = true }) do
+    _out, err = capture_io do
       Timezone.fetch('foo/bar', 'a') { 'b' }
     end
 
-    assert warning, 'warning was not issued'
+    assert_equal "warning: block supersedes default value argument\n", err
   end
 
   def test_lookup

data/test/timezone/lookup/test_geonames.rb

@@ -2,6 +2,7 @@
 
 require 'timezone/lookup/geonames'
 require 'minitest/autorun'
+require 'ostruct'
 require_relative '../../http_test_client'
 
 class TestGeonames < ::Minitest::Test
@@ -19,6 +20,10 @@ class TestGeonames < ::Minitest::Test
     }
   end
 
+  def lookup_file(file_name, &block)
+    lookup(File.open(File.join(mock_path, file_name)).read, &block)
+  end
+
   def lookup(body = nil, &_block)
     config = OpenStruct.new
     config.username = 'timezone'
@@ -40,23 +45,25 @@ class TestGeonames < ::Minitest::Test
   end
 
   def test_lookup
-    mine = lookup(File.open(mock_path + '/lat_lon_coords.txt').read)
+    mine = lookup_file('/lat_lon_coords.txt')
 
     assert_equal 'Australia/Adelaide', mine.lookup(*coordinates)
   end
 
   def test_lookup_with_etc
     etc_data.each do |key, data|
-      body = File.open(mock_path + "/lat_lon_coords_#{key}.txt").read
-      mine = lookup(body) { |c| c.offset_etc_zones = true }
+      mine = lookup_file("/lat_lon_coords_#{key}.txt") do |c|
+        c.offset_etc_zones = true
+      end
 
       assert_equal data[:name], mine.lookup(*data[:coordinates])
     end
   end
 
   def test_wrong_offset
-    body = File.open(mock_path + '/lat_lon_coords_wrong_offset.txt').read
-    mine = lookup(body) { |c| c.offset_etc_zones = true }
+    mine = lookup_file('/lat_lon_coords_wrong_offset.txt') do |c|
+      c.offset_etc_zones = true
+    end
 
     assert_nil mine.lookup(*coordinates)
   end
@@ -80,7 +87,7 @@ class TestGeonames < ::Minitest::Test
   end
 
   def test_api_limit
-    mine = lookup(File.open(mock_path + '/api_limit_reached.json').read)
+    mine = lookup_file('/api_limit_reached.json')
 
     assert_exception(
       mine,
@@ -90,19 +97,19 @@ class TestGeonames < ::Minitest::Test
   end
 
   def test_invalid_latlong
-    mine = lookup(File.open(mock_path + '/invalid_latlong.json').read)
+    mine = lookup_file('/invalid_latlong.json')
 
     assert_exception(mine, 'invalid lat/lng')
   end
 
   def test_no_result_found
-    mine = lookup(File.open(mock_path + '/no_result_found.json').read)
+    mine = lookup_file('/no_result_found.json')
 
     assert_nil(mine.lookup(10, 10))
   end
 
   def test_invalid_parameter
-    mine = lookup(File.open(mock_path + '/invalid_parameter.json').read)
+    mine = lookup_file('/invalid_parameter.json')
 
     assert_exception(mine, 'error parsing parameter')
   end

data/test/timezone/lookup/test_google.rb

@@ -3,6 +3,7 @@
 require 'timezone/lookup/google'
 require 'minitest/autorun'
 require 'timecop'
+require 'ostruct'
 require_relative '../../http_test_client'
 
 class TestGoogle < ::Minitest::Test
@@ -12,6 +13,10 @@ class TestGoogle < ::Minitest::Test
     [-34.92771808058, 138.477041423321]
   end
 
+  def lookup_file(file_name, &block)
+    lookup(File.open(File.join(mock_path, file_name)).read, &block)
+  end
+
   def lookup(body = nil, &_block)
     config = OpenStruct.new
     config.api_key = 'MTIzYWJj'
@@ -33,7 +38,7 @@ class TestGoogle < ::Minitest::Test
   end
 
   def test_google_using_lat_long_coordinates
-    mine = lookup(File.open(mock_path + '/google_lat_lon_coords.txt').read)
+    mine = lookup_file('/google_lat_lon_coords.txt')
 
     assert_equal 'Australia/Adelaide', mine.lookup(*coordinates)
   end
@@ -76,7 +81,7 @@ class TestGoogle < ::Minitest::Test
   end
 
   def test_no_result_found
-    mine = lookup(File.open(mock_path + '/google_no_result_found.json').read)
+    mine = lookup_file('/google_no_result_found.json')
 
     assert_nil(mine.lookup(26.188703, -78.987053))
   end

data/test/timezone/lookup/test_test.rb

@@ -3,6 +3,7 @@
 require 'timezone/lookup/test'
 require 'timezone'
 require 'minitest/autorun'
+require 'ostruct'
 
 class TestTest < ::Minitest::Test
   parallelize_me!

data/test/timezone/test_lookup.rb

@@ -8,7 +8,7 @@ class TestLookup < ::Minitest::Test
     Timezone::Lookup.config(:test)
 
     assert_equal Timezone::Lookup::Test,
-      Timezone::Lookup.lookup.class
+                 Timezone::Lookup.lookup.class
   end
 
   def test_geonames_config
@@ -17,10 +17,10 @@ class TestLookup < ::Minitest::Test
     end
 
     assert_equal Timezone::Lookup::Geonames,
-      Timezone::Lookup.lookup.class
+                 Timezone::Lookup.lookup.class
 
     assert_equal Timezone::NetHTTPClient,
-      Timezone::Lookup.lookup.config.request_handler
+                 Timezone::Lookup.lookup.config.request_handler
   end
 
   def test_google_config
@@ -29,10 +29,10 @@ class TestLookup < ::Minitest::Test
     end
 
     assert_equal Timezone::Lookup::Google,
-      Timezone::Lookup.lookup.class
+                 Timezone::Lookup.lookup.class
 
     assert_equal Timezone::NetHTTPClient,
-      Timezone::Lookup.lookup.config.request_handler
+                 Timezone::Lookup.lookup.config.request_handler
   end
 
   def test_custom_config

data/test/timezone/test_zone.rb

@@ -130,12 +130,12 @@ class TestZone < ::Minitest::Test
 
   # http://www.timeanddate.com/worldclock/clockchange.html?n=2364&year=1940
   def test_historical_time_change_in_hebron
-    local = Time.strptime('1940-05-31T23:59:59 UTC', '%Y-%m-%dT%H:%M:%S %Z')
-    utc = Time.strptime('1940-05-31T21:59:59 UTC', '%Y-%m-%dT%H:%M:%S %Z')
+    local = Time.strptime('1940-06-01T01:59:59 UTC', '%Y-%m-%dT%H:%M:%S %Z')
+    utc = Time.strptime('1940-05-31T23:59:59 UTC', '%Y-%m-%dT%H:%M:%S %Z')
     assert_equal local.to_i, zone('Asia/Hebron').time(utc).to_i
 
-    local = Time.strptime('1940-06-01T01:00:00 UTC', '%Y-%m-%dT%H:%M:%S %Z')
-    utc = Time.strptime('1940-05-31T22:00:00 UTC', '%Y-%m-%dT%H:%M:%S %Z')
+    local = Time.strptime('1940-06-01T03:00:00 UTC', '%Y-%m-%dT%H:%M:%S %Z')
+    utc = Time.strptime('1940-06-01T00:00:00 UTC', '%Y-%m-%dT%H:%M:%S %Z')
     assert_equal local.to_i, zone('Asia/Hebron').time(utc).to_i
   end