e164 0.3.1 → 0.3.2

data/README.markdown

@@ -54,7 +54,7 @@ Just like the CountryCodes, NDC info is stored in a hash of hashes and accessed
 
     E164::NANP('303') #=> {:abbreviation => 'Colorado', :description => '[Colorado] (Boulder, Longmont, Aurora, Denver and central Colorado, overlays with [720])', :info => 'en.wikipedia.com.org/wiki/Area_codes_303_and_720'}
     
-    E164::Austria['1'] => {:description => 'Wient'}
+    E164::Austria['1'] => {:description => 'Wien'}
     
     E164::Germany['10'] => {:description => 'Call-By-Call'}
 

data/VERSION

@@ -1 +1 @@
-0.3.1
+0.3.2

data/e164.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{e164}
-  s.version = "0.3.1"
+  s.version = "0.3.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = [%q{hexorx}]
-  s.date = %q{2011-11-03}
+  s.date = %q{2011-12-30}
   s.description = %q{The e164 gem can parse and normalize numbers into the e164 format.
       It provides extra information on the Country Code and National Destination Codes.
       It can be used standalone or mixed into a model.}

data/lib/e164.rb

@@ -1,30 +1,40 @@
 module E164
-  
+
   Dir.glob(File.join(File.dirname(__FILE__), 'e164/*.rb')).each {|f| require f }
-  
+
   ValidFormat = /^\+([\d]{1,3})([\d]{1,14})$/
   Identifiers = ['+','011', '00']
   DefaultIdentifier = '+'
   DefaultCountryCode = '1'  # Override by E164.set_default_country_code!()
-  
+  DefaultCountryLength = 10 # Override by E164.set_default_country_length!()
+
+  def self.country_codes
+    CountryCodes
+  end
+
   def self.normalize(num)
     parse(num).unshift(DefaultIdentifier).join
   end
-  
+
   def self.parse(num)
     num = e164_clean(num)
     identifier = Identifiers.include?(num.first) ? num.shift : nil
-    
-    num = (identifier || num.join.start_with?(DefaultCountryCode)) ? join_country_code(num) : num.unshift(DefaultCountryCode)
-    num = join_national_destination_code(num)
-    
+
+    if identifier || num.join.start_with?(DefaultCountryCode)
+      num = join_country_code(num)
+    else
+      num = num.unshift(DefaultCountryCode) if num.join.length == DefaultCountryLength
+    end
+
+    num = join_national_destination_code(num) if CountryCodes[num[0]]
+
     [num.shift,num.shift,num.join]
   end
