mini_phone 1.1.2 → 1.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 45a73dd6dde16c5baff08c0d9cf225e4bb53ae15b8b040559e4555180070e8d1
-  data.tar.gz: cbb196644cb95f7cf3a46648c176e22845708f5e3bab14256a8d80832e187175
+  metadata.gz: 4f3cfea7458b4c50503fd9b9786c3622c7018128ab2785cee254ed45b8da6008
+  data.tar.gz: 574028442c0b7bc1ce52ca558f2397b7a298fafaebc635b082bc211620235805
 SHA512:
-  metadata.gz: b95b0e2e18d15b7cf7c17e901a85d0b42f2e5fd6d9947f6d0e63a97197c86b39ce8f6341669e67ab69a07a6356b336f3cf4659a328a9c603a6d03856ac7c325b
-  data.tar.gz: 5db0ebb434cd3d427ae511e2a3e8bad13bcc7520c1147e1d7a8fafbf06c3213ae8521b30234b7691d0f06f634e0a503912bf638820f7dd37750ea12838944cf3
+  metadata.gz: ed571b1fd20e7fd99effc2a70b0f692e91962c0145bd47440b54ef374b60ef7705cf29952c2380ed491fa5fa8cb6df98a3460c3479014cbc4c510445b7b9f6fa
+  data.tar.gz: f56388c5750d5fc1446bdcae0dcfaf5b47edba6ffff33360c0dab2144088380bd9316fbc6ad7623005ec38ec9105dd94000ad7fd13f5540b0b4cb4d09d8159b3

data/Dockerfile.dev

@@ -6,4 +6,4 @@ WORKDiR /app
 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
+RUN bundle install -j4

data/Gemfile

@@ -17,4 +17,5 @@ gem 'rubocop', require: false
 group :bench do
   gem 'benchmark-ips'
   gem 'phonelib'
+  gem 'telephone_number'
 end

data/README.md

@@ -3,7 +3,7 @@
 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 to 50x faster than other Ruby phone number
+average, most methods are 70x to 80x faster than other Ruby phone number
 libraries.
 
 ## Usage
@@ -77,16 +77,18 @@ an issue and we will try to support it.
 On average, most methods are 40x to 50x faster than other libraries. To run
 the benchmarks locally, execute: `bundle exec rake bench`
 
+### Results from my Linux (5.10.6-arch1-10)
+
 ```
 Comparison:
-   MiniPhone: valid?:    23111.4 i/s
-    Phonelib: valid?:      482.3 i/s - 47.92x  (± 0.00) slower
-```
+   MiniPhone:    valid?:    33382.0 i/s
+    Phonelib:    valid?:      422.8 i/s - 78.95x  (± 0.00) slower
+TelephoneNumber: valid?:      164.3 i/s - 203.13x  (± 0.00) slower
 
-```
 Comparison:
-     MiniPhone: e164:    31567.0 i/s
-      Phonelib: e164:      652.3 i/s - 48.39x  (± 0.00) slower
+     MiniPhone:  e164:    41187.5 i/s
+      Phonelib:  e164:      579.0 i/s - 71.14x  (± 0.00) slower
+TelephoneNumber: e164:      228.8 i/s - 179.99x  (± 0.00) slower
 ```
 
 ## Installation
@@ -98,7 +100,7 @@ Comparison:
    ```
 
    ```sh
