telephone_number 1.4.3 → 1.4.8

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.3"
+  VERSION = "1.4.8"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: telephone_number
 version: !ruby/object:Gem::Version
-  version: 1.4.3
+  version: 1.4.8
 platform: ruby
 authors:
 - MOBI Wireless Management
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-09-27 00:00:00.000000000 Z
+date: 2020-07-14 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
@@ -323,6 +325,8 @@ files:
 - data/geocoding/en/383.txt
 - data/geocoding/en/385.dat
 - data/geocoding/en/385.txt
+- data/geocoding/en/386.dat
+- data/geocoding/en/386.txt
 - data/geocoding/en/387.dat
 - data/geocoding/en/387.txt
 - data/geocoding/en/389.dat
@@ -371,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
@@ -379,20 +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
@@ -401,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
@@ -411,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
@@ -421,10 +455,18 @@ 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
 - data/geocoding/en/972.txt
 - data/geocoding/en/975.dat
@@ -435,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
@@ -608,7 +654,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2.3
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: Phone number validation