phonelib 0.6.42 → 0.6.47

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b77a627655db4c34f0879f0dec65e326abe62dbf60fa4a158ca2599922100551
-  data.tar.gz: 9920a5b9f955217f7e5768501af64f5751544e6f22608178a3a91c0d7a1a2f69
+  metadata.gz: 94a9dc3f92bdda4df449b88b989c0b90f79b1fcdd6f4ffe1729aa4b9aefb2992
+  data.tar.gz: 01c8f2034b5451b696ba58be76db5cf4d61be25d467e46b57fd4cfee455e3325
 SHA512:
-  metadata.gz: 19b9d77ba6a7e7b26f19c09fc1b3a5f692db1f2f4205ba5cdda4e82fa144df32fb1dd3c8419a7a5d7065935556b215be33805487a3848ba814da8416a0db924d
-  data.tar.gz: c83ca573baf9347761aebc9a3183842d4e16ac4daae47f2a5090247487bc8f5f749c4c9bf009f0d7caa352118b1c64327573bc12be61a1ab4ac9346338803b12
+  metadata.gz: 6fa5f840b24ffbb506292a9577fb9832bc374dd22bc9096bef6f0685e9a86ba94ebf2230685790b5b4f046b64f19d7b90725ae15b2a36fa76fe5a511048fa563
+  data.tar.gz: 95841918b7173a4b8f93ad4939acc121a07cbb1c99a29064333666f50cad5548e02d4a4ad4f5afdaf34c0612cc3f563ba279cd9373157fbcaae8aed0224993d4

data/README.md

@@ -61,6 +61,12 @@ To disable sanitizing of passed phone number (keeping digits only)
 Phonelib.strict_check = true
 ```
 
+To change sanitized symbols on parsed number, so non-specified symbols won't be wiped and will fail the parsing
+
+``` ruby
+Phonelib.sanitize_regex = '[\.\-\(\) \;\+]'
+```
+
 To disable sanitizing of double prefix on passed phone number
 
 ```ruby

data/Rakefile

@@ -22,6 +22,13 @@ end
 Bundler::GemHelper.install_tasks
 
 require 'rspec/core/rake_task'
+module TempFixForRakeLastComment
+  def last_comment
+    last_description
+  end
+end
+Rake::Application.send :include, TempFixForRakeLastComment
+
 RSpec::Core::RakeTask.new(:spec) do |t|
   if defined? Rails
     puts 'Rails found! Running tests with Rails'

data/lib/phonelib/core.rb

@@ -107,6 +107,22 @@ module Phonelib
       @@strict_check = strict
     end
 
+    # @private sanitizing regex, matching symbols will get removed from parsed number, must be string
+    @@sanitize_regex = '[^0-9]+'
+
+    # getter for sanitize regex
+    # @return [String] regex of symbols to wipe from parsed number
+    def sanitize_regex
+      @@sanitize_regex
+    end
+
+    # setter for sanitize regex
+    # @param regex [String] symbols to wipe from parsed number
+    # @return [String] regex of symbols to wipe from parsed number
+    def sanitize_regex=(regex)
+      @@sanitize_regex = regex.is_a?(String) ? regex : regex.to_s
+    end
+
     # @private strict double prefix check for validator, doesn't sanitize number
     @@strict_double_prefix_check = false
 

data/lib/phonelib/data_importer.rb

@@ -145,10 +145,10 @@ module Phonelib
 
         require 'open-uri'
         require 'csv'
-        io = open('http://download.geonames.org/export/dump/countryInfo.txt')
+        io = open('http://api.geonames.org/countryInfoCSV?username=demo&style=full')
         csv = CSV.new(io, {col_sep: "\t"})
         csv.each do |row|
-          next if row[0].start_with?('#') || row[0].empty?
+          next if row[0].nil? || row[0].start_with?('#') || row[0].empty?
 
           @countries[row[0]] = row[4]
         end

data/lib/phonelib/phone.rb

@@ -51,7 +51,7 @@ module Phonelib
     def sanitized
       @sanitized ||=
           vanity_converted(@original).gsub(
-              Phonelib.strict_check ? cr('^\+') : cr('[^0-9]+'),
+              Phonelib.strict_check ? cr('^\+') : cr(Phonelib.sanitize_regex),
               '')
     end
 

data/lib/phonelib/phone_formatter.rb

@@ -44,7 +44,7 @@ module Phonelib
       prefix = formatted if formatted.is_a?(String)
       return nil if sanitized.empty?
       return "#{prefix}#{country_prefix_or_not}#{sanitized}" unless valid?
-      return country_code + @national_number unless formatted
+      return "#{prefix}#{country_code}#{@national_number}" unless formatted
 
       fmt = @data[country][:format]
       national = @national_number

data/lib/phonelib/version.rb

@@ -1,4 +1,4 @@
 module Phonelib
   # @private
-  VERSION = '0.6.42'
+  VERSION = '0.6.47'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: phonelib
 version: !ruby/object:Gem::Version
-  version: 0.6.42
+  version: 0.6.47
 platform: ruby
 authors:
 - Vadim Senderovich
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-11 00:00:00.000000000 Z
+date: 2020-12-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - "<"
       - !ruby/object:Gem::Version
-        version: '11.0'
+        version: '14.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "<"
       - !ruby/object:Gem::Version
-        version: '11.0'
+        version: '14.0'
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.10.4
+        version: 1.10.8
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.10.4
+        version: 1.10.8
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -114,14 +114,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.8.6
+        version: 2.3.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.8.6
+        version: 2.3.1
 description: |2
       Google libphonenumber library was taken as a basis for
       this gem. Gem uses its data file for validations and number formatting.
@@ -168,7 +168,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
+rubygems_version: 3.0.9
 signing_key: 
 specification_version: 4
 summary: Gem validates phone numbers with Google libphonenumber database