mini_phone 1.1.5 → 1.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c3a42ec155de4fb7b2a8ea675ac0380274f23b38795c0eb0e73c0efb3ed4d8a5
-  data.tar.gz: aaec470245e26e61d277a329340833eef93fa22939395273eabba719f977408e
+  metadata.gz: ebcb47083ca24a0f63795c4431ae65181ed25e6cca2b1a800603d36bd480fb98
+  data.tar.gz: 7bdd9504face792c9ac115132830bcef3a8427365c6fa44a078332175e5fad10
 SHA512:
-  metadata.gz: 99128e918a87c4e875191b47177507da77be675aafb7a7bec430457ab420c4b5081872407b31d07de04fc24233e57d14e711a019f49939d3db89e757eeeab1a1
-  data.tar.gz: a9676a2d17fd3a5e0d178159ed9b413ea73469790e5219040cfa80e5679fce578ac0e80e95b60366cdd23f4961744eba65740464e6bd05bb1549805547862b1f
+  metadata.gz: 55b46d7a81ac2e377addb268586a7f4b6b883803dddaa7aa6970bb868d598f91c8cd5933effadbda658a4cfb5b4caeb918f697709df129319b62b1db26139f90
+  data.tar.gz: 1361bf8922c55170646d6da8b163da65d13ad6e88cc5ee8621e68ed732d21adf03880d95a6d3db353b397e8ef6ecafcdca44ce5790185fb9ee52a1c8736fd7d6

data/Gemfile

@@ -9,7 +9,7 @@ gem 'rake', require: false
 # https://github.com/rake-compiler/rake-compiler/pull/166
 gem 'get_process_mem', require: false
 gem 'pry', require: false
-gem 'rake-compiler', github: 'larskanis/rake-compiler', branch: 'fix-native-version'
+gem 'rake-compiler'
 gem 'rspec', '~> 3.0', require: false
 gem 'rspec-github', require: false
 gem 'rubocop', require: false
@@ -17,4 +17,5 @@ gem 'rubocop', require: false
 group :bench do
   gem 'benchmark-ips'
   gem 'phonelib'
+  gem 'telephone_number'
 end

data/README.md

@@ -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)
+### Results from my Linux (5.10.6-arch1-10)
 
