phony 1.2.11 → 1.3.0

data/lib/phony/countries/netherlands.rb

@@ -3,55 +3,53 @@
 # 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).
 #
-Phony::Countries::Netherlands = Phony::Country.configured :local_format => [8], # 8 is for mobile numbers, other numbers will work as well (they use 7).
-  :ndc_fallback_length => 3,
-  :ndc_mapping => {
-    :landline => [
-                  '10', # Rotterdam
-                  '13', # Tilburg
-                  '14', # KPN
-                  '15', # Delft
-                  '20', # Amsterdam
-                  '23', # Haarlem
-                  '24', # Nijmegen
-                  '26', # Arnhem
-                  '30', # Utrecht
-                  '33', # Amersfoort
-                  '35', # Hilversum
-                  '36', # Almere
-                  '38', # Zwolle
-                  '40', # Eindhoven
-                  '43', # Maastricht
-                  '45', # Heerlen
-                  '46', # Sittard
-                  '50', # Groningen
-                  '53', # Enschede
-                  '55', # Apeldoorn
-                  '58', # Leeuwarden
-                  '70', # Den Haag
-                  '71', # Leiden
-                  '72', # Alkmaar
-                  '73', # 's-Hertogenbosch
-                  '74', # Hengelo
-                  '75', # Zaanstad
-                  '76', # Breda
-                  '77', # Venlo
-                  '78', # Dordrecht
-                  '79', # Zoetermeer
-                 ],
-    :mobile => [
-                '6' # Mobiele nummers en Semafoondiensten
-               ],
-    :service => [
-                 '84',  # Persoonlijke-assistentdiensten, zoals voicemail en faxmail
-                 '85',  # Plaatsonafhankelijk netnummer
-                 '87',  # Both of the above.
-                 '88',  # Bedrijfsnummers
-                 '91',  # Plaatsonafhankelijk netnummer
-                 '676', # Inbelnummers van Internetproviders
-                 '800', # Gratis informatienummers
-                 '900', # Betaalde informatienummers
-                 '906', # Betaalde informatienummers
-                 '909', # Betaalde informatienummers
-                ]
-  }
+ndcs = [
+  '10', # Rotterdam
+  '13', # Tilburg
+  '14', # KPN
+  '15', # Delft
+  '20', # Amsterdam
+  '23', # Haarlem
+  '24', # Nijmegen
+  '26', # Arnhem
+  '30', # Utrecht
+  '33', # Amersfoort
+  '35', # Hilversum
+  '36', # Almere
+  '38', # Zwolle
+  '40', # Eindhoven
+  '43', # Maastricht
+  '45', # Heerlen
+  '46', # Sittard
+  '50', # Groningen
+  '53', # Enschede
+  '55', # Apeldoorn
+  '58', # Leeuwarden
+  '70', # Den Haag
+  '71', # Leiden
+  '72', # Alkmaar
+  '73', # 's-Hertogenbosch
+  '74', # Hengelo
+  '75', # Zaanstad
+  '76', # Breda
+  '77', # Venlo
+  '78', # Dordrecht
+  '79', # Zoetermeer
+ ]
+
+service = [
+  '84',  # Persoonlijke-assistentdiensten, zoals voicemail en faxmail
+  '85',  # Plaatsonafhankelijk netnummer
+  '87',  # Both of the above.
+  '88',  # Bedrijfsnummers
+  '91',  # Plaatsonafhankelijk netnummer
+  '676', # Inbelnummers van Internetproviders
+  '800', # Gratis informatienummers
+  '900', # Betaalde informatienummers
+  '906', # Betaalde informatienummers
+  '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).

data/lib/phony/countries/romania.rb

@@ -1,31 +1,32 @@
+include Phony::DSL
+
 # Romanian phone numbers.
 #
 # http://en.wikipedia.org/wiki/Romania_telephone_area_codes
 #
-Phony::Countries::Romania = Phony::Country.configured :local_format => [3, 4], # Also captures 3, 3 on a fallback.
-  :local_special_format => [3, 3],
-  :local_mobile_format => [3, 4],
-  :ndc_fallback_length => 3,
-  :ndc_mapping => {
-    :landline => [
-                   '21', # Bucureşti
-                   '31', # Bucureşti
-                  ],
-    :mobile   => [
-                  '71',
-                  '72',
-                  '73',
-                  '74',
-                  '75',
-                  '76',
-                  '77',
-                  '78',
-                 ],
-    :service  => [
-                  '112',
-                  '800',
-                  '900',
-                  '903',
-                  '906',
-                 ]
-  }
+
+ndcs = [
+ '21', # Bucureşti
+ '31', # Bucureşti
+]
+mobile = [
+ '71',
+ '72',
+ '73',
+ '74',
+ '75',
+ '76',
+ '77',
+ '78',
+]
+service = [
+ '112',
+ '800',
+ '900',
+ '903',
+ '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

data/lib/phony/countries/south_korea.rb

@@ -1,15 +1,15 @@
+include Phony::DSL
+
 # South Korean (Republic of Korea) phone numbers.
 #
 # http://en.wikipedia.org/wiki/Telephone_numbers_in_South_Korea
 #
-Phony::Countries::SouthKorea = Phony::Country.configured :local_format => [4, 4],
-  :ndc_fallback_length => 2,
-  :ndc_mapping => {
-    :landline => [
-                  '2', # Seoul
-                 ],
-    :mobile   => %w{ 10 11 12 13 14 15 16 17 18 19 },
-    # TODO 4-digit services, like "unreasonable infringement of livelihood report" number :)
-    #
-    :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 }
-  }
+
+# TODO 4-digit services, like "unreasonable infringement of livelihood report" number :)
+#
+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

data/lib/phony/countries/sweden.rb

@@ -6,52 +6,52 @@
 # Taken from: http://en.wikipedia.org/wiki/Telephone_numbers_in_Sweden
 #             http://www.pts.se/upload/Ovrigt/Tele/Nummerfragor/bilaga-2b.pdf
 #
-Phony::Countries::Sweden = Phony::Country.configured :local_format => [8],
- :ndc_fallback_length => 3,
- :ndc_mapping => {
-   :landline => [
-                 '7',  # Non-geographical
-                 '8',  # Stockholm
-                 '10', # VOIP
-                 '11', # Norrköping
-                 '13', # Linköping
-                 '16', # Eskilstuna-Torshälla
-                 '18', # Uppsala
-                 '19', # Örebro-Kumla
-                 '20', # toll-free
-                 '21', # Västerås
-                 '23', # Falun
-                 '26', # Gävle-Sandviken
-                 '31', # Göteborg
-                 '33', # Borås
-                 '35', # Halmstad
-                 '36', # Jönköping-Huskvarna
-                 '40', # Malmö
-                 '42', # Helsingborg-Höganäs
-                 '44', # Kristianstad
-                 '46', # Lund
-                 '54', # Karlstad
-                 '60', # Sundsvall-Timrå
-                 '63', # Östersund
-                 '90', # Umeå
-                ],
-   :mobile => [
-               '70', # Mobile
-               '71', # Telematics
-               '72', # Mobile
-               '73', # Mobile
-               '74', # Pagers
-               '76', # Mobile
-              ],
-   :service => [
-                   '99', # Premium Rate
-                  '112', # Emergency Service
-                  '116', # Psychological Help
-                  '118', # Number enquiries
-                  '900', # Premium Rate
-                  '939', # Premium Rate
-                  '944', # Premium Rate
-                 '1177', # Health Care Advice
-                '11414', # Police
-               ]
- }
+
+ndcs = [
+ '7',  # Non-geographical
+ '8',  # Stockholm
+ '10', # VOIP
+ '11', # Norrköping
+ '13', # Linköping
+ '16', # Eskilstuna-Torshälla
+ '18', # Uppsala
+ '19', # Örebro-Kumla
+ '20', # toll-free
+ '21', # Västerås
+ '23', # Falun
+ '26', # Gävle-Sandviken
+ '31', # Göteborg
+ '33', # Borås
+ '35', # Halmstad
+ '36', # Jönköping-Huskvarna
+ '40', # Malmö
+ '42', # Helsingborg-Höganäs
+ '44', # Kristianstad
+ '46', # Lund
+ '54', # Karlstad
+ '60', # Sundsvall-Timrå
+ '63', # Östersund
+ '90', # Umeå
+]
+mobile = [
+ '70', # Mobile
+ '71', # Telematics
+ '72', # Mobile
+ '73', # Mobile
+ '74', # Pagers
+ '76', # Mobile
+]
+service = [
+    '99', # Premium Rate
+   '112', # Emergency Service
+   '116', # Psychological Help
+   '118', # Number enquiries
+   '900', # Premium Rate
+   '939', # Premium Rate
+   '944', # Premium Rate
+  '1177', # Health Care Advice
+ '11414', # Police
+]
+
+Phony::Countries::Sweden = one_of(service)                            >> split(3,3) | 
+                           one_of(ndcs + mobile, :max_length => 3) >> split(8)

data/lib/phony/countries/united_kingdom.rb

@@ -12,7 +12,7 @@
 #
 handlers = []
 
-area_code_2_national = Phony::NationalSplitters::Variable.new nil, :landline => [
+area_code_2_national = Phony::NationalSplitters::Variable.new nil, [
   '20',   # London
   '23',   # Southampton, Portsmith
   '24',   # Coventry
@@ -22,7 +22,7 @@ area_code_2_national = Phony::NationalSplitters::Variable.new nil, :landline =>
 area_code_2_local    = Phony::LocalSplitters::Fixed.instance_for [4, 4]
 handlers            << Phony::NationalCode.new(area_code_2_national, area_code_2_local)
 
-area_code_3_national = Phony::NationalSplitters::Variable.new nil, :landline => [
+area_code_3_national = Phony::NationalSplitters::Variable.new nil, [
   # Geographical.
   #
   '113',  # Leeds
@@ -61,7 +61,7 @@ handlers            << Phony::NationalCode.new(area_code_3_national, area_code_3
 
 # 6 is the fallback length.
 #
-area_code_45_national = Phony::NationalSplitters::Variable.new 6, :landline => [
+area_code_45_national = Phony::NationalSplitters::Variable.new 6, [
   # Geographical.
   #
   '1204', # Bolton
@@ -100,7 +100,7 @@ area_code_45_national = Phony::NationalSplitters::Variable.new 6, :landline => [
   '17684', # Pooley Bridge
   '17687', # Keswick
   '19467', # Gosforth
-]
+].flatten
 area_code_45_local    = Phony::LocalSplitters::Fixed.instance_for [6]
 handlers             << Phony::NationalCode.new(area_code_45_national, area_code_45_local)
 

data/lib/phony/country.rb

@@ -4,18 +4,31 @@ module Phony
   #
   class Country
     
+    attr_accessor :codes
+    
     # 
     #
     def initialize *codes
       @codes = codes
     end
     
+    # DSL.
+    #
+    # TODO
+    #
+    def |(other)
+      self.codes = self.codes + other.codes
+      self
+    end
+    
     # A number is split with the code handlers as given in the initializer.
     #
+    # Note: If the ndc is nil, it will not return it.
+    #
     def split national_number
       @codes.each do |code|
         ndc, *rest = code.split national_number
-        return [ndc, *rest] if rest && !rest.empty?
+        return ndc ? [ndc, *rest] : rest if rest && !rest.empty?
       end
     end
     
@@ -46,85 +59,6 @@ module Phony
       "#{ndc}#{Vanity.replace(rest.join)}"
     end
     
-    
-    # Get a configured country instance.
-    #
-    # Define your countries like this:
-    # Phony::Countries::Austria = Phony::Country.configured <options>
-    #
-    # Example:
-    #  Phony::Country.configured :local_format         => [3, 2, 2],
-    #                            :service_local_format => [3, 3],
-    #                            :ndc_fallback_length  => 4,
-    #                            :ndc_mapping => {
-    #                              :normal  => ['44'],
-    #                              :service => ['800'],
-    #                              :mobile  => ['76']
-    #                            }
-    #
-    # Service numbers can have a special formatting.
-    # Cellphones usually use the same as the landline.
-    # If that is not the case, I will expand the framework.
-    #
-    def self.configured options = {}
-      normalize            = options[:normalize]
-      ndc_fallback_length  = options[:ndc_fallback_length]
-      ndc_mapping          = options[:ndc_mapping] || raise("No ndc_mapping given!")
-      
-      codes = []
-      
-      if ndc_mapping[:service]
-        service_national_splitter = Phony::NationalSplitters::Variable.new nil, :service => ndc_mapping[:service]
-        service_local_splitter    = Phony::LocalSplitters::Fixed.instance_for options[:service_local_format] || [3, 6]
-        codes                    << Phony::NationalCode.new(service_national_splitter, service_local_splitter, normalize)
-      end
-      if ndc_mapping[:mobile]
-        mobile_local_format      = options[:mobile_local_format] || options[:local_format] || [9]
-        mobile_national_splitter = Phony::NationalSplitters::Variable.new nil, :mobile => ndc_mapping[:mobile]
-        mobile_local_splitter    = Phony::LocalSplitters::Fixed.instance_for mobile_local_format
-        codes                   << Phony::NationalCode.new(mobile_national_splitter, mobile_local_splitter, normalize)
-      end
-      
-      national_splitter = Phony::NationalSplitters::Variable.new ndc_fallback_length, ndc_mapping
-      local_splitter    = Phony::LocalSplitters::Fixed.instance_for options[:local_format] || [3, 2, 2]
-      codes            << Phony::NationalCode.new(national_splitter, local_splitter, normalize)
-      
-      new *codes
-    end
-    
-    # Gets a configured country instance with fixed length ndc code.
-    #
-    # Define your countries like this:
-    # Phony::Countries::Switzerland = Phony::Country.fixed <options>
-    #
-    # Example:
-    #  Phony::Country.fixed :ndc_length           => 4,
-    #                       :local_format         => [3, 2, 2],
-    #                       :service_local_format => [3, 3],
-    #                       :service_ndcs         => ['800']
-    #
-    def self.fixed options = {}
-      normalize    = options[:normalize]
-      ndc_length   = options[:ndc_length]
-      service_ndcs = options[:service_ndcs]
-      local_format = options[:local_format]
-      
-      codes = []
-      
-      if service_ndcs
-        service_local_format      = options[:service_local_format] || local_format || [3, 3]
-        service_national_splitter = Phony::NationalSplitters::Variable.new nil, :service => service_ndcs
-        service_local_splitter    = Phony::LocalSplitters::Fixed.instance_for service_local_format
-        codes                    << Phony::NationalCode.new(service_national_splitter, service_local_splitter, normalize)
-      end
-      
-      national_splitter = Phony::NationalSplitters::Fixed.new ndc_length
-      local_splitter    = Phony::LocalSplitters::Fixed.instance_for local_format || [3, 2, 2]
-      codes            << Phony::NationalCode.new(national_splitter, local_splitter, normalize)
-      
-      new *codes
-    end
-    
   end
   
 end