timezone 1.3.20 → 1.3.29

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,10 +2,10 @@
 
 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

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,7 +9,7 @@ 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
 
     # Bookkeeping files that we do not want to parse.
     IGNORE = ['leapseconds', 'posixrules', 'tzdata.zi'].freeze
@@ -25,6 +25,7 @@ module Timezone
         next if File.directory?(file)
         next if file.end_with?('.tab')
         next if IGNORE.include?(File.basename(file))
+
         parse(file)
       end
     end
@@ -65,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
@@ -76,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

data/lib/timezone/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Timezone
-  VERSION = '1.3.20'.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

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/timezone.gemspec

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
-# -*- encoding: utf-8 -*-
 
-$:.push File.expand_path('../lib', __FILE__)
+$:.push File.expand_path('lib', __dir__)
 require 'timezone/version'
 
 Gem::Specification.new do |s|
@@ -16,6 +15,10 @@ Gem::Specification.new do |s|
   s.description = 'Accurate current and historical timezones for Ruby with ' \
     'support for Geonames and Google latitude - longitude lookups.'
 
+  s.metadata =    {
+    'changelog_uri' => 'https://github.com/panthomakos/timezone/blob/master/CHANGES.markdown'
+  }
+
   s.files       = `git ls-files`.split("\n")
   s.test_files  = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables = `git ls-files -- bin/*`
@@ -25,8 +28,12 @@ Gem::Specification.new do |s|
   s.rdoc_options     = ['--charset=UTF-8']
   s.require_paths    = ['lib']
 
+  s.add_runtime_dependency('base64', '~> 0.2')
+  s.add_runtime_dependency('ostruct', '~> 0.6')
+
   s.add_development_dependency('minitest', '~> 5.8')
-  s.add_development_dependency('rake', '~> 12')
-  s.add_development_dependency('rubocop', '= 0.51')
+  s.add_development_dependency('rake', '~> 13')
+  s.add_development_dependency('rubocop', '= 1.5.1')
+  s.add_development_dependency('rubocop-performance', '= 1.5.1')
   s.add_development_dependency('timecop', '~> 0.8')
 end

metadata

@@ -1,15 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: timezone
 version: !ruby/object:Gem::Version
-  version: 1.3.20
+  version: 1.3.29
 platform: ruby
 authors:
 - Pan Thomakos
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-11-01 00:00:00.000000000 Z
+date: 2025-03-23 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: base64
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.2'
+- !ruby/object:Gem::Dependency
+  name: ostruct
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.6'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.6'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -30,28 +58,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12'
+        version: '13'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12'
+        version: '13'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: '0.51'
+        version: 1.5.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.5.1
+- !ruby/object:Gem::Dependency
+  name: rubocop-performance
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.5.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: '0.51'
+        version: 1.5.1
 - !ruby/object:Gem::Dependency
   name: timecop
   requirement: !ruby/object:Gem::Requirement
@@ -76,8 +118,9 @@ extra_rdoc_files:
 - README.markdown
 - License.txt
 files:
+- ".codeclimate.yml"
 - ".editorconfig"
-- ".github/workflows/rake.yml"
+- ".github/workflows/ci.yml"
 - ".gitignore"
 - ".rubocop.yml"
 - CHANGES.markdown
@@ -183,9 +226,11 @@ files:
 - data/America/Cayman
 - data/America/Chicago
 - data/America/Chihuahua
+- data/America/Ciudad_Juarez
 - data/America/Coral_Harbour
 - data/America/Cordoba
 - data/America/Costa_Rica
+- data/America/Coyhaique
 - data/America/Creston
 - data/America/Cuiaba
 - data/America/Curacao
@@ -729,7 +774,8 @@ files:
 homepage: https://github.com/panthomakos/timezone
 licenses:
 - MIT
-metadata: {}
+metadata:
+  changelog_uri: https://github.com/panthomakos/timezone/blob/master/CHANGES.markdown
 post_install_message:
 rdoc_options:
 - "--charset=UTF-8"
@@ -746,10 +792,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.15
+rubygems_version: 3.4.19
 signing_key:
 specification_version: 4
-summary: timezone-1.3.20
+summary: timezone-1.3.29
 test_files:
 - test/data/Helsinki_rules_without_timestamps.json
 - test/data/asia