telephone_number 1.4.6 → 1.4.16

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/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.6"
+  VERSION = "1.4.16"
 end

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/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.6
+  version: 1.4.16
 platform: ruby
 authors:
 - MOBI Wireless Management
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-01-21 00:00:00.000000000 Z
+date: 2022-06-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -136,7 +136,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: 
+description:
 email:
 - adam.fernung@mobiwm.com
 - josh.wetzel@mobiwm.com
@@ -150,6 +150,7 @@ files:
 - ".rubocop.yml"
 - ".ruby-version"
 - ".travis.yml"
+- CHANGELOG.md
 - CODE_OF_CONDUCT.md
 - Gemfile
 - LICENSE
@@ -217,6 +218,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 +376,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 +390,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 +432,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 +444,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
@@ -427,12 +454,20 @@ 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
+- 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 +480,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
@@ -596,13 +635,12 @@ 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:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -610,16 +648,15 @@ 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:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.14
-signing_key: 
+rubygems_version: 3.2.3
+signing_key:
 specification_version: 4
 summary: Phone number validation
 test_files: []

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