mini_phone 0.1.5 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e912300b4f76db0e62e401bfb92baf1591f2c84ad79ea4a5f01a184e55d45269
-  data.tar.gz: ad34125da6539853d30f8b6fe846130e6895d7f67188d14a5cd8006ccee7f1b0
+  metadata.gz: d580b7173d240a4922cdee2385d61330427a60de326d3438b8746aa2656b4946
+  data.tar.gz: ed18b90ce3412d534e80703b9f95574a629fd9a214ec38476424a23a38cebeb5
 SHA512:
-  metadata.gz: 7c01a16d10ca9ec1e26202500af5f5e6415f7808a15713542ecf6a83cafb42c70b40d0041efb63027f7523a4d1e61581efc87c2efa6b7cc252123e538894ebab
-  data.tar.gz: 0d67e790bf60c2ca2108e1f62f9022bb51dfbda3e82b63fa4fc5d27edc1de936c2c2984c887588c7a7a8b1d8e947023f2100010050ddc9a0f41634d94822b2a9
+  metadata.gz: b0b758fce7c61229b6dd32c24f62cec09d972c16a1db73531e4ed504fe6275a35aaa7dae0c9d1d38c918bdbfd741189b85f1f4b6b589460be69404cc0662787b
+  data.tar.gz: 9d9fb2335ff906834231c7dd23669a6faf9550ec9419d8473933d92d4c12d4f2d751b8f12358be77e204889126f9962236f6c0c60cf7c1c7b5cbe4cc6bc9fe84

data/.github/workflows/ci.yml

@@ -8,7 +8,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby: ["2.5", "2.6", "2.7"]
+        ruby: ["2.5", "2.6", "2.7", "3.0"]
         os: [ubuntu-latest, macos-latest]
         experimental: [false]
         # include:

data/.github/workflows/release.yml

@@ -12,9 +12,7 @@ jobs:
       fail-fast: false
       matrix:
         ruby: ["2.7"]
-        os: [ubuntu-latest, macos-latest]
-    name: ${{ matrix.os }}
-    runs-on: ${{ matrix.os }}
+    runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
 
@@ -23,13 +21,8 @@ jobs:
           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
 
@@ -51,5 +44,4 @@ jobs:
 
       - name: 🛳 Ship it
         run: |
-          bundle exec rake publish:native
-          bundle exec rake publish:non_native || true
+          bundle exec rake publish:non_native

data/.rubocop.yml

@@ -12,7 +12,12 @@ AllCops:
   TargetRubyVersion: 2.5
   NewCops: enable
   SuggestExtensions: false
+  Exclude:
+    - pkg/**/*
+    - tmp/**/*
 
 Metrics/BlockLength:
   Exclude:
     - spec/**/*
+    - Rakefile
+    - Gemfile

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

@@ -36,9 +36,22 @@ task :deploy do
 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"
+    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
@@ -50,6 +63,11 @@ namespace :publish do
   task non_native: [:gem] do
     g = "./pkg/mini_phone-#{MiniPhone::VERSION}.gem"
 
-    push_to_rubygems(g)
+    results = []
+
+    results << push_to_rubygems(g)
+    results << push_to_github_registry(g)
+
+    abort if results.all? { |r| r == true }
   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

@@ -30,7 +30,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 +51,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 +68,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; }
 
@@ -108,7 +108,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);
@@ -339,7 +339,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?",
@@ -351,9 +351,9 @@ extern "C" void Init_mini_phone(void) {
   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);
+                            "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);

data/lib/mini_phone/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mini_phone
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 1.0.1
 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.