phonelib 0.5.6 → 0.6.0

data/lib/phonelib/phone_analyzer.rb

@@ -20,11 +20,11 @@ module Phonelib
 
       result = try_to_parse_single_country(phone, country)
       # if previous parsing failed, trying for all countries
-      if result.nil? || result.empty? || result.values.first[:valid].empty?
+      if passed_country.nil? && (result.nil? || result.empty? || result.values.first[:valid].empty?)
         detected = detect_and_parse phone
         result = detected.empty? ? result || {} : detected
       end
-      result
+      result || {}
     end
 
     private
@@ -64,7 +64,7 @@ module Phonelib
         get_national_and_data(e164, data, valid_match)
       else
         possible_match = phone_match_data?(e164, data, true)
-        possible_match && get_national_and_data(e164, data, possible_match)
+        possible_match && get_national_and_data(e164, data, possible_match, true)
       end
     end
 
@@ -111,14 +111,17 @@ module Phonelib
     # * +phone+ - phone number for parsing
     # * +data+ - country data
     # * +country_match+ - result of match of phone within full regex
-    def get_national_and_data(phone, data, country_match)
+    # * +not_valid+ - specifies that number is not valid by general desc pattern
+    def get_national_and_data(phone, data, country_match, not_valid = false)
       prefix_length = data[Core::COUNTRY_CODE].length
       prefix_length += [1, 2].map { |i| country_match[i].to_s.size }.inject(:+)
       result = data.select { |k, v| k != :types && k != :formats }
       result[:national] = phone[prefix_length..-1] || ''
       result[:format] = get_number_format(result[:national],
                                           data[Core::FORMATS])
-      result.merge! all_number_types(result[:national], data[Core::TYPES])
+      result.merge! all_number_types(result[:national], data[Core::TYPES], not_valid)
+      result[:valid] = [] if not_valid
+
       { result[:id] => result }
     end
 
@@ -129,14 +132,15 @@ module Phonelib
     #
     # * +phone+ - phone number for parsing
     # * +data+  - country data
-    def all_number_types(phone, data)
+    # * +not_valid+ - specifies that number is not valid by general desc pattern
+    def all_number_types(phone, data, not_valid = false)
       response = { valid: [], possible: [] }
 
       types_for_check(data).each do |type|
         possible, valid = get_patterns(data, type)
 
         valid_and_possible, possible_result =
-            number_valid_and_possible?(phone, possible, valid)
+            number_valid_and_possible?(phone, possible, valid, not_valid)
         response[:possible] << type if possible_result
         response[:valid] << type if valid_and_possible
       end

data/lib/phonelib/phone_analyzer_helper.rb

@@ -111,13 +111,14 @@ module Phonelib
     # * +number+ - phone number for validation
     # * +possible_pattern+ - possible pattern for validation
     # * +national_pattern+ - valid pattern for validation
-    def number_valid_and_possible?(number, possible_pattern, national_pattern)
+    # * +not_valid+ - specifies that number is not valid by general desc pattern
+    def number_valid_and_possible?(number, possible_pattern, national_pattern, not_valid = false)
       possible_match = number.match(cr("^(?:#{possible_pattern})$"))
       possible = possible_match && possible_match.to_s.length == number.length
 
-      return [possible, possible] if possible_pattern == national_pattern
+      return [!not_valid && possible, possible] if possible_pattern == national_pattern
       valid = false
-      if possible
+      if !not_valid && possible
         # doing national pattern match only in case possible matches
         national_match = number.match(cr("^(?:#{national_pattern})$"))
         valid = national_match && national_match.to_s.length == number.length

data/lib/phonelib/version.rb

@@ -1,5 +1,5 @@
 # :nodoc:
 module Phonelib
   # :nodoc:
-  VERSION = '0.5.6'
+  VERSION = '0.6.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: phonelib
 version: !ruby/object:Gem::Version
-  version: 0.5.6
+  version: 0.6.0
 platform: ruby
 authors:
 - Vadim Senderovich
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-07 00:00:00.000000000 Z
+date: 2016-04-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -110,6 +110,7 @@ files:
 - data/libphonenumber/AUTHORS
 - data/libphonenumber/CONTRIBUTING.md
 - data/libphonenumber/CONTRIBUTORS
+- data/libphonenumber/FALSEHOODS.md
 - data/libphonenumber/FAQ.md
 - data/libphonenumber/LICENSE
 - data/libphonenumber/LICENSE.Chromium
@@ -1579,6 +1580,7 @@ files:
 - data/libphonenumber/java/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_US
 - data/libphonenumber/java/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_YT
 - data/libphonenumber/java/libphonenumber/test/com/google/i18n/phonenumbers/data/SingleFilePhoneNumberMetadataProtoForTesting
+- data/libphonenumber/java/pending_code_changes.txt
 - data/libphonenumber/java/pom.xml
 - data/libphonenumber/java/release_notes.txt
 - data/libphonenumber/javadoc/allclasses-frame.html