+```
 Comparison:
-    Phonelib: valid?:      426.0 i/s
-   MiniPhone: valid?:    34707.9 i/s - 81.47x faster
+   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:
-      Phonelib: e164:      580.3 i/s
-     MiniPhone: e164:    43385.9 i/s - 74.76x faster
+     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

data/Rakefile

@@ -7,8 +7,6 @@ require 'rake/extensiontask'
 
 RSpec::Core::RakeTask.new(:spec)
 
-task build: :compile
-
 task default: %i[clobber compile spec lint]
 
 spec = Gem::Specification.load(File.expand_path('mini_phone.gemspec', __dir__))
@@ -23,7 +21,7 @@ Rake::ExtensionTask.new('mini_phone', spec) do |ext|
 end
 
 task bench: %i[clobber compile] do
-  Dir['bench/**/*'].each do |f|
+  Dir['bench/**/*'].sort.each do |f|
     require_relative f
   end
 end
@@ -41,50 +39,16 @@ 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:'"
-  sh 'gem_push=no bundle exec rake release'
+  sh 'bundle exec rake release'
 end
 
-namespace :publish do
-  def push_to_github_registry(gem)
-    puts "Pushing #{gem} to GitHub Package Registry"
-    sh "gem push #{gem} --host https://rubygems.pkg.github.com/ianks --key github"
-    true
-  rescue StandardError
-    warn 'Could not publish to Github Package Registry'
-    false
-  end
-
-  def push_to_rubygems(gem)
-    puts "Pushing #{gem} to rubygems"
-    sh "gem push #{gem}"
-    true
-  rescue StandardError
-    warn 'Could not publish to rubygems'
-    false
-  end
-
-  task native: %i[native gem] do
-    g = "./pkg/mini_phone-#{MiniPhone::VERSION}-#{Gem::Platform.new(RUBY_PLATFORM)}.gem"
-
-    push_to_rubygems(g)
-  end
-
-  task non_native: [:gem] do
-    g = "./pkg/mini_phone-#{MiniPhone::VERSION}.gem"
-
-    push_to_rubygems(g)
-    push_to_github_registry(g)
-  end
-end
-
-desc 'Run valgrind test'
-
 namespace :debug do
   desc 'Plot memory'
   task :memory do
     sh 'debug/memory_plot/plot.sh'
   end
 
+  desc 'Run valgrind test'
   task :valgrind do
     sh 'docker build --tag mini_phone_dev -f Dockerfile.dev .'
     args = '--tool=memcheck --num-callers=15 --partial-loads-ok=yes --undef-value-errors=no'

data/certs/ianks.pem

@@ -0,0 +1,21 @@
+-----BEGIN CERTIFICATE-----
+MIIDfDCCAmSgAwIBAgIBATANBgkqhkiG9w0BAQUFADBCMRQwEgYDVQQDDAtpLmtl
+cnNleW1lcjEVMBMGCgmSJomT8ixkARkWBWdtYWlsMRMwEQYKCZImiZPyLGQBGRYD
+Y29tMB4XDTIyMDQxMzE5NTY1MVoXDTIzMDQxMzE5NTY1MVowQjEUMBIGA1UEAwwL
+aS5rZXJzZXltZXIxFTATBgoJkiaJk/IsZAEZFgVnbWFpbDETMBEGCgmSJomT8ixk
+ARkWA2NvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMJ2pG+er4cP
+PasxsMIKL9/tmLL4gh80EMuF3SCS0qZoh+Oo8dkvRYxW8NXdwEIcp3cCNgE+5G+J
+TCMOVF8S15n1Z1P7xxXiXxa/BIofKKbtatVRngm14uR/6pjdkvLXqlrWdS57bNwv
+7LtpzYVfDHfsl/qRWaEi4jq00PNCRSWjcva8teqswjBg8KlwGtyygpezPbVSWP8Y
+vzWZmVF7fqRBXU78Ah0+pNOhslBXDTvI3xJdN4hQ3H7rLjpD/qxKWq/8o+Qvx6cX
+dNZ3ugH/Pr3BAsqt4JFLXin9AK7PO9GDMH5JXJrUb+hAt2VNIZqpz9VlKA6BA0jN
+eWGea+yCZkECAwEAAaN9MHswCQYDVR0TBAIwADALBgNVHQ8EBAMCBLAwHQYDVR0O
+BBYEFOkrF6hsocaIMOjR/K3JBzyXCLJPMCAGA1UdEQQZMBeBFWkua2Vyc2V5bWVy
+QGdtYWlsLmNvbTAgBgNVHRIEGTAXgRVpLmtlcnNleW1lckBnbWFpbC5jb20wDQYJ
+KoZIhvcNAQEFBQADggEBADHnvHbZn5nldcpArIQcFF9URCBloCBZHqLFMhlGj5BX
+bFvuoq4CBmEFiJpTazeoEaxPlsmIK1+4CqBXwg8lHEMC9RV5g9QtJHQry2eFE/8U
+WrgCbqdxb8HBl9ayOHRcdfcv0RHBlmBHwBOoQ+hXMlInjssjfIX4BS39mTYefclE
+zxOFntl+vb4kluo0j9/BGzdnGCo7iE+GfGSENFdOn2J38RCDLUzgOCmCtxzSvldq
+Rl+ASkq2/1i07TkBpCf+2hq66+h/hx+/Y/KrUzXfe0jtvil0WESkJT2kqRqHWNhD
+9GKBxaQlXokNDtWCm1/gl6cD8WRZ0N5S4ZGJT1FLLsA=
+-----END CERTIFICATE-----

data/ext/mini_phone/extconf.rb

@@ -4,6 +4,14 @@
 
 require 'mkmf'
 
+conf = RbConfig::MAKEFILE_CONFIG
+
+if conf['target_cpu'] == 'arm64' && conf['target_os'].start_with?('darwin')
+  $LIBPATH << '/opt/homebrew/lib'
+  $INCFLAGS << ' -I/opt/homebrew/include '
+  $CXXFLAGS << ' -I/opt/homebrew/include '
+end
+
 unless have_library('phonenumber')
   abort <<~MSG
 
@@ -31,7 +39,7 @@ end
 
 dir_config('mini_phone')
 
-$CXXFLAGS += ' -std=c++11 -ofast '
+$CXXFLAGS += ' -std=c++14 -ofast '
 
 create_makefile('mini_phone/mini_phone')
 

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) {
@@ -433,13 +438,14 @@ 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 == "") {
+  if (phone_number == NULL) {
     return Qnil;
-  } else {
-    return rb_str_new(raw_input.c_str(), raw_input.size());
   }
+
+  std::string raw_input = phone_number->raw_input();
+
+  return rb_str_new(raw_input.c_str(), raw_input.size());
 }
 
 static inline void setup_formats() {
@@ -470,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)) {
@@ -517,10 +528,10 @@ extern "C" VALUE rb_phone_number_initialize(int argc, VALUE *argv, VALUE self) {
 
   if (result != PhoneNumberUtil::NO_PARSING_ERROR) {
     rb_phone_number_nullify_ivars(self);
-  } else {
-    phone_number_info->phone_number->Swap(&parsed_number);
   }
 
+  phone_number_info->phone_number->Swap(&parsed_number);
+
   return self;
 }
 
@@ -577,6 +588,5 @@ 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.5'
+  VERSION = '1.1.8'
 end

data/mini_phone.gemspec

@@ -36,4 +36,9 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
   spec.extensions    = ['ext/mini_phone/extconf.rb']
+
+  # Security
+  spec.metadata['rubygems_mfa_required'] = 'true'
+  spec.cert_chain = ['certs/ianks.pem']
+  spec.signing_key = File.expand_path('~/.ssh/gem-private_key.pem') if $PROGRAM_NAME.end_with?('gem')
 end

metadata

@@ -1,14 +1,36 @@
 --- !ruby/object:Gem::Specification
 name: mini_phone
 version: !ruby/object:Gem::Version
-  version: 1.1.5
+  version: 1.1.8
 platform: ruby
 authors:
 - Ian Ker-Seymer
-autorequire: 
+autorequire:
 bindir: exe
-cert_chain: []
-date: 2021-02-11 00:00:00.000000000 Z
+cert_chain:
+- |
+  -----BEGIN CERTIFICATE-----
+  MIIDfDCCAmSgAwIBAgIBATANBgkqhkiG9w0BAQUFADBCMRQwEgYDVQQDDAtpLmtl
+  cnNleW1lcjEVMBMGCgmSJomT8ixkARkWBWdtYWlsMRMwEQYKCZImiZPyLGQBGRYD
+  Y29tMB4XDTIyMDQxMzE5NTY1MVoXDTIzMDQxMzE5NTY1MVowQjEUMBIGA1UEAwwL
+  aS5rZXJzZXltZXIxFTATBgoJkiaJk/IsZAEZFgVnbWFpbDETMBEGCgmSJomT8ixk
+  ARkWA2NvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMJ2pG+er4cP
+  PasxsMIKL9/tmLL4gh80EMuF3SCS0qZoh+Oo8dkvRYxW8NXdwEIcp3cCNgE+5G+J
+  TCMOVF8S15n1Z1P7xxXiXxa/BIofKKbtatVRngm14uR/6pjdkvLXqlrWdS57bNwv
+  7LtpzYVfDHfsl/qRWaEi4jq00PNCRSWjcva8teqswjBg8KlwGtyygpezPbVSWP8Y
+  vzWZmVF7fqRBXU78Ah0+pNOhslBXDTvI3xJdN4hQ3H7rLjpD/qxKWq/8o+Qvx6cX
+  dNZ3ugH/Pr3BAsqt4JFLXin9AK7PO9GDMH5JXJrUb+hAt2VNIZqpz9VlKA6BA0jN
+  eWGea+yCZkECAwEAAaN9MHswCQYDVR0TBAIwADALBgNVHQ8EBAMCBLAwHQYDVR0O
+  BBYEFOkrF6hsocaIMOjR/K3JBzyXCLJPMCAGA1UdEQQZMBeBFWkua2Vyc2V5bWVy
+  QGdtYWlsLmNvbTAgBgNVHRIEGTAXgRVpLmtlcnNleW1lckBnbWFpbC5jb20wDQYJ
+  KoZIhvcNAQEFBQADggEBADHnvHbZn5nldcpArIQcFF9URCBloCBZHqLFMhlGj5BX
+  bFvuoq4CBmEFiJpTazeoEaxPlsmIK1+4CqBXwg8lHEMC9RV5g9QtJHQry2eFE/8U
+  WrgCbqdxb8HBl9ayOHRcdfcv0RHBlmBHwBOoQ+hXMlInjssjfIX4BS39mTYefclE
+  zxOFntl+vb4kluo0j9/BGzdnGCo7iE+GfGSENFdOn2J38RCDLUzgOCmCtxzSvldq
+  Rl+ASkq2/1i07TkBpCf+2hq66+h/hx+/Y/KrUzXfe0jtvil0WESkJT2kqRqHWNhD
+  9GKBxaQlXokNDtWCm1/gl6cD8WRZ0N5S4ZGJT1FLLsA=
+  -----END CERTIFICATE-----
+date: 2022-07-16 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.
@@ -27,6 +49,7 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- certs/ianks.pem
 - debug/memory_plot/memory.rb
 - debug/memory_plot/plot.sh
 - ext/mini_phone/extconf.rb
@@ -43,7 +66,8 @@ 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: 
+  rubygems_mfa_required: 'true'
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -58,8 +82,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
-signing_key: 
+rubygems_version: 3.3.7
+signing_key:
 specification_version: 4
 summary: Uses the Google libphonenumber C lib to parse, validate, and format phone
   numbers

metadata.gz.sig

@@ -0,0 +1,3 @@
+9��I��,.��j���l˽`&҂p���>
�x�w��!�:
+b�"(,Ӕw	��af��h�3 
�B�?�wG����u�m_G�Ee�*T�������T���7�.��}@\~�3�"��x�5n��)�� ��
+ǭ铹�������i2�<���qiuΦ��L�a�E��@��U�@\qz����֗_i���~yW��mXǘG��z˧�bGv����P+�+ԲRMZ]	�ן0�|ȗ�����螉