mini_phone 0.1.7 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d7bb347a05cfd2252b4d3da6bfb2918ab277ac8c0ade0d1ebfc1bd14d95a7acd
-  data.tar.gz: d62bb44c21e637a343f039df50bd12f196ab27b763f426a635c080ac08e549a1
+  metadata.gz: 8f19ec27523bfdcd42b72b4421441b4016b4bf86c94f91f527e10bf5a33d1a16
+  data.tar.gz: 7ab2cf83930eaa1c35f7bf2a2faa7afded85238b8a69bf8822013f3f33ee274a
 SHA512:
-  metadata.gz: 321ffa3218cb9d040b40d8ec8b03281ae1d92e910ab66275b21f258183f6e17fd14bfaa5a8629401cf3aae5b059727a6182ebff366d10badcbd8376eca908789
-  data.tar.gz: 7916ba4ee31c8f9414481dbad9d4210d5fd16f4e77372588e1bf7154eb12f4d47d53dac1c413e905567abddd6e18284c386bda40bee0feb6ca5b617a2266f8ea
+  metadata.gz: 853cc1202032f2c6f2fec744de57bfdabac907116fd1495060b65c5d51da060dbf317f253ca3179787f2de9162c7961e83d3f1c39909bbf7ae252262dcfaf7e4
+  data.tar.gz: 3965cf5f9798b3529eab55f0eb24b3532950f306005fca4655589d8d27c925028115a976fa623af6ca16e715aa6f8f9993cd8716779356f5c194b7cc5f7d4e6f

data/Gemfile

@@ -5,11 +5,12 @@ source 'https://rubygems.org'
 # Specify your gem's dependencies in mini_phone.gemspec
 gemspec
 
-gem 'rake', '~> 12.0'
+gem 'rake', require: false
+# https://github.com/rake-compiler/rake-compiler/pull/166
 gem 'rake-compiler', github: 'larskanis/rake-compiler', branch: 'fix-native-version'
-gem 'rspec', '~> 3.0'
+gem 'rspec', '~> 3.0', require: false
 gem 'rspec-github', require: false
-gem 'rubocop'
+gem 'rubocop', require: false
 
 group :bench do
   gem 'benchmark-ips'

data/Rakefile

@@ -9,7 +9,7 @@ RSpec::Core::RakeTask.new(:spec)
 
 task build: :compile
 
-task default: %i[clobber compile spec]
+task default: %i[clobber compile spec lint]
 
 spec = Gem::Specification.load(File.expand_path('mini_phone.gemspec', __dir__))
 
@@ -28,7 +28,11 @@ task bench: %i[clobber compile] do
   end
 end
 
-task :deploy do
+task :lint do
+  sh 'bundle exec rubocop'
+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:'"
@@ -63,11 +67,7 @@ namespace :publish do
   task non_native: [:gem] do
     g = "./pkg/mini_phone-#{MiniPhone::VERSION}.gem"
 
-    results = []
-
-    results << push_to_rubygems(g)
-    results << push_to_github_registry(g)
-
-    abort if results.all? { |r| r == true }
+    push_to_rubygems(g)
+    push_to_github_registry(g)
   end
 end

data/ext/mini_phone/extconf.rb

@@ -4,47 +4,6 @@
 
 require 'mkmf'
 
-LIBDIR      = RbConfig::CONFIG['libdir']
-
-INCLUDEDIR  = RbConfig::CONFIG['includedir']
-
-header_dirs = [
-  # First search /opt/local for macports
-  '/opt/local/include',
-
-  # Then search /usr/local for people that installed from source
-  '/usr/local/include',
-
-  # Check the ruby install locations
-  INCLUDEDIR,
-
-  # Finally fall back to /usr
-  '/usr/include'
-]
-
-lib_dirs = [
-  # First search /opt/local for macports
-  '/opt/local/lib',
-
-  # Then search /usr/local for people that installed from source
-  '/usr/local/lib',
-
-  # Check the ruby install locations
-  LIBDIR,
-
-  # Finally fall back to /usr
-  '/usr/lib'
-]
-
-# Detect homebrew installs
-if find_executable('brew')
-  brew_prefix = `brew --prefix`.strip
-  header_dirs.unshift "#{brew_prefix}/include"
-  lib_dirs.unshift "#{brew_prefix}/lib"
-end
-
-dir_config('mini_phone', header_dirs, lib_dirs)
-
 unless have_library('phonenumber')
   abort <<~MSG
 
@@ -70,7 +29,9 @@ unless have_library('phonenumber')
   MSG
 end
 
-$CXXFLAGS += ' -std=c++11 '
+dir_config('mini_phone')
+
+$CXXFLAGS += ' -std=c++11 -ofast '
 
 create_makefile('mini_phone/mini_phone')
 

