telephone_number 1.4.4 → 1.4.9

data/data/timezones/map_data.txt

@@ -681,6 +681,7 @@
 1321|America/New_York
 1323|America/Los_Angeles
 1325|America/Chicago
+1326|America/New_York
 1330|America/New_York
 1331|America/Chicago
 1332|America/New_York
@@ -700,6 +701,7 @@
 1361|America/Chicago
 1364|America/New_York
 1365|America/Toronto
+1367|America/Toronto
 1380|America/New_York
 1385|America/Denver
 1386|America/New_York
@@ -1158,11 +1160,13 @@
 1620384|America/Denver
 1623|America/Phoenix
 1626|America/Los_Angeles
+1628|America/Los_Angeles
 1629|America/Chicago
 1630|America/Chicago
 1631|America/New_York
 1636|America/Chicago
 1639|America/Winnipeg
+1640|America/New_York
 1641|America/Chicago
 1646|America/New_York
 1647|America/Toronto
@@ -1171,6 +1175,7 @@
 1651|America/Chicago
 1657|America/Los_Angeles
 1658|America/Jamaica
+1659|America/Chicago
 1660|America/Chicago
 1661|America/Los_Angeles
 1662|America/Chicago
@@ -1179,6 +1184,7 @@
 1669|America/Los_Angeles
 1670|Pacific/Saipan
 1671|Pacific/Guam
+1672|America/Vancouver
 1678|America/New_York
 1680|America/New_York
 1681|America/New_York
@@ -1602,6 +1608,7 @@
 1831|America/Los_Angeles
 1832|America/Chicago
 1838|America/New_York
+1839|America/New_York
 1843|America/New_York
 1845|America/New_York
 1847|America/Chicago
@@ -2063,16 +2070,15 @@
 297|America/Aruba
 298|Atlantic/Faeroe
 299|America/Godthab&America/Scoresbysund&America/Thule
+2991|America/Godthab
+2992|America/Godthab
 2993|America/Godthab
+2994|America/Godthab
+2995|America/Godthab
 2996|America/Godthab
 2998|America/Godthab
-29991|America/Godthab
-29992|America/Godthab
-29994|America/Godthab
-29995|America/Godthab
-29996|America/Godthab
+2999|America/Godthab
 29997|America/Thule
-29998|America/Godthab
 29999|America/Scoresbysund
 30|Europe/Athens
 31|Europe/Amsterdam
@@ -2821,21 +2827,19 @@
 5598|America/Sao_Paulo
 5599|America/Sao_Paulo
 56|America/Santiago&Pacific/Easter
+561|America/Santiago
 562|America/Santiago
 5632|Pacific/Easter
+56322|America/Santiago
+56323|America/Santiago
 5633|America/Santiago
 5634|America/Santiago
 5635|America/Santiago
-5641|America/Santiago
-5642|America/Santiago
-5643|America/Santiago
-5645|America/Santiago
+564|America/Santiago
 565|America/Santiago
-5663|America/Santiago
-5664|America/Santiago
-5665|America/Santiago
-5667|America/Santiago
+566|America/Santiago
 567|America/Santiago
+56800|America/Santiago
 569|America/Santiago
 57|America/Bogota
 58|America/Caracas
@@ -2843,6 +2847,7 @@
 591|America/La_Paz
 592|America/Guyana
 593|America/Guayaquil&Pacific/Galapagos
+5931|America/Guayaquil&Pacific/Galapagos
 5932|America/Guayaquil
 5933|America/Guayaquil
 5934|America/Guayaquil
@@ -2850,18 +2855,21 @@
 59352|America/Guayaquil&Pacific/Galapagos
 5936|America/Guayaquil
 5937|America/Guayaquil
+5939|America/Guayaquil
 594|America/Cayenne
 595|America/Asuncion
 596|America/Martinique
 597|America/Paramaribo
 598|America/Montevideo
 599|America/Curacao&America/Kralendijk
-599318|America/Kralendijk
-599416|America/Kralendijk
+5993|America/Kralendijk
+5994|America/Kralendijk
+5996|America/Curacao
 5997|America/Kralendijk
 5999|America/Curacao
 60|Asia/Kuching
 61|Australia/Adelaide&Australia/Eucla&Australia/Lord_Howe&Australia/Perth&Australia/Sydney&Indian/Christmas&Indian/Cocos
