telephone_number 1.4.5 → 1.4.10

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
@@ -914,12 +916,14 @@
 1442|America/Los_Angeles
 1443|America/New_York
 1445|America/New_York
+1447|America/Chicago
 1450|America/Toronto
 1458|America/Los_Angeles
 1463|America/New_York
 1469|America/Chicago
 1470|America/New_York
 1473|America/Grenada
+1474|America/Winnipeg
 1475|America/New_York
 1478|America/New_York
 1479|America/Chicago
@@ -1158,11 +1162,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 +1177,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 +1186,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 +1610,8 @@
 1831|America/Los_Angeles
 1832|America/Chicago
 1838|America/New_York
+1839|America/New_York
+1840|America/Los_Angeles
 1843|America/New_York
 1845|America/New_York
 1847|America/Chicago
@@ -1965,6 +1975,7 @@
 1939|America/Puerto_Rico
 1940|America/Chicago
 1941|America/New_York
+1945|America/Chicago
 1947|America/New_York
 1949|America/Los_Angeles
 1951|America/Los_Angeles
@@ -2063,16 +2074,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
@@ -2167,6 +2177,33 @@
 441534|Europe/Jersey
 441624|Europe/Isle_of_Man
 442|Europe/London
+443|Europe/Guernsey&Europe/Isle_of_Man&Europe/London
+445|Europe/Guernsey&Europe/Isle_of_Man&Europe/London
+4470|Europe/Guernsey&Europe/Isle_of_Man&Europe/London
+4471|Europe/Guernsey&Europe/Isle_of_Man&Europe/London
+4472|Europe/Guernsey&Europe/Isle_of_Man&Europe/London
+4473|Europe/Guernsey&Europe/Isle_of_Man&Europe/London
+4474|Europe/Guernsey&Europe/Isle_of_Man&Europe/London
+4475|Europe/Guernsey&Europe/Isle_of_Man&Europe/London
+44760|Europe/Guernsey&Europe/Isle_of_Man&Europe/London
+44762|Europe/Guernsey&Europe/Isle_of_Man&Europe/London
+44763|Europe/Guernsey&Europe/Isle_of_Man&Europe/London
+447640|Europe/Guernsey&Europe/Isle_of_Man&Europe/London
+447641|Europe/Guernsey&Europe/Isle_of_Man&Europe/London
+447643|Europe/Guernsey&Europe/Isle_of_Man&Europe/London
+447644|Europe/Guernsey&Europe/Isle_of_Man&Europe/London
+447646|Europe/Guernsey&Europe/Isle_of_Man&Europe/London
+44765|Europe/Guernsey&Europe/Isle_of_Man&Europe/London
+44766|Europe/Guernsey&Europe/Isle_of_Man&Europe/London
+44767|Europe/Guernsey&Europe/Isle_of_Man&Europe/London
+44768|Europe/Guernsey&Europe/Isle_of_Man&Europe/London
+447693|Europe/Guernsey&Europe/Isle_of_Man&Europe/London
+447699|Europe/Guernsey&Europe/Isle_of_Man&Europe/London
+4477|Europe/Guernsey&Europe/Isle_of_Man&Europe/London
+4478|Europe/Guernsey&Europe/Isle_of_Man&Europe/London
+4479|Europe/Guernsey&Europe/Isle_of_Man&Europe/London
+448|Europe/Guernsey&Europe/Isle_of_Man&Europe/London
+449|Europe/Guernsey&Europe/Isle_of_Man&Europe/London
 45|Europe/Copenhagen
 46|Europe/Stockholm
 47|Arctic/Longyearbyen&Europe/Oslo
@@ -2821,21 +2858,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
+568|America/Santiago
 569|America/Santiago
 57|America/Bogota
 58|America/Caracas
@@ -2843,6 +2878,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 +2886,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 +2925,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 +2934,60 @@
 61851031|Indian/Cocos
 61851059|Indian/Christmas
 61851060|Indian/Cocos
