phony 2.16.5 → 2.16.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 007664f345320ce791321f4caefa7547e51fc87f
-  data.tar.gz: 88fa29994d4278c8a103b60286a920fb582582e2
+SHA256:
+  metadata.gz: a692a55cbcbd9468fce9e49b6ea2e866695de5b32683b8e70fdeed9148bc26fa
+  data.tar.gz: 339527a9c152e964205ddc42f4c701ede918aa36d3c4fb861335800c78ad9e91
 SHA512:
-  metadata.gz: 106d1d49a6bd3c4a2448e18c4bba3f8896c3a6cb46cf9597a0c9b0a8ff7c061cd877bd9b5189bedb68a193714e64c322b8658cf1345a6c563b323c334a4f2a76
-  data.tar.gz: 3e23392df6d3f950664b15f3d3be277627d3b2f9242e8033d97a41c73e1d0b3d6d03e56e37e75bf922658e7dd578fd88209bff681b2dde76716284f5ede146dd
+  metadata.gz: 72558d720a71eeab6dd18b4b0c85c02e640688d0337a82a288434fec29c3f38df3b706ceef959f76b618b1c62f77bc8c792160c9f454115f419903ca8c9a15a6
+  data.tar.gz: bf64d35ba470fd802f5c63aec263703312ed5a3cf5266bc736c396d9c337ff3986619f90f733a94405e2fe935633fcfc0d57d24ccde9ab26ca06daaded00467f

data/lib/phony/countries.rb

@@ -685,13 +685,24 @@ Phony.define do
   # Note: https://en.wikipedia.org/wiki/Telephone_numbers_in_Bulgaria
   country '359',
           trunk('0') |
-          one_of('2') >> matched_split(
-            /\A\d{6}\z/ => [3,3],     # Landline Sofia (optional last digit)
-            /\A\d{7}\z/ => [3,4]) |   # Landline Sofia
-          fixed(2) >> matched_split(
-            /\A\d{5}\z/ => [3,2],     # Landline (optional last digit)
-            /\A\d{6}\z/ => [3,3],     # Landline
-            /\A\d{7}\z/ => [3,4])     # Mobile
+          match(/^(2)\d{6}$/) >> split(3,3)  | # Landline Sofia (optional last digit)
+          match(/^(2)\d{7}$/) >> split(3,4)  | # Landline Sofia (optional last digit)
+          match(/^(30|31|33|36|37|39|41|43\d|45|47|51|53|55|57|59)\d{5}$/) >> split(5) |
+          match(/^(30|31|32|33|34|35|36|37|38|39|41|42|44|45|46|47|51|52|53|54|55|56|57|58|59)\d{6}$/) >> split(2,4) |
+
+          match(/^(60|61|63|65|66|69)\d{5}$/) >> split(5) |
+          match(/^(60|61|62|63|64|65|66|68|69)\d{6}$/) >> split(6) |
+
+          match(/^(700|701|703|704|705|706|707|708|709)\d{5}$/) >> split(5) |
+          match(/^(701|702|703|704|705|706|707|708|709)\d{4}$/) >> split(4) |
+
+          match(/^(71|72|74|75|77)\d{5}$/) >> split(5) |
+          match(/^(71|72|73|74|75|76|77|78|79)\d{6}$/) >> split(6) |
+
+          match(/^(80\d|81|91|93|95|97)\d{5}$/) >> split(5) |
+          match(/^(81|82|84|86)\d{6}$/) >> split(6) |
+          match(/^(87|88|89)\d{7}$/) >> split(4,3) |
+          match(/^(90|91|92|93|94|95|96|97|98\d|99\d)\d{6}$/) >> split(6)
 
   # Lithuania
   #
@@ -1155,7 +1166,7 @@ Phony.define do
           one_of(%w(500 700 900)) >> split(3,3) | # premium rate
           one_of('800') >> matched_split(
               /\A\d{2}\z/ => [2],
-              /\A\d+\z/ => [2,3,4]) | # freephone
+              /\A\d+\z/ => [2,3,4])| # freephone
           one_of(%w(50 52 54 55 56 58)) >> split(3,4) | # mobile
           one_of(%w(2 3 4 6 7 9)) >> split(3,4) |
           fixed(1) >> split(3,4)

data/lib/phony/countries/malaysia.rb