+611|Australia/Sydney
 612|Australia/Sydney
 61255007|Australia/Lord_Howe
 61255053|Australia/Lord_Howe
@@ -2886,6 +2894,7 @@
 61265632|Australia/Lord_Howe
 61265998|Australia/Lord_Howe
 613|Australia/Sydney
+614|Australia/Sydney
 617|Australia/Sydney
 618510|Australia/Adelaide&Australia/Perth
 61851001|Indian/Christmas
@@ -2894,13 +2903,36 @@
 61851031|Indian/Cocos
 61851059|Indian/Christmas
 61851060|Indian/Cocos
+61851087|Australia/Perth
+61851088|Indian/Christmas
+61851089|Australia/Sydney
+6185109|Australia/Perth
+618511|Australia/Perth
+61851100|Australia/Adelaide&Australia/Perth
 61851116|Australia/Adelaide&Australia/Perth
 61851117|Indian/Christmas
 61851118|Indian/Cocos
 61851119|Australia/Adelaide&Australia/Perth
 6185112|Australia/Adelaide&Australia/Perth
 6185113|Australia/Adelaide&Australia/Perth
-6185114|Australia/Adelaide&Australia/Perth
+61851140|Australia/Adelaide&Australia/Perth
+61851141|Australia/Adelaide&Australia/Perth
+61851142|Australia/Adelaide&Australia/Perth
+61851143|Australia/Adelaide&Australia/Perth
+61851144|Australia/Adelaide&Australia/Perth
+61851146|Indian/Christmas
+61851156|Australia/Adelaide&Australia/Perth
+61851158|Australia/Adelaide&Australia/Perth
+61851175|Indian/Christmas
+61851185|Australia/Adelaide&Australia/Perth
+61851187|Australia/Adelaide&Australia/Perth
+6185120|Australia/Perth
+61851204|Indian/Christmas
+61851205|Australia/Sydney
+6185123|Australia/Sydney
+6185124|Australia/Sydney
+6185125|Australia/Sydney
+6185126|Australia/Sydney
 6186|Australia/Adelaide&Australia/Perth
 6187|Australia/Adelaide&Australia/Perth
 6188|Australia/Adelaide&Australia/Perth
@@ -3026,11 +3058,16 @@
 6298|Asia/Jayapura
 63|Asia/Manila
 64|Pacific/Auckland&Pacific/Chatham
+641|Pacific/Auckland
+642|Pacific/Auckland
 643|Pacific/Auckland
-643305|Pacific/Chatham
+64330|Pacific/Chatham
 644|Pacific/Auckland
+645|Pacific/Auckland
 646|Pacific/Auckland
 647|Pacific/Auckland
+6480|Pacific/Auckland
+6486|Pacific/Auckland
 649|Pacific/Auckland
 65|Asia/Singapore
 66|Asia/Bangkok
@@ -3058,10 +3095,11 @@
 68989|Pacific/Tahiti
 690|Pacific/Fakaofo
 691|Pacific/Kosrae&Pacific/Ponape&Pacific/Truk
+6913|Pacific/Truk
 69132|Pacific/Ponape
-69133|Pacific/Truk
-69135|Pacific/Truk
 69137|Pacific/Kosrae
+6918|Pacific/Kosrae&Pacific/Ponape&Pacific/Truk
+6919|Pacific/Kosrae&Pacific/Ponape&Pacific/Truk
 691920|Pacific/Ponape
 691921|Pacific/Ponape
 691924|Pacific/Ponape
@@ -3099,12 +3137,18 @@
 747|Europe/Moscow
 748|Europe/Moscow
 749|Europe/Moscow
+77|Asia/Almaty&Asia/Aqtobe
 771|Asia/Almaty
 7711|Asia/Aqtobe
 7712|Asia/Aqtobe
 7713|Asia/Aqtobe
 772|Asia/Almaty
 7729|Asia/Aqtobe
+7800|Asia/Almaty&Asia/Aqtobe&Europe/Moscow
+7803|Europe/Moscow
+7804|Europe/Moscow
+7808|Asia/Almaty&Asia/Aqtobe&Europe/Moscow
+7809|Asia/Almaty&Asia/Aqtobe&Europe/Moscow
 781|Europe/Moscow
 782|Europe/Moscow
 783|Europe/Moscow