+61851087|Australia/Perth
+61851088|Indian/Christmas
+61851089|Indian/Cocos
+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
+61851176|Indian/Cocos
+61851185|Australia/Adelaide&Australia/Perth
+61851187|Australia/Adelaide&Australia/Perth
+6185120|Australia/Perth
+61851204|Indian/Christmas
+61851205|Australia/Sydney
+61851209|Australia/Adelaide&Australia/Perth
+6185121|Australia/Adelaide&Australia/Perth
+61851221|Australia/Adelaide&Australia/Perth
+61851222|Indian/Christmas
+61851223|Indian/Cocos
+61851224|Australia/Perth
+61851225|Australia/Perth
+61851226|Australia/Perth
+61851227|Australia/Adelaide&Australia/Perth
+61851228|Australia/Adelaide&Australia/Perth
+61851229|Australia/Adelaide&Australia/Perth
+61851230|Australia/Sydney
+61851231|Australia/Adelaide&Australia/Perth
+61851232|Australia/Sydney
+61851233|Australia/Sydney
+61851234|Australia/Sydney
+61851235|Indian/Christmas
+61851236|Australia/Adelaide&Australia/Perth
+61851237|Australia/Adelaide&Australia/Perth
+61851238|Australia/Adelaide&Australia/Perth
+61851239|Australia/Adelaide&Australia/Perth
+6185124|Australia/Sydney
+6185125|Australia/Sydney
+6185126|Australia/Sydney
+6185127|Australia/Adelaide&Australia/Perth
+6185128|Australia/Adelaide&Australia/Perth
+6185129|Australia/Adelaide&Australia/Perth
 6186|Australia/Adelaide&Australia/Perth
 6187|Australia/Adelaide&Australia/Perth
 6188|Australia/Adelaide&Australia/Perth
@@ -2941,11 +3028,15 @@
 61891700|Australia/Adelaide&Australia/Perth&Indian/Christmas
 61891701|Australia/Adelaide&Australia/Perth&Indian/Christmas
 61891702|Australia/Adelaide&Australia/Perth&Indian/Cocos
+61891703|Indian/Cocos
 61891710|Australia/Adelaide&Australia/Perth&Indian/Christmas
 61891711|Australia/Adelaide&Australia/Perth&Indian/Christmas
 61891712|Australia/Adelaide&Australia/Perth&Indian/Christmas
+61891958|Indian/Christmas
 61891959|Australia/Adelaide&Australia/Perth&Indian/Cocos
 62|Asia/Jakarta&Asia/Jayapura&Asia/Makassar
+62007|Asia/Jakarta&Asia/Makassar
+621|Asia/Jakarta&Asia/Makassar
 622|Asia/Jakarta
 6231|Asia/Jakarta
 6232|Asia/Jakarta
@@ -2953,12 +3044,8 @@
 6234|Asia/Jakarta
 6235|Asia/Jakarta
 6236|Asia/Makassar
-62370|Asia/Makassar
-62371|Asia/Makassar
-62372|Asia/Makassar
-62373|Asia/Makassar
-62374|Asia/Makassar
-62376|Asia/Makassar
+6237|Asia/Makassar
+62379|Asia/Jakarta&Asia/Makassar
 6238|Asia/Makassar
 624|Asia/Makassar
 62403|Asia/Jayapura&Asia/Makassar
@@ -2983,27 +3070,21 @@
 6256|Asia/Jakarta
 626|Asia/Jakarta
 627|Asia/Jakarta
-6281|Asia/Jakarta
+628|Asia/Jakarta
+6280|Asia/Jakarta&Asia/Makassar
 62811|Asia/Jakarta&Asia/Makassar
 62818|Asia/Jakarta&Asia/Makassar
 62819|Asia/Jakarta&Asia/Makassar
-6282|Asia/Jakarta
 62824|Asia/Jakarta&Asia/Makassar
 62829|Asia/Jakarta&Asia/Makassar
-6283|Asia/Jakarta
 62831|Asia/Jakarta&Asia/Makassar
 62833|Asia/Jakarta&Asia/Makassar
 62834|Asia/Jakarta&Asia/Makassar
 62839|Asia/Jakarta&Asia/Makassar
