phony 1.3.1 → 1.3.2

data/lib/phony.rb

@@ -39,11 +39,11 @@ require File.expand_path '../phony/countries/united_kingdom', __FILE__
 require File.expand_path '../countries', __FILE__
 
 module Phony
-  
+
   # Phony uses a single country codes instance.
   #
   @codes = CountryCodes.instance
-  
+
   # Normalizes the given number.
   #
   # Useful before inserting the number into a database.
@@ -54,7 +54,7 @@ module Phony
   def self.normalize! phone_number
     @codes.normalize phone_number
   end
-  
+
   # Splits the phone number into pieces according to the country codes.
   #
   def self.split phone_number
@@ -63,7 +63,7 @@ module Phony
   def self.split! phone_number
     @codes.split phone_number
   end
-  
+
   # Formats a E164 number according to local customs.
   #
   def self.formatted phone_number, options = {}
@@ -72,7 +72,7 @@ module Phony
   def self.formatted! phone_number, options = {}
     @codes.formatted phone_number, options
   end
-  
+
   # def self.service? number
   #   @codes.service? number.dup
   # end
@@ -82,19 +82,19 @@ module Phony
   # def self.landline? number
   #   @codes.landline? number.dup
   # end
-  
+
   # Returns true if there is a character in the number
   # after the first four numbers.
   #
   def self.vanity? phone_number
     @codes.vanity? phone_number.dup
   end
-  
+
   # Converts any character in the vanity_number to its numeric representation.
   # Does not check if the passed number is a valid vanity_number, simply does replacement.
   #
   def self.vanity_to_number vanity_number
     @codes.vanity_to_number vanity_number.dup
   end
-  
+
 end

data/lib/phony/countries/austria.rb

