mini_phone 1.0.5 → 1.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e442f98e547a4059112a40d4a28d79b7438ded4ec9d697ed7a59e03447e073f3
-  data.tar.gz: b7ff1d3b6c32564197471098acb0654f214a035df703382500a5c7c825b80d9f
+  metadata.gz: 4f7c87533de0643b9af5d9394d62a238208c34fa34e16effbb9064e9fd3578d7
+  data.tar.gz: 5868d8b76184925da0ba875fa0a5df7c3bb61f920b51f5d9391fd2d742335ddc
 SHA512:
-  metadata.gz: 90e2db831e7edf8ccbe083f3daad5830d8d65d6945598441a4b7bc38c0b191d5aec85c7356b9549375add822e3e6b8d27d550ed647d1721d29fb4113e50e6fc3
-  data.tar.gz: adc1643314e3f781e9c427ff6540ba406995c14e9429fa4c520b681375459a73711fa1cbf8072c51c7f2b79f781a44fd81d219e79c6388e0d6c25f3e56e0e781
+  metadata.gz: 6bdb02eee2405855e49defd3e27d9eccd8934ec1bc1c02977b69d17026d32500969b443b053b1eece4ca7f72294a2d57349c19cfe14f6993c02dab6d21ec9d21
+  data.tar.gz: e57f59c8c2b75a1e4983d8a7fc3941fa1c641bd1c55eb13185bc9c8b35347b39a3ce301e65e021887f5bfc403ee8b0b5e5bad60d20e3604900418c0b6d46511e

data/ext/mini_phone/mini_phone.cc

@@ -125,6 +125,8 @@ static inline VALUE rb_phone_number_nullify_ivars(VALUE self) {
   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);
@@ -252,6 +254,47 @@ extern "C" VALUE rb_phone_number_dasherized_national(VALUE self) {
   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");
@@ -313,21 +356,6 @@ extern "C" VALUE rb_phone_number_region_code(VALUE self) {
   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;
@@ -481,6 +509,10 @@ extern "C" void Init_mini_phone(void) {
   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),

data/lib/mini_phone/version.rb

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

metadata

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