ziptz 2.1.11 → 3.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 366216ea101a226ef4e1fb3367a2445b21b41a5dd4a06a1732dd0c175c23f580
-  data.tar.gz: d056db4de8cffcc73ad9469b34781dc60b3017b0ddee651d4f048c79e6fde016
+  metadata.gz: e542801fa40a2a225e67c8e7dead718bec94979238e27b64d53578723ce8906e
+  data.tar.gz: c720f121c5bd87726882d86348c707108a329fc492985584c8f04e4b76e732be
 SHA512:
-  metadata.gz: b9e0e80b825e9b70af78828cd94eef615ecb34c0dca3f66e911896dd4537418d695f92bdc828903cbf18b6c68b7c7365bea798201c94c6459c1947ea743a41bf
-  data.tar.gz: 2f3919e30ba1f9eb546d620820329a59f81065a2aaba4c851da0271cda90d3110a8b6e4e2dfc27cfd42756622e9bb29e3cdf90dc6172e9ccbcba9dc15260dad5
+  metadata.gz: 7f0eafc3c80b0c7074f561f1f291ae40591f4e97996943e7ecbdcb9c3c54e6bf67f79141d5b1c92b8aba0c7dce38bf0d493dff39c1c108393edd1d4e26fa636e
+  data.tar.gz: 2cde6491cca2335357f0cab943b5c22b89ffdb38258398d23df891369e0c34f6a6c8a6cc5af6416c808d530ac6e575462bc404c57132677a919fbb97bda2b7fc

data/Gemfile.lock

@@ -1,17 +1,17 @@
 PATH
   remote: .
   specs:
