ziptz 3.0.18 → 4.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8584f30a48d305cf57165059fdf89bc90ff1169b540b07e4810dd08facf3bb76
-  data.tar.gz: 974d31d4c7ab3f17e7e5bf86d875eca5b29f9d44087a09ae9b83c4694fd68945
+  metadata.gz: 0d3cd4dde0a56133d9db0798f044077335652c0dfcf16dbbbf4a09f1a47230bc
+  data.tar.gz: 20d18826c8007c4d15b418902cc467bb93e29eddf565f3a1776623dedb481fb7
 SHA512:
-  metadata.gz: e12dbe849abc336a65894be858be518433b97b9b9ac2622581534b7da9078de2f10fe21270dfed58cee58bb7a0f2003f40f86d9d3e1dcf662cad952dd2e41e20
-  data.tar.gz: dd9b487f4a8a868e07c39837732433662879696f12378666d700a69ed561743e47dd5a0bd607b87e381b7abe63ffe6d36ebfba61a7efc848e95fedfd7cf4f0f8
+  metadata.gz: b23fb49a49a372b949e6fe31af147999f241a706744654613c576d00c2e9c4f1d65bf50c9d0224089479a6361096a6c77bcd1b54ff21d341365606bcd9db0f95
+  data.tar.gz: aff97067607af0b0d3aff3313761cea8e38dbabf89545eeae0b45da826e7aa794dff58245353ec8885d8dfb823242eb99d27196ffe326bf149ef2c6456060d25

data/README.md

@@ -6,7 +6,7 @@
 
 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
 

data/lib/version.rb

@@ -0,0 +1,3 @@
+class Ziptz
+  VERSION = '4.0.1'.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,11 @@ 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
-
-  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/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'
@@ -17,4 +19,5 @@ Gem::Specification.new do |s|
   s.require_paths = ['lib']
   s.required_ruby_version = '>= 2.0.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: 4.0.1
 platform: ruby
 authors:
 - Keith Morrison
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-10-02 00:00:00.000000000 Z
-dependencies: []
+date: 2023-12-04 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
@@ -47,7 +63,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.10
+rubygems_version: 3.4.21
 signing_key:
 specification_version: 4
 summary: TimeZone info for any 5-digit US zip code