mini_phone 0.1.3 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ecd792546c1404a41c162138a718cd788795d891aac24c97ee87b3df382f431e
-  data.tar.gz: c77a185fce6abd249a5d0cabf92d718869ac3a99b0eb7c8596f64595582c00a6
+  metadata.gz: 7aeb4f877c1a92925416a7642c331cc9229233bdc070b877cb1b8801241dd6f8
+  data.tar.gz: 7262c82936a62c6d6e32123f23b2189a4eddc870cb708eb06784658785080e68
 SHA512:
-  metadata.gz: 99a20b5158402162ee9f2d10732c1d4ec07e18b2395d823ee2e5573059dfbc04c7815102eded133e38958b4b8573290287e9acccba9436be763bc7eb9763dd8f
-  data.tar.gz: 54e2043235f832e46a48bd94a9fb01c9e4ac30fc1e34835d9889fb3702bef96282adf5db5f6cce5d62b40ca095d6d4553a8c550465c1a244d882bea9767ae63a
+  metadata.gz: e6bf08052c013aa7bbd6a49ebbe47ab8ee356c32866e7b0a2048751ca16c407e9efc65593a400b5fe2440bbc9c5ea424f1489561d05e0e107064d068b1f02a8a
+  data.tar.gz: 121ef682de85616bf54075dd70246669b2228234795856fe12cc323a58fe7d89685a660084f3c7c5246e5a83bfdd55a4f17b4be08b44a12ae1ce5de21f3a7e21

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/.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

@@ -32,31 +32,42 @@ task :deploy 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 'bundle exec rake release'
+  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"
+    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_github_registry(g)
     push_to_rubygems(g)
   end
 
   task non_native: [:gem] do
     g = "./pkg/mini_phone-#{MiniPhone::VERSION}.gem"
 
-    push_to_github_registry(g)
-    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/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.3'
+  VERSION = '1.0.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mini_phone
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 1.0.0
 platform: ruby
 authors:
 - Ian Ker-Seymer
-autorequire:
+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.
@@ -47,7 +47,7 @@ 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:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -62,8 +62,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
-signing_key:
+rubygems_version: 3.1.4
+signing_key: 
 specification_version: 4
 summary: Uses the Google libphonenumber C lib to parse, validate, and format phone
   numbers