mini_phone 1.1.7 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4f3cfea7458b4c50503fd9b9786c3622c7018128ab2785cee254ed45b8da6008
-  data.tar.gz: 574028442c0b7bc1ce52ca558f2397b7a298fafaebc635b082bc211620235805
+  metadata.gz: c398c60b592f86860c4e077e2c645d6a581dbac7819f1ddfa2a15af5bcf5d6bf
+  data.tar.gz: 2332e7b03cf3a703d98a3bca80a5eeadfbcb285136a1c1402240c10e2d189021
 SHA512:
-  metadata.gz: ed571b1fd20e7fd99effc2a70b0f692e91962c0145bd47440b54ef374b60ef7705cf29952c2380ed491fa5fa8cb6df98a3460c3479014cbc4c510445b7b9f6fa
-  data.tar.gz: f56388c5750d5fc1446bdcae0dcfaf5b47edba6ffff33360c0dab2144088380bd9316fbc6ad7623005ec38ec9105dd94000ad7fd13f5540b0b4cb4d09d8159b3
+  metadata.gz: 4004538e8696f32e6ca6947c6ee66ff18ccd2383c53ee5097c9597d2614f6107273e6beaee7a959a365f8063dde1543be013d803b9e2afff44bceb29b8fdb1b6
+  data.tar.gz: f9c11923842410cfbb77e78289d7c2f181d1f8cca95902b2b7d506f6a00c4435fbe82fc3b9aac0bb6c1aeed78f1b1562e98b56668ea9247ea60d952879c9d0f8

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

data/README.md

