telephone_number 1.4.8 → 1.4.12

data/data/timezones/map_data.txt

@@ -15,7 +15,7 @@
 # Generated from:
 # Internal statistics data (2018-06-12).
 
-1|America/Adak&America/Anchorage&America/Anguilla&America/Antigua&America/Barbados&America/Boise&America/Cayman&America/Chicago&America/Denver&America/Dominica&America/Edmonton&America/Fort_Nelson&America/Grand_Turk&America/Grenada&America/Halifax&America/Jamaica&America/Juneau&America/Los_Angeles&America/Lower_Princes&America/Montserrat&America/Nassau&America/New_York&America/North_Dakota/Center&America/Phoenix&America/Port_of_Spain&America/Puerto_Rico&America/Santo_Domingo&America/St_Johns&America/St_Kitts&America/St_Lucia&America/St_Thomas&America/St_Vincent&America/Toronto&America/Tortola&America/Vancouver&America/Winnipeg&Atlantic/Bermuda&Pacific/Guam&Pacific/Honolulu&Pacific/Pago_Pago&Pacific/Saipan
+1|America/Adak&America/Anchorage&America/Anguilla&America/Antigua&America/Barbados&America/Boise&America/Cayman&America/Chicago&America/Denver&America/Dominica&America/Edmonton&America/Fort_Nelson&America/Grand_Turk&America/Grenada&America/Halifax&America/Jamaica&America/Juneau&America/Los_Angeles&America/Lower_Princes&America/Montserrat&America/Nassau&America/New_York&America/North_Dakota/Center&America/Phoenix&America/Port_of_Spain&America/Puerto_Rico&America/Regina&America/Santo_Domingo&America/St_Johns&America/St_Kitts&America/St_Lucia&America/St_Thomas&America/St_Vincent&America/Toronto&America/Tortola&America/Vancouver&America/Winnipeg&Atlantic/Bermuda&Pacific/Guam&Pacific/Honolulu&Pacific/Pago_Pago&Pacific/Saipan
 1201|America/New_York
 1202|America/New_York
 1203|America/New_York
@@ -641,7 +641,7 @@
 1303|America/Denver
 1304|America/New_York
 1305|America/New_York
-1306|America/Winnipeg
+1306|America/Regina
 1307|America/Denver
 1308|America/Chicago
 1308235|America/Denver
@@ -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
@@ -701,6 +702,7 @@
 1364|America/New_York
 1365|America/Toronto
 1367|America/Toronto
+1368|America/Edmonton
 1380|America/New_York
 1385|America/Denver
 1386|America/New_York
@@ -915,12 +917,15 @@
 1442|America/Los_Angeles
 1443|America/New_York
 1445|America/New_York
+1447|America/Chicago
+1448|America/New_York
 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
@@ -965,6 +970,7 @@
 1567|America/New_York
 1570|America/New_York
 1571|America/New_York
+1572|America/Chicago
 1573|America/Chicago
 1574|America/New_York
 1574772|America/Chicago
@@ -1164,7 +1170,7 @@
 1630|America/Chicago
 1631|America/New_York
 1636|America/Chicago
-1639|America/Winnipeg
+1639|America/Regina
 1640|America/New_York
 1641|America/Chicago
 1646|America/New_York
@@ -1607,6 +1613,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
@@ -1970,6 +1978,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
@@ -2095,6 +2104,7 @@
 34928|Atlantic/Canary
 350|Europe/Gibraltar
 351|Atlantic/Azores&Europe/Lisbon
+3511|Atlantic/Azores&Europe/Lisbon
 3512|Europe/Lisbon
 351292|Atlantic/Azores
 351295|Atlantic/Azores
@@ -2171,6 +2181,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
@@ -2837,7 +2874,7 @@
 565|America/Santiago
 566|America/Santiago
 567|America/Santiago
-56800|America/Santiago
+568|America/Santiago
 569|America/Santiago
 57|America/Bogota
 58|America/Caracas
@@ -2903,7 +2940,7 @@
 61851060|Indian/Cocos
 61851087|Australia/Perth
 61851088|Indian/Christmas
