phony 2.15.44 → 2.15.46

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1fa108fb584dd17a81f785d16e15dee13d88df92
-  data.tar.gz: a34a89f9767d736726e355dae3e0f5e4bd7226fd
+  metadata.gz: 425702e9ff19dfa1d39a04347c5aa17aa68ee0c9
+  data.tar.gz: 0d33325a64b947754d840bb30f59288157c06c36
 SHA512:
-  metadata.gz: 0ebae7268f7c148285f231f447f174fbda78552d3827b0cb8746e27d2f42ebfaca7c72166b4e4b335d2caf66b002ac0ec2e86fcd6f2b7491058959814580969d
-  data.tar.gz: 107b5d6e714356813cade294e5d0cd4fa76414119e3b63eb3fdaf2c980cee5c1473df5f84d8fe8708ddc2bbe7cf327f8a8aa48c2c588ae1036afd9efd7822355
+  metadata.gz: 944eef26079290a5ed72511efdb219eefe5328918964ad80febc0a368a4e759436cee633cfe3857f9a43c285ad9cd6fe138f770c2da427a252b01290050854f2
+  data.tar.gz: 98c7fc92e39eed57867085e44bd77f54965405ffbbce9692c5eb6620cd00b6a895ac7558c7c678c9a5d32f0250cace9dca2ef48ea2b49a91a75c9dd1da426382

data/lib/phony/countries.rb

@@ -472,9 +472,11 @@ Phony.define do
 
   # Zambia
   # http://www.wtng.info/wtng-260-zm.html
+  # https://github.com/googlei18n/libphonenumber/
   country '260',
