mini_phone 1.1.4 → 1.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8267c89cf237c4baf3e8dfe8718e0c0fe453b4919f6e38d00dc70cc557ed8cf0
-  data.tar.gz: 2b537745421bbb9fe70000c3707c6f20c052f0770fd156ac4d915bb92e33c736
+  metadata.gz: c3a42ec155de4fb7b2a8ea675ac0380274f23b38795c0eb0e73c0efb3ed4d8a5
+  data.tar.gz: aaec470245e26e61d277a329340833eef93fa22939395273eabba719f977408e
 SHA512:
-  metadata.gz: 0db1af779c2b9564dedc09eee290359b5d3bb53bfb8e53180b1d56225cd054d1bddc37b87ff7da794cc2686c04ccbfcaed0285cebea170e4f5b5f594ee841091
-  data.tar.gz: 9e94872e27a229014cc754fe349e5d9f536baef87e26aee5b6bd9205604c553fcd392fa8ec4c658f9e5fedb0f958217e3b839337559200cded15b36442f2ab45
+  metadata.gz: 99128e918a87c4e875191b47177507da77be675aafb7a7bec430457ab420c4b5081872407b31d07de04fc24233e57d14e711a019f49939d3db89e757eeeab1a1
+  data.tar.gz: a9676a2d17fd3a5e0d178159ed9b413ea73469790e5219040cfa80e5679fce578ac0e80e95b60366cdd23f4961744eba65740464e6bd05bb1549805547862b1f

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);
@@ -66,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) {
@@ -105,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);
 
@@ -282,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");
@@ -348,14 +326,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;
@@ -364,6 +334,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 {
@@ -455,7 +429,18 @@ 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;
+  std::string raw_input = phone_number->raw_input();
+
+  if (raw_input == "") {
+    return Qnil;
+  } else {
+    return rb_str_new(raw_input.c_str(), raw_input.size());
+  }
+}
 
 static inline void setup_formats() {
   // Raw
@@ -469,18 +454,49 @@ 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")) &&
+      !rb_str_equal(rb_phone_number_region_code(self), input_region_code)) {
+    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 def_cc;
+  VALUE input_region_code;
 
-  rb_scan_args(argc, argv, "11", &str, &def_cc);
+  rb_scan_args(argc, argv, "11", &str, &input_region_code);
+  rb_iv_set(self, "@input_region_code", input_region_code);
 
-  if (NIL_P(def_cc)) {
-    def_cc = rb_iv_get(rb_mMiniPhone, "@default_country");
+  if (NIL_P(input_region_code)) {
+    input_region_code = 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)) {
@@ -495,9 +511,9 @@ extern "C" VALUE rb_phone_number_initialize(int argc, VALUE *argv, VALUE self) {
   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));
+  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);
+  auto result = phone_util.ParseAndKeepRawInput(phone_number, country_code, &parsed_number);
 
   if (result != PhoneNumberUtil::NO_PARSING_ERROR) {
     rb_phone_number_nullify_ivars(self);
@@ -505,10 +521,6 @@ extern "C" VALUE rb_phone_number_initialize(int argc, VALUE *argv, VALUE self) {
     phone_number_info->phone_number->Swap(&parsed_number);
   }
 
-  if (country_code != "ZZ" && !rb_str_equal(rb_phone_number_region_code(self), def_cc)) {
-    rb_phone_number_nullify_ivars(self);
-  }
-
   return self;
 }
 
@@ -565,5 +577,6 @@ extern "C" void Init_mini_phone(void) {
   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, "to_s", reinterpret_cast<VALUE (*)(...)>(rb_phone_number_to_s), 0);
+  rb_define_method(rb_cPhoneNumber, "raw_input", reinterpret_cast<VALUE (*)(...)>(rb_phone_number_to_s), 0);
   rb_define_method(rb_cPhoneNumber, "==", reinterpret_cast<VALUE (*)(...)>(rb_phone_number_match_eh), 1);
 }

data/lib/mini_phone/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mini_phone
 version: !ruby/object:Gem::Version
-  version: 1.1.4
+  version: 1.1.5
 platform: ruby
 authors:
 - Ian Ker-Seymer