-61851089|Australia/Sydney
+61851089|Indian/Cocos
 6185109|Australia/Perth
 618511|Australia/Perth
 61851100|Australia/Adelaide&Australia/Perth
@@ -2922,15 +2959,39 @@
 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
-6185123|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
@@ -2971,11 +3032,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
@@ -2983,12 +3048,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
@@ -3013,27 +3074,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
@@ -3088,6 +3143,7 @@
 688|Pacific/Funafuti
 689|Pacific/Gambier&Pacific/Marquesas&Pacific/Tahiti
 6894|Pacific/Tahiti
+68980|Pacific/Gambier&Pacific/Marquesas&Pacific/Tahiti
 68987|Pacific/Gambier&Pacific/Marquesas&Pacific/Tahiti
 68988|Pacific/Tahiti
 68989|Pacific/Tahiti

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

data/lib/telephone_number/version.rb

@@ -1,3 +1,3 @@
 module TelephoneNumber
-  VERSION = "1.4.8"
+  VERSION = "1.4.12"
 end

data/telephone_number.gemspec

@@ -19,6 +19,7 @@ Gem::Specification.new do |spec|
   spec.bindir        = 'exe'
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
+  spec.required_ruby_version = '>= 2.4.0'
 
   spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'rake'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: telephone_number
 version: !ruby/object:Gem::Version
-  version: 1.4.8
+  version: 1.4.12
 platform: ruby
 authors:
 - MOBI Wireless Management
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-07-14 00:00:00.000000000 Z
+date: 2021-07-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -150,6 +150,7 @@ files:
 - ".rubocop.yml"
 - ".ruby-version"
 - ".travis.yml"
+- CHANGELOG.md
 - CODE_OF_CONDUCT.md
 - Gemfile
 - LICENSE
@@ -453,6 +454,8 @@ files:
 - data/geocoding/en/95.txt
 - data/geocoding/en/960.dat
 - data/geocoding/en/960.txt
+- data/geocoding/en/961.dat
+- data/geocoding/en/961.txt
 - data/geocoding/en/962.dat
 - data/geocoding/en/962.txt
 - data/geocoding/en/963.dat
@@ -632,7 +635,6 @@ files:
 - lib/telephone_number/parser.rb
 - lib/telephone_number/time_zone_detector.rb
 - lib/telephone_number/version.rb
-- lib/utilities/hash.rb
 - telephone_number.gemspec
 homepage: https://github.com/mobi/telephone_number
 licenses:
@@ -646,7 +648,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.4.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="

data/lib/utilities/hash.rb

@@ -1,47 +0,0 @@
-class Hash
-  # Returns a new hash with +self+ and +other_hash+ merged recursively.
-  #
-  #   h1 = { a: true, b: { c: [1, 2, 3] } }
-  #   h2 = { a: false, b: { x: [3, 4, 5] } }
-  #
-  #   h1.deep_merge(h2) # => { a: false, b: { c: [1, 2, 3], x: [3, 4, 5] } }
-  #
-  # Like with Hash#merge in the standard library, a block can be provided
-  # to merge values:
-  #
-  #   h1 = { a: 100, b: 200, c: { c1: 100 } }
-  #   h2 = { b: 250, c: { c1: 200 } }
-  #   h1.deep_merge(h2) { |key, this_val, other_val| this_val + other_val }
-  #   # => { a: 100, b: 450, c: { c1: 300 } }
-  def deep_deep_merge(other_hash, &block)
-    dup.deep_deep_merge!(other_hash, &block)
-  end
-
-  # Same as +deep_merge+, but modifies +self+.
-  def deep_deep_merge!(other_hash, &block)
-    other_hash.each_pair do |current_key, other_value|
-      this_value = self[current_key]
-
-      self[current_key] = if this_value.is_a?(Hash) && other_value.is_a?(Hash)
-        this_value.deep_deep_merge(other_value, &block)
-      else
-        if block_given? && key?(current_key)
-          block.call(current_key, this_value, other_value)
-        else
-          other_value
-        end
-      end
-    end
-
-    self
-  end
-
-  def except(*keys)
-    dup.except!(*keys)
-  end
-
-  def except!(*keys)
-    keys.each { |key| delete(key) }
-    self
-  end
-end