phony 1.2.11 → 1.3.0

data/lib/phony/countries/austria.rb

@@ -1,69 +1,70 @@
+include Phony::DSL
+
 # Austria uses a variable-length ndc code, thus we use a separate file to not let all_other.rb explode.
 #
-Phony::Countries::Austria = Phony::Country.configured :local_format => [10],
-  :local_special_format => [10],
-  :ndc_fallback_length => 4,
-  :ndc_mapping => {
-    :landline => [
-                    '1', # Vienna
-                   '57',  # -
-                   '59',  # -
-                   '89',  # Routing Number
-                   '316', # Graz
-                   '501', # -
-                   '502', # -
-                   '503', # -
-                   '504', # -
-                   '505', # -
-                   '506', # -
-                   '507', # -
-                   '508', # -
-                   '509', # -
-                   '512', # Innsbruck
-                   '517', # -
-                   '662', # Salzburg
-                   '720', #
-                   '732'  # Linz
-                  ],
-     :mobile => [
-                 '67', 
-                 '68', 
-                 '644',
-                 '650',
-                 '651',
-                 '652',
-                 '653',
-                 '655',
-                 '657',
-                 '659',
-                 '660',
-                 '661',
-                 '663',
-                 '664',
-                 '665',
-                 '666',
-                 '667',
-                 '668',
-                 '669'
-                ],
-     :service => [
-                  '710',
-                  '711',
-                  '718',
-                  '730',
-                  '740',
-                  '780',
-                  '800',
-                  '802',
-                  '804',
-                  '810',
-                  '820',
-                  '821',
-                  '828',
-                  '900',
-                  '901',
-                  '930',
-                  '931',
-                  '939' 
-                 ]
-  }
+ndcs = [
+  '1', # Vienna
+ '57',  # -
+ '59',  # -
+ '89',  # Routing Number
+ '316', # Graz
+ '501', # -
+ '502', # -
+ '503', # -
+ '504', # -
+ '505', # -
+ '506', # -
+ '507', # -
+ '508', # -
+ '509', # -
+ '512', # Innsbruck
+ '517', # -
+ '662', # Salzburg
+ '720', #
+ '732'  # Linz
+]
+
+mobile = [
+ '67', 
+ '68', 
+ '644',
+ '650',
+ '651',
+ '652',
+ '653',
+ '655',
+ '657',
+ '659',
+ '660',
+ '661',
+ '663',
+ '664',
+ '665',
+ '666',
+ '667',
+ '668',
+ '669'
+]
+
+service = [
+ '710',
+ '711',
+ '718',
+ '730',
+ '740',
+ '780',
+ '800',
+ '802',
+ '804',
+ '810',
+ '820',
+ '821',
+ '828',
+ '900',
+ '901',
+ '930',
+ '931',
+ '939'  
+]
+
+Phony::Countries::Austria = one_of(service + mobile + ndcs, :max_length => 4) >> split(10)

data/lib/phony/countries/belgium.rb

@@ -1,61 +1,33 @@
+include Phony::DSL
+
 # Belgium uses a variable-length ndc code, thus we use a separate file to not let all_other.rb explode.
 #
 # Taken from: http://en.wikipedia.org/wiki/Telephone_numbers_in_Belgium
 #
-Phony::Countries::Belgium = Phony::Country.configured :local_format => [3, 5],
- :mobile_local_format => [6],
- :ndc_fallback_length => 2,
- :ndc_mapping => {
-   :landline => [
-                 '2', # Brussels (Bruxelles/Brussel)
-                 '3', # Antwerpen (Antwerp), Sint-Niklaas
-                 '4', # Liège (Luik), Voeren (Fourons)
-                 '9', # Gent (Ghent/Gand)
-                ],
-   :mobile => [
-                '470', # Mobistar
-                '471', # Mobistar
-                '472', # Mobistar
-                '473', # Mobistar
-                '474', # Mobistar
-                '475', # Mobistar
-                '476', # Mobistar
-                '477', # Mobistar
-                '478', # Mobistar
-                '479', # Mobistar
-                '480', # Base
-                '481', # Base
-                '482', # Base
-                '483', # Base
-                '484', # Base
-                '485', # Base
-                '486', # Base
-                '487', # Base
-                '488', # Base
-                '489', # Base
-                '490', # Proximus
-                '491', # Proximus
-                '492', # Proximus
-                '493', # Proximus
-                '494', # Proximus
-                '495', # Proximus
-                '496', # Proximus
-                '497', # Proximus
-                '498', # Proximus
-                '499', # Proximus
-              ],
-   :service => [
-                 '70', # Specialty numbers, i.e. bus information or bank information
-                '800', # Tollfree
-                '900', # Premium
-                '901', # Premium
-                '902', # Premium
-                '903', # Premium
-                '904', # Premium
-                '905', # Premium
-                '906', # Premium
-                '907', # Premium
-                '908', # Premium
-                '909'  # Premium
-               ]
- }
+ndcs = [
+ '2', # Brussels (Bruxelles/Brussel)
+ '3', # Antwerpen (Antwerp), Sint-Niklaas
+ '4', # Liège (Luik), Voeren (Fourons)
+ '9', # Gent (Ghent/Gand)
+]
+
+mobile_regex = /^(4[789]\d)\d{6}$/ # Mobistar, Base, Proximus
+
+service = [
+  '70', # Specialty numbers, i.e. bus information or bank information
+ '800', # Tollfree
+ '900', # Premium
+ '901', # Premium
+ '902', # Premium
+ '903', # Premium
+ '904', # Premium
+ '905', # Premium
+ '906', # Premium
+ '907', # Premium
+ '908', # Premium
+ '909'  # Premium
+]
+
+Phony::Countries::Belgium = one_of(service)                >> split(3,3) |
+                            match(mobile_regex)            >> split(6)   |
+                            one_of(ndcs, :max_length => 2) >> split(3,5)