-6285|Asia/Jakarta
 62853|Asia/Jakarta&Asia/Makassar
-6286|Asia/Jakarta
 62868|Asia/Jakarta&Asia/Makassar
-6287|Asia/Jakarta
 62876|Asia/Jakarta&Asia/Makassar
-6288|Asia/Jakarta
 62887|Asia/Jakarta&Asia/Makassar
-6289|Asia/Jakarta
 6290|Asia/Jayapura
 6291|Asia/Jayapura
 62915|Asia/Jakarta&Asia/Jayapura
@@ -3026,11 +3107,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 +3144,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 +3186,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 +3214,7 @@
 7855|Europe/Moscow
 786|Europe/Moscow
 787|Europe/Moscow
+79|Europe/Moscow
 81|Asia/Tokyo
 82|Asia/Seoul
 84|Asia/Bangkok
@@ -3177,18 +3271,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/telephone_number.rb

@@ -1,5 +1,4 @@
 require 'telephone_number/version'
-require 'utilities/hash'
 require 'active_model/telephone_number_validator' if defined?(ActiveModel)
 require 'forwardable'
 

data/lib/telephone_number/country.rb

@@ -7,18 +7,18 @@ module TelephoneNumber
     MOBILE_TOKEN_COUNTRIES = { AR: '9' }.freeze
 
     def initialize(data_hash)
+      validations = data_hash.fetch(:validations, {}).dup
       @country_code = data_hash[:country_code]
       @country_id = data_hash[:id]
-      @general_validation = NumberValidation.new(:general_desc, data_hash[:validations][:general_desc]) if data_hash.fetch(:validations, {})[:general_desc]
+      @general_validation = NumberValidation.new(:general_desc, validations[:general_desc]) if validations[:general_desc]
       @international_prefix = Regexp.new(data_hash[:international_prefix]) if data_hash[:international_prefix]
       @main_country_for_code = data_hash[:main_country_for_code] == 'true'
       @mobile_token = MOBILE_TOKEN_COUNTRIES[@country_id.to_sym]
       @national_prefix = data_hash[:national_prefix]
       @national_prefix_for_parsing = Regexp.new(data_hash[:national_prefix_for_parsing]) if data_hash[:national_prefix_for_parsing]
       @national_prefix_transform_rule = data_hash[:national_prefix_transform_rule]
-      @validations = data_hash.fetch(:validations, {})
-                              .except(:general_desc, :area_code_optional)
-                              .map { |name, data| NumberValidation.new(name, data) }
+      @validations = validations.delete_if { |name, _| name == :general_desc || name == :area_code_optional }
+                                .map { |name, data| NumberValidation.new(name, data) }
       @formats = data_hash.fetch(:formats, []).map { |format| NumberFormat.new(format, data_hash[:national_prefix_formatting_rule]) }
     end
 
@@ -52,11 +52,24 @@ module TelephoneNumber
     end
 
     def self.load_data
-      data_file = "#{File.dirname(__FILE__)}/../../data/telephone_number_data_file.dat"
-      main_data = Marshal.load(File.binread(data_file))
-      override_data = {}
-      override_data = Marshal.load(File.binread(TelephoneNumber.override_file)) if TelephoneNumber.override_file
-      return main_data.deep_deep_merge!(override_data)
+      data_path = "#{File.dirname(__FILE__)}/../../data/telephone_number_data_file.dat"
+      main_data = Marshal.load(File.binread(data_path))
+      if TelephoneNumber.override_file
+        override_data = Marshal.load(File.binread(TelephoneNumber.override_file))
+        main_data = deep_merge(main_data, override_data)
+      end
+      main_data
+    end
+
+    def self.deep_merge(base_hash, other_hash)
+      other_hash.each do |key, value|
+        base_hash[key] = if base_hash[key].is_a?(Hash) && value.is_a?(Hash)
+          deep_merge(base_hash[key], value)
+        else
+          value
+        end
+      end
+      base_hash
     end
 
     def self.all_countries