@@ -3121,6 +3165,7 @@
 7855|Europe/Moscow
 786|Europe/Moscow
 787|Europe/Moscow
+79|Europe/Moscow
 81|Asia/Tokyo
 82|Asia/Seoul
 84|Asia/Bangkok
@@ -3177,18 +3222,6 @@
 97624|Asia/Hovd
 97625|Asia/Ulaanbaatar
 976258|Asia/Choibalsan
-9765000|Asia/Ulaanbaatar
-9765001|Asia/Ulaanbaatar
-9765002|Asia/Ulaanbaatar
-9765006|Asia/Ulaanbaatar
-9765011|Asia/Ulaanbaatar
-9765037|Asia/Ulaanbaatar
-9765050|Asia/Ulaanbaatar
-9765088|Asia/Ulaanbaatar
-9765099|Asia/Ulaanbaatar
-9765515|Asia/Ulaanbaatar
-9765525|Asia/Ulaanbaatar
-9765526|Asia/Ulaanbaatar
 977|Asia/Katmandu
 98|Asia/Tehran
 992|Asia/Dushanbe

data/lib/importers/geo_location_data_importer.rb

@@ -8,7 +8,7 @@ module TelephoneNumber
       master_data = {}
       bin_file_path = "#{File.dirname(file_path)}/#{File.basename(file_path, '.txt')}.dat"
 
-      File.open(file_path, 'r').each do |row|
+      File.open(file_path, 'r:UTF-8').each do |row|
         next if row.strip !~ /^[0-9]/
         number, location = row.split('|')
         master_data[number.strip] = location.strip

data/lib/importers/test_data_importer.rb

@@ -11,7 +11,7 @@ module TelephoneNumber
                   AU: %w(0467703037),
                   BE: %w(32498485960 32477702206 32474095692),
                   BO: %w(59178500348 59178006138 59178006139),
-                  BR: %w(011992339376 1123456789 11961234567),
+                  BR: %w(011992339376 1123456789 11961234567 55991472683),
                   BY: %w(80152450911 294911911 152450911),
                   CA: %w(16135550119 16135550171 16135550112 16135550194
                          16135550122 16135550131 15146708700 14169158200),

data/lib/telephone_number/parser.rb

@@ -9,7 +9,7 @@ module TelephoneNumber
     end
 
     def valid_types
-      @valid_types ||= validate
+      @valid_types ||= generate_valid_types(normalized_number)
     end
 
     def valid?(keys = [])
@@ -23,15 +23,20 @@ module TelephoneNumber
     # basically anything else that uses google data
     def build_normalized_number
       match_result = parse_prefix.match(country.full_general_pattern)
-      match_result ? match_result[:national_num] : original_number
+
+      if match_result && generate_valid_types(match_result[:national_num]).any?
+        match_result[:national_num]
+      else
+        original_number
+      end
     end
 
-    # returns an array of valid types for the normalized number
+    # returns an array of valid types for the given number
     # if array is empty, we can assume that the number is invalid
-    def validate
+    def generate_valid_types(number)
       return [] unless country
       country.validations.select do |validation|
-        normalized_number.match?(Regexp.new("^(#{validation.pattern})$"))
+        number.match?(Regexp.new("^(#{validation.pattern})$"))
       end.map(&:name)
     end
 

data/lib/telephone_number/version.rb

@@ -1,3 +1,3 @@
 module TelephoneNumber
-  VERSION = "1.4.4"
+  VERSION = "1.4.9"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: telephone_number
 version: !ruby/object:Gem::Version
-  version: 1.4.4
+  version: 1.4.9
 platform: ruby
 authors:
 - MOBI Wireless Management
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-12-09 00:00:00.000000000 Z
+date: 2020-08-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -217,6 +217,8 @@ files:
 - data/geocoding/en/233.txt
 - data/geocoding/en/234.dat
 - data/geocoding/en/234.txt
+- data/geocoding/en/236.dat
+- data/geocoding/en/236.txt
 - data/geocoding/en/237.dat
 - data/geocoding/en/237.txt
 - data/geocoding/en/238.dat