@@ -4,7 +4,6 @@
 #
 ndcs = [
   '2', # Singapore
-  '3', # Selangor & Federal Territories of Kuala Lumpur & Putrajaya & also Genting Highlands, Pahang
   '4', # Kedah, Penang & Perlis
   '5', # Perak & Cameron Highlands (Pahang)
   '6', # Melaka, Negeri Sembilan & Muar (Johor)
@@ -14,6 +13,9 @@ ndcs = [
 mobile = %w{ 10 11 12 13 14 153 154 156 158 16 17 18 19 }
 # service = %w{ 100 101 102 103 104 108 991 994 995 999 }  # Emergeny and Service numbers, only 3 digits long
 freephone = %w{ 300 700 800 }
+ndcs_eight = [
+  '3' # Selangor & Federal Territories of Kuala Lumpur & Putrajaya & also Genting Highlands, Pahang
+]
 
 Phony.define do
   country '60',
@@ -21,6 +23,7 @@ Phony.define do
     one_of(freephone) >> split(2,4) | # Freephone, Tollfree, Forwarding
     # one_of(service) >>  none  | # Service
     one_of(mobile)  >> split(3,4..5)   | # Mobile
-    one_of(ndcs)    >> split(8)     | # 1-digit NDCs
+    one_of(ndcs)    >> split(7)     | # 1-digit NDCs
+    one_of(ndcs_eight)    >> split(8)     | # 1-digit NDCs
     fixed(2)        >> split(8)       # 2-digit NDCs (Also, fallback)
 end

data/spec/functional/plausibility_spec.rb

@@ -50,6 +50,134 @@ describe 'plausibility' do
       it_is_correct_for 'Bosnia and Herzegovina', :samples => ['+387 66 666 666',
                                                                '+387 37 123 456',
                                                                '+387 33 222 111']
+      it 'is correct for Bulgaria' do
+          Phony.plausible?('+359 2 1234567').should be_truthy
+          Phony.plausible?('+359 30 12345').should be_truthy
+          Phony.plausible?('+359 30 123456').should be_truthy
+          Phony.plausible?('+359 31 12345').should be_truthy
+          Phony.plausible?('+359 31 123456').should be_truthy
+          Phony.plausible?('+359 32 123456').should be_truthy
+          Phony.plausible?('+359 33 12345').should be_truthy
+          Phony.plausible?('+359 33 123456').should be_truthy
+          Phony.plausible?('+359 34 123456').should be_truthy
+          Phony.plausible?('+359 35 123456').should be_truthy
+          Phony.plausible?('+359 36 12345').should be_truthy
+          Phony.plausible?('+359 36 123456').should be_truthy
+          Phony.plausible?('+359 37 12345').should be_truthy
+          Phony.plausible?('+359 37 123456').should be_truthy
+          Phony.plausible?('+359 38 123456').should be_truthy
+          Phony.plausible?('+359 39 12345').should be_truthy
+          Phony.plausible?('+359 39 123456').should be_truthy
+          Phony.plausible?('+359 41 12345').should be_truthy
+          Phony.plausible?('+359 41 123456').should be_truthy
+          Phony.plausible?('+359 42 123456').should be_truthy
+          Phony.plausible?('+359 430 12345').should be_truthy
+          Phony.plausible?('+359 431 12345').should be_truthy
+          Phony.plausible?('+359 432 12345').should be_truthy
+          Phony.plausible?('+359 433 12345').should be_truthy
+          Phony.plausible?('+359 434 12345').should be_truthy
+          Phony.plausible?('+359 435 12345').should be_truthy
+          Phony.plausible?('+359 436 12345').should be_truthy
+          Phony.plausible?('+359 437 12345').should be_truthy
+          Phony.plausible?('+359 438 12345').should be_truthy
+          Phony.plausible?('+359 439 12345').should be_truthy
+          Phony.plausible?('+359 44 123456').should be_truthy
+          Phony.plausible?('+359 45 12345').should be_truthy
+          Phony.plausible?('+359 45 123456').should be_truthy
+          Phony.plausible?('+359 46 123456').should be_truthy
+          Phony.plausible?('+359 47 12345').should be_truthy
+          Phony.plausible?('+359 47 123456').should be_truthy
+          Phony.plausible?('+359 47 12345').should be_truthy
+          Phony.plausible?('+359 47 123456').should be_truthy
+          Phony.plausible?('+359 51 12345').should be_truthy
+          Phony.plausible?('+359 51 123456').should be_truthy
+          Phony.plausible?('+359 52 123456').should be_truthy
+          Phony.plausible?('+359 53 12345').should be_truthy
+          Phony.plausible?('+359 53 123456').should be_truthy
+          Phony.plausible?('+359 54 123456').should be_truthy
+          Phony.plausible?('+359 55 12345').should be_truthy
+          Phony.plausible?('+359 55 123456').should be_truthy
+          Phony.plausible?('+359 56 123456').should be_truthy
+          Phony.plausible?('+359 57 12345').should be_truthy
+          Phony.plausible?('+359 57 123456').should be_truthy
+          Phony.plausible?('+359 58 123456').should be_truthy
+          Phony.plausible?('+359 59 12345').should be_truthy
+          Phony.plausible?('+359 59 123456').should be_truthy
+          Phony.plausible?('+359 60 12345').should be_truthy
+          Phony.plausible?('+359 60 123456').should be_truthy
+          Phony.plausible?('+359 61 12345').should be_truthy
+          Phony.plausible?('+359 61 123456').should be_truthy
+          Phony.plausible?('+359 62 123456').should be_truthy
+          Phony.plausible?('+359 63 12345').should be_truthy
+          Phony.plausible?('+359 63 123456').should be_truthy
+          Phony.plausible?('+359 64 123456').should be_truthy
+          Phony.plausible?('+359 65 12345').should be_truthy
+          Phony.plausible?('+359 65 123456').should be_truthy
+          Phony.plausible?('+359 66 12345').should be_truthy
+          Phony.plausible?('+359 66 123456').should be_truthy
+          Phony.plausible?('+359 68 123456').should be_truthy
+          Phony.plausible?('+359 69 12345').should be_truthy
+          Phony.plausible?('+359 69 123456').should be_truthy
+          Phony.plausible?('+359 700 12345').should be_truthy
+          Phony.plausible?('+359 701 1234').should be_truthy
+          Phony.plausible?('+359 701 12345').should be_truthy
+          Phony.plausible?('+359 71 12345').should be_truthy
+          Phony.plausible?('+359 71 123456').should be_truthy
+          Phony.plausible?('+359 72 12345').should be_truthy
+          Phony.plausible?('+359 72 123456').should be_truthy
+          Phony.plausible?('+359 73 123456').should be_truthy
+          Phony.plausible?('+359 74 12345').should be_truthy
+          Phony.plausible?('+359 74 123456').should be_truthy
+          Phony.plausible?('+359 75 12345').should be_truthy
+          Phony.plausible?('+359 75 123456').should be_truthy
+          Phony.plausible?('+359 76 123456').should be_truthy
+          Phony.plausible?('+359 77 12345').should be_truthy
+          Phony.plausible?('+359 77 123456').should be_truthy
+          Phony.plausible?('+359 78 123456').should be_truthy
+          Phony.plausible?('+359 79 123456').should be_truthy
+          Phony.plausible?('+359 800 12345').should be_truthy
+          Phony.plausible?('+359 81 12345').should be_truthy
+          Phony.plausible?('+359 81 123456').should be_truthy
+          Phony.plausible?('+359 82 123456').should be_truthy
+          Phony.plausible?('+359 82 123456').should be_truthy
+          Phony.plausible?('+359 84 123456').should be_truthy
+          Phony.plausible?('+359 86 123456').should be_truthy
+          Phony.plausible?('+359 87 1234567').should be_truthy
+          Phony.plausible?('+359 88 1234567').should be_truthy
+          Phony.plausible?('+359 89 1234567').should be_truthy
+          Phony.plausible?('+359 90 123456').should be_truthy
+          Phony.plausible?('+359 91 12345').should be_truthy
+          Phony.plausible?('+359 91 123456').should be_truthy
+          Phony.plausible?('+359 92 123456').should be_truthy
+          Phony.plausible?('+359 93 12345').should be_truthy
+          Phony.plausible?('+359 93 123456').should be_truthy
+          Phony.plausible?('+359 94 123456').should be_truthy
+          Phony.plausible?('+359 95 12345').should be_truthy
+          Phony.plausible?('+359 95 123456').should be_truthy
+          Phony.plausible?('+359 96 123456').should be_truthy
+          Phony.plausible?('+359 97 12345').should be_truthy
+          Phony.plausible?('+359 97 123456').should be_truthy
+          Phony.plausible?('+359 980 123456').should be_truthy
+          Phony.plausible?('+359 981 123456').should be_truthy
+          Phony.plausible?('+359 982 123456').should be_truthy
+          Phony.plausible?('+359 983 123456').should be_truthy
+          Phony.plausible?('+359 984 123456').should be_truthy
+          Phony.plausible?('+359 985 123456').should be_truthy
+          Phony.plausible?('+359 986 123456').should be_truthy
+          Phony.plausible?('+359 987 123456').should be_truthy
+          Phony.plausible?('+359 988 123456').should be_truthy
+          Phony.plausible?('+359 989 123456').should be_truthy
+          Phony.plausible?('+359 990 123456').should be_truthy
+          Phony.plausible?('+359 991 123456').should be_truthy
+          Phony.plausible?('+359 992 123456').should be_truthy
+          Phony.plausible?('+359 993 123456').should be_truthy
+          Phony.plausible?('+359 994 123456').should be_truthy
+          Phony.plausible?('+359 995 123456').should be_truthy
+          Phony.plausible?('+359 996 123456').should be_truthy
+          Phony.plausible?('+359 997 123456').should be_truthy
+          Phony.plausible?('+359 998 123456').should be_truthy
+          Phony.plausible?('+359 999 123456').should be_truthy
+      end
       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'
@@ -430,6 +558,10 @@ describe 'plausibility' do
         Phony.plausible?('+359 30 123 123').should be_truthy    # Landline
         Phony.plausible?('+359 89 123 1234').should be_truthy   # Mobile
       end
+
+      it 'is correct for Malaysia' do
+        Phony.plausible?('+60 5 123 1234').should be_truthy     # Non Selangor Landline
+      end
     end
   end
 end

data/spec/lib/phony/countries_spec.rb

@@ -179,6 +179,26 @@ describe 'country descriptions' do
         it_splits '55199', ['55', '199', ""]
       end
     end
+    describe "Bulgaria" do
+      it_splits '35929284000', ['359', '2', '928', '4000']   # Sofia
+      it_splits '359878357523', ['359', '87', '8357', '523']
+      it_splits '3593012345', ['359', '30', '12345']
+      it_splits '35930123456', ['359', '30', '12', '3456']
+      it_splits '35943312345', ['359', '433', '12345']
+      it_splits '3596012345', ['359', '60', '12345']
+      it_splits '35969123456', ['359', '69', '123456']
+      it_splits '35970512345', ['359', '705', '12345']
+      it_splits '3597051234', ['359', '705', '1234']
+      it_splits '3597112345', ['359', '71', '12345']
+      it_splits '35979123456', ['359', '79', '123456']
+      it_splits '35980112345', ['359', '801', '12345']
+      it_splits '3598112345', ['359', '81', '12345']
+      it_splits '35986123456', ['359', '86', '123456']
+      it_splits '359881234567', ['359', '88', '1234', '567']
+      it_splits '35990123456', ['359', '90', '123456']
+      it_splits '359988123456', ['359', '988', '123456']
+      it_splits '359998123456', ['359', '998', '123456']
+    end
     describe 'Cambodia' do
       it_splits '85512236142', ["855", "12", "236", "142"]   # mobile (Mobitel)
       it_splits '855977100872', ["855", "97", "710", "0872"] # mobile (Metfone)
@@ -1308,6 +1328,8 @@ describe 'country descriptions' do
     describe 'United Arab Emirates' do
       it_splits '97180012', %w(971 800 12)
       it_splits '971800123456789', %w(971 800 12 345 6789)
+      it_splits '97180012345678', %w(971 800 12 345 678)
+      it_splits '9718001234567', %w(971 800 12 345 67)
       it_splits '97121234567', %w(971 2 123 4567)
       it_splits '971506412345', %w(971 50 641 2345)
       it_splits '971600641234', %w(971 600 641 234)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: phony
 version: !ruby/object:Gem::Version
-  version: 2.16.5
+  version: 2.16.6
 platform: ruby
 authors:
 - Florian Hanke
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-27 00:00:00.000000000 Z
+date: 2018-11-13 00:00:00.000000000 Z
 dependencies: []
 description: 'Fast international phone number (E164 standard) normalizing, splitting
   and formatting. Lots of formatting options: International (+.., 00..), national
@@ -112,7 +112,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Fast international phone number (E164 standard) normalizing, splitting and