pico_phone 0.3.2 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ab7e3aefeff6473c01d13aeb8498261220e6ac2cef2c517a7e14acfe2967505e
-  data.tar.gz: 9d2f1767ca6582c3dec028fd2f5e742fe6265a28787410c198b6073893866942
+  metadata.gz: 8c2d268e1535faacd152f3253cfc75d422b754709184ea993a9a6b5b00551a4b
+  data.tar.gz: 12852a51f54aa294e5dd9c3bb388e5175b7af96352a0e656ec17fbf52b25dbde
 SHA512:
-  metadata.gz: 7046914f29929ccaaa19508dd1bcf7a2bb7d6a41d691d43c060d24b402337f9a382c7e240c8fd94c2b9949a794024e0ca72745fc53f7f1f17849577be81b1d16
-  data.tar.gz: ee80361ab9897651f638b7990f93b9768c509d458179ced20baea073374c317eb0ab8a363a41251b4703db695fc2ecbf92bca59abb6d7fd2f86c3093e7b0c470
+  metadata.gz: 395c2dcfc9823ae7180b822a2a88b37b2e4fbdd5ef5da84f96a795c585b9aaf2e2e97bd50aa0d2b27261b1f408bf88b5654f6b7c3e6c377fa65a0376c4d1646f
+  data.tar.gz: 7d4c21dc53148a87a564b2f8da1aebded151af3d12b809e00dec99147935853400066c4aee08ecca04eeeb5a10c757bab7a31c01f431461aaeab6bbba244a9cd

data/ext/pico_phone/extconf.rb

@@ -11,14 +11,30 @@ if NATIVE_BUILD
   $INCFLAGS << " -I#{VENDOR_INSTALL}/include"
 
   static_libs = []
+  # geocoding depends on symbols from phonenumber, so it must precede it in
+  # the static link order.
+  static_libs << "#{VENDOR_INSTALL}/lib/libgeocoding.a"
   static_libs << "#{VENDOR_INSTALL}/lib/libphonenumber.a"
   static_libs << "#{VENDOR_INSTALL}/lib/libprotobuf.a"
+  # protobuf's own transitive static deps (UTF-8 validation, upb). Whole-archive
+  # linking (below) force-includes every object in libprotobuf.a, including
+  # members that reference these, so they must be present even though nothing
+  # in our own code calls them directly. libutf8_range and libutf8_validity are
+  # two CMake target names for the exact same compiled object (utf8_range.c.o)
+  # in this protobuf version — link only one, or whole-archive pulls in both
+  # copies and the linker sees duplicate symbols.
+  %w[libutf8_range libupb].each do |lib|
+    path = "#{VENDOR_INSTALL}/lib/#{lib}.a"
+    static_libs << path if File.exist?(path)
+  end
   static_libs += Dir["#{VENDOR_INSTALL}/lib/libabsl_*.a"].sort
 
   if RUBY_PLATFORM.include?("darwin")
     boost_prefix = `brew --prefix boost 2>/dev/null`.strip
     icu_prefix   = `brew --prefix icu4c@78 2>/dev/null`.strip
 
+    $INCFLAGS << " -I#{icu_prefix}/include"
+
     %w[libboost_date_time libboost_thread libboost_atomic].each do |lib|
       static_libs << "#{boost_prefix}/lib/#{lib}.a"
     end
@@ -31,18 +47,37 @@ if NATIVE_BUILD
     # Ubuntu's libicu-dev static archives are not compiled with -fPIC and cannot
     # be linked into a shared object. Link ICU dynamically instead — libicu74 is
     # part of the Ubuntu 24.04 base system and is present in the target environment.
+    # ICU headers (for the geocoder) come from the system libicu-dev package.
     $LOCAL_LIBS << " -licui18n -licuuc -licudata -lpthread -ldl"
   end
 
-  $LOCAL_LIBS << " " + static_libs.join(" ")
+  # Adding the geocoder introduces a circular reference among several small
+  # Abseil static archives (e.g. synchronization <-> log_internal). A plain
+  # left-to-right static link only pulls in archive members that satisfy an
+  # already-outstanding undefined symbol, which for a -bundle target isn't
+  # even validated until dlopen time — so a missing member surfaces as a
+  # runtime "symbol not found in flat namespace" error, not a link failure.
+  # Force-load every member of our own vendored archives so nothing gets
+  # silently dropped.
+  if RUBY_PLATFORM.include?("darwin")
+    $LOCAL_LIBS << " -Wl,-all_load " + static_libs.join(" ")
+  else
+    $LOCAL_LIBS << " -Wl,--whole-archive " + static_libs.join(" ") + " -Wl,--no-whole-archive"
+  end
 
   unless find_header("phonenumbers/phonenumberutil.h")
     abort "Could not find phonenumberutil.h in #{VENDOR_INSTALL}/include — run build_deps.sh first"
   end
+
+  unless find_header("phonenumbers/geocoding/phonenumber_offline_geocoder.h")
+    abort "Could not find the geocoding header in #{VENDOR_INSTALL}/include — run build_deps.sh first"
+  end
 else
   # Dynamic linking against system/Homebrew libraries (default developer workflow).
   if RUBY_PLATFORM.include?("darwin")