@@ -1,5 +1,3 @@
-include Phony::DSL
-
 # Austria uses a variable-length ndc code, thus we use a separate file to not let all_other.rb explode.
 #
 ndcs = [
@@ -25,8 +23,8 @@ ndcs = [
 ]
 
 mobile = [
- '67', 
- '68', 
+ '67',
+ '68',
  '644',
  '650',
  '651',
@@ -64,7 +62,9 @@ service = [
  '901',
  '930',
  '931',
- '939'  
+ '939'
 ]
 
-Phony::Countries::Austria = one_of(service + mobile + ndcs, :max_length => 4) >> split(10)
+Phony.define do
+  country '43', one_of(service + mobile + ndcs, :max_length => 4) >> split(10)
+end

data/lib/phony/countries/belgium.rb

@@ -1,5 +1,3 @@
-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
@@ -28,6 +26,8 @@ service = [
  '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)
+Phony.define do
+  country '32', one_of(service)                >> split(3,3) |
+                match(mobile_regex)            >> split(6)   |
+                one_of(ndcs, :max_length => 2) >> split(3,5)
+end

data/lib/phony/countries/chile.rb

@@ -8,6 +8,7 @@
 #
 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.
+Phony.define do
+  country '56', one_of(*service)                   >> split(3,3) |
+                one_of('2', '9', :max_length => 2) >> split(8) # Santiago (2) and mobile.
+end

data/lib/phony/countries/china.rb

@@ -1,10 +1,8 @@
-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. 
+# Note: Tibet partially uses 4-digit NDC codes. This is NOT YET reflected here.
 #
 ndcs = [
  '10', # Beijing, TODO Confirm – is it 10 or 1?
@@ -22,6 +20,8 @@ ndcs = [
 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)
+Phony.define do
+  country '86', one_of(service)                >> split(8)   |
+                one_of(mobile)                 >> split(4,4) |
+                one_of(ndcs, :max_length => 3) >> split(4,4)
+end

data/lib/phony/countries/egypt.rb

@@ -1,5 +1,3 @@
-include Phony::DSL
-
 # TODO Move this into the country definitions.
 
 # Egyptian phone numbers.
@@ -13,5 +11,7 @@ ndcs = [
 
 # TODO Change how one_of works. max_length should be optional.
 #
-Phony::Countries::Egypt = one_of('800')                  >> split(7) |
-                          one_of(ndcs, :max_length => 2) >> split(8)
+Phony.define do
+  Phony::Countries::Egypt = one_of('800')                  >> split(7) |
+                            one_of(ndcs, :max_length => 2) >> split(8)
+end

data/lib/phony/countries/germany.rb

@@ -1,5 +1,3 @@
-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.
@@ -4067,6 +4065,8 @@ service = [
 '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)
+Phony.define do
+   country '49', one_of(service)                >> split(3,10) |
+                 match(/^(1[567]\d)\d*$/)       >> split(3,10) | # Mobile
+                 one_of(ndcs, :max_length => 5) >> split(3,10)
+end

data/lib/phony/countries/greece.rb

@@ -1,5 +1,3 @@
-include Phony::DSL
-
 # Greece uses a variable-length ndc code, thus we use a separate file to not let all_other.rb explode.
 #
 # Note: Greece uses a variable ndc format from length 2 to 4.
@@ -23,4 +21,6 @@ ndcs = [
   '800'  # Service
 ]
 
-Phony::Countries::Greece = one_of(ndcs, :max_length => 4) >> split(6)
+Phony.define do
+  country '30', one_of(ndcs, :max_length => 4) >> split(6)
+end

data/lib/phony/countries/hungary.rb

@@ -1,10 +1,10 @@
-include Phony::DSL
-
 # Hungarian phone numbers.
 #
 # http://en.wikipedia.org/wiki/Telephone_numbers_in_Hungary
 #
-Phony::Countries::Hungary = one_of('104', '105', '107', '112') >> split(3,3) | 
-# special
-                            # TODO mobile
-                            one_of('1', :max_length => 2)      >> split(3,4)
+
+Phony.define do
+  country '36', one_of('104', '105', '107', '112') >> split(3,3) | # special
+  # TODO mobile
+  one_of('1', :max_length => 2)      >> split(3,4)
+end

data/lib/phony/countries/italy.rb

@@ -1,5 +1,3 @@
-include Phony::DSL
-
 # Italian phone numbers.
 #
 # http://en.wikipedia.org/wiki/Telephone_numbers_in_Italy
@@ -15,7 +13,7 @@ ndcs = [
  '0161', # Vercelli
  '0165', # Aosta, Courmayeur
  '0166', # Cervinia
- '0171', # Cuneo 
+ '0171', # Cuneo
  '0185', # Tigullio
  '0187', # La Spezia and Cinque Terre
   '019', # Savona
@@ -63,27 +61,27 @@ ndcs = [
  '0771', # Fondi
  '0773', # Latina
  '0775', # Frosinone
- '0789', # Olbia and Costa Smeralda 
+ '0789', # Olbia and Costa Smeralda
   '079', # Sassari
   '080', # Bari
   '081', # Naples
  '0823', # Caserta
  '0824', # Benevento
- '0825', # Avellino 
+ '0825', # Avellino
   '085', # Pescara
- '0865', # Isernia 
+ '0865', # Isernia
  '0871', # Chieti
  '0872', # Lanciano
  '0873', # Vasto
- '0874', # Campobasso 
+ '0874', # Campobasso
  '0875', # Termoli
  '0881', # Foggia
-  '089', # Salerno 
+  '089', # Salerno
   '090', # Messina
   '091', # Palermo
   '092', # Agrigento
   '095', # Catania
- '0961', # Catanzaro 
+ '0961', # Catanzaro
  '0965', # Reggio di Calabria
  '0971', # Potenza
   '099', # Taranto
@@ -155,10 +153,10 @@ service = [ # Not exhaustive.
 
 # TODO Normalize!
 #
-# Phony::Countries::Italy = one_of(*service)                >> split(3,3) | 
-#                           one_of(*mobile)                 >> split(3,4) | 
+# Phony::Countries::Italy = one_of(*service)                >> split(3,3) |
+#                           one_of(*mobile)                 >> split(3,4) |
 #                           one_of(*ndcs, :max_length => 3) >> split(3,4)
-                          
+
 handlers = []
 handlers << Phony::NationalCode.new(
   Phony::NationalSplitters::Variable.new(nil, service),
@@ -175,4 +173,7 @@ handlers << Phony::NationalCode.new(
   Phony::LocalSplitters::Fixed.instance_for([3, 4]),
   false
 )
-Phony::Countries::Italy = Phony::Country.new *handlers
+
+Phony.define do
+  country '39', Phony::Country.new(*handlers)
+end

data/lib/phony/countries/malaysia.rb

@@ -1,5 +1,3 @@
-include Phony::DSL
-
 # Malaysian phone numbers.
 #
 # http://en.wikipedia.org/wiki/Telephone_numbers_in_Malaysia
@@ -16,6 +14,8 @@ ndcs = [
 mobile = %w{ 10 11 12 13 14 153 154 156 158 16 17 18 19 }
 service = %w{ 100 101 102 103 104 108 112 991 994 995 999 }
 
-Phony::Countries::Malaysia = one_of(service)                >> split(3,3) |
-                             one_of(mobile)                 >> split(8)   |
-                             one_of(ndcs, :max_length => 2) >> split(8)
+Phony.define do
+  country '60', one_of(service)                >> split(3,3) |
+                one_of(mobile)                 >> split(8)   |
+                one_of(ndcs, :max_length => 2) >> split(8)
+end

data/lib/phony/countries/netherlands.rb

@@ -50,6 +50,8 @@ service = [
   '909', # Betaalde informatienummers
  ]
 
-Phony::Countries::Netherlands = one_of(service)                        >> split(3,3) |
-                                one_of(['6'] + ndcs, :max_length => 3) >> split(8) # mobile + landline
-                                # 8 is for mobile numbers, other numbers will work as well (they use 7).
+Phony.define do
+  country '31', one_of(service)                        >> split(3,3) |
+          one_of(['6'] + ndcs, :max_length => 3) >> split(8) # mobile + landline
+          # 8 is for mobile numbers, other numbers will work as well (they use 7).
+end

data/lib/phony/countries/romania.rb

@@ -1,5 +1,3 @@
-include Phony::DSL
-
 # Romanian phone numbers.
 #
 # http://en.wikipedia.org/wiki/Romania_telephone_area_codes
@@ -27,6 +25,8 @@ service = [
  '906',
 ]
 
-Phony::Countries::Romania = one_of(*service)                     >> split(3,3) | 
-                            match(/^(7[1-8])\d*$/)               >> split(3,4) | 
-                            one_of('21', '31', :max_length => 3) >> split(3,4) # Bucureşti
+Phony.define do
+  country '40', one_of(*service)                     >> split(3,3) |
+                match(/^(7[1-8])\d*$/)               >> split(3,4) |
+                one_of('21', '31', :max_length => 3) >> split(3,4) # Bucureşti
+end

data/lib/phony/countries/south_korea.rb

@@ -1,5 +1,3 @@
-include Phony::DSL
-
 # South Korean (Republic of Korea) phone numbers.
 #
 # http://en.wikipedia.org/wiki/Telephone_numbers_in_South_Korea
@@ -10,6 +8,8 @@ include Phony::DSL
 service = %w{ 30 50 60 70 80 100 101 105 106 107 108 109 111 112 113 114 115 116 117 118 119 120 121 122 123 125 127 128 129 131 132 134 141 182 188 }
 mobile  = ('10'..'19').to_a
 
-Phony::Countries::SouthKorea = one_of(*service)              >> split(3,3) |
-                               one_of(*mobile)               >> split(4,4) |
-                               one_of('2', :max_length => 2) >> split(4,4) # Seoul
+Phony.define do
+  country '82', one_of(*service)              >> split(3,3) |
+                one_of(*mobile)               >> split(4,4) |
+                one_of('2', :max_length => 2) >> split(4,4) # Seoul
+end

data/lib/phony/countries/sweden.rb

@@ -53,5 +53,7 @@ service = [
  '11414', # Police
 ]
 
-Phony::Countries::Sweden = one_of(service)                            >> split(3,3) | 
-                           one_of(ndcs + mobile, :max_length => 3) >> split(8)
+Phony.define do
+  country '46', one_of(service)                         >> split(3,3) |
+                one_of(ndcs + mobile, :max_length => 3) >> split(8)
+end

data/lib/phony/countries/united_kingdom.rb

@@ -17,7 +17,7 @@ area_code_2_national = Phony::NationalSplitters::Variable.new nil, [
   '23',   # Southampton, Portsmith
   '24',   # Coventry
   '28',   # Northern Ireland
-  '29',   # Cardiff 
+  '29',   # Cardiff
 ]
 area_code_2_local    = Phony::LocalSplitters::Fixed.instance_for [4, 4]
 handlers            << Phony::NationalCode.new(area_code_2_national, area_code_2_local)
@@ -26,10 +26,10 @@ area_code_3_national = Phony::NationalSplitters::Variable.new nil, [
   # Geographical.
   #
   '113',  # Leeds
-  '114',  # Sheffield	
-  '115',  # Nottingham	
-  '116',  # Leicester	
-  '117',  # Bristol	
+  '114',  # Sheffield
+  '115',  # Nottingham
+  '116',  # Leicester
+  '117',  # Bristol
   '118',  # Reading
   '121',  # Birmingham
   '131',  # Edinburgh
@@ -46,7 +46,7 @@ area_code_3_national = Phony::NationalSplitters::Variable.new nil, [
   '842',
   '843',
   '844',
-  '845', 
+  '845',
   '870',
   '871',
   '872',
@@ -70,7 +70,7 @@ area_code_45_national = Phony::NationalSplitters::Variable.new 6, [
   '1382', # Dundee
   '1429', # Hartlepool
   '1482', # Hull
-  '1527', # Redditch	
+  '1527', # Redditch
   '1582', # Luton
   '1670', # Morpeth
   '1730', # Petersfield
@@ -104,4 +104,6 @@ area_code_45_national = Phony::NationalSplitters::Variable.new 6, [
 area_code_45_local    = Phony::LocalSplitters::Fixed.instance_for [6]
 handlers             << Phony::NationalCode.new(area_code_45_national, area_code_45_local)
 
-Phony::Countries::UnitedKingdom = Phony::Country.new *handlers
+Phony.define do
+  country '44', Phony::Country.new(*handlers)
+end

data/lib/phony/dsl.rb

@@ -1,37 +1,47 @@
-# # Ideas for a DSL:
-# #
-# 
-# # Switzerland
+# # Switzerland (simplified):
 # #
 # country('41', fixed(2) >> local([3,2,2]))
-# country(match(/^1.*$/) >> [3,3] || none >> [2,2,2,2])
-# 
-# # Germany. Too big.
-# #
-# country('49', Countries::Germany)
-# #
-# # … and in Germany:
+#
+# # Germany. Too big, we use a separate file:
 # #
 # include Phony::DSL
-# Countries::Germany = match(...) >> split([...]) ||
-#                      one_of([...], :max_length => 5) >> split([...])
-# 
-# # Denmark.
+# country '49', match(...) >> split([...]) ||
+#               one_of([...], :max_length => 5) >> split([...])
+#
+# # Denmark:
+# #
+# country('45', none >> split([2,2,2,2]))
+#
+# # Hungary:
 # #
-# country('45', none >> split([2,2,2,2])) # Denmark.
-# 
-# # Hungary.
-# # 
 # country('36',
 #         match(/^104|105|107|112/) >> split([3,3]) ||
 #         one_of([1], :max_length => 2) >> split([3,4])
 # )
 
 module Phony
-  
-  module DSL
 
-    # 
+  # For country definitions.
+  #
+  # There are two styles: With or without block.
+  # Use the block if you have multiple.
+  #
+  # Examples:
+  # Phony.define do
+  #   country ...
+  # end
+  #
+  # Phony.define.country ...
+  #
+  def self.define
+    dsl = DSL.new
+    dsl.instance_eval &Proc.new if block_given?
+    dsl
+  end
+
+  class DSL
+
+    #
     #
     def country country_code, country
       Phony::CountryCodes.instance.add country_code, country
@@ -39,8 +49,8 @@ module Phony
 
     # National matcher & splitters.
     #
-    
-    # 
+
+    #
     #
     def fixed size
       NationalSplitters::Fixed.instance_for size
@@ -50,20 +60,20 @@ module Phony
     end
     def one_of *ndcs
       options = Hash === ndcs.last ? ndcs.pop : {}
-      
+
       # Ruby 1.8 compatibility mode.
       #
       ndcs = ndcs.first if Array === ndcs.first
-      
+
       NationalSplitters::Variable.new options[:max_length], ndcs
     end
     def match regex, options = {}
       NationalSplitters::Regex.instance_for regex, options[:on_fail_take]
     end
-    
+
     # Local splitters.
     #
-    
+
     #
     #
     def split *local
@@ -72,7 +82,7 @@ module Phony
     def matched_split options = {}
       Phony::LocalSplitters::Regex.instance_for options
     end
-    
+
   end
-  
+
 end