phonelib 0.6.0 → 0.6.1

data/data/libphonenumber/tools/cpp/src/cpp-build/generate_geocoding_data.cc

@@ -20,6 +20,7 @@
 #include <locale>
 #include <sys/stat.h>
 #include <algorithm>
+#include <cctype>
 #include <cmath>
 #include <cstdio>
 #include <cstring>
@@ -141,7 +142,7 @@ bool StrToInt(const string& s, int32* n) {
   std::stringstream stream;
   stream << s;
   stream >> *n;
-  return stream;
+  return !stream.fail();
 }
 
 // Converts integer to string, returns true on success.
@@ -149,7 +150,7 @@ bool IntToStr(int32 n, string* s) {
   std::stringstream stream;
   stream << n;
   stream >> *s;
-  return stream;
+  return !stream.fail();
 }
 
 // Parses the prefix descriptions file at path, clears and fills the output

data/lib/phonelib/phone.rb

@@ -26,7 +26,7 @@ module Phonelib
       if sanitized.empty?
         @data = {}
       else
-        @data = analyze(sanitized, @original.start_with?('+') ? nil : country)
+        @data = analyze(sanitized, passed_country(country))
         first = @data.values.first
         @national_number = first ? first[:national] : sanitized
       end
@@ -154,7 +154,7 @@ module Phonelib
     # Returns e164 formatted phone number
     def international(formatted = true)
       return nil if sanitized.nil? || sanitized.empty?
-      return "+#{sanitized}" unless valid?
+      return "+#{sanitized.start_with?(country_code) ? '' : country_code}#{sanitized}" unless valid?
       return "#{@data[country][Core::COUNTRY_CODE]}#{@national_number}" unless formatted
 
       format = @data[country][:format]
@@ -165,7 +165,12 @@ module Phonelib
         national = @national_number
       end
 
-      "+#{@data[country][Core::COUNTRY_CODE]} #{national}"
+      "+#{country_code} #{national}"
+    end
+
+    # returns national formatted number with extension added
+    def full_national
+      "#{national}#{formatted_extension}"
     end
 
     # returns international formatted number with extension added
@@ -215,7 +220,7 @@ module Phonelib
 
     # returns extension with separator defined
     def formatted_extension
-      return '' unless @extension
+      return '' if @extension.nil? || @extension.empty?
 
       "#{Phonelib.extension_separator}#{@extension}"
     end

data/lib/phonelib/phone_analyzer_helper.rb

@@ -3,6 +3,22 @@ module Phonelib
   module PhoneAnalyzerHelper
     private
 
+    # defines if to validate against single country or not
+    def passed_country(country)
+      country_code = country_prefix(country)
+      if @original.start_with?('+') && country_code && !sanitized.start_with?(country_code)
+        # in case number passed with + but it doesn't start with passed country prefix
+        country = nil
+      end
+      country
+    end
+
+    # returns country prefix for provided country or nil
+    def country_prefix(country)
+      country = country.to_s.upcase
+      Phonelib.phone_data[country] && Phonelib.phone_data[country][Core::COUNTRY_CODE]
+    end
+
     # caches regular expression, reusing it for later lookups
     def cr(regexp)
       Phonelib.phone_regexp_cache[regexp] ||= Regexp.new(regexp)

data/lib/phonelib/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: phonelib
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.1
 platform: ruby
 authors:
 - Vadim Senderovich
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-20 00:00:00.000000000 Z
+date: 2016-06-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -586,6 +586,7 @@ files:
 - data/libphonenumber/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1530_en
 - data/libphonenumber/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1540_en
 - data/libphonenumber/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1541_en
+- data/libphonenumber/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1548_en
 - data/libphonenumber/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1551_en
 - data/libphonenumber/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1559_en
 - data/libphonenumber/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1561_en
@@ -669,6 +670,7 @@ files:
 - data/libphonenumber/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1734_en
 - data/libphonenumber/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1737_en
 - data/libphonenumber/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1740_en
+- data/libphonenumber/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1743_en
 - data/libphonenumber/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1754_en
 - data/libphonenumber/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1757_en
 - data/libphonenumber/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1760_en
@@ -786,6 +788,7 @@ files:
 - data/libphonenumber/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/221_en
 - data/libphonenumber/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/222_en
 - data/libphonenumber/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/222_fr
+- data/libphonenumber/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/223_en
 - data/libphonenumber/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/224_en
 - data/libphonenumber/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/225_en
 - data/libphonenumber/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/226_en
@@ -895,11 +898,13 @@ files:
 - data/libphonenumber/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/48_pl
 - data/libphonenumber/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/49_de
 - data/libphonenumber/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/49_en
+- data/libphonenumber/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/501_en
 - data/libphonenumber/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/51_en
 - data/libphonenumber/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/53_en
 - data/libphonenumber/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/54_en
 - data/libphonenumber/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/54_es
 - data/libphonenumber/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/55_en
+- data/libphonenumber/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/55_pt
 - data/libphonenumber/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/56_en
 - data/libphonenumber/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/56_es
 - data/libphonenumber/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/57_en
@@ -1817,6 +1822,7 @@ files:
 - data/libphonenumber/resources/geocoding/en/220.txt
 - data/libphonenumber/resources/geocoding/en/221.txt
 - data/libphonenumber/resources/geocoding/en/222.txt
+- data/libphonenumber/resources/geocoding/en/223.txt
 - data/libphonenumber/resources/geocoding/en/224.txt
 - data/libphonenumber/resources/geocoding/en/225.txt
 - data/libphonenumber/resources/geocoding/en/226.txt
@@ -1885,6 +1891,7 @@ files:
 - data/libphonenumber/resources/geocoding/en/47.txt
 - data/libphonenumber/resources/geocoding/en/48.txt
 - data/libphonenumber/resources/geocoding/en/49.txt
+- data/libphonenumber/resources/geocoding/en/501.txt
 - data/libphonenumber/resources/geocoding/en/51.txt
 - data/libphonenumber/resources/geocoding/en/53.txt
 - data/libphonenumber/resources/geocoding/en/54.txt