phony 2.19.1 → 2.19.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cbadf1b4b8c2d79d7f32c069ee47175e879d57eaf582c93a6098efb068860945
-  data.tar.gz: 644bf8449040256b95af0a1d47bcc15ce0ff35b8dfbc0ee36dd72bdaec20bc4c
+  metadata.gz: 992055cdb02a340ea072dfd5909e05fb5cab8bd2c223764539527a1b13635404
+  data.tar.gz: 2357031c39a1a1345fb84ef4800115f867c815627a018dc029660165f3f2c04c
 SHA512:
-  metadata.gz: 994d683a1954d9136d9ee1fe9086e328c14b547c12db01beaf004c81beafa5625ae02f131269cfe6c945fb9666d544318663fa34b35f9d40a611066025583a82
-  data.tar.gz: 43de3b0bf711cae8010b8b61c7c96b1ec89c88730044ae16acc68a6d866725e937811b33891a9663069f1f039d0c269fd1d1930413a168bce13957354694eba6
+  metadata.gz: 7a4c94d5e5af075704d1a4651160f98f00346a8885f4bb9a38b9d47bdec0749bb2c3b3442d3ece7e5fe9aa624e93ad21c26f780114c8e06a89de04ca2dd662dd
+  data.tar.gz: 38f16122cad2ee8b1ecdc909c12c3383d6a69072d5ddcbdfca49a88420df60d0e8874bb69f74b9da2804631951145625a4b843214ce925bdbc3a5b0e72d86426

data/lib/phony/countries/taiwan.rb

@@ -11,6 +11,7 @@ Phony.define do
     match(/\A(836)\d{5}\z/) >> split(1,4) | # 馬祖, start with 0836, plus 5 digits
     match(/\A(82)\d{6}\z/)  >> split(2,4) | # 金門, start with 082, plus 6 digits
     match(/\A(89)\d{6}\z/)  >> split(2,4) | # 臺東, start with 089, plus 6 digits