-    %w[libphonenumber protobuf abseil].each do |pkg|
+    # icu4c@78 is already a transitive dependency of Homebrew's libphonenumber
+    # formula (which itself ships geocoding), so no extra install step needed.
+    %w[libphonenumber protobuf abseil icu4c@78].each do |pkg|
       prefix = `brew --prefix #{pkg} 2>/dev/null`.strip
       next if prefix.empty?
       $INCFLAGS << " -I#{prefix}/include"
@@ -50,17 +85,26 @@ else
     end
   end
 
-  $LOCAL_LIBS << " -lphonenumber"
+  $LOCAL_LIBS << " -lphonenumber -lgeocoding"
 
   unless find_header("phonenumbers/phonenumberutil.h")
     abort <<~MSG
 
       Could not find libphonenumber. Please install it before installing this gem:
         macOS:  brew install libphonenumber
-        Ubuntu: sudo apt-get install libphonenumber-dev
+        Ubuntu: sudo apt-get install libphonenumber-dev libicu-dev
         Fedora: sudo dnf install libphonenumber-devel
     MSG
   end
+
+  unless find_header("phonenumbers/geocoding/phonenumber_offline_geocoder.h")
+    abort <<~MSG
+
+      Found libphonenumber but not its geocoding headers/library. On Debian/Ubuntu
+      this also needs ICU development headers:
+        sudo apt-get install libphonenumber-dev libicu-dev
+    MSG
+  end
 end
 
 create_makefile("pico_phone/pico_phone")

data/ext/pico_phone/pico_phone.cpp

@@ -7,6 +7,13 @@
 #include <phonenumbers/phonenumberutil.h>
 #include <phonenumbers/shortnumberinfo.h>
 
+// Ruby's regex engine (onigmo.h, pulled in via rice.hpp above) #defines UChar
+// as unsigned char; ICU (pulled in transitively by the geocoding header)
+// typedefs UChar as char16_t. We don't use Ruby's macro, so drop it before
+// any ICU header is reachable.
+#undef UChar
+#include <phonenumbers/geocoding/phonenumber_offline_geocoder.h>
+
 using namespace Rice;
 using namespace i18n::phonenumbers;
 
@@ -190,6 +197,32 @@ static const ShortNumberInfo& GetShortNumberInfo() {
   return instance;
 }
 
+// PhoneNumberOfflineGeocoder lazily loads its area-code-to-description data
+// one (country calling code, language) file at a time on first lookup, and
+// caches each loaded file for the life of this instance -- unlike phonelib's
+// extended data, nothing gets pulled into memory until it's actually queried.
+static const PhoneNumberOfflineGeocoder& GetGeocoder() {
+  static PhoneNumberOfflineGeocoder instance;
+  return instance;
+}
+
+VALUE parsed_number_geo_name(int argc, VALUE *argv, VALUE self) {
+  VALUE language;
+  rb_scan_args(argc, argv, "01", &language);
+
+  std::string language_code = RB_NIL_P(language)
+    ? "en"
+    : std::string(StringValuePtr(language), RSTRING_LEN(language));
+
+  PhoneNumber *phone_number;
+  TypedData_Get_Struct(self, PhoneNumber, &phone_number_type, phone_number);
+
+  Locale locale(language_code.c_str());
+  std::string description = GetGeocoder().GetDescriptionForNumber(*phone_number, locale);
+
+  return rb_str_new(description.c_str(), description.size());
+}
+
 Object pico_phone_is_emergency_number(Object self, String number, String region) {
   return GetShortNumberInfo().IsEmergencyNumber(number.c_str(), region.c_str()) ? Qtrue : Qfalse;
 }
@@ -831,4 +864,5 @@ void Init_pico_phone() {
 
     rb_define_alloc_func(rb_cPhoneNumber, rb_phone_number_alloc);
     rb_define_method(rb_cPhoneNumber, "initialize", reinterpret_cast<VALUE (*)(...)>(phone_number_initialize), -1);
+    rb_define_method(rb_cPhoneNumber, "geo_name", reinterpret_cast<VALUE (*)(...)>(parsed_number_geo_name), -1);
 }

data/lib/pico_phone/phone_number.rb

@@ -155,6 +155,14 @@ module PicoPhone
     # @return [String]
     def local_number; end
 
+    # Text description of the geographic area the number is from (e.g. a city
+    # or region), falling back to the country name when no finer-grained
+    # description is available. Returns an empty string for non-geographical
+    # numbers (e.g. toll-free) or numbers that could not be parsed.
+    # @param language [String] two- or three-letter ISO 639 language code (default: "en")
+    # @return [String]
+    def geo_name(language = "en"); end
+
     # @param region [String] ISO 3166-1 alpha-2 region code
     # @return [Boolean]
     def valid_for_country?(region); end

data/lib/pico_phone/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module PicoPhone
-  VERSION = "0.3.2"
+  VERSION = "0.4.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pico_phone
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.4.0
 platform: ruby
 authors:
 - Gabi Jack
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2026-07-09 00:00:00.000000000 Z
+date: 2026-07-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rice