mini_phone 1.1.6 → 1.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 48fbcbb306ad72fdcbd33b68c46e1c3bc586d24a7ba931f8c4a059e22f65b3a7
-  data.tar.gz: cbdc2cadfa4c1438312de09177b2c54d476f68e5fc585248eeb046212d71025a
+  metadata.gz: 4f3cfea7458b4c50503fd9b9786c3622c7018128ab2785cee254ed45b8da6008
+  data.tar.gz: 574028442c0b7bc1ce52ca558f2397b7a298fafaebc635b082bc211620235805
 SHA512:
-  metadata.gz: 0cb7432992d4c61aaa8ccb0774e48aad98a61a575555dc6e4d509560938fd4fb4267bd62d90cdd2f589d93ed1eb5ded12503fe213023f10972ed399ded5f863c
-  data.tar.gz: 4dd9e4ae33cde41d27e308fc1d5249cc7676274162ecc20d79e1088f029b6aab330bfe1dc424fb74515fbb42ab744c375fd60ef6078ad6c9ba6e315ca07a71f8
+  metadata.gz: ed571b1fd20e7fd99effc2a70b0f692e91962c0145bd47440b54ef374b60ef7705cf29952c2380ed491fa5fa8cb6df98a3460c3479014cbc4c510445b7b9f6fa
+  data.tar.gz: f56388c5750d5fc1446bdcae0dcfaf5b47edba6ffff33360c0dab2144088380bd9316fbc6ad7623005ec38ec9105dd94000ad7fd13f5540b0b4cb4d09d8159b3

data/ext/mini_phone/mini_phone.cc

@@ -308,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) {
@@ -471,9 +476,14 @@ extern "C" VALUE rb_phone_number_valid_eh(VALUE self) {
 
   const PhoneNumberUtil &phone_util(*PhoneNumberUtil::GetInstance());
 
-  if (!rb_str_equal(input_region_code, rb_str_new_literal("ZZ")) &&
-      !rb_str_equal(rb_phone_number_region_code(self), input_region_code)) {
-    return rb_iv_set(self, "@valid", Qfalse);
+  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)) {

data/lib/mini_phone/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module MiniPhone
-  VERSION = '1.1.6'
+  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.6
+  version: 1.1.7
 platform: ruby
 authors:
 - Ian Ker-Seymer
-autorequire:
+autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-02-18 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.
@@ -43,7 +43,7 @@ metadata:
   homepage_uri: https://github.com/ianks/mini_phone
   source_code_uri: https://github.com/ianks/mini_phone
   changelog_uri: https://github.com/ianks/mini_phone/blob/master/CHANGELOG.md
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -59,7 +59,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.1.4
-signing_key:
+signing_key: 
 specification_version: 4
 summary: Uses the Google libphonenumber C lib to parse, validate, and format phone
   numbers