mini_phone 1.0.2 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 54303715ea62a3242c279007d693c6e50727f63a584bd180ec64b385fd5c5368
-  data.tar.gz: 9fee829e59cdbc304eea3a2e88a86c8e53264e38ab6cde0aaf31261a6dd5d03c
+  metadata.gz: 89fa88b742202101e6bb0204bad2fd20545946a19447d227f61312dd1f9e251c
+  data.tar.gz: 49a1d96d9a61aa00c24b88c7e6d3b51dab2929f9ec12043ce2508fc6af374da2
 SHA512:
-  metadata.gz: 43829b6078b48ac2a5ed3e69662a9c0cd8b3bc42d2b744d9836b080eaa604a8a33486f445ead9506c3663714853b914203811af781ca71a3804c0ca0a358b9b1
-  data.tar.gz: 759f0d9dd79035372a50bc19b049f05d897df905cce531eaf5b71b738cf611d3179e8256c9b072b4c59a05573496d3c721946b7b4d266fe7dab7991169a33719
+  metadata.gz: 5e719bb7cade41a127cd601f06ca5f2529dae2994112c89bf56ace37202230a2c4a3fae7c0738632d78d032cae0f6b7d1e20365a48f57f0ff046bc0241b2f023
+  data.tar.gz: f4ba0f376645bea9b1c25c94f5ba696d744988a1e11a44ff4081af0435165b7a573e24f3101b12dd652add2dccf2e23596bf75ed21b43a5e2fd0a44b1772ef35

data/Dockerfile.dev

@@ -0,0 +1,9 @@
+FROM ruby:2.7-alpine
+
+WORKDiR /app
+
+# RUN apt-get update -y && apt-get install -y valgrind libphonenumber
+RUN apk add --no-cache libphonenumber-dev valgrind git make libffi-dev build-base
+COPY Gemfile Gemfile.lock mini_phone.gemspec ./
+COPY lib/mini_phone/version.rb ./lib/mini_phone/version.rb
+RUN bundle install -j4

data/Gemfile

@@ -7,6 +7,7 @@ gemspec
 
 gem 'rake', require: false
 # https://github.com/rake-compiler/rake-compiler/pull/166
+gem 'get_process_mem', require: false
 gem 'rake-compiler', github: 'larskanis/rake-compiler', branch: 'fix-native-version'
 gem 'rspec', '~> 3.0', require: false
 gem 'rspec-github', require: false

data/README.md

@@ -1,9 +1,9 @@
 # MiniPhone
 
