phonelib 0.6.57 → 0.7.1

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: f18f3a063d8059ddaaadcdf93350da7722596deb8eceedc3fff2582a92cbb51b
4
- data.tar.gz: 0a00eff81cad4d498ddc60a3080813ea9df7d7f6089fd9eba0ba50b8419e0b73
3
+ metadata.gz: de2fb5689287a2a83f3c74e7d12b25344d08f0d22d684e8c00cba53e558fcfa4
4
+ data.tar.gz: 23080bb4050fd864bdd099ff55cb685bc1b03fbc2ea202402f428070104726fb
5
5
  SHA512:
6
- metadata.gz: 2c54689fada25b70ecf4a8c2dafd0cca72f74d4b7909103c12b6fe02590095a40ce4051fb54eff06eaf198ca66a0b64e3f65e68e25907e872cd7c0cc530c6f12
7
- data.tar.gz: 6313294668d0cb684aaa312cd350f3ac4b4f791a1ceb1ebfd19c0cd3c7815cc4a15b09711c05cf7ad7d0fd775691f0f1ea4f7680cf5c42c99014f41e45aa5fae
6
+ metadata.gz: 82f68a1c09bf91a304778457977ead507f54feea2b67694571b9855bc41e44e238753d5f85b8bc89a1eaafe561e34d97a9031070325b448f02ba63558a03cb59
7
+ data.tar.gz: ea6c6adf618037f4aece9d1c871c08953bae9f934b5dad1f5406d4842e253f30a8c7f55669b6bb690d9b3be7df34534f5a0cd5d27b45d04708235b47dd15a01b
data/README.md CHANGED
@@ -2,7 +2,7 @@
2
2
 