-    ziptz (2.1.11)
+    ziptz (3.0.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (6.0.3.3)
-      activesupport (= 6.0.3.3)
-    activerecord (6.0.3.3)
-      activemodel (= 6.0.3.3)
-      activesupport (= 6.0.3.3)
-    activesupport (6.0.3.3)
+    activemodel (6.0.3.4)
+      activesupport (= 6.0.3.4)
+    activerecord (6.0.3.4)
+      activemodel (= 6.0.3.4)
+      activesupport (= 6.0.3.4)
+    activesupport (6.0.3.4)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
@@ -55,7 +55,7 @@ GEM
       nenv (~> 0.1)
       shellany (~> 0.0)
     parallel (1.19.2)
-    parser (2.7.1.5)
+    parser (2.7.2.0)
       ast (~> 2.4.1)
     pry (0.13.1)
       coderay (~> 1.1)
@@ -65,39 +65,40 @@ GEM
     rb-fsevent (0.10.4)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
-    regexp_parser (1.8.1)
-    reline (0.1.5)
+    regexp_parser (1.8.2)
+    reline (0.1.7)
       io-console (~> 0.5)
     rexml (3.2.4)
-    rspec (3.9.0)
-      rspec-core (~> 3.9.0)
-      rspec-expectations (~> 3.9.0)
-      rspec-mocks (~> 3.9.0)
-    rspec-core (3.9.3)
-      rspec-support (~> 3.9.3)
-    rspec-expectations (3.9.2)
+    rspec (3.10.0)
+      rspec-core (~> 3.10.0)
+      rspec-expectations (~> 3.10.0)
+      rspec-mocks (~> 3.10.0)
+    rspec-core (3.10.0)
+      rspec-support (~> 3.10.0)
+    rspec-expectations (3.10.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.9.0)
-    rspec-mocks (3.9.1)
+      rspec-support (~> 3.10.0)
+    rspec-mocks (3.10.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.9.0)
-    rspec-support (3.9.3)
-    rubocop (0.92.0)
+      rspec-support (~> 3.10.0)
+    rspec-support (3.10.0)
+    rubocop (0.93.1)
       parallel (~> 1.10)
       parser (>= 2.7.1.5)
       rainbow (>= 2.2.2, < 4.0)
-      regexp_parser (>= 1.7)
+      regexp_parser (>= 1.8)
       rexml
-      rubocop-ast (>= 0.5.0)
+      rubocop-ast (>= 0.6.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 2.0)
-    rubocop-ast (0.7.1)
+    rubocop-ast (1.1.0)
       parser (>= 2.7.1.5)
     rubocop-performance (1.8.1)
       rubocop (>= 0.87.0)
       rubocop-ast (>= 0.4.0)
-    rubocop-rspec (1.43.2)
+    rubocop-rspec (1.44.1)
       rubocop (~> 0.87)
+      rubocop-ast (>= 0.7.1)
     ruby-progressbar (1.10.1)
     shellany (0.0.1)
     thor (1.0.1)
@@ -108,7 +109,7 @@ GEM
     tzinfo (1.2.7)
       thread_safe (~> 0.1)
     unicode-display_width (1.7.0)
-    zeitwerk (2.4.0)
+    zeitwerk (2.4.1)
 
 PLATFORMS
   ruby
@@ -130,4 +131,4 @@ DEPENDENCIES
   ziptz!
 
 BUNDLED WITH
-   1.17.3
+   2.1.4

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2015-2020 Keith Morrison <keithm@infused.org>
+Copyright (c) 2015-2021 Keith Morrison <keithm@infused.org>
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.md

@@ -1,12 +1,18 @@
 # Ziptz
 [![Version](http://img.shields.io/gem/v/ziptz.svg?style=flat)](https://rubygems.org/gems/ziptz)
-[![Build Status](http://img.shields.io/travis/infused/ziptz/master.svg?style=flat)](http://travis-ci.org/infused/ziptz)
+[![Build Status](http://img.shields.io/travis/infused/ziptz/master.svg?style=flat)](http://travis-ci.com/infused/ziptz)
 [![Total Downloads](https://img.shields.io/gem/dt/ziptz.svg)](https://rubygems.org/gems/ziptz/)
 [![License](https://img.shields.io/github/license/infused/ziptz.svg)](https://github.com/infused/ziptz)
 
-Get time zone and daylight saving time for any US ZIP code.
+Get time zone, daylight saving time, and base offset for any US ZIP code.
 
-<i>ZIP codes are up to date as of <b>October 2020</b>.</i>
+<i>ZIP codes are up to date as of <b>April 2021</b>.</i>
+
+## Compatibility
+
+Ziptz is tested to work with the following versions of Ruby:
+
+* Ruby 2.3.x, 2.4.x, 2.5.x, 2.6.x, 2.7.x, 3.0.x, and TruffleRuby
 
 ## Installation
 
@@ -24,7 +30,7 @@ Get the time zone name for any ZIP code:
 
 Get the time zone offset for any ZIP code:
 
-    z.time_zone_offset('97213') #=> -8
+    z.time_zone_offset('97213') #=> -28800
 
 <em>Note that offsets do not include daylight saving time.</em>
 
@@ -34,28 +40,106 @@ Determine if the ZIP code uses Daylight Saving Time:
 
 Get all the zip codes in a time zone:
 
-    z.zips('Pacific/Pago_Pago') #=> ["96799", "96941", "96942", "96943", "96944"]
+    z.zips('Pacific/Chuuk') #=> ["96942", "96943"]
 
 
 ## Supported Time Zones
 
-* "America/Puerto_Rico" UTC -04:00
-* "America/New_York" UTC -05:00
-* "America/Chicago" UTC -06:00
-* "America/Denver" UTC -07:00
-* "America/Phoenix" UTC -07:00
-* "America/Los_Angeles" UTC -08:00
-* "America/Anchorage" UTC -09:00
-* "America/Adak" UTC -10:00
-* "Pacific/Honolulu" UTC -10:00
-* "Pacific/Pago_Pago" UTC -11:00
-* "Pacific/Majuro" UTC +12:00
-* "Pacific/Guam" UTC +10:00
-* "Pacific/Palau" UTC +09:00
-* "Pacific/Pohnpei" UTC +11:00
+* America/Adak
+* America/Anchorage
+* America/Boise
+* America/Chicago
+* America/Denver
+* America/Detroit
+* America/Indiana/Indianapolis
+* America/Indiana/Knox
+* America/Indiana/Marengo
+* America/Indiana/Petersburg
+* America/Indiana/Tell_City
+* America/Indiana/Vevay
+* America/Indiana/Vincennes
+* America/Indiana/Winamac
+* America/Juneau
+* America/Kentucky/Louisville
+* America/Kentucky/Monticello
+* America/Los_Angeles
+* America/Menominee
+* America/Metlakatla
+* America/New_York
+* America/Nome
+* America/North_Dakota/Beulah
+* America/North_Dakota/Center
+* America/North_Dakota/New_Salem
+* America/Phoenix
+* America/Puerto_Rico
+* America/Sitka
+* America/St_Thomas
+* America/Yakutat
+* Pacific/Chuuk
+* Pacific/Guam
+* Pacific/Honolulu
+* Pacific/Kosrae
+* Pacific/Kwajalein
+* Pacific/Majuro
+* Pacific/Pago_Pago
+* Pacific/Palau
+* Pacific/Pohnpei
+* Pacific/Saipan
+* Pacific/Wake
 
 <em>Note that APO/FPO zip codes will not return a known time zone offset.</em>
 
+## Prefer raw data?
+
+If you would prefer raw data instead of a gem, see my [ZIP Code Time Zones](https://us-west-2.console.aws.amazon.com/dataexchange/home#/products/prodview-4vcapflqwntdw) product on AWS Data Exchange to subscribe.
+
+## Version 3 breaking changes
+
+* APO, DPO, and FPO zip codes are no longer included, because they are non-geographic.
+* Time zone offsets are now specified in seconds instead of hours.
+* Time zone are now more granular. The full list of time zones is:
+  * America/Adak
+  * America/Anchorage
+  * America/Boise
+  * America/Chicago
+  * America/Denver
+  * America/Detroit
+  * America/Indiana/Indianapolis
+  * America/Indiana/Knox
+  * America/Indiana/Marengo
+  * America/Indiana/Petersburg
+  * America/Indiana/Tell_City
+  * America/Indiana/Vevay
+  * America/Indiana/Vincennes
+  * America/Indiana/Winamac
+  * America/Juneau
+  * America/Kentucky/Louisville
+  * America/Kentucky/Monticello
+  * America/Los_Angeles
+  * America/Menominee
+  * America/Metlakatla
+  * America/New_York
+  * America/Nome
+  * America/North_Dakota/Beulah
+  * America/North_Dakota/Center
+  * America/North_Dakota/New_Salem
+  * America/Phoenix
+  * America/Puerto_Rico
+  * America/Sitka
+  * America/St_Thomas
+  * America/Yakutat
+  * Pacific/Chuuk
+  * Pacific/Guam
+  * Pacific/Honolulu
+  * Pacific/Kosrae
+  * Pacific/Kwajalein
+  * Pacific/Majuro
+  * Pacific/Pago_Pago
+  * Pacific/Palau
+  * Pacific/Pohnpei
+  * Pacific/Saipan
+  * Pacific/Wake
+
 ## Version 2 breaking changes
 
 Time zone names now reflect standard tz-database names.
@@ -76,7 +160,7 @@ Time zone names now reflect standard tz-database names.
 
 ## License
 
-  Copyright (c) 2015-2020 Keith Morrison <<keithm@infused.org>>
+  Copyright (c) 2015-2021 Keith Morrison <<keithm@infused.org>>
 
   Permission is hereby granted, free of charge, to any person
   obtaining a copy of this software and associated documentation

data/Rakefile

@@ -16,9 +16,3 @@ desc 'Open an irb session preloaded with this library'
 task :console do
   sh 'irb -r rubygems -I lib -r ziptz.rb'
 end
-
-desc 'Create ziptz db from zipcodes database'
-task :create_ziptz do
-  require 'zip_code'
-  ZipCode.import
-end

data/data/tzm.data

@@ -0,0 +1,3 @@
+x�uS]O1|���@������G.b4>]ֺrK{��ע�{�z�(�K���vf��I��\L�A��Q��;�4�R,�0�a�p-T0�LZ��J����mL���B.=�ۊw�N��{#��.Μ�+kjX佗�[sth�7oW]�'4����u)<�v]���
+����1T���g���y�w�ޒ17(��#̟�� u1����d<n�2d���a3t4�#�����U��UR��e!֕�����X�2
+���7���s�-`:���OX���� i�������������	�:v�K��Ho	�
����?�o��R&

data/lib/ziptz.rb

@@ -1,41 +1,33 @@
 require 'yaml'
+require 'zlib'
 
 class Ziptz
-  VERSION = '2.1.11'.freeze
-
-  TZ_INFO = {
-    '0' => {name: 'APO/FPO (time zone unknown)', offset: 0},
-    '4' => {name: 'America/Puerto_Rico', offset: -4},
-    '5' => {name: 'America/New_York', offset: -5},
-    '6' => {name: 'America/Chicago', offset: -6},
-    '7' => {name: 'America/Denver', offset: -7},
-    '8' => {name: 'America/Los_Angeles', offset: -8},
-    '9' => {name: 'America/Anchorage', offset: -9},
-    '10' => {name: 'Pacific/Honolulu', offset: -10},
-    '11' => {name: 'Pacific/Pago_Pago', offset: -11},
-    '13' => {name: 'Pacific/Majuro', offset: 12},
-    '14' => {name: 'Pacific/Guam', offset: 10},
-    '15' => {name: 'Pacific/Palau', offset: 9},
-    '16' => {name: 'Pacific/Pohnpei', offset: 11},
-    'AZ' => {name: 'America/Phoenix', offset: -7},
-    'AD' => {name: 'America/Adak', offset: -10}
-  }.freeze
+  VERSION = '3.0.1'.freeze
 
   def time_zone_name(zip)
-    get_time_zone(zip)
+    tz_info = time_zone_info(zip)
+    return unless tz_info
+
+    tz_info[:tz]
   end
 
   def time_zone_offset(zip)
-    tz = time_zone_info(zip)
-    tz && tz[:offset]
+    tz_info = time_zone_info(zip)
+    return unless tz_info
+
+    tzm_info = tzm[tz_info[:tz]]
+    tzm_info[:offset] && tzm_info[:offset].to_i
   end
 
   def time_zone_uses_dst?(zip)
-    dst[zip.to_s.slice(0, 5)]
+    tz_info = time_zone_info(zip)
+    return unless tz_info
+
+    tz_info[:dst]
   end
 
   def zips(tz_name)
-    zips_by_code(tz_name)
+    tz.select { |_, v| v[:tz].downcase == tz_name.downcase }.keys
   end
 
   def inspect
@@ -44,24 +36,20 @@ class Ziptz
 
   protected
 
-  def tz
-    @tz ||= load_tz_data
-  end
-
-  def dst
-    @dst ||= load_dst_data
+  def tzm
+    @tzm ||= load_tzm_data
   end
 
-  def zips_by_code(tz_code)
-    tz.select { |_, v| v.match(/#{tz_code}/i) }.keys.sort
+  def tz
+    @tz ||= load_tz_data
   end
 
   def time_zone_info(zip)
-    TZ_INFO.values.detect { |v| v[:name] == get_time_zone(zip) }
+    tz[zip.to_s.slice(0, 5)]
   end
 
-  def get_time_zone(zip)
-    tz[zip.to_s.slice(0, 5)]
+  def tzm_data_path
+    File.join(File.dirname(__FILE__), '..', 'data', 'tzm.data')
   end
 
   def tz_data_path
@@ -69,20 +57,18 @@ class Ziptz
   end
 
   def load_tz_data
-    File.foreach(tz_data_path).with_object({}) do |line, data|
-      zip, tz = line.strip.split('=')
-      data[zip] = tz
+    uncompressed = Zlib::Inflate.inflate(File.read(tz_data_path, encoding: 'ASCII-8BIT'))
+    uncompressed.each_line.with_object({}) do |line, data|
+      zip, tz, dst = line.strip.split(':')
+      data[zip] = {tz: tz, dst: dst == '1'}
     end
   end
 
-  def dst_data_path
-    File.join(File.dirname(__FILE__), '..', 'data', 'dst.data')
-  end
-
-  def load_dst_data
-    File.foreach(dst_data_path).with_object({}) do |line, data|
-      zip, dst = line.strip.split('=')
-      data[zip] = dst == '1'
+  def load_tzm_data
+    uncompressed = Zlib::Inflate.inflate(File.read(tzm_data_path, encoding: 'ASCII-8BIT'))
+    uncompressed.each_line.with_object({}) do |line, data|
+      tz, offset = line.strip.split(':')
+      data[tz] = {offset: offset}
     end
   end
 end

data/spec/ziptz_spec.rb

@@ -74,13 +74,13 @@ RSpec.describe Ziptz do
   describe '#time_zone_offset' do
     context 'when given a 5-digit zipcode' do
       it 'returns the time zone number' do
-        expect(ziptz.time_zone_offset('97034')).to eq(-8)
+        expect(ziptz.time_zone_offset('97034')).to eq(-28800)
       end
     end
 
     context 'when given a 9-digit zipcode' do
       it 'returns the time zone number' do
-        expect(ziptz.time_zone_offset('97034-1234')).to eq(-8)
+        expect(ziptz.time_zone_offset('97034-1234')).to eq(-28800)
       end
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ziptz
 version: !ruby/object:Gem::Version
-  version: 2.1.11
+  version: 3.0.1
 platform: ruby
 authors:
 - Keith Morrison
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-10-01 00:00:00.000000000 Z
+date: 2021-04-01 00:00:00.000000000 Z
 dependencies: []
 description: Get timezone info for all 5-digit US zip codes
 email: keithm@infused.org
@@ -25,10 +25,9 @@ files:
 - LICENSE
 - README.md
 - Rakefile
-- data/dst.data
 - data/tz.data
+- data/tzm.data
 - database.yml
-- lib/zip_code.rb
 - lib/ziptz.rb
 - spec/spec_helper.rb
 - spec/ziptz_spec.rb
@@ -53,7 +52,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
+rubygems_version: 3.1.4
 signing_key:
 specification_version: 4
 summary: TimeZone info for any 5-digit US zip code