-A Ruby gem which plugs directly in the the Google's native C++
-[libphonenumber](https://github.com/google/libphonenumber) for extemely
+A Ruby gem which plugs directly into Google's native C++
+[libphonenumber](https://github.com/google/libphonenumber) for extremely
 _fast_ and _robust_ phone number parsing, validation, and formatting. On
-average, most methods are 40x t0 50x faster than other Ruby phone number
+average, most methods are 40x to 50x faster than other Ruby phone number
 libraries.
 
 ## Usage
@@ -23,10 +23,12 @@ MiniPhone.default_country = 'US'
 
 phone_number = MiniPhone.parse('404-384-1399')
 
-phone_number.e164          # +14043841399
-phone_number.national      # (404) 384-1399
-phone_number.international # +1 404-384-1399
-phone_number.rfc3966       # tel:+1-404-384-1384
+phone_number.e164                 # +14043841399
+phone_number.national             # (404) 384-1399
+phone_number.raw_national         # 4043841399
+phone_number.dasherized_national  # 404-384-1399
+phone_number.international        # +1 404-384-1399
+phone_number.rfc3966              # tel:+1-404-384-1384
 ```
 
 ### Checking if a phone number is possible
@@ -41,7 +43,7 @@ phone_number.possible? # false
 
 ```ruby
 MiniPhone.parse('+12423570000').type # :mobile
-MiniPhone.parse['+12423651234').type # :fixed_line
+MiniPhone.parse('+12423651234').type # :fixed_line
 ```
 
 The possible types are directly mapped from [this
@@ -65,14 +67,14 @@ enum](https://github.com/google/libphonenumber/blob/4e9954edea7cf263532c5dd3861a
 ## Compatibility with PhoneLib
 
 MiniPhone aims to be compatible with
-[Phonelib](https://github.com/daddyz/phonelib) so in many cases it can be a
-drop in replacement. It has a smaller feature set, so if you need it it not a
-drop in replacement for every use case. If there is a feature you need, open
+[Phonelib](https://github.com/daddyz/phonelib). In many cases it can be a
+drop in replacement. It has a smaller feature set, so it is not a
+replacement for every use case. If there is a feature you need, open
 an issue and we will try to support it.
 
 ## Benchmarks
 
-On average, most methods are 40x t0 50x faster than other libraries. To run
+On average, most methods are 40x to 50x faster than other libraries. To run
 the benchmarks locally, execute: `bundle exec rake bench`
 
 ```
@@ -132,10 +134,10 @@ push git commits and tags, and push the `.gem` file to
 ## Contributing
 
 Bug reports and pull requests are welcome on GitHub at
-https://github.com/[USERNAME]/mini_phone. This project is intended to be a
+https://github.com/ianks/mini_phone. This project is intended to be a
 safe, welcoming space for collaboration, and contributors are expected to
 adhere to the [code of
-conduct](https://github.com/[USERNAME]/mini_phone/blob/master/CODE_OF_CONDUCT.md).
+conduct](https://github.com/ianks/mini_phone/blob/master/CODE_OF_CONDUCT.md).
 
 ## License
 
@@ -146,4 +148,4 @@ License](https://opensource.org/licenses/MIT).
 
 Everyone interacting in the MiniPhone project's codebases, issue trackers,
 chat rooms and mailing lists is expected to follow the [code of
-conduct](https://github.com/[USERNAME]/mini_phone/blob/master/CODE_OF_CONDUCT.md).
+conduct](https://github.com/ianks/mini_phone/blob/master/CODE_OF_CONDUCT.md).

data/Rakefile

@@ -9,7 +9,7 @@ RSpec::Core::RakeTask.new(:spec)
 
 task build: :compile
 
-task default: %i[clobber compile spec]
+task default: %i[clobber compile spec lint]
 
 spec = Gem::Specification.load(File.expand_path('mini_phone.gemspec', __dir__))
 
@@ -28,7 +28,16 @@ task bench: %i[clobber compile] do
   end
 end
 
-task :deploy do
+task :lint do
+  sh 'bundle exec rubocop'
+end
+
+task :format do
+  sh 'bundle exec rubocop -A'
+  sh 'clang-format -i ext/**/*.{h,cc}'
+end
+
+task deploy: :default do
   sh 'code -w ./lib/mini_phone/version.rb'
   version = `ruby -r ./lib/mini_phone/version.rb -e 'print MiniPhone::VERSION'`.strip
   sh "git commit -am 'Bump to v#{version} :confetti_ball:'"
@@ -67,3 +76,21 @@ namespace :publish do
     push_to_github_registry(g)
   end
 end
+
+desc 'Run valgrind test'
+
+namespace :debug do
+  desc 'Plot memory'
+  task :memory do
+    sh 'debug/memory_plot/plot.sh'
+  end
+
+  task :valgrind do
+    sh 'docker build --tag mini_phone_dev -f Dockerfile.dev .'
+    args = '--tool=memcheck --num-callers=15 --partial-loads-ok=yes --undef-value-errors=no'
+    script = 'ruby debug/memory_plot/memory.rb --once'
+    cmd = "docker run -it --rm -v #{Dir.pwd}:/app -w /app mini_phone_dev valgrind #{args} #{script}"
+    puts cmd
+    system cmd
+  end
+end

data/debug/memory_plot/memory.rb

@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+require 'bundler/setup'
+require 'mini_phone'
+require 'get_process_mem'
+
+10.times do
+  GC.start
+  GC.compact
+end
+
+$stdout.sync = true
+
+loop do
+  10_000.times do
+    pn = MiniPhone::PhoneNumber.new('+1 404 388 1299')
+    pn.e164
+    pn.valid?
+    pn.possible?
+    pn.raw_national
+    pn.international
+    pn.country_code
+    pn.area_code
+  end
+
+  4.times { GC.start }
+
+  memory_mb = GetProcessMem.new.mb
+
+  $stdout.puts memory_mb
+
+  break if ARGV.first == '--once'
+end

data/debug/memory_plot/plot.sh

@@ -0,0 +1,6 @@
+#!/bin/bash
+
+set -euo pipefail
+
+bundle exec rake compile
+exec ruby "$(dirname "$0")/memory.rb" | ttyplot

data/ext/mini_phone/mini_phone.cc

@@ -1,28 +1,58 @@
 #include "mini_phone.h"
+#include "phonenumbers/phonemetadata.pb.h"
+#include "phonenumbers/phonenumber.pb.h"
 #include "phonenumbers/phonenumberutil.h"
 
 using namespace ::i18n::phonenumbers;
 
+using google::protobuf::RepeatedPtrField;
+
 static VALUE rb_mMiniPhone;
 
 static VALUE rb_cPhoneNumber;
 
-extern "C" struct PhoneNumberInfo {
-  PhoneNumber phone_number;
-  std::string raw_phone_number;
-  std::string raw_country_code;
+static RepeatedPtrField<NumberFormat> raw_national_format;
+static RepeatedPtrField<NumberFormat> dasherized_national_format;
+
+extern "C" struct PhoneNumberInfo { PhoneNumber *phone_number; };
+
+extern "C" size_t phone_number_info_size(const void *data) { return sizeof(PhoneNumberInfo) + sizeof(PhoneNumber); }
+
+extern "C" void phone_number_info_free(void *data) {
+  PhoneNumberInfo *phone_number_info = static_cast<PhoneNumberInfo *>(data);
+  phone_number_info->phone_number->~PhoneNumber();
+  xfree(phone_number_info->phone_number);
+  phone_number_info->~PhoneNumberInfo();
+  xfree(data);
+}
+
+extern "C" const rb_data_type_t phone_number_info_type = {
+    .wrap_struct_name = "MiniPhone/PhoneNumberInfo",
+    .function =
+        {
+            .dmark = NULL,
+            .dfree = phone_number_info_free,
+            .dsize = phone_number_info_size,
+        },
+    .parent = NULL,
+    .data = NULL,
+    .flags = RUBY_TYPED_FREE_IMMEDIATELY,
 };
 
 static inline VALUE is_phone_number_valid(VALUE self, VALUE str, VALUE cc) {
+  if (NIL_P(str) || NIL_P(cc)) {
+    return Qfalse;
+  }
+
   PhoneNumber parsed_number;
-  PhoneNumberUtil *phone_util = PhoneNumberUtil::GetInstance();
+  const PhoneNumberUtil &phone_util(*PhoneNumberUtil::GetInstance());
 
   std::string phone_number(RSTRING_PTR(str), RSTRING_LEN(str));
   std::string country_code(RSTRING_PTR(cc), RSTRING_LEN(cc));
 
-  auto result = phone_util->ParseAndKeepRawInput(phone_number, country_code, &parsed_number);
+  auto result = phone_util.ParseAndKeepRawInput(phone_number, country_code, &parsed_number);
 
-  if (result == PhoneNumberUtil::NO_PARSING_ERROR && phone_util->IsValidNumber(parsed_number)) {
+  if (result == PhoneNumberUtil::NO_PARSING_ERROR && phone_util.IsValidNumber(parsed_number)) {
     return Qtrue;
   } else {
     return Qfalse;
@@ -35,6 +65,20 @@ extern "C" VALUE rb_is_phone_number_valid(VALUE self, VALUE str) {
   return is_phone_number_valid(self, str, def_cc);
 }
 
+extern "C" VALUE rb_normalize_digits_only(VALUE self, VALUE str) {
+  if (NIL_P(str)) {
+    return Qnil;
+  }
+
+  const PhoneNumberUtil &phone_util(*PhoneNumberUtil::GetInstance());
+
+  std::string phone_number(RSTRING_PTR(str), RSTRING_LEN(str));
+
+  phone_util.NormalizeDigitsOnly(&phone_number);
+
+  return rb_str_new(phone_number.c_str(), phone_number.size());
+}
+
 extern "C" VALUE rb_is_phone_number_valid_for_country(VALUE self, VALUE str, VALUE cc) {
   return is_phone_number_valid(self, str, cc);
 }
@@ -48,16 +92,20 @@ extern "C" VALUE rb_is_phone_number_invalid_for_country(VALUE self, VALUE str, V
 }
 
 extern "C" VALUE rb_is_phone_number_possible(VALUE self, VALUE str) {
+  if (NIL_P(str)) {
+    return Qnil;
+  }
+
   PhoneNumber parsed_number;
-  PhoneNumberUtil *phone_util = PhoneNumberUtil::GetInstance();
+  const PhoneNumberUtil &phone_util(*PhoneNumberUtil::GetInstance());
 
   VALUE def_cc = rb_iv_get(rb_mMiniPhone, "@default_country");
   std::string phone_number(RSTRING_PTR(str), RSTRING_LEN(str));
   std::string country_code(RSTRING_PTR(def_cc), RSTRING_LEN(def_cc));
 
-  auto result = phone_util->Parse(phone_number, country_code, &parsed_number);
+  auto result = phone_util.Parse(phone_number, country_code, &parsed_number);
 
-  if (result == PhoneNumberUtil::NO_PARSING_ERROR && phone_util->IsPossibleNumber(parsed_number)) {
+  if (result == PhoneNumberUtil::NO_PARSING_ERROR && phone_util.IsPossibleNumber(parsed_number)) {
     return Qtrue;
   } else {
     return Qfalse;
@@ -69,27 +117,36 @@ extern "C" VALUE rb_is_phone_number_impossible(VALUE self, VALUE str) {
 }
 
 extern "C" VALUE rb_set_default_country(VALUE self, VALUE str_code) {
+  if (NIL_P(str_code)) {
+    str_code = rb_str_new("ZZ", 2);
+  }
+
   return rb_iv_set(self, "@default_country", str_code);
 }
 
 extern "C" VALUE rb_get_default_country(VALUE self) { return rb_iv_get(self, "@default_country"); }
 
-extern "C" void rb_phone_number_dealloc(PhoneNumberInfo *phone_number_info) { delete phone_number_info; }
-
 extern "C" VALUE rb_phone_number_parse(int argc, VALUE *argv, VALUE self) {
   return rb_class_new_instance(argc, argv, rb_cPhoneNumber);
 }
 
 extern "C" VALUE rb_phone_number_alloc(VALUE self) {
-  PhoneNumberInfo *phone_number_info = new PhoneNumberInfo();
+  void *phone_number_data = ALLOC(PhoneNumber);
+  void *data = ALLOC(PhoneNumberInfo);
+  PhoneNumberInfo *phone_number_info = new (data) PhoneNumberInfo();
+  PhoneNumber *phone_number = new (phone_number_data) PhoneNumber();
+  phone_number_info->phone_number = phone_number;
 
-  /* wrap */
-  return Data_Wrap_Struct(self, NULL, &rb_phone_number_dealloc, phone_number_info);
+  return TypedData_Wrap_Struct(self, &phone_number_info_type, phone_number_info);
 }
 
 static inline VALUE rb_phone_number_nullify_ivars(VALUE self) {
   rb_iv_set(self, "@national", Qnil);
+  rb_iv_set(self, "@raw_national", Qnil);
+  rb_iv_set(self, "@dasherized_national", Qnil);
   rb_iv_set(self, "@international", Qnil);
+  rb_iv_set(self, "@raw_international", Qnil);
+  rb_iv_set(self, "@dasherized_international", Qnil);
   rb_iv_set(self, "@e164", Qnil);
   rb_iv_set(self, "@country_code", Qnil);
   rb_iv_set(self, "@region_code", Qnil);
@@ -97,6 +154,7 @@ static inline VALUE rb_phone_number_nullify_ivars(VALUE self) {
   rb_iv_set(self, "@type", Qnil);
   rb_iv_set(self, "@valid", Qfalse);
   rb_iv_set(self, "@possible", Qfalse);
+  rb_iv_set(self, "@area_code", Qnil);
 
   return Qtrue;
 }
@@ -122,19 +180,19 @@ extern "C" VALUE rb_phone_number_initialize(int argc, VALUE *argv, VALUE self) {
   PhoneNumberInfo *phone_number_info;
   PhoneNumber parsed_number;
 
-  Data_Get_Struct(self, PhoneNumberInfo, phone_number_info);
+  TypedData_Get_Struct(self, PhoneNumberInfo, &phone_number_info_type, phone_number_info);
 
-  PhoneNumberUtil *phone_util = PhoneNumberUtil::GetInstance();
+  const PhoneNumberUtil &phone_util(*PhoneNumberUtil::GetInstance());
 
   std::string phone_number(RSTRING_PTR(str), RSTRING_LEN(str));
   std::string country_code(RSTRING_PTR(def_cc), RSTRING_LEN(def_cc));
 
-  auto result = phone_util->Parse(phone_number, country_code, &parsed_number);
+  auto result = phone_util.Parse(phone_number, country_code, &parsed_number);
 
   if (result != PhoneNumberUtil::NO_PARSING_ERROR) {
     rb_phone_number_nullify_ivars(self);
   } else {
-    phone_number_info->phone_number = parsed_number;
+    phone_number_info->phone_number->Swap(&parsed_number);
   }
 
   return self;
@@ -143,11 +201,11 @@ extern "C" VALUE rb_phone_number_initialize(int argc, VALUE *argv, VALUE self) {
 static inline VALUE rb_phone_number_format(VALUE self, PhoneNumberUtil::PhoneNumberFormat fmt) {
   std::string formatted_number;
   PhoneNumberInfo *phone_number_info;
-  Data_Get_Struct(self, PhoneNumberInfo, phone_number_info);
+  TypedData_Get_Struct(self, PhoneNumberInfo, &phone_number_info_type, phone_number_info);
 
-  PhoneNumberUtil *phone_util = PhoneNumberUtil::GetInstance();
-  PhoneNumber parsed_number = phone_number_info->phone_number;
-  phone_util->Format(parsed_number, fmt, &formatted_number);
+  const PhoneNumberUtil &phone_util(*PhoneNumberUtil::GetInstance());
+  PhoneNumber *parsed_number = phone_number_info->phone_number;
+  phone_util.Format(*parsed_number, fmt, &formatted_number);
 
   return rb_str_new(formatted_number.c_str(), formatted_number.size());
 }
@@ -185,6 +243,78 @@ extern "C" VALUE rb_phone_number_rfc3966(VALUE self) {
   return rb_iv_set(self, "@rfc3966", rb_phone_number_format(self, PhoneNumberUtil::PhoneNumberFormat::RFC3966));
 }
 
+VALUE format_by_pattern_national(VALUE self, RepeatedPtrField<NumberFormat> format) {
+  std::string formatted_number;
+  PhoneNumberInfo *phone_number_info;
+  const PhoneNumberUtil &phone_util(*PhoneNumberUtil::GetInstance());
+  TypedData_Get_Struct(self, PhoneNumberInfo, &phone_number_info_type, phone_number_info);
+
+  phone_util.FormatByPattern(*phone_number_info->phone_number, PhoneNumberUtil::NATIONAL, format, &formatted_number);
+
+  return rb_str_new(formatted_number.c_str(), formatted_number.size());
+}
+
+extern "C" VALUE rb_phone_number_raw_national(VALUE self) {
+  if (rb_ivar_defined(self, rb_intern("@raw_national"))) {
+    return rb_iv_get(self, "@raw_national");
+  }
+
+  VALUE result = format_by_pattern_national(self, raw_national_format);
+
+  return rb_iv_set(self, "@raw_national", result);
+}
+
+extern "C" VALUE rb_phone_number_dasherized_national(VALUE self) {
+  if (rb_ivar_defined(self, rb_intern("@dasherized_national"))) {
+    return rb_iv_get(self, "@dasherized_national");
+  }
+
+  VALUE result = format_by_pattern_national(self, dasherized_national_format);
+
+  return rb_iv_set(self, "@dasherized_national", result);
+}
+
+extern "C" VALUE rb_phone_number_country_code(VALUE self) {
+  if (rb_ivar_defined(self, rb_intern("@country_code"))) {
+    return rb_iv_get(self, "@country_code");
+  }
+
+  PhoneNumberInfo *phone_number_info;
+  TypedData_Get_Struct(self, PhoneNumberInfo, &phone_number_info_type, phone_number_info);
+
+  int code = phone_number_info->phone_number->country_code();
+
+  VALUE result = INT2NUM(code);
+
+  return rb_iv_set(self, "@country_code", result);
+}
+
+extern "C" VALUE rb_phone_number_dasherized_international(VALUE self) {
+  if (rb_ivar_defined(self, rb_intern("@dasherized_international"))) {
+    return rb_iv_get(self, "@dasherized_international");
+  }
+
+  VALUE national = rb_phone_number_dasherized_national(self);
+  VALUE cc = rb_fix2str(rb_phone_number_country_code(self), 10);
+  VALUE dash = rb_str_new("-", 1);
+  VALUE prefix = rb_str_concat(cc, dash);
+  VALUE result = rb_str_concat(prefix, national);
+
+  return rb_iv_set(self, "@dasherized_international", result);
+}
+
+extern "C" VALUE rb_phone_number_raw_international(VALUE self) {
+  if (rb_ivar_defined(self, rb_intern("@raw_international"))) {
+    return rb_iv_get(self, "@raw_international");
+  }
+
+  VALUE national = rb_phone_number_raw_national(self);
+  VALUE cc = rb_fix2str(rb_phone_number_country_code(self), 10);
+  VALUE result = rb_str_concat(cc, national);
+
+  return rb_iv_set(self, "@raw_international", result);
+}
+
 extern "C" VALUE rb_phone_number_valid_eh(VALUE self) {
   if (rb_ivar_defined(self, rb_intern("@valid"))) {
     return rb_iv_get(self, "@valid");
@@ -192,11 +322,11 @@ extern "C" VALUE rb_phone_number_valid_eh(VALUE self) {
 
   std::string formatted_number;
   PhoneNumberInfo *phone_number_info;
-  Data_Get_Struct(self, PhoneNumberInfo, phone_number_info);
+  TypedData_Get_Struct(self, PhoneNumberInfo, &phone_number_info_type, phone_number_info);
 
-  PhoneNumberUtil *phone_util = PhoneNumberUtil::GetInstance();
+  const PhoneNumberUtil &phone_util(*PhoneNumberUtil::GetInstance());
 
-  if (phone_util->IsValidNumber(phone_number_info->phone_number)) {
+  if (phone_util.IsValidNumber(*phone_number_info->phone_number)) {
     return rb_iv_set(self, "@valid", Qtrue);
   } else {
     return rb_iv_set(self, "@valid", Qfalse);
@@ -214,11 +344,11 @@ extern "C" VALUE rb_phone_number_possible_eh(VALUE self) {
 
   std::string formatted_number;
   PhoneNumberInfo *phone_number_info;
-  Data_Get_Struct(self, PhoneNumberInfo, phone_number_info);
+  TypedData_Get_Struct(self, PhoneNumberInfo, &phone_number_info_type, phone_number_info);
 
-  PhoneNumberUtil *phone_util = PhoneNumberUtil::GetInstance();
+  const PhoneNumberUtil &phone_util(*PhoneNumberUtil::GetInstance());
 
-  if (phone_util->IsPossibleNumber(phone_number_info->phone_number)) {
+  if (phone_util.IsPossibleNumber(*phone_number_info->phone_number)) {
     return rb_iv_set(self, "@possible", Qtrue);
   } else {
     return rb_iv_set(self, "@possible", Qfalse);
@@ -236,44 +366,30 @@ extern "C" VALUE rb_phone_number_region_code(VALUE self) {
 
   PhoneNumberInfo *phone_number_info;
   std::string code;
-  Data_Get_Struct(self, PhoneNumberInfo, phone_number_info);
-  PhoneNumberUtil *phone_util = PhoneNumberUtil::GetInstance();
+  TypedData_Get_Struct(self, PhoneNumberInfo, &phone_number_info_type, phone_number_info);
+  const PhoneNumberUtil &phone_util(*PhoneNumberUtil::GetInstance());
 
-  phone_util->GetRegionCodeForCountryCode(phone_number_info->phone_number.country_code(), &code);
+  phone_util.GetRegionCodeForCountryCode(phone_number_info->phone_number->country_code(), &code);
 
   VALUE result = rb_str_new(code.c_str(), code.size());
 
   return rb_iv_set(self, "@region_code", result);
 }
 
-extern "C" VALUE rb_phone_number_country_code(VALUE self) {
-  if (rb_ivar_defined(self, rb_intern("@country_code"))) {
-    return rb_iv_get(self, "@country_code");
-  }
-
-  PhoneNumberInfo *phone_number_info;
-  Data_Get_Struct(self, PhoneNumberInfo, phone_number_info);
-
-  int code = phone_number_info->phone_number.country_code();
-
-  VALUE result = INT2NUM(code);
-
-  return rb_iv_set(self, "@country_code", result);
-}
-
 extern "C" VALUE rb_phone_number_eql_eh(VALUE self, VALUE other) {
   if (!rb_obj_is_instance_of(other, rb_cPhoneNumber)) {
     return Qfalse;
   }
 
-  PhoneNumberUtil *phone_util = PhoneNumberUtil::GetInstance();
+  const PhoneNumberUtil &phone_util(*PhoneNumberUtil::GetInstance());
 
   PhoneNumberInfo *self_phone_number_info;
-  Data_Get_Struct(self, PhoneNumberInfo, self_phone_number_info);
+  TypedData_Get_Struct(self, PhoneNumberInfo, &phone_number_info_type, self_phone_number_info);
 
   PhoneNumberInfo *other_phone_number_info;
-  Data_Get_Struct(other, PhoneNumberInfo, other_phone_number_info);
-  if (phone_util->IsNumberMatch(other_phone_number_info->phone_number, self_phone_number_info->phone_number)) {
+  TypedData_Get_Struct(other, PhoneNumberInfo, &phone_number_info_type, other_phone_number_info);
+
+  if (phone_util.IsNumberMatch(*other_phone_number_info->phone_number, *self_phone_number_info->phone_number)) {
     return Qtrue;
   } else {
     return Qfalse;
@@ -286,14 +402,14 @@ extern "C" VALUE rb_phone_number_type(VALUE self) {
   }
 
   PhoneNumberInfo *phone_number_info;
-  Data_Get_Struct(self, PhoneNumberInfo, phone_number_info);
-  PhoneNumberUtil *phone_util = PhoneNumberUtil::GetInstance();
+  TypedData_Get_Struct(self, PhoneNumberInfo, &phone_number_info_type, phone_number_info);
+  const PhoneNumberUtil &phone_util(*PhoneNumberUtil::GetInstance());
 
   VALUE result;
 
   // @see
   // https://github.com/google/libphonenumber/blob/4e9954edea7cf263532c5dd3861a801104c3f012/cpp/src/phonenumbers/phonenumberutil.h#L91
-  switch (phone_util->GetNumberType(phone_number_info->phone_number)) {
+  switch (phone_util.GetNumberType(*phone_number_info->phone_number)) {
   case PhoneNumberUtil::PREMIUM_RATE:
     result = rb_intern("premium_rate");
     break;
@@ -335,7 +451,50 @@ extern "C" VALUE rb_phone_number_type(VALUE self) {
   return rb_iv_set(self, "@type", ID2SYM(result));
 }
 
+extern "C" VALUE rb_phone_number_area_code(VALUE self) {
+  if (rb_ivar_defined(self, rb_intern("@area_code"))) {
+    return rb_iv_get(self, "@area_code");
+  }
+
+  const PhoneNumberUtil &phone_util(*PhoneNumberUtil::GetInstance());
+  PhoneNumberInfo *phone_number_info;
+  TypedData_Get_Struct(self, PhoneNumberInfo, &phone_number_info_type, phone_number_info);
+
+  PhoneNumber *number = phone_number_info->phone_number;
+  string national_significant_number;
+  phone_util.GetNationalSignificantNumber(*number, &national_significant_number);
+  string area_code;
+  string subscriber_number;
+
+  int area_code_length = phone_util.GetLengthOfGeographicalAreaCode(*number);
+  if (area_code_length > 0) {
+    area_code = national_significant_number.substr(0, area_code_length);
+    subscriber_number = national_significant_number.substr(area_code_length, string::npos);
+  } else {
+    area_code = "";
+    subscriber_number = national_significant_number;
+  }
+
+  VALUE result = rb_str_new(area_code.c_str(), area_code.size());
+
+  return rb_iv_set(self, "@area_code", result);
+}
+
+static inline void setup_formats() {
+  // Raw
+  NumberFormat *raw_fmt = raw_national_format.Add();
+  raw_fmt->set_pattern("(\\d{3})(\\d{3})(\\d{4})");
+  raw_fmt->set_format("$1$2$3");
+
+  // Dasherized
+  NumberFormat *dsh_fmt = dasherized_national_format.Add();
+  dsh_fmt->set_pattern("(\\d{3})(\\d{3})(\\d{4})");
+  dsh_fmt->set_format("$1-$2-$3");
+}
+
 extern "C" void Init_mini_phone(void) {
+  setup_formats();
+
   rb_mMiniPhone = rb_define_module("MiniPhone");
 
   // Unknown
@@ -350,11 +509,13 @@ extern "C" void Init_mini_phone(void) {
   rb_define_module_function(rb_mMiniPhone, "possible?", reinterpret_cast<VALUE (*)(...)>(rb_is_phone_number_valid), 1);
   rb_define_module_function(rb_mMiniPhone, "impossible?", reinterpret_cast<VALUE (*)(...)>(rb_is_phone_number_invalid),
                             1);
-  rb_define_module_function(rb_mMiniPhone,
-                            "default_country=", reinterpret_cast<VALUE (*)(...)>(rb_set_default_country), 1);
-  rb_define_module_function(rb_mMiniPhone, "default_country",
-                            reinterpret_cast<VALUE (*)(...)>(rb_get_default_country), 0);
+  rb_define_module_function(rb_mMiniPhone, "default_country=", reinterpret_cast<VALUE (*)(...)>(rb_set_default_country),
+                            1);
+  rb_define_module_function(rb_mMiniPhone, "default_country", reinterpret_cast<VALUE (*)(...)>(rb_get_default_country),
+                            0);
   rb_define_module_function(rb_mMiniPhone, "parse", reinterpret_cast<VALUE (*)(...)>(rb_phone_number_parse), -1);
+  rb_define_module_function(rb_mMiniPhone, "normalize_digits_only",
+                            reinterpret_cast<VALUE (*)(...)>(rb_normalize_digits_only), 1);
 
   rb_cPhoneNumber = rb_define_class_under(rb_mMiniPhone, "PhoneNumber", rb_cObject);
 
@@ -367,11 +528,21 @@ extern "C" void Init_mini_phone(void) {
   rb_define_method(rb_cPhoneNumber, "impossible?", reinterpret_cast<VALUE (*)(...)>(rb_phone_number_impossible_eh), 0);
   rb_define_method(rb_cPhoneNumber, "e164", reinterpret_cast<VALUE (*)(...)>(rb_phone_number_e164), 0);
   rb_define_method(rb_cPhoneNumber, "national", reinterpret_cast<VALUE (*)(...)>(rb_phone_number_national), 0);
+
+  rb_define_method(rb_cPhoneNumber, "raw_national", reinterpret_cast<VALUE (*)(...)>(rb_phone_number_raw_national), 0);
+  rb_define_method(rb_cPhoneNumber, "raw_international",
+                   reinterpret_cast<VALUE (*)(...)>(rb_phone_number_raw_international), 0);
+  rb_define_method(rb_cPhoneNumber, "dasherized_international",
+                   reinterpret_cast<VALUE (*)(...)>(rb_phone_number_dasherized_international), 0);
+  rb_define_method(rb_cPhoneNumber, "dasherized_national",
+                   reinterpret_cast<VALUE (*)(...)>(rb_phone_number_dasherized_national), 0);
   rb_define_method(rb_cPhoneNumber, "international", reinterpret_cast<VALUE (*)(...)>(rb_phone_number_international),
                    0);
   rb_define_method(rb_cPhoneNumber, "rfc3966", reinterpret_cast<VALUE (*)(...)>(rb_phone_number_rfc3966), 0);
   rb_define_method(rb_cPhoneNumber, "region_code", reinterpret_cast<VALUE (*)(...)>(rb_phone_number_region_code), 0);
+  rb_define_method(rb_cPhoneNumber, "country", reinterpret_cast<VALUE (*)(...)>(rb_phone_number_region_code), 0);
   rb_define_method(rb_cPhoneNumber, "country_code", reinterpret_cast<VALUE (*)(...)>(rb_phone_number_country_code), 0);
   rb_define_method(rb_cPhoneNumber, "type", reinterpret_cast<VALUE (*)(...)>(rb_phone_number_type), 0);
+  rb_define_method(rb_cPhoneNumber, "area_code", reinterpret_cast<VALUE (*)(...)>(rb_phone_number_area_code), 0);
   rb_define_method(rb_cPhoneNumber, "eql?", reinterpret_cast<VALUE (*)(...)>(rb_phone_number_eql_eh), 1);
 }

data/lib/mini_phone/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module MiniPhone
-  VERSION = '1.0.2'
+  VERSION = '1.1.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mini_phone
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.1.0
 platform: ruby
 authors:
 - Ian Ker-Seymer
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-01-08 00:00:00.000000000 Z
+date: 2021-01-16 00:00:00.000000000 Z
 dependencies: []
 description: Plugs directly in the the Google's native C++ [libphonenumber](https://github.com/google/libphonenumber)
   for extemely _fast_ and _robust_ phone number parsing, validation, and formatting.
@@ -22,10 +22,13 @@ extra_rdoc_files: []
 files:
 - CHANGELOG.md
 - CODE_OF_CONDUCT.md
+- Dockerfile.dev
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
+- debug/memory_plot/memory.rb
+- debug/memory_plot/plot.sh
 - ext/mini_phone/extconf.rb
 - ext/mini_phone/mini_phone.cc
 - ext/mini_phone/mini_phone.h