phonelib 0.5.6 → 0.6.0

data/data/libphonenumber/cpp/test/phonenumbers/phonenumbermatcher_test.cc

@@ -864,11 +864,15 @@ static const NumberTest kStrictGroupingCases[] = {
   // Should be found by strict grouping but not exact grouping, as the last two
   // groups are formatted together as a block.
   NumberTest("0800-2491234", RegionCode::DE()),
+  // If the user is using alternate formats, test that numbers formatted in
+  // that way are found.
+#ifdef I18N_PHONENUMBERS_USE_ALTERNATE_FORMATS
   // Doesn't match any formatting in the test file, but almost matches an
   // alternate format (the last two groups have been squashed together here).
   NumberTest("0900-1 123123", RegionCode::DE()),
   NumberTest("(0)900-1 123123", RegionCode::DE()),
   NumberTest("0 900-1 123123", RegionCode::DE()),
+#endif  // I18N_PHONENUMBERS_USE_ALTERNATE_FORMATS
   // NDC also found as part of the country calling code; this shouldn't ruin the
   // grouping expectations.
   NumberTest("+33 3 34 2312", RegionCode::FR()),
@@ -903,13 +907,17 @@ static const NumberTest kExactGroupingCases[] = {
   NumberTest("0494949 ext. 49", RegionCode::DE()),
   NumberTest("01 (33) 3461 2234", RegionCode::MX()),  // Optional NP present
   NumberTest("(33) 3461 2234", RegionCode::MX()),  // Optional NP omitted
-  // Breakdown assistance number with normal formatting.
+  // If the user is using alternate formats, test that numbers formatted in
+  // that way are found.
+#ifdef I18N_PHONENUMBERS_USE_ALTERNATE_FORMATS
+  // Breakdown assistance number using alternate formatting pattern.
   NumberTest("1800-10-10 22", RegionCode::AU()),
   // Doesn't match any formatting in the test file, but matches an alternate
   // format exactly.
   NumberTest("0900-1 123 123", RegionCode::DE()),
   NumberTest("(0)900-1 123 123", RegionCode::DE()),
   NumberTest("0 900-1 123 123", RegionCode::DE()),
+#endif  // I18N_PHONENUMBERS_USE_ALTERNATE_FORMATS
   NumberTest("+33 3 34 23 12", RegionCode::FR()),
 };
 

data/data/libphonenumber/cpp/test/phonenumbers/phonenumberutil_test.cc

@@ -372,6 +372,25 @@ TEST_F(PhoneNumberUtilTest, GetExampleNumber) {
   EXPECT_FALSE(phone_util_.GetExampleNumber(RegionCode::UN001(), &test_number));
 }
 
+TEST_F(PhoneNumberUtilTest, GetInvalidExampleNumber) {
+  // RegionCode 001 is reserved for supporting non-geographical country calling
+  // codes. We don't support getting an invalid example number for it with
+  // GetInvalidExampleNumber.
+  PhoneNumber test_number;
+  EXPECT_FALSE(phone_util_.GetInvalidExampleNumber(RegionCode::UN001(),
+                                                   &test_number));
+  EXPECT_EQ(PhoneNumber::default_instance(), test_number);
+  EXPECT_FALSE(phone_util_.GetInvalidExampleNumber(RegionCode::CS(),
+                                                   &test_number));
+  EXPECT_EQ(PhoneNumber::default_instance(), test_number);
+
+  EXPECT_TRUE(phone_util_.GetInvalidExampleNumber(RegionCode::US(),
+                                                  &test_number));
+  // At least the country calling code should be set correctly.
+  EXPECT_EQ(1, test_number.country_code());
+  EXPECT_NE(0, test_number.national_number());
+}
+
 TEST_F(PhoneNumberUtilTest, GetExampleNumberForNonGeoEntity) {
   PhoneNumber toll_free_number;
   toll_free_number.set_country_code(800);
@@ -390,6 +409,30 @@ TEST_F(PhoneNumberUtilTest, GetExampleNumberForNonGeoEntity) {
   EXPECT_EQ(universal_premium_rate, test_number);
 }
 
+TEST_F(PhoneNumberUtilTest, GetExampleNumberWithoutRegion) {
+  // In our test metadata we don't cover all types: in our real metadata, we do.
+  PhoneNumber test_number;
+  bool success = phone_util_.GetExampleNumberForType(
+      PhoneNumberUtil::FIXED_LINE,
+      &test_number);
+  // We test that the call to get an example number succeeded, and that the
+  // number passed in was modified.
+  EXPECT_TRUE(success);
+  EXPECT_NE(PhoneNumber::default_instance(), test_number);
+  test_number.Clear();
+
+  success = phone_util_.GetExampleNumberForType(PhoneNumberUtil::MOBILE,
+                                                &test_number);
+  EXPECT_TRUE(success);
+  EXPECT_NE(PhoneNumber::default_instance(), test_number);
+  test_number.Clear();
+
+  success = phone_util_.GetExampleNumberForType(PhoneNumberUtil::PREMIUM_RATE,
+                                                &test_number);
+  EXPECT_TRUE(success);
+  EXPECT_NE(PhoneNumber::default_instance(), test_number);
+}
+
 TEST_F(PhoneNumberUtilTest, FormatUSNumber) {
   PhoneNumber test_number;
   string formatted_number;
@@ -1852,6 +1895,22 @@ TEST_F(PhoneNumberUtilTest, IsNumberGeographical) {
   number.set_country_code(800);
   number.set_national_number(12345678ULL);
   EXPECT_FALSE(IsNumberGeographical(number));  // Internation toll free number.
+
+  // We test that mobile phone numbers in relevant regions are indeed considered
+  // geographical.
+
+  number.set_country_code(54);
+  number.set_national_number(91187654321ULL);
+  EXPECT_TRUE(IsNumberGeographical(number));  // Argentina, mobile phone number.
+
+  number.set_country_code(52);
+  number.set_national_number(12345678900ULL);
+  EXPECT_TRUE(IsNumberGeographical(number));  // Mexico, mobile phone number.
+
+  number.set_country_code(52);
+  number.set_national_number(15512345678ULL);
+  EXPECT_TRUE(IsNumberGeographical(number));  // Mexico, another mobile phone
+                                              // number.
 }
 
 TEST_F(PhoneNumberUtilTest, IsLeadingZeroPossible) {
@@ -2363,7 +2422,7 @@ TEST_F(PhoneNumberUtilTest, ConvertAlphaCharactersInNumber) {
 
   // Try with some non-ASCII characters.
   input.assign("1\xE3\x80\x80\xEF\xBC\x88" "800) ABC-DEF"
-               /* "1　（800) ABCD-DEF" */);
+               /* "1　（800) ABC-DEF" */);
   static const string kExpectedFullwidthOutput =
       "1\xE3\x80\x80\xEF\xBC\x88" "800) 222-333" /* "1　（800) 222-333" */;
   phone_util_.ConvertAlphaCharactersInNumber(&input);
@@ -3184,6 +3243,7 @@ TEST_F(PhoneNumberUtilTest, ParseWithInternationalPrefixes) {
             phone_util_.Parse("\xEF\xBC\x8B" "1 (650) 333-6000",
                               /* "＋1 (650) 333-6000" */
                               RegionCode::SG(), &test_number));
+  EXPECT_EQ(us_number, test_number);
   // Using a soft hyphen U+00AD.
   EXPECT_EQ(PhoneNumberUtil::NO_PARSING_ERROR,
             phone_util_.Parse("1 (650) 333" "\xC2\xAD" "-6000",

data/data/libphonenumber/debian/control

@@ -3,7 +3,7 @@ Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org>
 Uploaders: Daniel Pocock <daniel@pocock.pro>, Fredrik Roubert <roubert@google.com>
 Build-Depends: cdbs,
-               cmake (>= 3.1),
+               cmake (>= 2.8),
                debhelper (>= 9),
                default-jdk | java-sdk,
                libboost-dev (>= 1.40),

data/data/libphonenumber/java/carrier/pom.xml

@@ -3,14 +3,14 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.googlecode.libphonenumber</groupId>
   <artifactId>carrier</artifactId>
-  <version>1.27-SNAPSHOT</version>
+  <version>1.30-SNAPSHOT</version>
   <packaging>jar</packaging>
   <url>https://github.com/googlei18n/libphonenumber/</url>
 
   <parent>
     <groupId>com.googlecode.libphonenumber</groupId>
     <artifactId>libphonenumber-parent</artifactId>
-    <version>7.2.7-SNAPSHOT</version>
+    <version>7.3.1-SNAPSHOT</version>
   </parent>
 
   <build>
@@ -34,12 +34,12 @@
     <dependency>
       <groupId>com.googlecode.libphonenumber</groupId>
       <artifactId>libphonenumber</artifactId>
-      <version>7.2.7-SNAPSHOT</version>
+      <version>7.3.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>com.googlecode.libphonenumber</groupId>
       <artifactId>prefixmapper</artifactId>
-      <version>2.37-SNAPSHOT</version>
+      <version>2.40-SNAPSHOT</version>
     </dependency>
   </dependencies>
 

data/data/libphonenumber/java/demo/pom.xml

@@ -4,11 +4,11 @@
   <parent>
     <artifactId>libphonenumber-parent</artifactId>
     <groupId>com.googlecode.libphonenumber</groupId>
-    <version>7.2.7-SNAPSHOT</version>
+    <version>7.3.1-SNAPSHOT</version>
   </parent>
   <groupId>com.googlecode.libphonenumber</groupId>
   <artifactId>demo</artifactId>
-  <version>7.2.7-SNAPSHOT</version>
+  <version>7.3.1-SNAPSHOT</version>
 
   <properties>
     <gae.version>1.9.32</gae.version>
@@ -48,17 +48,17 @@
     <dependency>
       <groupId>com.googlecode.libphonenumber</groupId>
       <artifactId>libphonenumber</artifactId>
-      <version>7.2.7-SNAPSHOT</version>
+      <version>7.3.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>com.googlecode.libphonenumber</groupId>
       <artifactId>geocoder</artifactId>
-      <version>2.37-SNAPSHOT</version>
+      <version>2.40-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>com.googlecode.libphonenumber</groupId>
       <artifactId>carrier</artifactId>
-      <version>1.27-SNAPSHOT</version>
+      <version>1.30-SNAPSHOT</version>
     </dependency>
   </dependencies>
 

data/data/libphonenumber/java/geocoder/pom.xml

@@ -3,14 +3,14 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.googlecode.libphonenumber</groupId>
   <artifactId>geocoder</artifactId>
-  <version>2.37-SNAPSHOT</version>
+  <version>2.40-SNAPSHOT</version>
   <packaging>jar</packaging>
   <url>https://github.com/googlei18n/libphonenumber/</url>
 
   <parent>
     <groupId>com.googlecode.libphonenumber</groupId>
     <artifactId>libphonenumber-parent</artifactId>
-    <version>7.2.7-SNAPSHOT</version>
+    <version>7.3.1-SNAPSHOT</version>
   </parent>
 
   <build>
@@ -42,12 +42,12 @@
     <dependency>
       <groupId>com.googlecode.libphonenumber</groupId>
       <artifactId>libphonenumber</artifactId>
-      <version>7.2.7-SNAPSHOT</version>
+      <version>7.3.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>com.googlecode.libphonenumber</groupId>
       <artifactId>prefixmapper</artifactId>
-      <version>2.37-SNAPSHOT</version>
+      <version>2.40-SNAPSHOT</version>
     </dependency>
   </dependencies>
 

data/data/libphonenumber/java/internal/prefixmapper/pom.xml

@@ -3,14 +3,14 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.googlecode.libphonenumber</groupId>
   <artifactId>prefixmapper</artifactId>
-  <version>2.37-SNAPSHOT</version>
+  <version>2.40-SNAPSHOT</version>
   <packaging>jar</packaging>
   <url>https://github.com/googlei18n/libphonenumber/</url>
 
   <parent>
     <groupId>com.googlecode.libphonenumber</groupId>
     <artifactId>libphonenumber-parent</artifactId>
-    <version>7.2.7-SNAPSHOT</version>
+    <version>7.3.1-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 
@@ -29,7 +29,7 @@
     <dependency>
       <groupId>com.googlecode.libphonenumber</groupId>
       <artifactId>libphonenumber</artifactId>
-      <version>7.2.7-SNAPSHOT</version>
+      <version>7.3.1-SNAPSHOT</version>
     </dependency>
   </dependencies>
 

data/data/libphonenumber/java/libphonenumber/pom.xml

@@ -3,14 +3,14 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.googlecode.libphonenumber</groupId>
   <artifactId>libphonenumber</artifactId>
-  <version>7.2.7-SNAPSHOT</version>
+  <version>7.3.1-SNAPSHOT</version>
   <packaging>jar</packaging>
   <url>https://github.com/googlei18n/libphonenumber/</url>
 
   <parent>
     <groupId>com.googlecode.libphonenumber</groupId>
     <artifactId>libphonenumber-parent</artifactId>
-    <version>7.2.7-SNAPSHOT</version>
+    <version>7.3.1-SNAPSHOT</version>
   </parent>
 
   <build>

data/data/libphonenumber/java/libphonenumber/src/com/google/i18n/phonenumbers/PhoneNumberUtil.java

@@ -88,6 +88,11 @@ public class PhoneNumberUtil {
   // be the length of the area code plus the length of the mobile token.
   private static final Map<Integer, String> MOBILE_TOKEN_MAPPINGS;
 
+  // Set of country calling codes that have geographically assigned mobile numbers. This may not be
+  // complete; we add calling codes case by case, as we find geographical mobile numbers or hear
+  // from user reports.
+  private static final Set<Integer> GEO_MOBILE_COUNTRIES;
+
   // The PLUS_SIGN signifies the international prefix.
   static final char PLUS_SIGN = '+';
 
@@ -119,6 +124,12 @@ public class PhoneNumberUtil {
     mobileTokenMap.put(54, "9");
     MOBILE_TOKEN_MAPPINGS = Collections.unmodifiableMap(mobileTokenMap);
 
+    HashSet<Integer> geoMobileCountries = new HashSet<Integer>();
+    geoMobileCountries.add(52);  // Mexico
+    geoMobileCountries.add(54);  // Argentina
+    geoMobileCountries.add(55);  // Brazil
+    GEO_MOBILE_COUNTRIES = Collections.unmodifiableSet(geoMobileCountries);
+
     // Simple ASCII digits map used to populate ALPHA_PHONE_MAPPINGS and
     // ALL_PLUS_NUMBER_GROUPING_SYMBOLS.
     HashMap<Character, Character> asciiDigitMappings = new HashMap<Character, Character>();
@@ -1014,10 +1025,11 @@ public class PhoneNumberUtil {
    */
   boolean isNumberGeographical(PhoneNumber phoneNumber) {
     PhoneNumberType numberType = getNumberType(phoneNumber);
-    // TODO: Include mobile phone numbers from countries like Indonesia, which has some
-    // mobile numbers that are geographical.
-    return numberType == PhoneNumberType.FIXED_LINE ||
-        numberType == PhoneNumberType.FIXED_LINE_OR_MOBILE;
+
+    return numberType == PhoneNumberType.FIXED_LINE
+        || numberType == PhoneNumberType.FIXED_LINE_OR_MOBILE
+        || (GEO_MOBILE_COUNTRIES.contains(phoneNumber.getCountryCode())
+            && numberType == PhoneNumberType.MOBILE);
   }
 
   /**
@@ -1818,6 +1830,62 @@ public class PhoneNumberUtil {
     return getExampleNumberForType(regionCode, PhoneNumberType.FIXED_LINE);
   }
 
+  /**
+   * Gets an invalid number for the specified region. This is useful for unit-testing purposes,
+   * where you want to test what will happen with an invalid number. Note that the number that is
+   * returned will always be able to be parsed and will have the correct country code. It may also
+   * be a valid *short* number/code for this region. Validity checking such numbers is handled with
+   * {@link com.google.i18n.phonenumbers.ShortNumberInfo}.
+   *
+   * @param regionCode  the region for which an example number is needed
+   * @return  an invalid number for the specified region. Returns null when an unsupported region or
+   *     the region 001 (Earth) is passed in.
+   */
+  public PhoneNumber getInvalidExampleNumber(String regionCode) {
+    if (!isValidRegionCode(regionCode)) {
+      logger.log(Level.WARNING, "Invalid or unknown region code provided: " + regionCode);
+      return null;
+    }
+    // We start off with a valid fixed-line number since every country supports this. Alternatively
+    // we could start with a different number type, since fixed-line numbers typically have a wide
+    // breadth of valid number lengths and we may have to make it very short before we get an
+    // invalid number.
+    PhoneNumberDesc desc = getNumberDescByType(getMetadataForRegion(regionCode),
+        PhoneNumberType.FIXED_LINE);
+    if (desc.exampleNumber.equals("")) {
+      // This shouldn't happen; we have a test for this.
+      return null;
+    }
+    String exampleNumber = desc.exampleNumber;
+    // Try and make the number invalid. We do this by changing the length. We try reducing the
+    // length of the number, since currently no region has a number that is the same length as
+    // MIN_LENGTH_FOR_NSN. This is probably quicker than making the number longer, which is another
+    // alternative. We could also use the possible number pattern to extract the possible lengths of
+    // the number to make this faster, but this method is only for unit-testing so simplicity is
+    // preferred to performance.  We don't want to return a number that can't be parsed, so we check
+    // the number is long enough. We try all possible lengths because phone number plans often have
+    // overlapping prefixes so the number 123456 might be valid as a fixed-line number, and 12345 as
+    // a mobile number. It would be faster to loop in a different order, but we prefer numbers that
+    // look closer to real numbers (and it gives us a variety of different lengths for the resulting
+    // phone numbers - otherwise they would all be MIN_LENGTH_FOR_NSN digits long.)
+    for (int phoneNumberLength = exampleNumber.length() - 1;
+         phoneNumberLength >= MIN_LENGTH_FOR_NSN;
+         phoneNumberLength--) {
+      String numberToTry = exampleNumber.substring(0, phoneNumberLength);
+      try {
+        PhoneNumber possiblyValidNumber = parse(numberToTry, regionCode);
+        if (!isValidNumber(possiblyValidNumber)) {
+          return possiblyValidNumber;
+        }
+      } catch (NumberParseException e) {
+        // Shouldn't happen: we have already checked the length, we know example numbers have
+        // only valid digits, and we know the region code is fine.
+      }
+    }
+    // We have a test to check that this doesn't happen for any of our supported regions.
+    return null;
+  }
+
   /**
    * Gets a valid number for the specified region and number type.
    *
@@ -1845,6 +1913,37 @@ public class PhoneNumberUtil {
     return null;
   }
 
+  /**
+   * Gets a valid number for the specified number type (it may belong to any country).
+   *
+   * @param type  the type of number that is needed
+   * @return  a valid number for the specified type. Returns null when the metadata
+   *     does not contain such information. This should only happen when no numbers of this type are
+   *     allocated anywhere in the world anymore.
+   */
+  public PhoneNumber getExampleNumberForType(PhoneNumberType type) {
+    for (String regionCode : getSupportedRegions()) {
+      PhoneNumber exampleNumber = getExampleNumberForType(regionCode, type);
+      if (exampleNumber != null) {
+        return exampleNumber;
+      }
+    }
+    // If there wasn't an example number for a region, try the non-geographical entities.
+    for (int countryCallingCode : getSupportedGlobalNetworkCallingCodes()) {
+      PhoneNumberDesc desc = getNumberDescByType(
+          getMetadataForNonGeographicalRegion(countryCallingCode), type);
+      try {
+        if (!desc.exampleNumber.equals("")) {
+          return parse("+" + countryCallingCode + desc.exampleNumber, UNKNOWN_REGION);
+        }
+      } catch (NumberParseException e) {
+        logger.log(Level.SEVERE, e.toString());
+      }
+    }
+    // There are no example numbers of this type for any country in the library.
+    return null;
+  }
+
   /**
    * Gets a valid number for the specified country calling code for a non-geographical entity.
    *
@@ -1859,7 +1958,7 @@ public class PhoneNumberUtil {
       PhoneNumberDesc desc = metadata.generalDesc;
       try {
         if (!desc.exampleNumber.equals("")) {
-          return parse("+" + countryCallingCode + desc.exampleNumber, "ZZ");
+          return parse("+" + countryCallingCode + desc.exampleNumber, UNKNOWN_REGION);
         }
       } catch (NumberParseException e) {
         logger.log(Level.SEVERE, e.toString());
@@ -2670,10 +2769,18 @@ public class PhoneNumberUtil {
   }
 
   /**
-   * Parses a string and returns it in proto buffer format. This method will throw a
-   * {@link com.google.i18n.phonenumbers.NumberParseException} if the number is not considered to be
-   * a possible number. Note that validation of whether the number is actually a valid number for a
-   * particular region is not performed. This can be done separately with {@link #isValidNumber}.
+   * Parses a string and returns it as a phone number in proto buffer format. The method is quite
+   * lenient and looks for a number in the input text (raw input) and does not check whether the
+   * string is definitely only a phone number. To do this, it ignores punctuation and white-space,
+   * as well as any text before the number (e.g. a leading “Tel: ”) and trims the non-number bits.
+   * It will accept a number in any format (E164, national, international etc), assuming it can be
+   * interpreted with the defaultRegion supplied. It also attempts to convert any alpha characters
+   * into digits if it thinks this is a vanity number of the type "1800 MICROSOFT".
+   *
+   * <p> This method will throw a {@link com.google.i18n.phonenumbers.NumberParseException} if the
+   * number is not considered to be a possible number. Note that validation of whether the number
+   * is actually a valid number for a particular region is not performed. This can be done
+   * separately with {@link #isValidNumber}.
    *
    * @param numberToParse     number that we are attempting to parse. This can contain formatting
    *                          such as +, ( and -, as well as a phone number extension. It can also
@@ -2685,9 +2792,10 @@ public class PhoneNumberUtil {
    *                          start with a '+' followed by the country calling code, then
    *                          "ZZ" or null can be supplied.
    * @return                  a phone number proto buffer filled with the parsed number
-   * @throws NumberParseException  if the string is not considered to be a viable phone number or if
-   *                               no default region was supplied and the number is not in
-   *                               international format (does not start with +)
+   * @throws NumberParseException  if the string is not considered to be a viable phone number (e.g.
+   *                               too few or too many digits) or if no default region was supplied
+   *                               and the number is not in international format (does not start
+   *                               with +)
    */
   public PhoneNumber parse(String numberToParse, String defaultRegion)
       throws NumberParseException {