ziptz 2.0.17 → 2.1.0

data/lib/zip_code.rb

@@ -0,0 +1,68 @@
+require 'active_record'
+require 'tty-spinner'
+require 'yaml'
+require 'ziptz'
+
+class ZipCode < ActiveRecord::Base
+  self.table_name = 'ZIPCodes'
+  self.primary_key = 'ZipCode'
+  establish_connection YAML.safe_load(File.open('database.yml'))
+
+  alias_attribute :day_light_saving, :DayLightSaving
+  alias_attribute :state, :State
+  alias_attribute :time_zone, :TimeZone
+  alias_attribute :zip_code, :ZipCode
+
+  def self.import
+    spinner = TTY::Spinner.new('[:spinner] Retrieving zip codes from database')
+    spinner.auto_spin
+
+    spinner = TTY::Spinner.new('[:spinner] :message')
+    spinner.update message: 'Retrieving zip codes from database'
+    data = {}
+    ZipCode.find_each do |zip|
+      next if zip.time_zone.blank? || zip.day_light_saving.blank?
+
+      data[zip.zip_code] ||= {}
+      data[zip.zip_code][:tz] ||= begin
+        if zip.state == 'AZ' && zip.day_light_saving == 'N'
+          'America/Phoenix'
+        elsif zip.state == 'AK' && zip.time_zone == '10'
+          'America/Adak'
+        else
+          Ziptz::TZ_INFO[zip.time_zone][:name]
+        end
+      end
+      data[zip.zip_code][:dst] ||= zip.day_light_saving
+    end
+    spinner.update message: "Retrieving zip codes from database (#{data.size} records)"
+    spinner.success
+
+    spinner = TTY::Spinner.new('[:spinner] :message')
+    spinner.update message: 'Writing tz.data'
+    spinner.auto_spin
+    lines = data.map { |k, v| "#{k}=#{v[:tz]}" }
+    lines.sort!
+    File.open('data/tz.data', 'w') do |f|
+      lines.each { |line| f.puts line }
+    end
+    spinner.update message: "Writing tz.data (#{File.size('data/tz.data')} bytes)"
+    spinner.success
+    # puts File.size('data/tz.data').to_s
+
+    spinner = TTY::Spinner.new('[:spinner] :message')
+    spinner.update message: 'Writing dst.data'
+    spinner.auto_spin
+    lines = data.map { |k, v| "#{k}=#{v[:dst] =~ /y/i ? 1 : 0}" }
+    lines.sort!
+
+    File.open('data/dst.data', 'w') do |f|
+      lines.each { |line| f.puts line }
+    end
+    spinner.update message: "Writing dst.data (#{File.size('data/dst.data')} bytes)"
+    spinner.success
+  rescue StandardError
+    spinner && spinner.error
+    raise
+  end
+end

data/lib/ziptz.rb

@@ -1,7 +1,7 @@
 require 'yaml'
 
 class Ziptz
-  VERSION = '2.0.17'.freeze
+  VERSION = '2.1.0'.freeze
 
   TZ_INFO = {
     '0' => {name: 'APO/FPO (time zone unknown)', offset: 0},
@@ -16,12 +16,13 @@ class Ziptz
     '13' => {name: 'Pacific/Majuro', offset: 12},
     '14' => {name: 'Pacific/Guam', offset: 10},
     '15' => {name: 'Pacific/Palau', offset: 9},
-    '16' => {name: 'Pacific/Pohnpei', offset: 11}
+    '16' => {name: 'Pacific/Pohnpei', offset: 11},
+    'AZ' => {name: 'America/Phoenix', offset: -7},
+    'AD' => {name: 'America/Adak', offset: -10}
   }.freeze
 
   def time_zone_name(zip)
-    hash = time_zone_info(zip)
-    hash && hash[:name]
+    get_time_zone(zip)
   end
 
   def time_zone_offset(zip)
@@ -34,8 +35,7 @@ class Ziptz
   end
 
   def zips(tz_name)
-    tz_code = tz_name_to_code[tz_name.downcase]
-    tz_code && zips_by_code(tz_code)
+    zips_by_code(tz_name)
   end
 
   def inspect
@@ -53,24 +53,17 @@ class Ziptz
   end
 
   def zips_by_code(tz_code)
-    tz.select { |_, v| v == tz_code.to_s }.keys.sort
+    tz.select { |_, v| v.match /#{tz_code}/i }.keys.sort
   end
 
   def time_zone_info(zip)
-    TZ_INFO[get_time_zone(zip)]
+    TZ_INFO.values.detect { |v| v[:name] == get_time_zone(zip) }
   end
 
   def get_time_zone(zip)
     tz[zip.to_s.slice(0, 5)]
   end
 
-  def tz_name_to_code
-    @tz_name_to_code ||= TZ_INFO.each_with_object({}) do |(code, tz), data|
-      name = tz[:name].downcase
-      data[name] = code
-    end
-  end
-
   def tz_data_path
     File.join(File.dirname(__FILE__), '..', 'data', 'tz.data')
   end

data/spec/ziptz_spec.rb

@@ -29,15 +29,27 @@ RSpec.describe Ziptz do
     end
   end
 
-  describe '#time_zone_uses_dst?' do
+  describe '#time_zone_name' do
     context 'when given a 5-digit zipcode' do
       it 'returns the time zone number' do
         expect(ziptz.time_zone_name('97034')).to eq 'America/Los_Angeles'
       end
     end
+
+    context 'when given a 9-digit zipcode' do
+      it 'returns the time zone number' do
+        expect(ziptz.time_zone_name('97034-1234')).to eq 'America/Los_Angeles'
+      end
+    end
+
+    context 'when there is no matching zipcode' do
+      it 'returns nil' do
+        expect(ziptz.time_zone_name('xyz')).to be_nil
+      end
+    end
   end
 
-  describe '#time_zone_offset' do
+  describe '#time_zone_uses_dst?' do
     context 'when given a 5-digit zipcode' do
       it 'returns a boolean' do
         expect(ziptz.time_zone_uses_dst?('97034')).to eq true
@@ -52,6 +64,26 @@ RSpec.describe Ziptz do
       end
     end
 
+    context 'when there is no matching zipcode' do
+      it 'returns nil' do
+        expect(ziptz.time_zone_uses_dst?('xyz')).to be_nil
+      end
+    end
+  end
+
+  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)
+      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)
+      end
+    end
+
     context 'when there is no matching zipcode' do
       it 'returns nil' do
         expect(ziptz.time_zone_offset('xyz')).to be_nil
@@ -69,8 +101,8 @@ RSpec.describe Ziptz do
         expect(ziptz.zips('pacific/pago_pago')).to eq %w[96799]
       end
 
-      it 'returns nil for unknown time zones' do
-        expect(ziptz.zips('Glark')).to be_nil
+      it 'returns empty array for unknown time zones' do
+        expect(ziptz.zips('Glark')).to be_empty
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ziptz
 version: !ruby/object:Gem::Version
-  version: 2.0.17
+  version: 2.1.0
 platform: ruby
 authors:
 - Keith Morrison
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-02 00:00:00.000000000 Z
+date: 2019-10-22 00:00:00.000000000 Z
 dependencies: []
 description: Get timezone info for all 5-digit US zip codes
 email: keithm@infused.org
@@ -27,6 +27,7 @@ files:
 - Rakefile
 - data/dst.data
 - data/tz.data
+- lib/zip_code.rb
 - lib/ziptz.rb
 - spec/spec_helper.rb
 - spec/ziptz_spec.rb