-  
+
   def self.e164_clean(num)
     num.scan(/^(?:#{Identifiers.map{|i| Regexp.escape(i) }.join('|')})|[\d]/)
   end
-  
+
   def self.join_country_code(num)
     potentials = (1..3).map {|l| num[0,l].join}
     country_code = potentials.map {|x| CountryCodes[x] ? x : nil}.compact.first
@@ -33,13 +43,13 @@ module E164
       country_code = DefaultCountryCode
       num.unshift(country_code)
     end
-    
+
     [num.shift(country_code.length).join, *num]
   end
-  
+
   def self.join_national_destination_code(num)
     country = CountryCodes[num[0]]
-    
+
     case (destination_codes = country[:national_destination_codes])
     when Integer
       destination_code_length = destination_codes
@@ -48,7 +58,7 @@ module E164
       destination_code = potentials.map {|x| destination_codes[x] ? x : nil}.compact.first
       destination_code_length = (destination_code && destination_code.length) || destination_codes[:default]
     end
-    
+
     [num.shift, num.shift(destination_code_length).join, *num]
   end
 
@@ -57,4 +67,10 @@ module E164
     const_set(:DefaultCountryCode, country_code)
     ret_value
   end
+
+  def self.set_default_country_length!(country_length)
+    ret_value = remove_const(:DefaultCountryLength)
+    const_set(:DefaultCountryLength, country_length)
+    ret_value
+  end
 end

data/lib/e164/country_codes.rb

@@ -5,10 +5,10 @@ Dir.glob(File.join(File.dirname(__FILE__), 'national_destination_codes/*.rb')).e
 CountryCodes = {
   '1' => {:national_destination_codes => 3, :abbreviation => 'NANP', :description => 'North American Numbering Plan', :info => 'en.wikipedia.com.org/wiki/NANP'},
   '7' => {:national_destination_codes => 3, :abbreviation => '', :description => 'Russia', :info => 'en.wikipedia.com.org/wiki/Russia'},
-  
+
   '20' => {:national_destination_codes => 2, :abbreviation => '', :description => 'Egypt', :info => 'en.wikipedia.com.org/wiki/Egypt'},
   '27' => {:national_destination_codes => 2, :abbreviation => '', :description => 'South Africa', :info => 'en.wikipedia.com.org/wiki/South_Africa'},
-  
+
   '30' => {:national_destination_codes => 2, :abbreviation => '', :description => 'Greece', :info => 'en.wikipedia.com.org/wiki/Greece'},
   '31' => {:national_destination_codes => 2, :abbreviation => '', :description => 'Netherlands', :info => 'en.wikipedia.com.org/wiki/Netherlands'},
   '32' => {:national_destination_codes => 2, :abbreviation => '', :description => 'Belgium', :info => 'en.wikipedia.com.org/wiki/Belgium'},
@@ -16,7 +16,7 @@ CountryCodes = {
   '34' => {:national_destination_codes => 2, :abbreviation => '', :description => 'Spain', :info => 'en.wikipedia.com.org/wiki/Spain'},
   '36' => {:national_destination_codes => 2, :abbreviation => '', :description => 'Hungary', :info => 'en.wikipedia.com.org/wiki/Hungary'},
   '39' => {:national_destination_codes => 3, :abbreviation => '', :description => 'Italy', :info => 'en.wikipedia.com.org/wiki/Italy'},
-  
+
   '40' => {:national_destination_codes => 2, :abbreviation => '', :description => 'Romania', :info => 'en.wikipedia.com.org/wiki/Romania'},
   '41' => {:national_destination_codes => 2, :abbreviation => '', :description => 'Switzerland', :info => 'en.wikipedia.com.org/wiki/Switzerland'},
   '43' => {:national_destination_codes => Austria, :abbreviation => '', :description => 'Austria', :info => 'en.wikipedia.com.org/wiki/Austria'},
@@ -26,7 +26,7 @@ CountryCodes = {
   '47' => {:national_destination_codes => 2, :abbreviation => '', :description => 'Norway', :info => 'en.wikipedia.com.org/wiki/Norway'},
   '48' => {:national_destination_codes => 2, :abbreviation => '', :description => 'Poland', :info => 'en.wikipedia.com.org/wiki/Poland'},
   '49' => {:national_destination_codes => Germany, :abbreviation => '', :description => 'Germany', :info => 'en.wikipedia.com.org/wiki/Germany'},
-  
+
   '51' => {:national_destination_codes => 2, :abbreviation => '', :description => 'Peru', :info => 'en.wikipedia.com.org/wiki/Peru'},
   '52' => {:national_destination_codes => 2, :abbreviation => '', :description => 'Mexico', :info => 'en.wikipedia.com.org/wiki/Mexico'},
   '53' => {:national_destination_codes => 2, :abbreviation => '', :description => 'Cuba', :info => 'en.wikipedia.com.org/wiki/Cuba'},
@@ -35,7 +35,7 @@ CountryCodes = {
   '56' => {:national_destination_codes => 2, :abbreviation => '', :description => 'Chile', :info => 'en.wikipedia.com.org/wiki/Chile'},
   '57' => {:national_destination_codes => 2, :abbreviation => '', :description => 'Colombia', :info => 'en.wikipedia.com.org/wiki/Colombia'},
   '58' => {:national_destination_codes => 2, :abbreviation => '', :description => 'Venezuela', :info => 'en.wikipedia.com.org/wiki/Venezuela'},
-  
+
   '60' => {:national_destination_codes => 2, :abbreviation => '', :description => 'Malaysia', :info => 'en.wikipedia.com.org/wiki/Malaysia'},
   '61' => {:national_destination_codes => 2, :abbreviation => '', :description => 'Australia', :info => 'en.wikipedia.com.org/wiki/Australia'},
   '62' => {:national_destination_codes => 2, :abbreviation => '', :description => 'Indonesia', :info => 'en.wikipedia.com.org/wiki/Indonesia'},
@@ -43,12 +43,12 @@ CountryCodes = {
   '64' => {:national_destination_codes => 1, :abbreviation => '', :description => 'New Zealand', :info => 'en.wikipedia.com.org/wiki/New_Zealand'},
   '65' => {:national_destination_codes => 2, :abbreviation => '', :description => 'Singapore', :info => 'en.wikipedia.com.org/wiki/Singapore'},
   '66' => {:national_destination_codes => 2, :abbreviation => '', :description => 'Thailand', :info => 'en.wikipedia.com.org/wiki/Thailand'},
-  
+
   '81' => {:national_destination_codes => 2, :abbreviation => '', :description => 'Japan', :info => 'en.wikipedia.com.org/wiki/Japan'},
   '82' => {:national_destination_codes => 2, :abbreviation => '', :description => 'South Korea', :info => 'en.wikipedia.com.org/wiki/South_Korea'},
   '84' => {:national_destination_codes => 2, :abbreviation => '', :description => 'Vietnam', :info => 'en.wikipedia.com.org/wiki/Vietnam'},
   '86' => {:national_destination_codes => 2, :abbreviation => '', :description => 'People\'s Republic of China', :info => 'en.wikipedia.com.org/wiki/People%27s_Republic_of_China'},
-  
+
   '90' => {:national_destination_codes => 2, :abbreviation => '', :description => 'Turkey', :info => 'en.wikipedia.com.org/wiki/Turkey'},
   '91' => {:national_destination_codes => 2, :abbreviation => '', :description => 'India', :info => 'en.wikipedia.com.org/wiki/India'},
   '92' => {:national_destination_codes => 2, :abbreviation => '', :description => 'Pakistan', :info => 'en.wikipedia.com.org/wiki/Pakistan'},
@@ -56,12 +56,12 @@ CountryCodes = {
   '94' => {:national_destination_codes => 2, :abbreviation => '', :description => 'Sri Lanka', :info => 'en.wikipedia.com.org/wiki/Sri_Lanka'},
   '95' => {:national_destination_codes => 2, :abbreviation => '', :description => 'Burma', :info => 'en.wikipedia.com.org/wiki/Burma'},
   '98' => {:national_destination_codes => 2, :abbreviation => '', :description => 'Iran', :info => 'en.wikipedia.com.org/wiki/Iran'},
-  
+
   '212' => {:national_destination_codes => 2, :abbreviation => '', :description => 'Morocco', :info => 'en.wikipedia.com.org/wiki/Morocco'},
   '213' => {:national_destination_codes => 2, :abbreviation => '', :description => 'Algeria', :info => 'en.wikipedia.com.org/wiki/Algeria'},
   '216' => {:national_destination_codes => 2, :abbreviation => '', :description => 'Tunisia', :info => 'en.wikipedia.com.org/wiki/Tunisia'},
   '218' => {:national_destination_codes => 2, :abbreviation => '', :description => 'Libya', :info => 'en.wikipedia.com.org/wiki/Libya'},
-  
+
   '220' => {:national_destination_codes => 2, :abbreviation => '', :description => 'The Gambia', :info => 'en.wikipedia.com.org/wiki/The_Gambia'},
   '221' => {:national_destination_codes => 2, :abbreviation => '', :description => 'Senegal', :info => 'en.wikipedia.com.org/wiki/Senegal'},
   '222' => {:national_destination_codes => 2, :abbreviation => '', :description => 'Mauritania', :info => 'en.wikipedia.com.org/wiki/Mauritania'},
@@ -72,7 +72,7 @@ CountryCodes = {
   '227' => {:national_destination_codes => 2, :abbreviation => '', :description => 'Niger', :info => 'en.wikipedia.com.org/wiki/Niger'},
   '228' => {:national_destination_codes => 2, :abbreviation => '', :description => 'Togo', :info => 'en.wikipedia.com.org/wiki/Togo'},
   '229' => {:national_destination_codes => 2, :abbreviation => '', :description => 'Benin', :info => 'en.wikipedia.com.org/wiki/Benin'},
-  
+
   '230' => {:national_destination_codes => 2, :abbreviation => '', :description => 'Mauritius', :info => 'en.wikipedia.com.org/wiki/Mauritius'},
   '231' => {:national_destination_codes => 2, :abbreviation => '', :description => 'Liberia', :info => 'en.wikipedia.com.org/wiki/Liberia'},
   '232' => {:national_destination_codes => 2, :abbreviation => '', :description => 'Sierra Leone', :info => 'en.wikipedia.com.org/wiki/Sierra_Leone'},
@@ -83,7 +83,7 @@ CountryCodes = {
   '237' => {:national_destination_codes => 2, :abbreviation => '', :description => 'Cameroon', :info => 'en.wikipedia.com.org/wiki/Cameroon'},
   '238' => {:national_destination_codes => 2, :abbreviation => '', :description => 'Cape Verde', :info => 'en.wikipedia.com.org/wiki/Cape_Verde'},
   '239' => {:national_destination_codes => 2, :abbreviation => '', :description => 'São Tomé and Príncipe', :info => 'en.wikipedia.com.org/wiki/S%C3%A3o_Tom%C3%A9_and_Pr%C3%ADncipe'},
-  
+
   '240' => {:national_destination_codes => 2, :abbreviation => '', :description => 'Equatorial Guinea', :info => 'en.wikipedia.com.org/wiki/Equatorial_Guinea'},
   '241' => {:national_destination_codes => 2, :abbreviation => '', :description => 'Gabon', :info => 'en.wikipedia.com.org/wiki/Gabon'},
   '242' => {:national_destination_codes => 2, :abbreviation => '', :description => 'Republic of the Congo', :info => 'en.wikipedia.com.org/wiki/Republic_of_the_Congo'},
@@ -94,7 +94,7 @@ CountryCodes = {
   '247' => {:national_destination_codes => 2, :abbreviation => '', :description => 'United Kingdom', :info => 'en.wikipedia.com.org/wiki/United_Kingdom'},
   '248' => {:national_destination_codes => 2, :abbreviation => '', :description => 'Seychelles', :info => 'en.wikipedia.com.org/wiki/Seychelles'},
   '249' => {:national_destination_codes => 2, :abbreviation => '', :description => 'Sudan', :info => 'en.wikipedia.com.org/wiki/Sudan'},
-  
+
   '250' => {:national_destination_codes => 2, :abbreviation => '', :description => 'Rwanda', :info => 'en.wikipedia.com.org/wiki/Rwanda'},
   '251' => {:national_destination_codes => 2, :abbreviation => '', :description => 'Ethiopia', :info => 'en.wikipedia.com.org/wiki/Ethiopia'},
   '252' => {:national_destination_codes => 2, :abbreviation => '', :description => 'Somalia', :info => 'en.wikipedia.com.org/wiki/Somalia'},
@@ -104,7 +104,7 @@ CountryCodes = {
   '256' => {:national_destination_codes => 2, :abbreviation => '', :description => 'Uganda', :info => 'en.wikipedia.com.org/wiki/Uganda'},
   '257' => {:national_destination_codes => 2, :abbreviation => '', :description => 'Burundi', :info => 'en.wikipedia.com.org/wiki/Burundi'},
   '258' => {:national_destination_codes => 2, :abbreviation => '', :description => 'Mozambique', :info => 'en.wikipedia.com.org/wiki/Mozambique'},
-  
+
   '260' => {:national_destination_codes => 2, :abbreviation => '', :description => 'Zambia', :info => 'en.wikipedia.com.org/wiki/Zambia'},
   '261' => {:national_destination_codes => 2, :abbreviation => '', :description => 'Madagascar', :info => 'en.wikipedia.com.org/wiki/Madagascar'},
   '262' => {:national_destination_codes => 2, :abbreviation => '', :description => 'Mayotte', :info => 'en.wikipedia.com.org/wiki/Mayotte'},
@@ -115,13 +115,13 @@ CountryCodes = {
   '267' => {:national_destination_codes => 2, :abbreviation => '', :description => 'Botswana', :info => 'en.wikipedia.com.org/wiki/Botswana'},
   '268' => {:national_destination_codes => 2, :abbreviation => '', :description => 'Swaziland', :info => 'en.wikipedia.com.org/wiki/Swaziland'},
   '269' => {:national_destination_codes => 2, :abbreviation => '', :description => 'Comoros', :info => 'en.wikipedia.com.org/wiki/Comoros'},
-  
+
   '290' => {:national_destination_codes => 2, :abbreviation => '', :description => 'Saint Helena', :info => 'en.wikipedia.com.org/wiki/Saint_Helena'},
   '291' => {:national_destination_codes => 2, :abbreviation => '', :description => 'Eritrea', :info => 'en.wikipedia.com.org/wiki/Eritrea'},
   '297' => {:national_destination_codes => 2, :abbreviation => '', :description => 'Aruba', :info => 'en.wikipedia.com.org/wiki/Aruba'},
   '298' => {:national_destination_codes => 2, :abbreviation => '', :description => 'Faroe Islands', :info => 'en.wikipedia.com.org/wiki/Faroe_Islands'},
   '299' => {:national_destination_codes => 2, :abbreviation => '', :description => 'Greenland', :info => 'en.wikipedia.com.org/wiki/Greenland'},
-  
+
   '350' => {:national_destination_codes => 2, :abbreviation => '', :description => 'Gibraltar', :info => 'en.wikipedia.com.org/wiki/Gibraltar'},
   '351' => {:national_destination_codes => 2, :abbreviation => '', :description => 'Portugal', :info => 'en.wikipedia.com.org/wiki/Portugal'},
   '352' => {:national_destination_codes => 2, :abbreviation => '', :description => 'Luxembourg', :info => 'en.wikipedia.com.org/wiki/Luxembourg'},
@@ -132,7 +132,7 @@ CountryCodes = {
   '357' => {:national_destination_codes => 2, :abbreviation => '', :description => 'Cyprus', :info => 'en.wikipedia.com.org/wiki/Cyprus'},
   '358' => {:national_destination_codes => 2, :abbreviation => '', :description => 'Finland', :info => 'en.wikipedia.com.org/wiki/Finland'},
   '359' => {:national_destination_codes => 2, :abbreviation => '', :description => 'Bulgaria', :info => 'en.wikipedia.com.org/wiki/Bulgaria'},
-  
+
   '370' => {:national_destination_codes => 2, :abbreviation => '', :description => 'Lithuania', :info => 'en.wikipedia.com.org/wiki/Lithuania'},
   '371' => {:national_destination_codes => 2, :abbreviation => '', :description => 'Latvia', :info => 'en.wikipedia.com.org/wiki/Latvia'},
   '372' => {:national_destination_codes => 2, :abbreviation => '', :description => 'Estonia', :info => 'en.wikipedia.com.org/wiki/Estonia'},
@@ -143,7 +143,7 @@ CountryCodes = {
   '377' => {:national_destination_codes => 2, :abbreviation => '', :description => 'Monaco', :info => 'en.wikipedia.com.org/wiki/Monaco'},
   '378' => {:national_destination_codes => 2, :abbreviation => '', :description => 'discontinued (was assigned to [San Marino], see [+378])', :info => ''},
   '379' => {:national_destination_codes => 2, :abbreviation => '', :description => 'Vatican City', :info => 'en.wikipedia.com.org/wiki/Vatican_City'},
-  
+
   '380' => {:national_destination_codes => 2, :abbreviation => '', :description => 'Ukraine', :info => 'en.wikipedia.com.org/wiki/Ukraine'},
   '381' => {:national_destination_codes => 2, :abbreviation => '', :description => 'Serbia', :info => 'en.wikipedia.com.org/wiki/Serbia'},
   '382' => {:national_destination_codes => 2, :abbreviation => '', :description => 'Montenegro', :info => 'en.wikipedia.com.org/wiki/Montenegro'},
@@ -152,11 +152,11 @@ CountryCodes = {
   '387' => {:national_destination_codes => 2, :abbreviation => '', :description => 'Bosnia and Herzegovina', :info => 'en.wikipedia.com.org/wiki/Bosnia_and_Herzegovina'},
   '388' => {:national_destination_codes => 2, :abbreviation => '', :description => 'shared code for groups of nations', :info => ''},
   '389' => {:national_destination_codes => 2, :abbreviation => '', :description => 'Republic of Macedonia', :info => 'en.wikipedia.com.org/wiki/Republic_of_Macedonia'},
-  
+
   '420' => {:national_destination_codes => 2, :abbreviation => '', :description => 'Czech Republic', :info => 'en.wikipedia.com.org/wiki/Czech_Republic'},
   '421' => {:national_destination_codes => 2, :abbreviation => '', :description => 'Slovakia', :info => 'en.wikipedia.com.org/wiki/Slovakia'},
   '423' => {:national_destination_codes => 2, :abbreviation => '', :description => 'Liechtenstein', :info => 'en.wikipedia.com.org/wiki/Liechtenstein'},
-  
+
   '500' => {:national_destination_codes => 2, :abbreviation => '', :description => 'Falkland Islands', :info => 'en.wikipedia.com.org/wiki/Falkland_Islands'},
   '501' => {:national_destination_codes => 2, :abbreviation => '', :description => 'Belize', :info => 'en.wikipedia.com.org/wiki/Belize'},
   '502' => {:national_destination_codes => 2, :abbreviation => '', :description => 'Guatemala', :info => 'en.wikipedia.com.org/wiki/Guatemala'},
@@ -167,7 +167,7 @@ CountryCodes = {
   '507' => {:national_destination_codes => 2, :abbreviation => '', :description => 'Panama', :info => 'en.wikipedia.com.org/wiki/Panama'},
   '508' => {:national_destination_codes => 2, :abbreviation => '', :description => 'Saint Pierre and Miquelon', :info => 'en.wikipedia.com.org/wiki/Saint_Pierre_and_Miquelon'},
   '509' => {:national_destination_codes => 2, :abbreviation => '', :description => 'Haiti', :info => 'en.wikipedia.com.org/wiki/Haiti'},
-  
+
   '590' => {:national_destination_codes => 3, :abbreviation => '', :description => 'Guadeloupe', :info => 'en.wikipedia.com.org/wiki/Guadeloupe'},
   '591' => {:national_destination_codes => 2, :abbreviation => '', :description => 'Bolivia', :info => 'en.wikipedia.com.org/wiki/Bolivia'},
   '592' => {:national_destination_codes => 2, :abbreviation => '', :description => 'Guyana', :info => 'en.wikipedia.com.org/wiki/Guyana'},
@@ -178,7 +178,7 @@ CountryCodes = {
   '597' => {:national_destination_codes => 2, :abbreviation => '', :description => 'Suriname', :info => 'en.wikipedia.com.org/wiki/Suriname'},
   '598' => {:national_destination_codes => 2, :abbreviation => '', :description => 'Uruguay', :info => 'en.wikipedia.com.org/wiki/Uruguay'},
   '599' => {:national_destination_codes => 2, :abbreviation => '', :description => 'Netherlands Antilles', :info => 'en.wikipedia.com.org/wiki/Netherlands_Antilles'},
-  
+
   '670' => {:national_destination_codes => 2, :abbreviation => '', :description => 'East Timor', :info => 'en.wikipedia.com.org/wiki/East_Timor'},
   '672' => {:national_destination_codes => 2, :abbreviation => '', :description => 'Australia', :info => 'en.wikipedia.com.org/wiki/Australia'},
   '673' => {:national_destination_codes => 2, :abbreviation => '', :description => 'Brunei', :info => 'en.wikipedia.com.org/wiki/Brunei'},
@@ -188,7 +188,7 @@ CountryCodes = {
   '677' => {:national_destination_codes => 2, :abbreviation => '', :description => 'Solomon Islands', :info => 'en.wikipedia.com.org/wiki/Solomon_Islands'},
   '678' => {:national_destination_codes => 2, :abbreviation => '', :description => 'Vanuatu', :info => 'en.wikipedia.com.org/wiki/Vanuatu'},
   '679' => {:national_destination_codes => 2, :abbreviation => '', :description => 'Fiji', :info => 'en.wikipedia.com.org/wiki/Fiji'},
-  
+
   '680' => {:national_destination_codes => 2, :abbreviation => '', :description => 'Palau', :info => 'en.wikipedia.com.org/wiki/Palau'},
   '681' => {:national_destination_codes => 2, :abbreviation => '', :description => 'Wallis and Futuna', :info => 'en.wikipedia.com.org/wiki/Wallis_and_Futuna'},
   '682' => {:national_destination_codes => 2, :abbreviation => '', :description => 'Cook Islands', :info => 'en.wikipedia.com.org/wiki/Cook_Islands'},
@@ -198,34 +198,34 @@ CountryCodes = {
   '687' => {:national_destination_codes => 2, :abbreviation => '', :description => 'New Caledonia', :info => 'en.wikipedia.com.org/wiki/New_Caledonia'},
   '688' => {:national_destination_codes => 2, :abbreviation => '', :description => 'Tuvalu', :info => 'en.wikipedia.com.org/wiki/Tuvalu'},
   '689' => {:national_destination_codes => 2, :abbreviation => '', :description => 'French Polynesia', :info => 'en.wikipedia.com.org/wiki/French_Polynesia'},
-  
+
   '690' => {:national_destination_codes => 2, :abbreviation => '', :description => 'Tokelau', :info => 'en.wikipedia.com.org/wiki/Tokelau'},
   '691' => {:national_destination_codes => 2, :abbreviation => '', :description => 'Federated States of Micronesia', :info => 'en.wikipedia.com.org/wiki/Federated_States_of_Micronesia'},
   '692' => {:national_destination_codes => 2, :abbreviation => '', :description => 'Marshall Islands', :info => 'en.wikipedia.com.org/wiki/Marshall_Islands'},
-  
+
   '800' => {:national_destination_codes => 2, :abbreviation => '', :description => 'International Freephone ([UIFN])', :info => ''},
   '808' => {:national_destination_codes => 2, :abbreviation => '', :description => 'reserved for [Shared Cost Services]', :info => ''},
-  
+
   '850' => {:national_destination_codes => 2, :abbreviation => '', :description => 'North Korea', :info => 'en.wikipedia.com.org/wiki/North_Korea'},
   '852' => {:national_destination_codes => 2, :abbreviation => '', :description => 'Hong Kong', :info => 'en.wikipedia.com.org/wiki/Hong_Kong'},
   '853' => {:national_destination_codes => 2, :abbreviation => '', :description => 'Macau', :info => 'en.wikipedia.com.org/wiki/Macau'},
   '855' => {:national_destination_codes => 2, :abbreviation => '', :description => 'Cambodia', :info => 'en.wikipedia.com.org/wiki/Cambodia'},
   '856' => {:national_destination_codes => 2, :abbreviation => '', :description => 'Laos', :info => 'en.wikipedia.com.org/wiki/Laos'},
-  
+
   '870' => {:national_destination_codes => 2, :abbreviation => '', :description => '[Inmarsat] "SNAC" service', :info => ''},
   '875' => {:national_destination_codes => 2, :abbreviation => '', :description => 'reserved for Maritime Mobile service', :info => ''},
   '876' => {:national_destination_codes => 2, :abbreviation => '', :description => 'reserved for Maritime Mobile service', :info => ''},
   '877' => {:national_destination_codes => 2, :abbreviation => '', :description => 'reserved for Maritime Mobile service', :info => ''},
   '878' => {:national_destination_codes => 2, :abbreviation => '', :description => '[Universal Personal Telecommunications] services', :info => ''},
   '879' => {:national_destination_codes => 2, :abbreviation => '', :description => 'reserved for national non', :info => ''},
-  
+
   '880' => {:national_destination_codes => 2, :abbreviation => '', :description => 'Bangladesh', :info => 'en.wikipedia.com.org/wiki/Bangladesh'},
   '881' => {:national_destination_codes => 2, :abbreviation => '', :description => '[Global Mobile Satellite System]', :info => ''},
   '882' => {:national_destination_codes => 2, :abbreviation => '', :description => '[International Networks]', :info => ''},
   '883' => {:national_destination_codes => 2, :abbreviation => '', :description => '[International Networks]', :info => ''},
   '886' => {:national_destination_codes => 2, :abbreviation => '', :description => 'Republic of China', :info => 'en.wikipedia.com.org/wiki/Republic_of_China'},
   '888' => {:national_destination_codes => 2, :abbreviation => '', :description => 'Telecommunications for Disaster Relief by [OCHA]', :info => ''},
-  
+
   '960' => {:national_destination_codes => 2, :abbreviation => '', :description => 'Maldives', :info => 'en.wikipedia.com.org/wiki/Maldives'},
   '961' => {:national_destination_codes => 2, :abbreviation => '', :description => 'Lebanon', :info => 'en.wikipedia.com.org/wiki/Lebanon'},
   '962' => {:national_destination_codes => 2, :abbreviation => '', :description => 'Jordan', :info => 'en.wikipedia.com.org/wiki/Jordan'},
@@ -236,7 +236,7 @@ CountryCodes = {
   '967' => {:national_destination_codes => 2, :abbreviation => '', :description => 'Yemen', :info => 'en.wikipedia.com.org/wiki/Yemen'},
   '968' => {:national_destination_codes => 2, :abbreviation => '', :description => 'Oman', :info => 'en.wikipedia.com.org/wiki/Oman'},
   '969' => {:national_destination_codes => 2, :abbreviation => '', :description => 'formerly [People\'s Democratic Republic of Yemen]', :info => ''},
-  
+
   '970' => {:national_destination_codes => 2, :abbreviation => '', :description => 'reserved (for the [Palestinian Authority]).', :info => ''},
   '971' => {:national_destination_codes => 2, :abbreviation => '', :description => 'United Arab Emirates', :info => 'en.wikipedia.com.org/wiki/United_Arab_Emirates'},
   '972' => {:national_destination_codes => 2, :abbreviation => '', :description => 'Israel', :info => 'en.wikipedia.com.org/wiki/Israel'},
@@ -246,7 +246,7 @@ CountryCodes = {
   '976' => {:national_destination_codes => 2, :abbreviation => '', :description => 'Mongolia', :info => 'en.wikipedia.com.org/wiki/Mongolia'},
   '977' => {:national_destination_codes => 2, :abbreviation => '', :description => 'Nepal', :info => 'en.wikipedia.com.org/wiki/Nepal'},
   '979' => {:national_destination_codes => 2, :abbreviation => '', :description => '[International Premium Rate Service]', :info => ''},
-  
+
   '991' => {:national_destination_codes => 2, :abbreviation => '', :description => '[International Telecommunications Public Correspondence Service trial] (ITPCS)', :info => ''},
   '992' => {:national_destination_codes => 2, :abbreviation => '', :description => 'Tajikistan', :info => 'en.wikipedia.com.org/wiki/Tajikistan'},
   '993' => {:national_destination_codes => 2, :abbreviation => '', :description => 'Turkmenistan', :info => 'en.wikipedia.com.org/wiki/Turkmenistan'},

data/lib/e164/national_destination_codes/austria.rb

@@ -1,46 +1,55 @@
+# 050 are Private networks according to RTR: http://www.rtr.at/index.php?S=050&id=4506&L=&submit_TK=Suchen
+# 67 and 68 are not completely mobile services. 
+# some ranges are used and some are note alocated, details: http://www.rtr.at/index.php?S=067&id=4506&L=&submit_TK=Suchen
+
 Austria = {
   :range => 1..3,
   :default => 3,
-  '1' => {:description => 'Wient'},
+  '1' => {:description => 'Wien'},
+  '50' => {:description => 'Private Networks'}, 
   '57' => {:description => '-'},
   '59' => {:description => '-'},
-  '67' => {:description => 'Mobile Services'},
-  '68' => {:description => 'Mobile Services'},
+  # '67' => {:description => 'Mobile Services'},
+  # '68' => {:description => 'Mobile Services'},
   '89' => {:description => 'Routing Number'},
   '316' => {:description => 'Graz'},
-  '501' => {:description => '-'},
-  '502' => {:description => '-'},
-  '503' => {:description => '-'},
-  '504' => {:description => '-'},
-  '505' => {:description => '-'},
-  '506' => {:description => '-'},
-  '507' => {:description => '-'},
-  '508' => {:description => '-'},
-  '509' => {:description => '-'},
+  # '501' => {:description => '-'},
+  # '502' => {:description => '-'},
+  # '503' => {:description => '-'},
+  # '504' => {:description => '-'},
+  # '505' => {:description => '-'},
+  # '506' => {:description => '-'},
+  # '507' => {:description => '-'},
+  # '508' => {:description => '-'},
+  # '509' => {:description => '-'},
   '512' => {:description => 'Innsbruck'},
   '517' => {:description => '-'},
   '644' => {:description => 'Mobile Services'},
-  '650' => {:description => 'Mobile Services'},
+  '650' => {:description => 'Mobile Services Tele.Ring'},
   '651' => {:description => 'Mobile Services'},
   '652' => {:description => 'Mobile Services'},
   '653' => {:description => 'Mobile Services'},
   '655' => {:description => 'Mobile Services'},
   '657' => {:description => 'Mobile Services'},
   '659' => {:description => 'Mobile Services'},
-  '660' => {:description => 'Mobile Services'},
+  '660' => {:description => 'Mobile Services H3G'},
   '661' => {:description => 'Mobile Services'},
   '662' => {:description => 'Salzburg'},
   '663' => {:description => 'Mobile Services'},
-  '664' => {:description => 'Mobile Services'},
+  '664' => {:description => 'Mobile Services A1'},
   '665' => {:description => 'Mobile Services'},
   '666' => {:description => 'Mobile Services'},
   '667' => {:description => 'Mobile Services'},
   '668' => {:description => 'Mobile Services'},
   '669' => {:description => 'Mobile Services'},
+  '676' => {:description => 'Mobile Services T-Mobile'},
+  '680' => {:description => 'Mobile Services Bob'},
+  '681' => {:description => 'Mobile Services Yesss!'},
+  '699' => {:description => 'Mobile Services Orange'},
   '710' => {:description => 'Service Number'},
   '711' => {:description => 'Service Number'},
   '718' => {:description => 'Service Number'},
-  '720' => {:description => ''},
+  '720' => {:description => 'VoIP'},
   '730' => {:description => 'Service Number'},
   '732' => {:description => 'Linz'},
   '740' => {:description => 'Service Number'},

data/spec/e164_spec.rb

@@ -4,7 +4,7 @@ describe E164 do
   it 'should set ValidFormat to regex that validates e164' do
     '+13035559850'.should =~ E164::ValidFormat
   end
-  
+
   it 'should set DefaultCountryCode to 1(NANP)' do
     E164::DefaultCountryCode.should == '1'
   end
@@ -20,20 +20,42 @@ describe E164 do
       end
     end
   end
-  
+
+  describe "#country_codes" do
+    it 'should search country code hash' do
+      E164.country_codes['1'].should == {:national_destination_codes=>3, :abbreviation=>"NANP", :description=>"North American Numbering Plan", :info=>"en.wikipedia.com.org/wiki/NANP"}
+    end
+  end
+
+  describe '#set_default_country_length!' do
+    it 'should override DefaultCountryLength' do
+      original = E164.set_default_country_length!('12')
+      begin
+        E164::DefaultCountryLength.should == '12'
+      ensure
+        # set back original DefaultCountryLength's value
+        E164.set_default_country_length!(original)
+      end
+    end
+  end
+
   describe '#normalize' do
     it 'should remove all non-numeric punctuation except the e164 identifier prefix' do
       E164.normalize('+1 (303) 555-9850').should == '+13035559850'
     end
-    
+
     it 'should add default country code if no country code e164 identifier is found.' do
       E164.normalize('3035559850').should == "+13035559850"
     end
-    
+
+    it 'should not add default country code if the number is longer than default country length' do
+      E164.normalize('447966845555').should == '+447966845555'
+    end
+
     it 'should not add country code if it already starts with the default country code and no identifier' do
       E164.normalize('13035559850').should == "+13035559850"
     end
-    
+
     it "shouldn't die on german numbers" do
       lambda { E164.normalize('+4988612345670') }.should_not raise_error
     end

data/spec/spec_helper.rb

@@ -7,5 +7,5 @@ require 'e164'
 Bundler.require(:default, :test) if defined?(Bundler)
 
 RSpec.configure do |config|
-  config.mock_with :rspec    
+  config.mock_with :rspec
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: e164
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 23
   prerelease: 
   segments: 
   - 0
   - 3
-  - 1
-  version: 0.3.1
+  - 2
+  version: 0.3.2
 platform: ruby
 authors: 
 - hexorx
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-11-03 00:00:00 Z
+date: 2011-12-30 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   version_requirements: &id001 !ruby/object:Gem::Requirement