3
3
  [![Built in integration with JetBrains RubyMine](https://github.com/daddyz/phonelib/blob/master/icon_RubyMine.png?raw=true)](https://www.jetbrains.com/ruby/)
4
4
  [![Gem Version](https://badge.fury.io/rb/phonelib.svg)](http://badge.fury.io/rb/phonelib)
5
- [![Build Status](https://travis-ci.com/daddyz/phonelib.svg?branch=master)](http://travis-ci.com/daddyz/phonelib)
5
+ [![CircleCI](https://circleci.com/gh/daddyz/phonelib/tree/master.svg?style=svg)](https://circleci.com/gh/daddyz/phonelib/tree/master)
6
6
  [![](https://codeclimate.com/github/daddyz/phonelib/badges/coverage.svg)](https://codeclimate.com/github/daddyz/phonelib/coverage)
7
7
  [![](https://codeclimate.com/github/daddyz/phonelib/badges/gpa.svg)](https://codeclimate.com/github/daddyz/phonelib)
8
8
  [![Inline docs](http://inch-ci.org/github/daddyz/phonelib.svg?branch=master)](http://inch-ci.org/github/daddyz/phonelib)
@@ -11,6 +11,11 @@ Phonelib is a gem allowing you to validate phone number. All validations are bas
11
11
  Currently it can make basic validations and formatting to e164 international number format and national number format with prefix.
12
12
  But it still doesn't include all Google's library functionality.
13
13
 
14
+ ## Incorrect parsing or validation
15
+
16
+ In case your phone number is incorrectly parsed, you can check original libphonenumber for result [here](https://rawgit.com/googlei18n/libphonenumber/master/javascript/i18n/phonenumbers/demo-compiled.html) and in case of same parse result [open an issue for them](https://issuetracker.google.com/issues/new?component=192347&template=829703). This gem's data is based on it.
17
+ If you can't wait for libphonenumber to resolve the issue, try to use ```Phonelib.add_additional_regex``` and ```Phonelib.additional_regexes``` methods.
18
+
14
19
  ## Information
15
20
 
16
21
  ### Change Log
@@ -37,10 +42,11 @@ gem 'phonelib'
37
42
 
38
43
  Run the bundle command to install it.
39
44
 
40
- To set the default country (country names are [ISO 3166-1 Alpha-2](http://en.wikipedia.org/wiki/ISO_3166-1_alpha-2) codes), create a initializer in <tt>config/initializers/phonelib.rb</tt>:
45
+ To set the default country or several default countries for parsing (country names are [ISO 3166-1 Alpha-2](http://en.wikipedia.org/wiki/ISO_3166-1_alpha-2) codes), create a initializer in <tt>config/initializers/phonelib.rb</tt>:
41
46
 
42
47
  ``` ruby
43
48
  Phonelib.default_country = "CN"
49
+ Phonelib.default_country = ['CN', 'FR']
44
50
  ```
45
51
 
46
52
  To use the ability to parse special numbers (Short Codes, Emergency etc.) you can set ```Phonelib.parse_special```. This is disabled by default
@@ -61,6 +67,12 @@ To disable sanitizing of passed phone number (keeping digits only)
61
67
  Phonelib.strict_check = true
62
68
  ```
63
69
 
70
+ To disable country reset during parsing in case phone starts with + sign and country specified but country phone prefix doesn't match phone's prefix
71
+
72
+ ``` ruby
73
+ Phonelib.ignore_plus = true
74
+ ```
75
+
64
76
  To change sanitized symbols on parsed number, so non-specified symbols won't be wiped and will fail the parsing
65
77
 
66
78
  ``` ruby
@@ -252,7 +264,7 @@ phone.full_e164 # returns e164 phone representation with extension
252
264
  phone.full_international # returns formatted international number with extension
253
265
  ```
254
266
 
255
- You can pass <tt>false</tt> to <tt>national</tt> and <tt>international</tt> methods in order to get unformatted representaions
267
+ You can pass <tt>false</tt> to <tt>national</tt> and <tt>international</tt> methods in order to get unformatted representations
256
268
 
257
269
  ``` ruby
258
270
  phone.international(false) # returns unformatted international phone
Binary file
data/data/phone_data.dat CHANGED
Binary file
data/lib/phonelib/core.rb CHANGED
@@ -107,6 +107,22 @@ module Phonelib
107
107
  @@strict_check = strict
108
108
  end
109
109
 
110
+ # @private don't use plus sign for automatic country change
111
+ @@ignore_plus = false
112
+
113
+ # getter for ignore plus flag
114
+ # @return [Boolean] Flag defines whether to reset country in case number has + and country prefix doesn't match
115
+ def ignore_plus
116
+ @@ignore_plus
117
+ end
118
+
119
+ # setter for ignore plus flag
120
+ # @param ignore_plus [Boolean] ignore plus sign or not
121
+ # @return [Boolean] Flag defines whether to ignore plus for country reset during validations in case country prefix doesn't match
122
+ def ignore_plus=(ignore_plus)
123
+ @@ignore_plus = ignore_plus
124
+ end
125
+
110
126
  # @private sanitizing regex, matching symbols will get removed from parsed number, must be string
111
127
  @@sanitize_regex = '[^0-9]+'
112
128
 
@@ -16,8 +16,31 @@ module Phonelib
16
16
  # * +passed_country+ - Country provided for parsing. Must be ISO code of
17
17
  # country (2 letters) like 'US', 'us' or :us for United States
18
18
  def analyze(phone, passed_country)
19
- country = country_or_default_country passed_country
19
+ countries = country_or_default_country passed_country
20
20
 
21
+ return analyze_single_country(phone, countries.first, passed_country) if countries.size == 1
22
+
23
+ results = {}
24
+ countries.map do |country|
25
+ results.merge! analyze_single_country(phone, country, passed_country)
26
+ end
27
+
28
+ pick_results(results)
29
+ end
30
+
31
+ private
32
+
33
+ # pick best result when several countries specified
34
+ def pick_results(results)
35
+ [:valid, :possible].each do |key|
36
+ final = results.select { |_k, v| v[key].any? }
37
+ return decorate_analyze_result(final) if final.size > 0
38
+ end
39
+
40
+ decorate_analyze_result(results)
41
+ end
42
+
43
+ def analyze_single_country(phone, country, passed_country)
21
44
  result = parse_country(phone, country)
22
45
  d_result = case
23
46
  when result && result.values.find { |e| e[:valid].any? }
@@ -32,8 +55,6 @@ module Phonelib
32
55
  better_result(result, d_result)
33
56
  end
34
57
 
35
- private
36
-
37
58
  # method checks which result is better to return
38
59
  def better_result(base_result, result = nil)
39
60
  base_result ||= {}
@@ -3,6 +3,14 @@ module Phonelib
3
3
  module PhoneAnalyzerHelper
4
4
  private
5
5
 
6
+ def decorate_analyze_result(result)
7
+ if result.size == 1
8
+ result
9
+ else
10
+ Hash[result.take(1)]
11
+ end
12
+ end
13
+
6
14
  def original_starts_with_plus?
7
15
  original_s[0] == Core::PLUS_SIGN
8
16
  end
@@ -24,7 +32,7 @@ module Phonelib
24
32
  # defines if to validate against single country or not
25
33
  def passed_country(country)
26
34
  code = country_prefix(country)
27
- if Core::PLUS_SIGN == @original[0] && code && !sanitized.start_with?(code)
35
+ if !Phonelib.ignore_plus && Core::PLUS_SIGN == @original[0] && code && !sanitized.start_with?(code)
28
36
  # in case number passed with + but it doesn't start with passed
29
37
  # country prefix
30
38
  country = nil
@@ -90,7 +98,11 @@ module Phonelib
90
98
  # * +country+ - country passed for parsing
91
99
  def country_or_default_country(country)
92
100
  country ||= (original_starts_with_plus? ? nil : Phonelib.default_country)
93
- country && country.to_s.upcase
101
+ if country.is_a?(Array)
102
+ country.compact.map { |e| e.to_s.upcase }
103
+ else
104
+ [country && country.to_s.upcase]
105
+ end
94
106
  end
95
107
 
96
108
  # constructs full regex for phone validation for provided phone data
@@ -22,8 +22,8 @@ module Phonelib
22
22
  return nil if sanitized.nil? || sanitized.empty?
23
23
  if valid?
24
24
  @national_number
25
- elsif country_code && sanitized.start_with?(country_code)
26
- sanitized[country_code.size..-1]
25
+ elsif data_country_code && sanitized.start_with?(data_country_code)
26
+ sanitized[data_country_code.size..-1]
27
27
  else
28
28
  sanitized
29
29
  end
@@ -32,8 +32,17 @@ module Phonelib
32
32
  # Returns the country code from the original phone number.
33
33
  # @return [String] matched country phone code
34
34
  def country_code
35
- @country_code ||= Phonelib.phone_data[country] && \
36
- Phonelib.phone_data[country][Core::COUNTRY_CODE]
35
+ return @country_code if @country_code
36
+
37
+ code = Phonelib.phone_data[country] && Phonelib.phone_data[country][Core::COUNTRY_CODE]
38
+ return @country_code = code unless code == '1' && Phonelib.phone_data[country][Core::LEADING_DIGITS]
39
+
40
+ match = e164.match(/\A\+(1(#{Phonelib.phone_data[country][Core::LEADING_DIGITS]}))/)
41
+ if match
42
+ @country_code = match[1]
43
+ else
44
+ @country_code = '1'
45
+ end
37
46
  end
38
47
 
39
48
  # Returns e164 formatted phone number. Method can receive single string parameter that will be defined as prefix
@@ -44,7 +53,7 @@ module Phonelib
44
53
  prefix = formatted if formatted.is_a?(String)
45
54
  return nil if sanitized.empty?
46
55
  return "#{prefix}#{country_prefix_or_not}#{sanitized}" unless valid?
47
- return "#{prefix}#{country_code}#{@national_number}" unless formatted
56
+ return "#{prefix}#{data_country_code}#{@national_number}" unless formatted
48
57
 
49
58
  fmt = @data[country][:format]
50
59
  national = @national_number
@@ -53,7 +62,7 @@ module Phonelib
53
62
  national = fmt.gsub(/\$\d/) { |el| matches[el[1].to_i] } unless fmt == 'NA'
54
63
  end
55
64
 
56
- "#{prefix}#{country_code} #{national}"
65
+ "#{prefix}#{data_country_code} #{national}"
57
66
  end
58
67
 
59
68
  # returns national formatted number with extension added
@@ -109,6 +118,10 @@ module Phonelib
109
118
 
110
119
  private
111
120
 
121
+ def data_country_code
122
+ @data_country_code ||= Phonelib.phone_data[country] && Phonelib.phone_data[country][Core::COUNTRY_CODE]
123
+ end
124
+
112
125
  # @private defines if phone can have area code
113
126
  def area_code_possible?
114
127
  return false if impossible?
@@ -124,8 +137,8 @@ module Phonelib
124
137
 
125
138
  # @private defines whether to put country prefix or not
126
139
  def country_prefix_or_not
127
- return '' unless country_code
128
- sanitized.start_with?(country_code) ? '' : country_code
140
+ return '' unless data_country_code
141
+ sanitized.start_with?(data_country_code) ? '' : data_country_code
129
142
  end
130
143
 
131
144
  # @private returns extension with separator defined
@@ -1,4 +1,4 @@
1
1
  module Phonelib
2
2
  # @private
3
- VERSION = '0.6.57'
3
+ VERSION = '0.7.1'
4
4
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: phonelib
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.6.57
4
+ version: 0.7.1
5
5
  platform: ruby
6
6
  authors:
7
7
  - Vadim Senderovich
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2022-02-23 00:00:00.000000000 Z
11
+ date: 2022-08-02 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: rake