-   apt-get install -y libphonenumber # debian / ubuntu
+   apt-get install -y libphonenumber-dev # debian / ubuntu
    ```
 
 2. Add this line to your application's Gemfile:

data/ext/mini_phone/extconf.rb

@@ -20,7 +20,7 @@ unless have_library('phonenumber')
     |    brew install libphonenumber                                       |
     |                                                                      |
     |  On Debian / Ubuntu:                                                 |
-    |    apt-get install -y libphonenumber                                 |
+    |    apt-get install -y libphonenumber-dev                             |
     |                                                                      |
     | 2. Retry installing the gem (i.e `bundle install`)                   |
     |                                                                      |

data/ext/mini_phone/mini_phone.cc

@@ -16,7 +16,7 @@ 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" size_t phone_number_info_size(const void *data) { return sizeof(PhoneNumberInfo); }
 
 extern "C" void phone_number_info_free(void *data) {
   PhoneNumberInfo *phone_number_info = static_cast<PhoneNumberInfo *>(data);
@@ -52,7 +52,13 @@ static inline VALUE is_phone_number_valid(VALUE self, VALUE str, VALUE cc) {
 
   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) {
+    return Qfalse;
+  }
+
+  if (country_code == "ZZ" && phone_util.IsValidNumber(parsed_number)) {
+    return Qtrue;
+  } else if (phone_util.IsValidNumberForRegion(parsed_number, country_code)) {
     return Qtrue;
   } else {
     return Qfalse;
@@ -60,9 +66,9 @@ static inline VALUE is_phone_number_valid(VALUE self, VALUE str, VALUE cc) {
 }
 
 extern "C" VALUE rb_is_phone_number_valid(VALUE self, VALUE str) {
-  VALUE def_cc = rb_iv_get(rb_mMiniPhone, "@default_country");
+  VALUE input_region_code = rb_iv_get(rb_mMiniPhone, "@default_country");
 
-  return is_phone_number_valid(self, str, def_cc);
+  return is_phone_number_valid(self, str, input_region_code);
 }
 
 extern "C" VALUE rb_normalize_digits_only(VALUE self, VALUE str) {
@@ -99,9 +105,9 @@ extern "C" VALUE rb_is_phone_number_possible(VALUE self, VALUE str) {
   PhoneNumber parsed_number;
   const PhoneNumberUtil &phone_util(*PhoneNumberUtil::GetInstance());
 
-  VALUE def_cc = rb_iv_get(rb_mMiniPhone, "@default_country");
+  VALUE input_region_code = 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));
+  std::string country_code(RSTRING_PTR(input_region_code), RSTRING_LEN(input_region_code));
 
   auto result = phone_util.Parse(phone_number, country_code, &parsed_number);
 
@@ -159,45 +165,6 @@ static inline VALUE rb_phone_number_nullify_ivars(VALUE self) {
   return Qtrue;
 }
 
-extern "C" VALUE rb_phone_number_initialize(int argc, VALUE *argv, VALUE self) {
-  VALUE str;
-  VALUE def_cc;
-
-  rb_scan_args(argc, argv, "11", &str, &def_cc);
-
-  if (NIL_P(def_cc)) {
-    def_cc = rb_iv_get(rb_mMiniPhone, "@default_country");
-  }
-
-  rb_iv_set(self, "@input", str);
-
-  if (FIXNUM_P(str)) {
-    str = rb_fix2str(str, 10);
-  } else if (!RB_TYPE_P(str, T_STRING)) {
-    return rb_phone_number_nullify_ivars(self);
-  }
-
-  PhoneNumberInfo *phone_number_info;
-  PhoneNumber parsed_number;
-
-  TypedData_Get_Struct(self, PhoneNumberInfo, &phone_number_info_type, phone_number_info);
-
-  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);
-
-  if (result != PhoneNumberUtil::NO_PARSING_ERROR) {
-    rb_phone_number_nullify_ivars(self);
-  } else {
-    phone_number_info->phone_number->Swap(&parsed_number);
-  }
-
-  return self;
-}
-
 static inline VALUE rb_phone_number_format(VALUE self, PhoneNumberUtil::PhoneNumberFormat fmt) {
   std::string formatted_number;
   PhoneNumberInfo *phone_number_info;
@@ -315,28 +282,6 @@ extern "C" VALUE rb_phone_number_raw_international(VALUE self) {
   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");
-  }
-
-  std::string formatted_number;
-  PhoneNumberInfo *phone_number_info;
-  TypedData_Get_Struct(self, PhoneNumberInfo, &phone_number_info_type, phone_number_info);
-
-  const PhoneNumberUtil &phone_util(*PhoneNumberUtil::GetInstance());
-
-  if (phone_util.IsValidNumber(*phone_number_info->phone_number)) {
-    return rb_iv_set(self, "@valid", Qtrue);
-  } else {
-    return rb_iv_set(self, "@valid", Qfalse);
-  }
-}
-
-extern "C" VALUE rb_phone_number_invalid_eh(VALUE self) {
-  return rb_phone_number_valid_eh(self) == Qtrue ? Qfalse : Qtrue;
-}
-
 extern "C" VALUE rb_phone_number_possible_eh(VALUE self) {
   if (rb_ivar_defined(self, rb_intern("@possible"))) {
     return rb_iv_get(self, "@possible");
@@ -363,17 +308,22 @@ extern "C" VALUE rb_phone_number_region_code(VALUE self) {
   if (rb_ivar_defined(self, rb_intern("@region_code"))) {
     return rb_iv_get(self, "@region_code");
   }
+  VALUE input_region_code = rb_iv_get(self, "@input_region_code");
 
-  PhoneNumberInfo *phone_number_info;
-  std::string code;
-  TypedData_Get_Struct(self, PhoneNumberInfo, &phone_number_info_type, phone_number_info);
-  const PhoneNumberUtil &phone_util(*PhoneNumberUtil::GetInstance());
+  if (NIL_P(input_region_code)) {
+    PhoneNumberInfo *phone_number_info;
+    std::string code;
+    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());
+    VALUE result = rb_str_new(code.c_str(), code.size());
 
-  return rb_iv_set(self, "@region_code", result);
+    return rb_iv_set(self, "@region_code", result);
+  } else {
+    return rb_iv_set(self, "@region_code", input_region_code);
+  }
 }
 
 extern "C" VALUE rb_phone_number_match_eh(VALUE self, VALUE other) {
@@ -381,14 +331,6 @@ extern "C" VALUE rb_phone_number_match_eh(VALUE self, VALUE other) {
     return Qfalse;
   }
 
-  VALUE self_input = rb_iv_get(self, "@input");
-  VALUE other_input = rb_iv_get(other, "@input");
-
-  // If inputs are the exact same, the result is as well
-  if (rb_eql(self_input, other_input)) {
-    return Qtrue;
-  }
-
   const PhoneNumberUtil &phone_util(*PhoneNumberUtil::GetInstance());
 
   PhoneNumberInfo *self_info;
@@ -397,6 +339,10 @@ extern "C" VALUE rb_phone_number_match_eh(VALUE self, VALUE other) {
   PhoneNumberInfo *other_info;
   TypedData_Get_Struct(other, PhoneNumberInfo, &phone_number_info_type, other_info);
 
+  if (self_info->phone_number->raw_input() == other_info->phone_number->raw_input()) {
+    return Qtrue;
+  }
+
   if (phone_util.IsNumberMatch(*other_info->phone_number, *self_info->phone_number) == PhoneNumberUtil::EXACT_MATCH) {
     return Qtrue;
   } else {
@@ -488,7 +434,19 @@ extern "C" VALUE rb_phone_number_area_code(VALUE self) {
   return rb_iv_set(self, "@area_code", result);
 }
 
-extern "C" VALUE rb_phone_number_to_s(VALUE self) { return rb_iv_get(self, "@input"); }
+extern "C" VALUE rb_phone_number_to_s(VALUE self) {
+  PhoneNumberInfo *phone_number_info;
+  TypedData_Get_Struct(self, PhoneNumberInfo, &phone_number_info_type, phone_number_info);
+  PhoneNumber *phone_number = phone_number_info->phone_number;
+
+  if (phone_number == NULL) {
+    return Qnil;
+  }
+
+  std::string raw_input = phone_number->raw_input();
+
+  return rb_str_new(raw_input.c_str(), raw_input.size());
+}
 
 static inline void setup_formats() {
   // Raw
@@ -502,6 +460,81 @@ static inline void setup_formats() {
   dsh_fmt->set_format("$1-$2-$3");
 }
 
+extern "C" VALUE rb_phone_number_valid_eh(VALUE self) {
+  if (rb_ivar_defined(self, rb_intern("@valid"))) {
+    return rb_iv_get(self, "@valid");
+  }
+
+  std::string formatted_number;
+  PhoneNumberInfo *phone_number_info;
+  VALUE input_region_code = rb_iv_get(self, "@input_region_code");
+  TypedData_Get_Struct(self, PhoneNumberInfo, &phone_number_info_type, phone_number_info);
+
+  if (NIL_P(input_region_code)) {
+    input_region_code = rb_iv_get(rb_mMiniPhone, "@default_country");
+  }
+
+  const PhoneNumberUtil &phone_util(*PhoneNumberUtil::GetInstance());
+
+  if (!rb_str_equal(input_region_code, rb_str_new_literal("ZZ"))) {
+    std::string country_code(RSTRING_PTR(input_region_code), RSTRING_LEN(input_region_code));
+
+    if (phone_util.IsValidNumberForRegion(*phone_number_info->phone_number, country_code)) {
+      return rb_iv_set(self, "@valid", Qtrue);
+    } else {
+      return rb_iv_set(self, "@valid", Qfalse);
+    }
+  }
+
+  if (phone_util.IsValidNumber(*phone_number_info->phone_number)) {
+    return rb_iv_set(self, "@valid", Qtrue);
+  } else {
+    return rb_iv_set(self, "@valid", Qfalse);
+  }
+}
+
+extern "C" VALUE rb_phone_number_invalid_eh(VALUE self) {
+  return rb_phone_number_valid_eh(self) == Qtrue ? Qfalse : Qtrue;
+}
+
+extern "C" VALUE rb_phone_number_initialize(int argc, VALUE *argv, VALUE self) {
+  VALUE str;
+  VALUE input_region_code;
+
+  rb_scan_args(argc, argv, "11", &str, &input_region_code);
+  rb_iv_set(self, "@input_region_code", input_region_code);
+
+  if (NIL_P(input_region_code)) {
+    input_region_code = rb_iv_get(rb_mMiniPhone, "@default_country");
+  }
+
+  if (FIXNUM_P(str)) {
+    str = rb_fix2str(str, 10);
+  } else if (!RB_TYPE_P(str, T_STRING)) {
+    return rb_phone_number_nullify_ivars(self);
+  }
+
+  PhoneNumberInfo *phone_number_info;
+  PhoneNumber parsed_number;
+
+  TypedData_Get_Struct(self, PhoneNumberInfo, &phone_number_info_type, phone_number_info);
+
+  const PhoneNumberUtil &phone_util(*PhoneNumberUtil::GetInstance());
+
+  std::string phone_number(RSTRING_PTR(str), RSTRING_LEN(str));
+  std::string country_code(RSTRING_PTR(input_region_code), RSTRING_LEN(input_region_code));
+
+  auto result = phone_util.ParseAndKeepRawInput(phone_number, country_code, &parsed_number);
+
+  if (result != PhoneNumberUtil::NO_PARSING_ERROR) {
+    rb_phone_number_nullify_ivars(self);
+  }
+
+  phone_number_info->phone_number->Swap(&parsed_number);
+
+  return self;
+}
+
 extern "C" void Init_mini_phone(void) {
   setup_formats();
 

data/lib/mini_phone/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mini_phone
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.1.7
 platform: ruby
 authors:
 - Ian Ker-Seymer
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-01-22 00:00:00.000000000 Z
+date: 2021-03-10 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.