mini_phone 1.0.1 → 1.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d580b7173d240a4922cdee2385d61330427a60de326d3438b8746aa2656b4946
-  data.tar.gz: ed18b90ce3412d534e80703b9f95574a629fd9a214ec38476424a23a38cebeb5
+  metadata.gz: 4f7c87533de0643b9af5d9394d62a238208c34fa34e16effbb9064e9fd3578d7
+  data.tar.gz: 5868d8b76184925da0ba875fa0a5df7c3bb61f920b51f5d9391fd2d742335ddc
 SHA512:
-  metadata.gz: b0b758fce7c61229b6dd32c24f62cec09d972c16a1db73531e4ed504fe6275a35aaa7dae0c9d1d38c918bdbfd741189b85f1f4b6b589460be69404cc0662787b
-  data.tar.gz: 9d9fb2335ff906834231c7dd23669a6faf9550ec9419d8473933d92d4c12d4f2d751b8f12358be77e204889126f9962236f6c0c60cf7c1c7b5cbe4cc6bc9fe84
+  metadata.gz: 6bdb02eee2405855e49defd3e27d9eccd8934ec1bc1c02977b69d17026d32500969b443b053b1eece4ca7f72294a2d57349c19cfe14f6993c02dab6d21ec9d21
+  data.tar.gz: e57f59c8c2b75a1e4983d8a7fc3941fa1c641bd1c55eb13185bc9c8b35347b39a3ce301e65e021887f5bfc403ee8b0b5e5bad60d20e3604900418c0b6d46511e

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:'"
@@ -63,11 +72,7 @@ namespace :publish do
   task non_native: [:gem] do
     g = "./pkg/mini_phone-#{MiniPhone::VERSION}.gem"
 
-    results = []
-
-    results << push_to_rubygems(g)
-    results << push_to_github_registry(g)
-
-    abort if results.all? { |r| r == true }
+    push_to_rubygems(g)
+    push_to_github_registry(g)
   end
 end

data/ext/mini_phone/mini_phone.cc

@@ -1,12 +1,19 @@
 #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;
 
+static RepeatedPtrField<NumberFormat> raw_national_format;
+static RepeatedPtrField<NumberFormat> dasherized_national_format;
+
 extern "C" struct PhoneNumberInfo {
   PhoneNumber phone_number;
   std::string raw_phone_number;
@@ -14,15 +21,19 @@ extern "C" struct PhoneNumberInfo {
 };
 
 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 +46,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 +73,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,6 +98,10 @@ 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);
 }
 
@@ -89,7 +122,11 @@ extern "C" VALUE rb_phone_number_alloc(VALUE self) {
 
 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 +134,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;
 }