-    match(/^(9(55|66|7[7-9]))/) >> split(6) | # mobile
-    match(/^(21[1-8])/) >> split(6) # fixed
+    match(/^(9(5[034589]|[67]\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
@@ -751,9 +753,11 @@ Phony.define do
 
   # Slovak Republic.
   #
-  country '421', match(/^(9\d\d).+$/) >> split(6) | # Mobile
-                 one_of('2')          >> split(8) | # Bratislava
-                 fixed(2)             >> split(7)   # 2-digit NDCs
+  country '421', match(/^(9\d\d).+$/)          >> split(6) | # Mobile
+                 match(/\A(2)1\d{2,4}\z/)      >> split(3..5) | # Bratislava Short
+                 match(/\A(\d{2})1\d{2,4}\z/)  >> split(3..5) | # 2-digit NDCs Short
+                 one_of('2')                   >> split(8) | # Bratislava
+                 fixed(2)                      >> split(7) # 2-digit NDCs
 
   country '422', todo # Spare code
   country '423', none >> split(3,2,2) # Liechtenstein (Principality of)
@@ -986,7 +990,8 @@ Phony.define do
   # Macao, China
   country '853', # Macao, China
     match(/^(28)\d+$/) >> split(2,4) | # Landline.
-    match(/^(6)\d+$/)  >> split(3,4)  # Mobile.
+    match(/^(8)\d+$/)  >> split(3,4) | # Landline.
+    match(/^(6)\d+$/)  >> split(3,4)   # Mobile.
 
   country '854', todo # Spare code
 

data/lib/phony/countries/croatia.rb

@@ -3,24 +3,19 @@
 # http://en.wikipedia.org/wiki/Telephone_numbers_in_Croatia
 # http://dialcode.org/Europe/Croatia/
 # http://www.howtocallabroad.com/croatia/
-#
-# Landline numbers are composed by a 2 digits area code + 6 fixed digits 
-# Mobile numbers are composed by a 2 digits prefix + 7 fixed digits 
+# https://github.com/googlei18n/libphonenumber/
 #
 
-mobile = %w(
-  91
-  92
-  95
-  97
-  977
-  98
-  99
-)
+landline = /^(2[0-3]|3[1-5]|4[02-47-9]|5[1-3])/
 
 Phony.define do
   country '385', trunk('0') |
-                 one_of(mobile) >> split(3, 4) |
-                 one_of('1')    >> split(4, 3) | # Zagreb
-                 fixed(2)       >> split(3, 3)   # 2-digit NDCs
-end
+                 one_of('1')         >> split(4, 3)       | # Zagreb
+                 match(/^(80[01])/)  >> matched_split(
+                                    /\A\d{4}\z/ => [4],
+                                    /\A\d{6}\z/ => [3,3]) | # Toll free
+                 match(/^(9\d)/)     >> split(3, 3..4)    | # Mobile
+                 match(landline)     >> split(3, 3..4)    | # Landline
+                 match(/^(6[01])/)   >> split(2,2..3)     | # Premium rate
+                 match(/^([67]\d)/)  >> split(3,3..4)       # Premium, personal and UAN
+end

data/lib/phony/countries/taiwan.rb

@@ -1,52 +1,25 @@
 # Taiwan
-# https://www.numberingplans.com/?page=dialling&sub=areacodes
-#
-
-ndcs_with_8_subscriber_numbers = %w(1 2)
-
-ndcs_with_7_subscriber_numbers = %w(3 4 5 6 7 8)
-
-ndcs_with_6_subscriber_numbers = %w(
-33
-34
-35
-36
-37
-38
-39
-42
-43
-44
-45
-46
-47
-48
-49
-55
-56
-62
-66
-67
-69
-88
-89
-)
-
-ndcs_with_5_subscriber_numbers = %w(823 826 827)
+# https://zh.wikipedia.org/wiki/%E4%B8%AD%E8%8F%AF%E6%B0%91%E5%9C%8B%E9%95%B7%E9%80%94%E9%9B%BB%E8%A9%B1%E5%8D%80%E8%99%9F%E8%A1%A8
+# https://en.wikipedia.org/wiki/Telephone_numbers_in_Taiwan
 
 Phony.define do
   country '886',
     trunk('0') |
-    one_of(ndcs_with_5_subscriber_numbers) >> split(3,2) |
-    match(/\A(6\d\d)\d{7}\z/) >> split(3,4) | # geographic ; Taipei
-    one_of(%w(412)) >> split(4) | # VoIP telephony ; Taichung
-    one_of(ndcs_with_6_subscriber_numbers) >> split(3,3) |
-    one_of(%w(18)) >> split(3,3) | # freephone
-    one_of(%w(90 91 92 93 95 96 97 98)) >> matched_split(
-       /\A\d{6}\z/ => [3,3],
-       /\A\d+\z/ => [3,4]) | # mobile
-    one_of(%w(60 70 94 95 99)) >> split(3,3) | # pager
-    one_of(ndcs_with_7_subscriber_numbers) >> split(3,4) |
-    one_of(ndcs_with_8_subscriber_numbers) >> split(4,4) |
-    fixed(2) >> split(3,3)
+    match(/\A(826)\d{5}\z/) >> split(1,4) | # 烏坵, start with 0826, plus 5 digits
+    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(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(
+       /\A\d{7}\z/          =>      [3,4],  # 彰化, start with 04, plus 7 digits
+       /\A\d+\z/            =>      [4,4])| # 臺中, start with 04, plus 8 digits
+    match(/\A(37)\d{6}\z/)  >> split(2,4) | # 苗栗, start with 037, plus 6 digits
+    match(/\A(3)\d{7}\z/)   >> split(3,4) | # 桃園 新竹 花蓮 宜蘭, start with 03, plus 7 digits
+    match(/\A(5)\d{7}\z/)   >> split(3,4) | # 嘉義 雲林, start with 05, plus 7 digits
+    match(/\A(6)\d{7}\z/)   >> split(3,4) | # 臺南 澎湖, start with 06, plus 7 digits
+    match(/\A(7)\d{7}\z/)   >> split(3,4) | # 高雄, start with 07, plus 7 digits
+    match(/\A(2)\d{8}\z/)   >> split(4,4) | # 臺北, start with 02, plus 8 digits
+    match(/\A(9\d\d)\d{6}\z/)   >> split(3,3) | # mobile phone, start with 09, plus 8 digits, but local usually show 4-3-3.
+    fixed(2)                >> split(4,4)   # fallback unknown
 end

data/spec/functional/plausibility_spec.rb

@@ -53,6 +53,16 @@ describe 'plausibility' do
       it_is_correct_for 'Congo', :samples => '+242 1234 56789'
       it_is_correct_for 'Cook Islands', :samples => '+682  71928'
       it_is_correct_for 'Costa Rica', :samples => '+506 2 234 5678'
+      it 'is correct for Croatia' do
+          Phony.plausible?('+385 21 695 900').should be_true  # Landline
+          Phony.plausible?('+385 1 4566 666').should be_true  # Landline (Zagreb)
+          Phony.plausible?('+385 99 444 999').should be_true  # Mobile
+          Phony.plausible?('+385 91 896 7509').should be_true # Mobile
+          Phony.plausible?('+385 800 1234').should be_true    # Toll free
+          Phony.plausible?('+385 800 123 456').should be_true # Toll free
+          Phony.plausible?('+385 60 12 345').should be_true   # Premium rate
+          Phony.plausible?('+385 62 123 456').should be_true  # Premium, personal and UAN
+      end
       it_is_correct_for "Côte d'Ivoire", :samples => '+225  9358 8764'
       it_is_correct_for 'Democratic Republic of Timor-Leste', :samples => ['+670 465 7886', '+670 7465 7886']
       it_is_correct_for 'Democratic Republic of the Congo', :samples => '+243 80 864 9794'
@@ -171,6 +181,9 @@ describe 'plausibility' do
         Phony.plausible?('+231 4 123 456').should be_true
         Phony.plausible?('+231 77 123 4567').should be_true
       end
+      it_is_correct_for 'Macao', :samples => ['+853 28 12 3456',
+                                              '+853 8 123 4567',
+                                              '+853 6 123 4567',]
       it_is_correct_for 'Macedonia', :samples => ['+389 2 123 4567',
                                                    '+389 7 124 3456',
                                                    '+389 7 234 5678']
@@ -270,15 +283,12 @@ describe 'plausibility' do
                                                              '+963 31 123 4567',
                                                              '+963 15 731 234',
                                                              '+963 9 1234 5678']
-      it_is_correct_for 'Taiwan', :samples => ['+886 18 123 456',
-                                               '+886 612 123 4567',
-                                               '+886 2 1234 5678',
+      it_is_correct_for 'Taiwan', :samples => ['+886 6 123 4567',
                                                '+886 3 123 4567',
                                                '+886 33 123 456',
                                                '+886 827 123 45',
-                                               '+886 412 1234',
-                                               ['+886 90 123 456', '+886 90 123 4567'],
-                                               '+886 94 991 345']
+                                               '+886 4 123 1234',
+                                               '+886 9 1234 5678']
       it_is_correct_for 'Tajikistan', :samples => ['+992 3130 123 45',
                                                    '+992 331700 123',
                                                    '+992 372 123 345',
@@ -362,8 +372,11 @@ describe 'plausibility' do
                                               '+967 77 123 4567',
                                               '+967 58 1234']
       it 'is correct for Zambia' do
-        Phony.plausible?('+260 955 123456').should be_true # mobile
-        Phony.plausible?('+260 211 123456').should be_true # fixed
+        Phony.plausible?('+260 211 123456').should be_true  # Fixed
+        Phony.plausible?('+260 955 123456').should be_true  # Mobile
+        Phony.plausible?('+260 967 123456').should be_true  # Mobile
+        Phony.plausible?('+260 978 123456').should be_true  # Mobile
+        Phony.plausible?('+260 800 123 456').should be_true # Toll free
       end
       it_is_correct_for 'Zimbabwe', :samples => [['+263 2582 123 456', '+263 2582 123'],
                                                  ['+263 147 123 456', '+263 147 123'],

data/spec/lib/phony/countries_spec.rb

@@ -201,7 +201,12 @@ describe 'country descriptions' do
     describe 'Croatia' do
       it_splits '38521695900',  %w( 385 21 695 900 )  # Landline
       it_splits '38514566666',  %w( 385 1 4566 666 )  # Landline (Zagreb)
+      it_splits '38599444999',  %w( 385 99 444 999 )  # Mobile
       it_splits '385918967509', %w( 385 91 896 7509 ) # Mobile
+      it_splits '3858001234',   %w( 385 800 1234 )    # Toll free
+      it_splits '385800123456', %w( 385 800 123 456 ) # Toll free
+      it_splits '3856012345',   %w( 385 60 12 345 )   # Premium rate
+      it_splits '38562123456',  %w( 385 62 123 456 )  # Premium, personal and UAN
     end
     describe 'Cuba' do
       it_splits '5351231234', ['53', '5123', '1234'] # Mobile
@@ -474,6 +479,7 @@ describe 'country descriptions' do
     end
     describe 'Macao' do
       it_splits '85328123456', ["853", "28", "12", "3456"] # Landline
+      it_splits '85381234567', ["853", "8", "123", "4567"] # Landline
       it_splits '85361234567', ["853", "6", "123", "4567"] # Mobile
     end
     describe 'Malaysia' do
@@ -660,7 +666,9 @@ describe 'country descriptions' do
     describe 'Slovakia' do
       it_splits '421912123456', ['421', '912', '123456'] # Mobile
       it_splits '421212345678', ['421', '2', '12345678'] # Bratislava
+      it_splits '4212123',      ['421', '2', '123'] # Bratislava Short
       it_splits '421371234567', ['421', '37', '1234567'] # Nitra / Other
+      it_splits '42137123',     ['421', '37', '123'] # Nitra / Other Short
     end
 
     describe 'Slovenia' do
@@ -777,8 +785,11 @@ describe 'country descriptions' do
       it_splits '84412345678', ['84', '4', '1234', '5678'] # Hanoi
     end
     describe 'Zambia' do
-      it_splits '260955123456', ['260', '955', '123456'] # mobile
-      it_splits '260211123456', ['260', '211', '123456'] # fixed
+      it_splits '260211123456', ['260', '211', '123456']     # Fixed
+      it_splits '260955123456', ['260', '955', '123456']     # Mobile
+      it_splits '260967123456', ['260', '967', '123456']     # Mobile
+      it_splits '260978123456', ['260', '978', '123456']     # Mobile
+      it_splits '260800123456', ['260', '800', '123', '456'] # Toll free
     end
     describe 'New Zealand' do
       it_splits '6491234567', ['64', '9', '123', '4567']
@@ -1211,16 +1222,21 @@ describe 'country descriptions' do
       it_splits '963912345678', %w(963 9 1234 5678)
     end
     describe 'Taiwan' do
-      it_splits '88618123456', %w(886 18 123 456)
-      it_splits '8866121234567', %w(886 612 123 4567)
       it_splits '886212345678', %w(886 2 1234 5678)
       it_splits '88631234567', %w(886 3 123 4567)
-      it_splits '88633123456', %w(886 33 123 456)
-      it_splits '88682712345', %w(886 827 123 45)
-      it_splits '8864121234', %w(886 412 1234)
-      it_splits '88690123456', %w(886 90 123 456)
-      it_splits '886901234567', %w(886 90 123 4567)
-      it_splits '88694991345', %w(886 94 991 345)
+      it_splits '88651234567', %w(886 5 123 4567)
+      it_splits '88661234567', %w(886 6 123 4567)
+      it_splits '88671234567', %w(886 7 123 4567)
+      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 '88689712345', %w(886 89 71 2345)
+      it_splits '88682672345', %w(886 826 7 2345)
+      it_splits '88683672345', %w(886 836 7 2345)
+      it_splits '88641212345', %w(886 4 121 2345)
+      it_splits '886412123456', %w(886 4 1212 3456)
+      it_splits '886491234567', %w(886 49 123 4567)
+      it_splits '886901234567', %w(886 901 234 567)
     end
     describe 'Togolese Republic' do
       it_splits '22812345678', ['228', false, '1234', '5678']

metadata

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