ziptz 3.0.18 → 5.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8584f30a48d305cf57165059fdf89bc90ff1169b540b07e4810dd08facf3bb76
-  data.tar.gz: 974d31d4c7ab3f17e7e5bf86d875eca5b29f9d44087a09ae9b83c4694fd68945
+  metadata.gz: 9f1ff0d267b6ba06ee70a99186cd14f8684744f4fd243f56d9b7150117f26cc0
+  data.tar.gz: 407d339f02d80651adc97150bccb8e85cac844f948f3e9e7c2d348e110dfc20c
 SHA512:
-  metadata.gz: e12dbe849abc336a65894be858be518433b97b9b9ac2622581534b7da9078de2f10fe21270dfed58cee58bb7a0f2003f40f86d9d3e1dcf662cad952dd2e41e20
-  data.tar.gz: dd9b487f4a8a868e07c39837732433662879696f12378666d700a69ed561743e47dd5a0bd607b87e381b7abe63ffe6d36ebfba61a7efc848e95fedfd7cf4f0f8
+  metadata.gz: 4724ab134a22f108612b724339343a16f78bfcdad477f378bf6e30154cdb9e2470a6f95964dbabbbfa874253df215a88e93adba6a0e0bcb8a4bc4f6b88eb2e68
+  data.tar.gz: 69242029d2511543b28068cc0045f4de2ee00b00458a834dbcd810b736d75090f8c1fa74e8156f124a4857059b93d4f6ba15174e75d2340aa458062821a089df

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2015-2023 Keith Morrison <keithm@infused.org>
+Copyright (c) 2015-2024 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

@@ -6,13 +6,13 @@
 
 Get time zone, daylight saving time, and base offset for any US ZIP code.
 
-<i>ZIP codes are up to date as of <b>July 2023</b>.</i>
+<i>ZIP codes are up to date as of <b>December 2023</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.x
+* Ruby 3.1.x, 3.2.x, 3.3.x
 
 ## Installation
 
@@ -160,7 +160,7 @@ Time zone names now reflect standard tz-database names.
 
 ## License
 
-  Copyright (c) 2015-2023 Keith Morrison <<keithm@infused.org>>
+  Copyright (c) 2015-2024 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/lib/version.rb

@@ -0,0 +1,3 @@
+class Ziptz
+  VERSION = '5.0.0'.freeze
+end

data/lib/ziptz.rb

@@ -1,37 +1,42 @@
-require 'yaml'
-require 'zlib'
+require 'sqlite3'
+require 'version'
 
 class Ziptz
-  VERSION = '3.0.18'.freeze
-
   def self.instance
     @instance ||= new
   end
 
-  def time_zone_name(zip)
-    tz_info = time_zone_info(zip)
-    return unless tz_info
+  def db
+    @db ||= begin
+      db = SQLite3::Database.open(tz_data_path)
+      db.results_as_hash = true
+      db
+    end
+  end
 
-    tz_info[:tz]
+  def time_zone_name(zip)
+    time_zone_info(zip)&.dig('time_zone')
   end
 
   def time_zone_offset(zip)
-    tz_info = time_zone_info(zip)
-    return unless tz_info
-
-    tzm_info = tzm[tz_info[:tz]]
-    tzm_info[:offset] && tzm_info[:offset].to_i
+    time_zone_info(zip)&.dig('offset')
   end
 
   def time_zone_uses_dst?(zip)
     tz_info = time_zone_info(zip)
     return unless tz_info
 
-    tz_info[:dst]
+    tz_info['observes_dst'] == 1
   end
 
   def zips(tz_name)
-    tz.select { |_, v| v[:tz].downcase == tz_name.downcase }.keys
+    sql = <<-SQL
+      select zip_code
+      from zip_codes
+      where time_zone = ?
+      order by zip_code
+    SQL
+    db.execute(sql, tz_name).map { |row| row['zip_code'] }
   end
 
   def inspect
@@ -40,53 +45,13 @@ class Ziptz
 
   protected
 
-  def tzm
-    @tzm ||= load_tzm_data
-  end
-
-  def lazy_tz
-    @lazy_tz ||= lazy_load_tz_data
-  end
-
-  def tz
-    @tz ||= load_tz_data
-  end
-
   def time_zone_info(zip)
-    if (data = lazy_tz[zip.to_s.slice(0, 5)])
-      _, tz, dst = data.strip.split('|')
-      {tz: tz, dst: dst == '1'}
-    end
-  end
+    return unless zip
 
-  def tzm_data_path
-    File.join(File.dirname(__FILE__), '..', 'data', 'tzm.data')
+    db.get_first_row('select * from zip_codes where zip_code = ? limit 1', zip[0, 5])
   end
 
   def tz_data_path