+    match(/\A(80\d)\d{6}\z/)>> split(3,4) | # Toll-free number
     match(/\A(8)\d{7}\z/)   >> split(3,4) | # 屏東, start with 08, plus 7 digits
     match(/\A(49)\d{7}\z/)  >> split(3,4) | # 南投, start with 049, plus 7 digits
     one_of(%w(4)) >> matched_split(

data/lib/phony/countries.rb

@@ -154,6 +154,7 @@ Phony.define do
   #
   country '41',
           trunk('0', normalize: true) |
+          match(/^(860)\d+$/) >> split(2, 3, 2, 2) | # Voice Mail access
           match(/^(8(?:00|4[0248]))\d+$/) >> split(3,3) |  # Freecall/Shared Cost
           match(/^(90[016])\d+$/)       >> split(3,3) |  # Business
           fixed(2)                      >> split(3,2,2)
@@ -486,9 +487,9 @@ Phony.define do
   # http://www.wtng.info/wtng-260-zm.html
   # https://github.com/googlei18n/libphonenumber/
   country '260',
-    match(/^(9(5[034589]|[67]\d))/) >> split(6)   | # Mobile
-    match(/^(800)/)                 >> split(3,3) | # Toll free
-    match(/^(21[1-8])/)             >> split(6)     # Fixed
+    match(/^([79][5678]\d)/) >> split(6)   | # Mobile
+    match(/^(800)/)          >> split(3,3) | # Toll free
+    match(/^(21[1-8])/)      >> split(6)     # Fixed
 
   # Madagascar http://www.wtng.info/wtng-261-mg.html
   # http://www.itu.int/oth/T020200007F/en
@@ -992,7 +993,10 @@ Phony.define do
   country '698', todo # -
   country '699', todo # -
 
-  country '800', todo # International Freephone Service
+  # International Freephone Service
+  # https://www.itu.int/en/ITU-T/inr/unum/Pages/uifn.aspx
+  country '800', none >> split(8)
+
   country '801', todo # -
   country '802', todo # -
   country '803', todo # -
@@ -1000,7 +1004,7 @@ Phony.define do
   country '805', todo # -
   country '806', todo # -
   country '807', todo # -
-  country '808', todo # International Shared Cost Service (ISCS)
+  country '808', none >> split(12) # International Shared Cost Service (ISCS)
   country '809', todo # -
 
   country '830', todo # -

data/lib/phony/country.rb

@@ -97,6 +97,9 @@ module Phony
       end
     end
     def format_cc_ndc trunk, ndc, local, type, space, parentheses, use_trunk
+      # Note: We mark NDCs that are of type "none" with false (nil trips plausible?). This would result in false being printed.
+      #       Therefore we set NDC to nil when formatting.
+      ndc = nil if ndc == false
       case type
       when String
         trunk &&= trunk.format(space, use_trunk)
@@ -125,6 +128,7 @@ module Phony
       end
     end
     def format_ndc ndc, parentheses
+      ndc = nil if ndc == false # TODO
       parentheses ? "(#{ndc})" : ndc
     end
     def format_with_ndc format, cc, ndc, local, space

data/lib/phony/national_splitters/none.rb

@@ -31,9 +31,7 @@ module Phony
       # since using nil is dangerous and breaks
       # abstraction)
       #
-      # Note: Actually, it might stay in.
-      #
-      # TODO Flip nil/false?
+      # Note: Decided it stays in. When formatting, it's turned into nil.
       #
       def split national_number
         [nil, false, national_number]

data/spec/functional/plausibility_spec.rb

@@ -255,7 +255,7 @@ describe 'plausibility' do
       end
       # it_is_correct_for 'Gabonese Republic', :samples => [
       #   '+241 1 627 739',
-      #   '+241 12 34 56 78', 
+      #   '+241 12 34 56 78',
       # ]
       it_is_correct_for 'Gambia', :samples => '+220  989 5148'
       it_is_correct_for 'Germany', :samples => [
@@ -568,6 +568,9 @@ describe 'plausibility' do
                                               '+967 58 1234']
       it 'is correct for Zambia' do
         Phony.plausible?('+260 211 123456').should be_truthy  # Fixed
+        Phony.plausible?('+260 761 123456').should be_truthy  # Mobile
+        Phony.plausible?('+260 772 123456').should be_truthy  # Mobile
+        Phony.plausible?('+260 783 123456').should be_truthy  # Mobile
         Phony.plausible?('+260 955 123456').should be_truthy  # Mobile
         Phony.plausible?('+260 967 123456').should be_truthy  # Mobile
         Phony.plausible?('+260 978 123456').should be_truthy  # Mobile

data/spec/lib/phony/countries_spec.rb

@@ -762,6 +762,7 @@ describe 'country descriptions' do
     describe 'Switzerland' do
       it_splits '41443643532', ['41', '44', '364', '35', '32'] # Zurich (usually)
       it_splits '41800334455', ['41', '800', '334', '455']     # Service number
+      it_splits '41860443643532', ['41', '860', '44', '364', '35', '32'] # Voicemail access
       it_splits '41900123456', ['41', '900', '123', '456']     # Business Number
       it_splits '41901123456', ['41', '901', '123', '456']     # Business Number Entertainment
       it_splits '41906123456', ['41', '906', '123', '456']     # Business Number Adult Entertainment
@@ -1317,6 +1318,7 @@ describe 'country descriptions' do
       it_splits '88633123456', %w(886 3 312 3456)
       it_splits '88637123456', %w(886 37 12 3456)
       it_splits '88682712345', %w(886 82 71 2345)
+      it_splits '886801123123', %w(886 801 123 123)
       it_splits '88689712345', %w(886 89 71 2345)
       it_splits '88682672345', %w(886 826 7 2345)
       it_splits '88683672345', %w(886 836 7 2345)
@@ -1427,6 +1429,14 @@ describe 'country descriptions' do
         it_splits  number, ['263', prefix, '234', '5678']
       end
     end
+
+    describe 'Universal International Freephone' do
+      it_splits '80012345678', ['800', false, '12345678']
+    end
+    
+    describe 'Shared-Cost Service' do
+      it_splits '80812345678', ['808', false, '12345678']
+    end
   end
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: phony
 version: !ruby/object:Gem::Version
-  version: 2.19.1
+  version: 2.19.5
 platform: ruby
 authors:
 - Florian Hanke
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-06-09 00:00:00.000000000 Z
+date: 2021-09-29 00:00:00.000000000 Z
 dependencies: []
 description: 'Fast international phone number (E164 standard) normalizing, splitting
   and formatting. Lots of formatting options: International (+.., 00..), national