data/ext/mini_phone/mini_phone.cc

@@ -1,12 +1,18 @@
 #include "mini_phone.h"
+#include "phonenumbers/phonemetadata.pb.h"
+#include "phonenumbers/phonenumber.pb.h"
 #include "phonenumbers/phonenumberutil.h"
 
 using namespace ::i18n::phonenumbers;
 
+using google::protobuf::RepeatedPtrField;
+
 static VALUE rb_mMiniPhone;
 
 static VALUE rb_cPhoneNumber;
 
+static RepeatedPtrField<NumberFormat> raw_national_format;
+
 extern "C" struct PhoneNumberInfo {
   PhoneNumber phone_number;
   std::string raw_phone_number;
@@ -30,7 +36,7 @@ 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_code");
+  VALUE def_cc = rb_iv_get(rb_mMiniPhone, "@default_country");
 
   return is_phone_number_valid(self, str, def_cc);
 }
@@ -51,7 +57,7 @@ extern "C" VALUE rb_is_phone_number_possible(VALUE self, VALUE str) {
   PhoneNumber parsed_number;
   PhoneNumberUtil *phone_util = PhoneNumberUtil::GetInstance();
 
-  VALUE def_cc = rb_iv_get(rb_mMiniPhone, "@default_country_code");
+  VALUE def_cc = 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));
 
@@ -68,11 +74,11 @@ extern "C" VALUE rb_is_phone_number_impossible(VALUE self, VALUE str) {
   return rb_is_phone_number_possible(self, str) == Qtrue ? Qfalse : Qtrue;
 }
 