@@ -124,12 +162,12 @@ extern "C" VALUE rb_phone_number_initialize(int argc, VALUE *argv, VALUE self) {
 
   Data_Get_Struct(self, PhoneNumberInfo, 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);
@@ -145,9 +183,9 @@ static inline VALUE rb_phone_number_format(VALUE self, PhoneNumberUtil::PhoneNum
   PhoneNumberInfo *phone_number_info;
   Data_Get_Struct(self, PhoneNumberInfo, phone_number_info);
 
-  PhoneNumberUtil *phone_util = PhoneNumberUtil::GetInstance();
+  const PhoneNumberUtil &phone_util(*PhoneNumberUtil::GetInstance());
   PhoneNumber parsed_number = phone_number_info->phone_number;
-  phone_util->Format(parsed_number, fmt, &formatted_number);
+  phone_util.Format(parsed_number, fmt, &formatted_number);
 
   return rb_str_new(formatted_number.c_str(), formatted_number.size());
 }
@@ -185,6 +223,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());
+  Data_Get_Struct(self, PhoneNumberInfo, 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;
+  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_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");
@@ -194,9 +304,9 @@ extern "C" VALUE rb_phone_number_valid_eh(VALUE self) {
   PhoneNumberInfo *phone_number_info;
   Data_Get_Struct(self, PhoneNumberInfo, 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);
@@ -216,9 +326,9 @@ extern "C" VALUE rb_phone_number_possible_eh(VALUE self) {
   PhoneNumberInfo *phone_number_info;
   Data_Get_Struct(self, PhoneNumberInfo, 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);
@@ -237,43 +347,28 @@ 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();
+  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);
 
   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)) {
+  if (phone_util.IsNumberMatch(other_phone_number_info->phone_number, self_phone_number_info->phone_number)) {
     return Qtrue;
   } else {
     return Qfalse;
@@ -287,13 +382,13 @@ 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();
+  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 +430,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;
+  Data_Get_Struct(self, PhoneNumberInfo, 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 +488,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 +507,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.1'
+  VERSION = '1.0.6'
 end

data/mini_phone.gemspec

@@ -27,7 +27,10 @@ Gem::Specification.new do |spec|
   # Specify which files should be added to the gem when it is released.
   # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
   spec.files = Dir.chdir(File.expand_path(__dir__)) do
-    `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(bin|spec|bench)/}) }
+    `git ls-files -z`
+      .split("\x0")
+      .reject { |f| f.match(%r{^(bin|spec|bench)/}) }
+      .reject { |f| f.start_with?('.') }
   end
   spec.bindir        = 'exe'
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mini_phone
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.6
 platform: ruby
 authors:
 - Ian Ker-Seymer
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-01-08 00:00:00.000000000 Z
+date: 2021-01-11 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.
@@ -20,13 +20,6 @@ extensions:
 - ext/mini_phone/extconf.rb
 extra_rdoc_files: []
 files:
-- ".clang-format"
-- ".github/workflows/ci.yml"
-- ".github/workflows/release.yml"
-- ".gitignore"
-- ".rspec"
-- ".rubocop.yml"
-- ".travis.yml"
 - CHANGELOG.md
 - CODE_OF_CONDUCT.md
 - Gemfile

data/.clang-format

@@ -1,3 +0,0 @@
----
-BasedOnStyle: LLVM
-ColumnLimit: 120

data/.github/workflows/ci.yml

@@ -1,51 +0,0 @@
----
-name: CI
-
-on: push
-
-jobs:
-  build:
-    strategy:
-      fail-fast: false
-      matrix:
-        ruby: ["2.5", "2.6", "2.7", "3.0"]
-        os: [ubuntu-latest, macos-latest]
-        experimental: [false]
-        # include:
-        #   - ruby: "truffleruby"
-        #     os: ubuntu-latest
-        #     experimental: true
-        #   - ruby: "truffleruby"
-        #     os: macos-latest
-        #     experimental: true
-    name: ${{ matrix.ruby }} on ${{ matrix.os }}
-    runs-on: ${{ matrix.os }}
-    continue-on-error: ${{ matrix.experimental }}
-    env:
-      CI_EXPERIMENTAL: ${{ matrix.experimental }}
-    steps:
-      - uses: actions/checkout@v2
-
-      - uses: ruby/setup-ruby@v1
-        with:
-          ruby-version: ${{ matrix.ruby }}
-
-      - name: Install dependencies (system)
-        if: ${{ matrix.os == 'ubuntu-latest' }}
-        run: sudo apt-get -yqq install libphonenumber-dev
-
-      - name: Install dependencies (system)
-        if: ${{ matrix.os == 'macos-latest' }}
-        run: brew install --build-from-source libphonenumber && brew link libphonenumber
-
-      - name: Install dependencies (ruby)
-        run: gem install bundler && bundle install --jobs 4 --retry 3
-
-      - name: Compile
-        run: bundle exec rake compile
-
-      - name: RSpec
-        run: bundle exec rspec --format RSpec::Github::Formatter --format documentation
-
-      - name: Rubocop
-        run: bundle exec rubocop --format github

data/.github/workflows/release.yml

@@ -1,47 +0,0 @@
----
-name: Release
-
-on:
-  push:
-    tags:
-      - "v*"
-
-jobs:
-  build:
-    strategy:
-      fail-fast: false
-      matrix:
-        ruby: ["2.7"]
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-
-      - uses: ruby/setup-ruby@v1
-        with:
-          ruby-version: ${{ matrix.ruby }}
-
-      - name: Install dependencies (system)
-        run: sudo apt-get -yqq install libphonenumber-dev
-
-      - name: Install dependencies (ruby)
-        run: gem install bundler && bundle install --jobs 4 --retry 3
-
-      - name: Login
-        run: |
-          mkdir -p ~/.gem
-
-          cat << EOF > ~/.gem/credentials
-          ---
-          :github: ${GITHUB_AUTH_TOKEN}
-          :rubygems_api_key: ${RUBYGEMS_AUTH_TOKEN}
-          EOF
-
-          chmod 0600 ~/.gem/credentials
-        env:
-          GITHUB_AUTH_TOKEN: "Bearer ${{secrets.GITHUB_TOKEN}}"
-          RUBYGEMS_AUTH_TOKEN: "${{secrets.RUBYGEMS_AUTH_TOKEN}}"
-          OWNER: ${{ github.repository_owner }}
-
-      - name: 🛳 Ship it
-        run: |
-          bundle exec rake publish:non_native

data/.gitignore

@@ -1,19 +0,0 @@
-.bundle/
-.yardoc
-_yardoc/
-coverage/
-doc/
-pkg/
-spec/reports/
-tmp/
-*.bundle
-*.so
-*.o
-*.a
-mkmf.log
-
-# rspec failure tracking
-.rspec_status
-Gemfile.lock
-vendor/cache/
-*.gem

data/.rspec

@@ -1,3 +0,0 @@
---format documentation
---color
---require spec_helper

data/.rubocop.yml

@@ -1,23 +0,0 @@
-# The behavior of RuboCop can be controlled via the .rubocop.yml
-# configuration file. It makes it possible to enable/disable
-# certain cops (checks) and to alter their behavior if they accept
-# any parameters. The file can be placed either in your home
-# directory or in some project directory.
-#
-# RuboCop will start looking for the configuration file in the directory
-# where the inspected file is and continue its way up to the root directory.
-#
-# See https://docs.rubocop.org/rubocop/configuration
-AllCops:
-  TargetRubyVersion: 2.5
-  NewCops: enable
-  SuggestExtensions: false
-  Exclude:
-    - pkg/**/*
-    - tmp/**/*
-
-Metrics/BlockLength:
-  Exclude:
-    - spec/**/*
-    - Rakefile
-    - Gemfile

data/.travis.yml

@@ -1,6 +0,0 @@
----
-language: ruby
-cache: bundler
-rvm:
-  - 2.7.1
-before_install: gem install bundler -v 2.1.4