-    File.join(File.dirname(__FILE__), '..', 'data', 'tz.data')
-  end
-
-  def lazy_load_tz_data
-    uncompressed = Zlib::Inflate.inflate(File.read(tz_data_path, encoding: 'ASCII-8BIT'))
-    uncompressed.each_line.with_object({}) do |line, data|
-      data[line.slice(0, 5)] = line
-    end
-  end
-
-  def load_tz_data
-    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 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
+    File.join(File.dirname(__FILE__), '..', 'data', 'tz.db')
   end
 end

data/spec/ziptz_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 RSpec.describe Ziptz do
-  let(:ziptz) { Ziptz.new }
+  let(:ziptz) { described_class.new }
 
   describe 'when inspected' do
     it 'does not show internal instance variables' do
@@ -27,39 +27,35 @@ RSpec.describe Ziptz do
         expect(ziptz.time_zone_name('xyz')).to be_nil
       end
     end
-  end
-
-  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
+    context 'when nil is passed' do
       it 'returns nil' do
-        expect(ziptz.time_zone_name('xyz')).to be_nil
+        expect(ziptz.time_zone_name(nil)).to be_nil
       end
     end
   end
 
   describe '#time_zone_uses_dst?' do
-    context 'when given a 5-digit zipcode' do
-      it 'returns a boolean' do
+    context 'when given a valid 5-digit zipcode' do
+      it 'returns true' do
         expect(ziptz.time_zone_uses_dst?('97034')).to eq true
+      end
+    end
+
+    context 'when given an invalid 5-digit zipcode' do
+      it 'returns false' do
         expect(ziptz.time_zone_uses_dst?('85004')).to eq false
       end
     end
 
-    context 'when given a 9-digit zipcode' do
-      it 'returns a boolean' do
+    context 'when given a valid 9-digit zipcode' do
+      it 'returns a true' do
         expect(ziptz.time_zone_uses_dst?('97034-1234')).to eq true
+      end
+    end
+
+    context 'when given an invalid 9-digit zipcode' do
+      it 'returns false' do
         expect(ziptz.time_zone_uses_dst?('85004-1234')).to eq false
       end
     end
@@ -74,13 +70,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(-28800)
+        expect(ziptz.time_zone_offset('97034')).to eq(-28_800)
       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(-28800)
+        expect(ziptz.time_zone_offset('97034-1234')).to eq(-28_800)
       end
     end
 
@@ -110,13 +106,13 @@ RSpec.describe Ziptz do
   describe '#instance' do
     context 'when given a 5 digit zip code' do
       it 'matches the behavior of Ziptz.new' do
-        expect(Ziptz.instance.time_zone_name('97034')).to eq ziptz.time_zone_name('97034')
+        expect(described_class.instance.time_zone_name('97034')).to eq ziptz.time_zone_name('97034')
       end
     end
 
     context 'when called twice' do
       it 'returns identical instances' do
-        expect(Ziptz.instance.object_id).to eq Ziptz.instance.object_id
+        expect(described_class.instance.object_id).to eq described_class.instance.object_id
       end
     end
   end

data/ziptz.gemspec

@@ -1,4 +1,6 @@
-require File.expand_path('lib/ziptz')
+lib = File.expand_path('lib', __dir__)
+$LOAD_PATH.unshift lib unless $LOAD_PATH.include?(lib)
+require 'version'
 
 Gem::Specification.new do |s|
   s.name = 'ziptz'
@@ -15,6 +17,7 @@ Gem::Specification.new do |s|
   s.extra_rdoc_files = ['README.md', 'LICENSE']
   s.files = Dir['README.md', 'LICENSE', '{data,lib,spec}/**/*', 'ziptz.gemspec']
   s.require_paths = ['lib']
-  s.required_ruby_version = '>= 2.0.0'
+  s.required_ruby_version = '>= 3.1.0'
   s.metadata['rubygems_mfa_required'] = 'true'
+  s.add_dependency 'sqlite3', '~> 1.6'
 end

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: ziptz
 version: !ruby/object:Gem::Version
-  version: 3.0.18
+  version: 5.0.0
 platform: ruby
 authors:
 - Keith Morrison
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-10-02 00:00:00.000000000 Z
-dependencies: []
+date: 2023-12-28 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: sqlite3
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.6'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.6'
 description: Get timezone info for all 5-digit US zip codes
 email: keithm@infused.org
 executables: []
@@ -21,7 +35,9 @@ files:
 - LICENSE
 - README.md
 - data/tz.data
+- data/tz.db
 - data/tzm.data
+- lib/version.rb
 - lib/ziptz.rb
 - spec/spec_helper.rb
 - spec/ziptz_spec.rb
@@ -40,14 +56,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.0.0
+      version: 3.1.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.10
+rubygems_version: 3.5.3
 signing_key:
 specification_version: 4
 summary: TimeZone info for any 5-digit US zip code