phony 2.15.15 → 2.15.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 22b736b7c1b155c5645a50e9bdd328c2d3294874
-  data.tar.gz: a590f86d78bf8c565e9a9136500d174860439f2c
+  metadata.gz: d3eb8c1122adf708d8a1652cc2d5c70c2efd8a5f
+  data.tar.gz: 65a6b956c6d63af16ec1bedb14a17e86a8c36594
 SHA512:
-  metadata.gz: 3b552ee46b9787b6b531feb321a629e432b99bf8643bc8ede2bc0e186b03f2fcf16b5673cfdc2a7b248f3c9c45aaccd9ffdc3a1e4e08ec8f9791284ab43c453a
-  data.tar.gz: b71c6eeff118aeb9a116aa6ceda2367f566d0ae674e1e6872307111d84e5878a7bde675f6fa80693beead62d32c0df510be74fc392372b484a4f1133cd98de84
+  metadata.gz: c099a1c1d395573f470f60c5e646264607e0a1d2559ff8a81862c08779f883831f520af4b87502585cbd4541616a9605deb4d51fcc84d6ff7faea609bfa0a89c
+  data.tar.gz: 58a9720a7a198feab8d83c3a1df52ebfa47954df5e26a56874059b98168d782b9c757d56e1cbb93b796828cee43c5321c611a6723da40a1ed89bc400c677bfe4

data/README.textile

@@ -27,7 +27,7 @@ E164 numbers are international numbers with a country dial prefix, usually an ar
 
 It currently handles the countries listed at the end of this README.
 
-It is covered by roughly 1,800 tests (June 2015).
+It is covered by roughly 2,000 tests (January 2016).
 If it doesn't work, please "enter an issue":http://github.com/floere/phony/issues or better, fork and "send a pull request":http://github.com/floere/phony/pulls.
 
 h2. Installation
@@ -80,7 +80,7 @@ NB If a country does not have an NDC, @#split@ will return @false@ in the NDC po
 
 h2. List of Handled Countries
 
-Mildly unmaintained list: Abhas, Afghan, Algerian, Argentinan, Austrian, Australian, Azerbaijani, Belgian, Brazilian, Cambodian, Chilean, Chinese, Croatian, Cuban, Cypriot, Czech, Danish, Dutch, Egyptian, El Salvadorian, Estonian, French, German, Ghanan, Gibraltar, Greek, Haiti, Hong Kong, Hungarian, Indian, Iran, Irish, Israel, Italian, Kazakh, Liberian, Lithuanian, Luxembourgian, Malaysian, Malta, Mexican, Monaco, Morocco, New Zealand, Nigerian, Norwegian, Peruvian, Polish, Romanian, Russian, Rwandan, Seychelles, Singapore, Slovakian, South African, South Korean, South Osetian, Spanish, Sri Lankan, Sudan, Swedish, Swiss, Thailand, Tunisian, Turkish, Liechtenstein, UK, US, Venezuelan, Vietnamese, and Zambian numbers.
+Mildly unmaintained list: Abhas, Afghan, Algerian, Argentina, Austrian, Australian, Azerbaijani, Belgian, Brazilian, Cambodian, Chilean, Chinese, Croatian, Cuban, Cypriot, Czech, Danish, Dutch, Egyptian, El Salvadorian, Estonian, French, German, Ghanan, Gibraltar, Greek, Haiti, Hong Kong, Hungarian, Indian, Iran, Irish, Israel, Italian, Kazakh, Liberian, Lithuanian, Luxembourgian, Malaysian, Malta, Mexican, Monaco, Morocco, New Zealand, Nigerian, Norwegian, Peruvian, Polish, Romanian, Russian, Rwandan, Seychelles, Singapore, Slovakian, South African, South Korean, South Osetian, Spanish, Sri Lankan, Sudan, Swedish, Swiss, Thailand, Tunisian, Turkish, Liechtenstein, UK, US, Venezuelan, Vietnamese, and Zambian numbers.
 
 h2. License
 

data/lib/phony/countries/netherlands.rb

@@ -1,4 +1,5 @@
-# The Netherlands use a variable-length ndc code, thus we use a separate file to not let all_other.rb explode.
+# The Netherlands use a variable-length ndc code, thus we use a separate file to not let all_other.rb explode. The
+# latest version of the numbering plan is available at http://wetten.overheid.nl/BWBR0010198/
 #
 # Note: The netherlands use a variable ndc format from length 2 to 3.
 #       To save space, we only use ndcs of length 2 (and use the fallback of 3 to handle the rest).