data/lib/phony/countries/chile.rb

@@ -6,15 +6,8 @@
 # Note: Totally unsure about this one, as I get contradicting infos (see links above).
 #      As usual, best effort.
 #
-Phony::Countries::Chile = Phony::Country.configured :local_format => [8],
-  :local_special_format => [3, 3],
-  :ndc_fallback_length => 2,
-  :ndc_mapping => {
-    :landline => [
-                  '2', # Santiago
-                 ],
-    :mobile   => [
-                  '9',
-                 ],
-    :service  => %w{130 131 132 133 134 135 136 137 139 147 149}
-  }
+service = %w{130 131 132 133 134 135 136 137 139 147 149}
+
+Phony::Countries::Chile = one_of(*service)                   >> split(3,3) | 
+
+                          one_of('2', '9', :max_length => 2) >> split(8) # Santiago (2) and mobile.

data/lib/phony/countries/china.rb

@@ -1,26 +1,27 @@
+include Phony::DSL
+
 # Chinese phone numbers.
 #
 # http://en.wikipedia.org/wiki/Telephone_numbers_in_China
 #
 # Note: Tibet partially uses 4-digit NDC codes. This is NOT YET reflected here. 
 #
-Phony::Countries::China = Phony::Country.configured :local_format => [4, 4],
-  :local_special_format => [8],
-  :ndc_fallback_length => 3,
-  :ndc_mapping => {
-    :landline => [
-      '10', # Beijing, TODO Confirm – is it 10 or 1?
-      '20', # Guangzhou
-      '21', # Shanghai
-      '22', # Tianjin
-      '23', # Chongquin
-      '24', # Shenyang
-      '25', # Nanjing
-      '26', # Taipei, Taiwan - gotta be kidding, right?!
-      '27', # Wuhan
-      '28', # Chengdu
-      '29', # Xi'an
-    ],
-    :mobile => %w{ 130 131 132 133 135 136 137 138 139 145 150 151 152 153 155 156 157 158 159 185 186 187 188 189 1340 1341 1342 1343 1344 1345 1346 1347 1348 1349 },
-    :service => %w{ 110 114 119 120 122 999 } # Probably not exhaustive. TODO Look at http://www.eoc.com.cn/?action-viewnews-itemid-11493.
-  }
+ndcs = [
+ '10', # Beijing, TODO Confirm – is it 10 or 1?
+ '20', # Guangzhou
+ '21', # Shanghai
+ '22', # Tianjin
+ '23', # Chongquin
+ '24', # Shenyang
+ '25', # Nanjing
+ '26', # Taipei, Taiwan - gotta be kidding, right?!
+ '27', # Wuhan
+ '28', # Chengdu
+ '29', # Xi'an
+]
+mobile = %w{ 130 131 132 133 135 136 137 138 139 145 150 151 152 153 155 156 157 158 159 185 186 187 188 189 1340 1341 1342 1343 1344 1345 1346 1347 1348 1349 }
+service = %w{ 110 114 119 120 122 999 } # Probably not exhaustive. TODO Look at http://www.eoc.com.cn/?action-viewnews-itemid-11493.
+
+Phony::Countries::China = one_of(service)                >> split(8)   |
+                          one_of(mobile)                 >> split(4,4) | 
+                          one_of(ndcs, :max_length => 3) >> split(4,4)

data/lib/phony/countries/egypt.rb

@@ -1,42 +1,17 @@
+include Phony::DSL
+
+# TODO Move this into the country definitions.
+
 # Egyptian phone numbers.
 #
 # http://en.wikipedia.org/wiki/Telephone_numbers_in_Egypt
 #