@@ -121,6 +121,20 @@ TelephoneNumber: e164:      228.8 i/s - 179.99x  (± 0.00) slower
    gem install mini_phone
    ```
 
+### Installation on Heroku
+
+1. In addition to the steps above add the [apt buildpack](https://github.com/heroku/heroku-buildpack-apt) to your Heroku app:
+
+   ```sh
+   heroku buildpacks:add --index 1 heroku-community/apt
+   ```
+
+2. Create Aptfile in your repo with the following content:
+   
+   ```
+   libphonenumber-dev
+   ```
+
 ## Development
 
 After checking out the repo, run `bin/setup` to install dependencies. Then,

data/Rakefile

@@ -5,9 +5,9 @@ require 'rspec/core/rake_task'
 require 'rubygems/package_task'
 require 'rake/extensiontask'
 
-RSpec::Core::RakeTask.new(:spec)
+CXX_FILES = FileList['ext/**/*.{c,cc,cpp,cxx,h}']
 
-task build: :compile
+RSpec::Core::RakeTask.new(:spec)
 
 task default: %i[clobber compile spec lint]
 
@@ -29,62 +29,30 @@ task bench: %i[clobber compile] do
 end
 
 task :lint do
+  require 'mkmf'
   sh 'bundle exec rubocop'
+  sh 'clang-format', '--dry-run', '-i', *CXX_FILES if find_executable('clang-format')
 end
 
 task :format do
   sh 'bundle exec rubocop -A'
-  sh 'clang-format -i ext/**/*.{h,cc}'
+  sh 'clang-format', '--dry-run', '-i', *CXX_FILES
 end
 
 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'
-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
+  sh 'bundle exec rake release'
 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-----
+MIIDfDCCAmSgAwIBAgIBATANBgkqhkiG9w0BAQsFADBCMRQwEgYDVQQDDAtpLmtl
+cnNleW1lcjEVMBMGCgmSJomT8ixkARkWBWdtYWlsMRMwEQYKCZImiZPyLGQBGRYD
+Y29tMB4XDTIzMDQxNDEzMzYxNVoXDTI0MDQxMzEzMzYxNVowQjEUMBIGA1UEAwwL
+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
+KoZIhvcNAQELBQADggEBAMAohCl0cdVlYrJl9viGtzbEyLV/Krn0ZD/LM9d2cIRj
+WBu7HRkP6AfYVzhZwdgUgDYw67d715kOMpLNGeWQw3QGEHFqbVzRML64jL8IxuTz
+J8ttZVqM8f4GrHyISJnL92u6iP4WzdbVqx89EFjrrHd14OJXK+ZpdRh0YvnN/vMJ
+t2EcDweRHkN/MEdrwbH+PbYjELnKcTIEZqcCWTk8pgssGrNyjkMhxGSsSUo9qTz0
+DIZ6NVmpBvohJVCCCDxQQxFKLXZp1ivoxjN+m7eJSW7yzIz062pH4u8pPNQsiVSb
+I5rgRPbDr2rAFGXKoQ0+u6CLkRxqrVsITl/OPfZhBQI=
+-----END CERTIFICATE-----

data/ext/mini_phone/extconf.rb

@@ -4,7 +4,15 @@
 
 require 'mkmf'
 
-unless have_library('phonenumber')
+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') && have_library('protobuf')
   abort <<~MSG
 
     ,----------------------------------------------------------------------,
@@ -30,8 +38,8 @@ unless have_library('phonenumber')
 end
 
 dir_config('mini_phone')
-
-$CXXFLAGS += ' -std=c++11 -ofast '
+append_cppflags('-O3')
+$CXXFLAGS << ' -std=c++17 ' unless $CXXFLAGS.include?('-std=c++')
 
 create_makefile('mini_phone/mini_phone')
 

data/ext/mini_phone/mini_phone.cc

@@ -14,7 +14,9 @@ static VALUE rb_cPhoneNumber;
 static RepeatedPtrField<NumberFormat> raw_national_format;
 static RepeatedPtrField<NumberFormat> dasherized_national_format;
 
-extern "C" struct PhoneNumberInfo { PhoneNumber *phone_number; };
+extern "C" struct PhoneNumberInfo {
+  PhoneNumber *phone_number;
+};
 
 extern "C" size_t phone_number_info_size(const void *data) { return sizeof(PhoneNumberInfo); }
 

data/lib/mini_phone/version.rb

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

data/mini_phone.gemspec

@@ -14,7 +14,7 @@ Gem::Specification.new do |spec|
   MSG
   spec.homepage      = 'https://github.com/ianks/mini_phone'
   spec.license       = 'MIT'
-  spec.required_ruby_version = Gem::Requirement.new('>= 2.5.0')
+  spec.required_ruby_version = Gem::Requirement.new('>= 3.0.0')
 
   spec.platform = Gem::Platform::RUBY
 
@@ -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.7
+  version: 1.2.0
 platform: ruby
 authors:
 - Ian Ker-Seymer
-autorequire: 
+autorequire:
 bindir: exe
-cert_chain: []
-date: 2021-03-10 00:00:00.000000000 Z
+cert_chain:
+- |
+  -----BEGIN CERTIFICATE-----
+  MIIDfDCCAmSgAwIBAgIBATANBgkqhkiG9w0BAQsFADBCMRQwEgYDVQQDDAtpLmtl
+  cnNleW1lcjEVMBMGCgmSJomT8ixkARkWBWdtYWlsMRMwEQYKCZImiZPyLGQBGRYD
+  Y29tMB4XDTIzMDQxNDEzMzYxNVoXDTI0MDQxMzEzMzYxNVowQjEUMBIGA1UEAwwL
+  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
+  KoZIhvcNAQELBQADggEBAMAohCl0cdVlYrJl9viGtzbEyLV/Krn0ZD/LM9d2cIRj
+  WBu7HRkP6AfYVzhZwdgUgDYw67d715kOMpLNGeWQw3QGEHFqbVzRML64jL8IxuTz
+  J8ttZVqM8f4GrHyISJnL92u6iP4WzdbVqx89EFjrrHd14OJXK+ZpdRh0YvnN/vMJ
+  t2EcDweRHkN/MEdrwbH+PbYjELnKcTIEZqcCWTk8pgssGrNyjkMhxGSsSUo9qTz0
+  DIZ6NVmpBvohJVCCCDxQQxFKLXZp1ivoxjN+m7eJSW7yzIz062pH4u8pPNQsiVSb
+  I5rgRPbDr2rAFGXKoQ0+u6CLkRxqrVsITl/OPfZhBQI=
+  -----END CERTIFICATE-----
+date: 2023-05-24 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
@@ -51,15 +75,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.5.0
+      version: 3.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
-signing_key: 
+rubygems_version: 3.4.6
+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 @@
+5�6h��
+�
	S�l/���lW|�*��{`>�q
+�\�avi�U|��t6^�!��=n7�5��X��G�QD�u���{�.����b�1�u�����