@@ -56,6 +57,7 @@ service3 = [
 Phony.define do
   country '31',
     trunk('0', :normalize => true)                |
+    match(/\A(97[0,9])\d{8}\z/) >> split(4,4)     | # machine-to-machine
     one_of(service)             >> split(4,3)     |
     match(/\A(800|900)\d{4}\z/) >> split(4)       |
     one_of(service3)            >> split(4,3)     |

data/lib/phony/countries.rb

@@ -598,11 +598,16 @@ Phony.define do
   # Luxembourg
   #
   country '352',
-          one_of('4')                   >> split(2,2,2)   | # Luxembourg City
-          match(/^(2[467]\d{2})$/)      >> split(2,2,2)   | # 4-digit NDC
-          match(/^(6\d[18])\d+$/)       >> split(3,3)     | # mobile
-          match(/^(60\d{2})\d{8}$/)     >> split(2,2,2,2) | # mobile machine to machine
-          match(/^([2-9]\d)/)           >> split(2,2,2)     # 2-digit NDC
+          match(/^(2[467]\d{2})\d{4}$/)       >> split(2,2)     | # 4-digit NDC
+          match(/^(6\d[18])\d+$/)             >> split(3,3)     | # mobile
+          match(/^(60\d{2})\d{8}$/)           >> split(2,2,2,2) | # mobile machine to machine
+          match(/^((2[^467]|[3-9]\d))\d{4}$/) >> split(2,2)     | # 2-digit NDC Regular 6 digits number
+          match(/^((2[^467]|[3-9]\d))\d{4}$/) >> split(2,2)     | # 2-digit NDC Regular 6 digits number
+          match(/^((2[^467]|[3-9]\d))\d{5}$/) >> split(2,2,1)   | # 2-digit NDC Regular 6 digits number w/ 1 digit extension
+          match(/^((2[^467]|[3-9]\d))\d{6}$/) >> split(2,2,2)   | # 2-digit NDC Regular 8 digits number or 6 digits with 2 digits extension
+          match(/^((2[^467]|[3-9]\d))\d{7}$/) >> split(2,2,3)   | # 2-digit NDC Regular 6 digits with 4 digits extension
+          match(/^((2[^467]|[3-9]\d))\d{8}$/) >> split(2,2,4)   | # 2-digit NDC Regular 6 digits number with 4 digits extension
+          match(/^(\d{2})\d{3}$/)             >> split(2,2,1)     # fallback for 5 digit number
 
   # country '353' # Republic of Ireland, see special file.
 
@@ -942,7 +947,11 @@ Phony.define do
   country '852',
           none >> split(4,4)
 
-  country '853', todo # Macao, China
+  # Macao, China
+  country '853', # Macao, China
+    match(/^(28)\d+$/) >> split(2,4) | # Landline.
+    match(/^(6)\d+$/)  >> split(3,4)  # Mobile.
+
   country '854', todo # Spare code
 
   # Lao People's Democratic Republic http://www.wtng.info/wtng-856-la.html, https://www.numberingplans.com

data/spec/lib/phony/countries_spec.rb

@@ -416,12 +416,16 @@ describe 'country descriptions' do
     end
     describe 'Luxembourg' do
       it_splits '352222809',       ['352', '22', '28', '09']
-      it_splits '35226222809',     ['352', '26', '22', '28', '09']
+      it_splits '35226222809',     ['352', '2622', '28', '09']
       it_splits '352621123456',    ['352', '621', '123', '456']
-      it_splits '3524123456',      ['352', '4', '12', '34', '56']
+      it_splits '3524123456',      ['352', '41', '23', '45', '6']
       it_splits '352602112345678', ['352', '6021', '12', '34', '56', '78']
       it_splits '352370431',       ['352', '37', '04', '31']
       it_splits '35227855',        ['352', '27', '85', '5']
+      it_splits '352445566',       ['352', '44', '55', '66']
+      it_splits '352545258',       ['352', '54', '52', '58']
+      it_splits '352818181',       ['352', '81', '81', '81']
+      it_splits '3523572141',      ['352', '35', '72', '14', '1']
     end
     describe 'Macedonia' do
       it_splits '38921234567', ['389', '2', '123', '4567'] # Skopje
@@ -430,6 +434,10 @@ describe 'country descriptions' do
       it_splits '38951234567', ['389', '5', '123', '4567'] # Premium
       it_splits '38971234567', ['389', '7', '123', '4567'] # Mobile
     end
+    describe 'Macao' do
+      it_splits '85328123456', ["853", "28", "12", "3456"] # Landline
+      it_splits '85361234567', ["853", "6", "123", "4567"] # Mobile
+    end
     describe 'Malaysia' do
       it_splits '6082123456',   ['60', '82', '123456']   # Kuching
       it_splits '60312345678',  ['60', '3', '12345678'] # Kuala Lumpur
@@ -480,6 +488,7 @@ describe 'country descriptions' do
       it_splits '31612345678', ['31', '6', '12', '34', '56', '78'] # mobile
       it_splits '31201234567', ['31', '20', '123', '4567']
       it_splits '31222123456', ['31', '222', '123', '456']
+      it_splits '3197012345678', ['31', '970', '1234', '5678'] # machine-to-machine
     end
     describe 'Norway' do
       it_splits '4721234567', ['47',false,'21','23','45','67']

data/spec/lib/phony/country_codes_spec.rb

@@ -79,13 +79,13 @@ describe Phony::CountryCodes do
         @countries.formatted('352222809', :format => :international).should eql '+352 22 28 09'
       end
       it "should format luxembourgian 4-digit ndc numbers" do
-        @countries.formatted('35226222809', :format => :international).should eql '+352 26 22 28 09'
+        @countries.formatted('35226222809', :format => :international).should eql '+352 2622 28 09'
       end
       it "should format luxembourgian mobile numbers" do
         @countries.formatted('352621123456', :format => :international).should eql '+352 621 123 456'
       end
       it "should format luxembourgian city numbers" do
-        @countries.formatted('3524123456', :format => :international).should eql '+352 4 12 34 56'
+        @countries.formatted('3524123456', :format => :international).should eql '+352 41 23 45 6'
       end
       it "should format luxembourgian machine to machine numbers" do
         @countries.formatted('352602112345678', :format => :international).should eql '+352 6021 12 34 56 78'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: phony
 version: !ruby/object:Gem::Version
-  version: 2.15.15
+  version: 2.15.17
 platform: ruby
 authors:
 - Florian Hanke
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-26 00:00:00.000000000 Z
+date: 2016-03-03 00:00:00.000000000 Z
 dependencies: []
 description: 'Fast international phone number (E164 standard) normalizing, splitting
   and formatting. Lots of formatting options: International (+.., 00..), national
@@ -129,3 +129,4 @@ test_files:
 - spec/lib/phony/national_splitters/none_spec.rb
 - spec/lib/phony/national_splitters/regex_spec.rb
 - spec/lib/phony/national_splitters/variable_spec.rb
+has_rdoc: false