-extern "C" VALUE rb_set_default_country_code(VALUE self, VALUE str_code) {
-  return rb_iv_set(self, "@default_country_code", str_code);
+extern "C" VALUE rb_set_default_country(VALUE self, VALUE str_code) {
+  return rb_iv_set(self, "@default_country", str_code);
 }
 
-extern "C" VALUE rb_get_default_country_code(VALUE self) { return rb_iv_get(self, "@default_country_code"); }
+extern "C" VALUE rb_get_default_country(VALUE self) { return rb_iv_get(self, "@default_country"); }
 
 extern "C" void rb_phone_number_dealloc(PhoneNumberInfo *phone_number_info) { delete phone_number_info; }
 
@@ -89,6 +95,7 @@ extern "C" VALUE rb_phone_number_alloc(VALUE self) {
 
 static inline VALUE rb_phone_number_nullify_ivars(VALUE self) {
   rb_iv_set(self, "@national", Qnil);
+  rb_iv_set(self, "@raw_national", Qnil);
   rb_iv_set(self, "@international", Qnil);
   rb_iv_set(self, "@e164", Qnil);
   rb_iv_set(self, "@country_code", Qnil);
@@ -108,7 +115,7 @@ extern "C" VALUE rb_phone_number_initialize(int argc, VALUE *argv, VALUE self) {
   rb_scan_args(argc, argv, "11", &str, &def_cc);
 
   if (NIL_P(def_cc)) {
-    def_cc = rb_iv_get(rb_mMiniPhone, "@default_country_code");
+    def_cc = rb_iv_get(rb_mMiniPhone, "@default_country");
   }
 
   rb_iv_set(self, "@input", str);
@@ -185,6 +192,24 @@ extern "C" VALUE rb_phone_number_rfc3966(VALUE self) {
   return rb_iv_set(self, "@rfc3966", rb_phone_number_format(self, PhoneNumberUtil::PhoneNumberFormat::RFC3966));
 }
 
+extern "C" VALUE rb_phone_number_raw_national(VALUE self) {
+  if (rb_ivar_defined(self, rb_intern("@raw_national"))) {
+    return rb_iv_get(self, "@raw_national");
+  }
+
+  std::string formatted_number;
+  PhoneNumberInfo *phone_number_info;
+  PhoneNumberUtil *phone_util = PhoneNumberUtil::GetInstance();
+  Data_Get_Struct(self, PhoneNumberInfo, phone_number_info);
+
+  phone_util->FormatByPattern(phone_number_info->phone_number, PhoneNumberUtil::NATIONAL, raw_national_format,
+                              &formatted_number);
+
+  VALUE result = rb_str_new(formatted_number.c_str(), formatted_number.size());
+
+  return rb_iv_set(self, "@raw_national", 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");
@@ -339,7 +364,7 @@ extern "C" void Init_mini_phone(void) {
   rb_mMiniPhone = rb_define_module("MiniPhone");
 
   // Unknown
-  rb_iv_set(rb_mMiniPhone, "@default_country_code", rb_str_new("ZZ", 2));
+  rb_iv_set(rb_mMiniPhone, "@default_country", rb_str_new("ZZ", 2));
 
   rb_define_module_function(rb_mMiniPhone, "valid?", reinterpret_cast<VALUE (*)(...)>(rb_is_phone_number_valid), 1);
   rb_define_module_function(rb_mMiniPhone, "valid_for_country?",
@@ -350,10 +375,10 @@ extern "C" void Init_mini_phone(void) {
   rb_define_module_function(rb_mMiniPhone, "possible?", reinterpret_cast<VALUE (*)(...)>(rb_is_phone_number_valid), 1);
   rb_define_module_function(rb_mMiniPhone, "impossible?", reinterpret_cast<VALUE (*)(...)>(rb_is_phone_number_invalid),
                             1);
-  rb_define_module_function(rb_mMiniPhone,
-                            "default_country_code=", reinterpret_cast<VALUE (*)(...)>(rb_set_default_country_code), 1);
-  rb_define_module_function(rb_mMiniPhone, "default_country_code",
-                            reinterpret_cast<VALUE (*)(...)>(rb_get_default_country_code), 0);
+  rb_define_module_function(rb_mMiniPhone, "default_country=", reinterpret_cast<VALUE (*)(...)>(rb_set_default_country),
+                            1);
+  rb_define_module_function(rb_mMiniPhone, "default_country", reinterpret_cast<VALUE (*)(...)>(rb_get_default_country),
+                            0);
   rb_define_module_function(rb_mMiniPhone, "parse", reinterpret_cast<VALUE (*)(...)>(rb_phone_number_parse), -1);
 
   rb_cPhoneNumber = rb_define_class_under(rb_mMiniPhone, "PhoneNumber", rb_cObject);
@@ -367,6 +392,11 @@ extern "C" void Init_mini_phone(void) {
   rb_define_method(rb_cPhoneNumber, "impossible?", reinterpret_cast<VALUE (*)(...)>(rb_phone_number_impossible_eh), 0);
   rb_define_method(rb_cPhoneNumber, "e164", reinterpret_cast<VALUE (*)(...)>(rb_phone_number_e164), 0);
   rb_define_method(rb_cPhoneNumber, "national", reinterpret_cast<VALUE (*)(...)>(rb_phone_number_national), 0);
+
+  // Raw National
+  raw_national_format.Add()->set_format("$1$2$3");
+
+  rb_define_method(rb_cPhoneNumber, "raw_national", reinterpret_cast<VALUE (*)(...)>(rb_phone_number_raw_national), 0);
   rb_define_method(rb_cPhoneNumber, "international", reinterpret_cast<VALUE (*)(...)>(rb_phone_number_international),
                    0);
   rb_define_method(rb_cPhoneNumber, "rfc3966", reinterpret_cast<VALUE (*)(...)>(rb_phone_number_rfc3966), 0);

data/lib/mini_phone/version.rb

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

data/mini_phone.gemspec

@@ -27,7 +27,10 @@ Gem::Specification.new do |spec|
   # Specify which files should be added to the gem when it is released.
   # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
   spec.files = Dir.chdir(File.expand_path(__dir__)) do
-    `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(bin|spec|bench)/}) }
+    `git ls-files -z`
+      .split("\x0")
+      .reject { |f| f.match(%r{^(bin|spec|bench)/}) }
+      .reject { |f| f.start_with?('.') }
   end
   spec.bindir        = 'exe'
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mini_phone
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 1.0.3
 platform: ruby
 authors:
 - Ian Ker-Seymer
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-01-05 00:00:00.000000000 Z
+date: 2021-01-08 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.
@@ -20,13 +20,6 @@ extensions:
 - ext/mini_phone/extconf.rb
 extra_rdoc_files: []
 files:
-- ".clang-format"
-- ".github/workflows/ci.yml"
-- ".github/workflows/release.yml"
-- ".gitignore"
-- ".rspec"
-- ".rubocop.yml"
-- ".travis.yml"
 - CHANGELOG.md
 - CODE_OF_CONDUCT.md
 - Gemfile

data/.clang-format

@@ -1,3 +0,0 @@
----
-BasedOnStyle: LLVM
-ColumnLimit: 120

data/.github/workflows/ci.yml

@@ -1,51 +0,0 @@
----
-name: CI
-
-on: push
-
-jobs:
-  build:
-    strategy:
-      fail-fast: false
-      matrix:
-        ruby: ["2.5", "2.6", "2.7"]
-        os: [ubuntu-latest, macos-latest]
-        experimental: [false]
-        # include:
-        #   - ruby: "truffleruby"
-        #     os: ubuntu-latest
-        #     experimental: true
-        #   - ruby: "truffleruby"
-        #     os: macos-latest
-        #     experimental: true
-    name: ${{ matrix.ruby }} on ${{ matrix.os }}
-    runs-on: ${{ matrix.os }}
-    continue-on-error: ${{ matrix.experimental }}
-    env:
-      CI_EXPERIMENTAL: ${{ matrix.experimental }}
-    steps:
-      - uses: actions/checkout@v2
-
-      - uses: ruby/setup-ruby@v1
-        with:
-          ruby-version: ${{ matrix.ruby }}
-
-      - name: Install dependencies (system)
-        if: ${{ matrix.os == 'ubuntu-latest' }}
-        run: sudo apt-get -yqq install libphonenumber-dev
-
-      - name: Install dependencies (system)
-        if: ${{ matrix.os == 'macos-latest' }}
-        run: brew install --build-from-source libphonenumber && brew link libphonenumber
-
-      - name: Install dependencies (ruby)
-        run: gem install bundler && bundle install --jobs 4 --retry 3
-
-      - name: Compile
-        run: bundle exec rake compile
-
-      - name: RSpec
-        run: bundle exec rspec --format RSpec::Github::Formatter --format documentation
-
-      - name: Rubocop
-        run: bundle exec rubocop --format github

data/.github/workflows/release.yml

@@ -1,55 +0,0 @@
----
-name: Release
-
-on:
-  push:
-    tags:
-      - "v*"
-
-jobs:
-  build:
-    strategy:
-      fail-fast: false
-      matrix:
-        ruby: ["2.7"]
-        os: [ubuntu-latest, macos-latest]
-    name: ${{ matrix.os }}
-    runs-on: ${{ matrix.os }}
-    steps:
-      - uses: actions/checkout@v2
-
-      - uses: ruby/setup-ruby@v1
-        with:
-          ruby-version: ${{ matrix.ruby }}
-
-      - name: Install dependencies (system)
-        if: ${{ matrix.os == 'ubuntu-latest' }}
-        run: sudo apt-get -yqq install libphonenumber-dev
-
-      - name: Install dependencies (system)
-        if: ${{ matrix.os == 'macos-latest' }}
-        run: brew install --build-from-source libphonenumber && brew link libphonenumber
-
-      - name: Install dependencies (ruby)
-        run: gem install bundler && bundle install --jobs 4 --retry 3
-
-      - name: Login
-        run: |
-          mkdir -p ~/.gem
-
-          cat << EOF > ~/.gem/credentials
-          ---
-          :github: ${GITHUB_AUTH_TOKEN}
-          :rubygems_api_key: ${RUBYGEMS_AUTH_TOKEN}
-          EOF
-
-          chmod 0600 ~/.gem/credentials
-        env:
-          GITHUB_AUTH_TOKEN: "Bearer ${{secrets.GITHUB_TOKEN}}"
-          RUBYGEMS_AUTH_TOKEN: "${{secrets.RUBYGEMS_AUTH_TOKEN}}"
-          OWNER: ${{ github.repository_owner }}
-
-      - name: 🛳 Ship it
-        run: |
-          bundle exec rake publish:native
-          bundle exec rake publish:non_native || true

data/.gitignore

@@ -1,19 +0,0 @@
-.bundle/
-.yardoc
-_yardoc/
-coverage/
-doc/
-pkg/
-spec/reports/
-tmp/
-*.bundle
-*.so
-*.o
-*.a
-mkmf.log
-
-# rspec failure tracking
-.rspec_status
-Gemfile.lock
-vendor/cache/
-*.gem

data/.rspec

@@ -1,3 +0,0 @@
---format documentation
---color
---require spec_helper

data/.rubocop.yml

@@ -1,23 +0,0 @@
-# The behavior of RuboCop can be controlled via the .rubocop.yml
-# configuration file. It makes it possible to enable/disable
-# certain cops (checks) and to alter their behavior if they accept
-# any parameters. The file can be placed either in your home
-# directory or in some project directory.
-#
-# RuboCop will start looking for the configuration file in the directory
-# where the inspected file is and continue its way up to the root directory.
-#
-# See https://docs.rubocop.org/rubocop/configuration
-AllCops:
-  TargetRubyVersion: 2.5
-  NewCops: enable
-  SuggestExtensions: false
-  Exclude:
-    - pkg/**/*
-    - tmp/**/*
-
-Metrics/BlockLength:
-  Exclude:
-    - spec/**/*
-    - Rakefile
-    - Gemfile

data/.travis.yml

@@ -1,6 +0,0 @@
----
-language: ruby
-cache: bundler
-rvm:
-  - 2.7.1
-before_install: gem install bundler -v 2.1.4