phony 1.8.1 → 1.8.2

data/lib/phony/countries.rb

@@ -355,7 +355,11 @@ Phony.define do
   country '298', todo # Faroe Islands
   country '299', todo # Greenland
 
-  country '350', todo # Gibraltar
+  # Gibraltar
+  country '350',
+          match(/^(2[012]\d)\d+$/) >> split(5) | # fixed
+          match(/^([56]\d)\d+$/) >> split(6)  | # mobile
+          match(/^(8\d\d\d)$/) >> split(0)
 
   # Portugal.
   #
@@ -378,8 +382,19 @@ Phony.define do
 
   country '354', none >> split(3,4) # Iceland
   country '355', todo # Albania
-  country '356', todo # Malta
-  country '357', todo # Cyprus
+
+  # Malta
+  # http://en.wikipedia.org/wiki/Telephone_numbers_in_Malta
+  country '356',
+          match(/^([79]\d)\d+$/)  >> split(6) | # mobile
+          match(/^(2\d\d\d)\d+$/) >> split(4) | # fixed line
+          fixed(4)                >> split(4)   # eg. with voice mail
+
+
+  # Cyprus
+  # http://www.cytaglobal.com/cytaglobal/userfiles/NewNumberingPlan.pdf
+  country '357', one_of('121','122','123') >> split(2,6) | # voicemail
+                 fixed(2) >> split(6)                      # fixed & mobile
 
   # Finland.
   #
@@ -404,12 +419,23 @@ Phony.define do
           fixed(3)              >> split(1,2,2)   # 3-digit NDCs.
 
   country '371', todo # Latvia
-  country '372', todo # Estonia
+
+  # Estonia
+  country '372',
+          match(/^(5\d\d\d)\d+$/)          >> split(4) | # Mobile
+          match(/^((?:70|8[12])\d\d)\d+$/) >> split(4) | # Mobile
+          fixed(3)                         >> split(4)   # 3-digit NDCs
+
   country '373', todo # Moldova
   country '374', todo # Armenia
   country '375', todo # Belarus
   country '376', todo # Andorra
-  country '377', todo # Monaco
+
+  # Monaco
+  country '377',
+          one_of('6')  >> split(2,2,2,2) | # mobile
+          fixed(2) >> split(2,2,2)
+
   country '378', todo # San Marino
   country '379', todo # Vatican City State
 

data/spec/lib/phony/countries_spec.rb

@@ -69,6 +69,11 @@ describe 'country descriptions' do
       it_splits '5371234567', ['53', '7', '1234567'] # Havana
       it_splits '5342123456', ['53', '42', '123456'] # Villa Clara
     end
+    describe 'Cyprus' do
+      it_splits '35712322123456', ['357', '123', '22', '123456'] # Voicemail
+      it_splits '35722123456',    ['357', '22', '123456']        # Fixed
+      it_splits '35791123456',    ['357', '91', '123456']        # Mobile
+    end
     describe 'Denmark' do
       it_splits '4532121212', ['45', false, '32', '12', '12', '12']
     end
@@ -77,6 +82,15 @@ describe 'country descriptions' do
       it_splits '20921234567', ['20', '92', '1234567']
       it_splits '20951234567', ['20', '95', '1234567']
     end
+    describe 'Estonia' do
+      it_splits '3723212345',  ['372', '321', '2345']   # Landline
+      it_splits '37251231234', ['372', '5123', '1234']  # Mobile
+      it_splits '3728001234',  ['372', '800', '1234']   # Freephone
+      it_splits '37281231234', ['372', '8123', '1234']  # Mobile
+      it_splits '37282231234', ['372', '8223', '1234']  # Mobile
+      it_splits '37283212345', ['372', '832', '12345']  # Mobile
+      it_splits '37270121234', ['372', '7012', '1234']  # Premium
+    end
     describe 'Finland' do
       it_splits '3589123123', ['358', '9', '123', '123'] # Helsinki
       it_splits '3581912312', ['358', '19', '123', '12'] # Nylandia
@@ -100,6 +114,17 @@ describe 'country descriptions' do
     describe 'Ghana' do
       it_splits '233302123456', ['233', '30', '212', '3456'] # Mobile Vodafone, Accra
     end
+    describe 'Gibraltar' do
+      it_splits '35020012345', ['350', '200', '12345'] # Fixed
+      it_splits '35021112345', ['350', '211', '12345'] # Fixed
+      it_splits '35022212345', ['350', '222', '12345'] # Fixed
+      it_splits '35054123456', ['350', '54', '123456'] # Mobile
+      it_splits '35056123456', ['350', '56', '123456'] # Mobile
+      it_splits '35057123456', ['350', '57', '123456'] # Mobile
+      it_splits '35058123456', ['350', '58', '123456'] # Mobile
+      it_splits '35060123456', ['350', '60', '123456'] # Mobile
+      it_splits '3508012', ['350', '8012', '' ] # Freephone
+    end
     describe 'Greece' do
       it_splits '3021123456', ['30', '21', '123456']     # Athens
       it_splits '3069512345', ['30', '695', '12345']     # Mobile
@@ -156,10 +181,20 @@ describe 'country descriptions' do
       it_splits '60312345678', ['60', '3', '12345678'] # Kuala Lumpur
       it_splits '60212345678', ['60', '2', '12345678'] # Singapore
     end
+    describe 'Malta' do
+      it_splits '35621231234', ['356', '2123', '1234'] # Fixed
+      it_splits '35677123456', ['356', '77', '123456'] # Mobile
+      it_splits '35698123456', ['356', '98', '123456'] # Mobile
+      it_splits '35651231234', ['356', '5123', '1234'] # Voice Mail
+    end
     describe 'Mexico' do
       it_splits '525512121212', ['52', '55', '12', '12', '12', '12'] # Mexico City
       it_splits '526641231212', ['52', '664', '123', '12', '12']     # Tijuana
     end
+    describe 'Monaco' do
+      it_splits '37741123456', ['377', '41', '12', '34', '56'] # Mobile
+      it_splits '377612345678', ['377', '6', '12', '34', '56', '78'] # Mobile
+    end
     describe 'Morocco' do
       it_splits '212537718685', ['212', '53', '7718', '685']
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: phony
 version: !ruby/object:Gem::Version
-  version: 1.8.1
+  version: 1.8.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-11 00:00:00.000000000 Z
+date: 2012-10-10 00:00:00.000000000 Z
 dependencies: []
 description: ! 'Fast international phone number (E164 standard) normalizing, splitting
   and formatting. Lots of formatting options: International (+.., 00..), national
@@ -103,3 +103,4 @@ test_files:
 - spec/lib/phony/validations_spec.rb
 - spec/lib/phony/vanity_spec.rb
 - spec/lib/phony_spec.rb
+has_rdoc: false