-# TODO If the fallback length is 2, why do I list length 2 landlines?
+ndcs = [
+  '2', # Cairo/Giza
+  '3', # Alexandria
+]
+
+# TODO Change how one_of works. max_length should be optional.
 #
-Phony::Countries::Egypt = Phony::Country.configured :local_format => [8],
-  :local_special_format => [7],
-  :ndc_fallback_length => 2,
-  :ndc_mapping => {
-    :landline => [
-                    '2', # Cairo/Giza
-                    '3', # Alexandria
-                   '13', # Banha
-                   '15', # 10th of Ramadan
-                   '45', # Damanhur
-                   '46', # Marsa Matruh
-                   '47', # Kafer El Sheik
-                   '48', # Monufia
-                   '50', # Mansoura
-                   '55', # Zazazig
-                   '56', # Spare
-                   '57', # Damiette
-                   '62', # Suez
-                   '64', # Ismailia
-                   '65', # Red Sea
-                   '66', # Port Said
-                   '68', # El Arish
-                   '69', # El-Tor
-                   '82', # Beni Suef
-                   '84', # Fayoum
-                   '86', # Minia
-                   '88', # Assiout
-                   '92', # Wadi El Gehid
-                   '93', # Sohag
-                   '95', # Luxor
-                   '96', # Qunea
-                   '97', # Aswan
-                  ],
-    :mobile => %w{10 11 12 14 16 17 18 19},
-    :service => %w{800} # Not exhaustive.
-  }
+Phony::Countries::Egypt = one_of('800')                  >> split(7) |
+                          one_of(ndcs, :max_length => 2) >> split(8)

data/lib/phony/countries/germany.rb

@@ -1,12 +1,12 @@
+include Phony::DSL
+
 # Germany uses a variable-length ndc code, thus we use a separate file to not let all_other.rb explode.
 #
 # Note: Germany uses a variable ndc format from length 2 to 5.
 #
-Phony::Countries::Germany = Phony::Country.configured :local_format => [3, 10],
-                                                      :local_special_format => [3, 10],
-                                                      :ndc_fallback_length => 5,
-                                                      :ndc_mapping => {
-                                                        :landline => ['10',  # Call-By-Call
+
+ndcs = [
+'10',  # Call-By-Call
 '11',  # formerly Value Added Services
 '13',  # Voting and Lottery Numbers
 '30',  # Berlin
@@ -3990,36 +3990,36 @@ Phony::Countries::Germany = Phony::Country.configured :local_format => [3, 10],
 '9976',
 '9977',
 '9978',
-],
-:mobile => [
-'150', # Group3G/Quam
-'151', # T-Mobile
-'152', # Vodafone
-'155', # E-Plus
-'156', # Mobilcom
-'157', # E-Plus
-'159', # O2
-'160', # T-Mobile
-'161', # C-Netz
-'162', # Vodafone
-'163', # E-Plus
-'164', # Cityruf
-'165', # Quix
-'166', # Telmi
-'168', # Scall
-'169', # Cityruf, Scall, Skyper (e*cityruf, e*message, e*skyper)
-'170', # T-Mobile
-'171', # T-Mobile
-'172', # Vodafone
-'173', # Vodafone
-'174', # Vodafone
-'175', # T-Mobile
-'176', # O2 Germany
-'177', # E-Plus
-'178', # E-Plus
-'179', # O2 Germany
-],
-:service => [
+]
+# mobile = [
+# '150', # Group3G/Quam
+# '151', # T-Mobile
+# '152', # Vodafone
+# '155', # E-Plus
+# '156', # Mobilcom
+# '157', # E-Plus
+# '159', # O2
+# '160', # T-Mobile
+# '161', # C-Netz
+# '162', # Vodafone
+# '163', # E-Plus
+# '164', # Cityruf
+# '165', # Quix
+# '166', # Telmi
+# '168', # Scall
+# '169', # Cityruf, Scall, Skyper (e*cityruf, e*message, e*skyper)
+# '170', # T-Mobile
+# '171', # T-Mobile
+# '172', # Vodafone
+# '173', # Vodafone
+# '174', # Vodafone
+# '175', # T-Mobile
+# '176', # O2 Germany
+# '177', # E-Plus
+# '178', # E-Plus
+# '179', # O2 Germany
+# ]
+service = [
 '12',  # Innovative Services
 '130',
 '180', #
@@ -4066,4 +4066,7 @@ Phony::Countries::Germany = Phony::Country.configured :local_format => [3, 10],
 '9005',
 '9009',
 ]
-}
+
+Phony::Countries::Germany = one_of(service)                >> split(3,10) | 
+                            match(/^(1[567]\d)\d*$/)       >> split(3,10) | # Mobile
+                            one_of(ndcs, :max_length => 5) >> split(3,10)