@@ -373,6 +375,12 @@ files:
 - data/geocoding/en/58.txt
 - data/geocoding/en/592.dat
 - data/geocoding/en/592.txt
+- data/geocoding/en/593.dat
+- data/geocoding/en/593.txt
+- data/geocoding/en/595.dat
+- data/geocoding/en/595.txt
+- data/geocoding/en/598.dat
+- data/geocoding/en/598.txt
 - data/geocoding/en/599.dat
 - data/geocoding/en/599.txt
 - data/geocoding/en/60.dat
@@ -381,26 +389,40 @@ files:
 - data/geocoding/en/61.txt
 - data/geocoding/en/62.dat
 - data/geocoding/en/62.txt
+- data/geocoding/en/63.dat
+- data/geocoding/en/63.txt
 - data/geocoding/en/64.dat
 - data/geocoding/en/64.txt
 - data/geocoding/en/66.dat
 - data/geocoding/en/66.txt
+- data/geocoding/en/670.dat
+- data/geocoding/en/670.txt
+- data/geocoding/en/672.dat
+- data/geocoding/en/672.txt
 - data/geocoding/en/673.dat
 - data/geocoding/en/673.txt
 - data/geocoding/en/675.dat
 - data/geocoding/en/675.txt
 - data/geocoding/en/676.dat
 - data/geocoding/en/676.txt
+- data/geocoding/en/678.dat
+- data/geocoding/en/678.txt
 - data/geocoding/en/679.dat
 - data/geocoding/en/679.txt
 - data/geocoding/en/680.dat
 - data/geocoding/en/680.txt
 - data/geocoding/en/682.dat
 - data/geocoding/en/682.txt
+- data/geocoding/en/685.dat
+- data/geocoding/en/685.txt
 - data/geocoding/en/686.dat
 - data/geocoding/en/686.txt
 - data/geocoding/en/688.dat
 - data/geocoding/en/688.txt
+- data/geocoding/en/689.dat
+- data/geocoding/en/689.txt
+- data/geocoding/en/690.dat
+- data/geocoding/en/690.txt
 - data/geocoding/en/7.dat
 - data/geocoding/en/7.txt
 - data/geocoding/en/81.dat
@@ -409,6 +431,8 @@ files:
 - data/geocoding/en/82.txt
 - data/geocoding/en/84.dat
 - data/geocoding/en/84.txt
+- data/geocoding/en/850.dat
+- data/geocoding/en/850.txt
 - data/geocoding/en/86.dat
 - data/geocoding/en/86.txt
 - data/geocoding/en/880.dat
@@ -419,6 +443,8 @@ files:
 - data/geocoding/en/90.txt
 - data/geocoding/en/91.dat
 - data/geocoding/en/91.txt
+- data/geocoding/en/92.dat
+- data/geocoding/en/92.txt
 - data/geocoding/en/93.dat
 - data/geocoding/en/93.txt
 - data/geocoding/en/94.dat
@@ -429,10 +455,16 @@ files:
 - data/geocoding/en/960.txt
 - data/geocoding/en/962.dat
 - data/geocoding/en/962.txt
+- data/geocoding/en/963.dat
+- data/geocoding/en/963.txt
 - data/geocoding/en/966.dat
 - data/geocoding/en/966.txt
+- data/geocoding/en/967.dat
+- data/geocoding/en/967.txt
 - data/geocoding/en/968.dat
 - data/geocoding/en/968.txt
+- data/geocoding/en/970.dat
+- data/geocoding/en/970.txt
 - data/geocoding/en/971.dat
 - data/geocoding/en/971.txt
 - data/geocoding/en/972.dat
@@ -445,8 +477,12 @@ files:
 - data/geocoding/en/98.txt
 - data/geocoding/en/992.dat
 - data/geocoding/en/992.txt
+- data/geocoding/en/993.dat
+- data/geocoding/en/993.txt
 - data/geocoding/en/994.dat
 - data/geocoding/en/994.txt
+- data/geocoding/en/995.dat
+- data/geocoding/en/995.txt
 - data/geocoding/en/996.dat
 - data/geocoding/en/996.txt
 - data/geocoding/es/228.dat