phonelib 0.5.5 → 0.5.6

data/data/libphonenumber/resources/ShortNumberMetadata.xml

@@ -5659,7 +5659,10 @@
            2[01389]|
            3(?:
              2|
-             39|
+             3[039]|
+             45|
+             66|
+             88|
              9[18]
            )|
            82
@@ -5687,9 +5690,11 @@
         <nationalNumberPattern>
          1(?:
            17|
-           29|
+           2[139]|
            3(?:
-             39|
+             3[09]|
+             66|
+             88|
              9[18]
            )|
            82
@@ -5703,10 +5708,11 @@
           1(?:
             1[78]|
             28|
+            330|
             82
           )
         </nationalNumberPattern>
-        <possibleNumberPattern>\d{3}</possibleNumberPattern>
+        <possibleNumberPattern>\d{3,4}</possibleNumberPattern>
         <exampleNumber>118</exampleNumber>
       </tollFree>
     </territory>
@@ -7825,17 +7831,45 @@
     <!-- http://www.anacom.pt/render.jsp?categoryId=279098 -->
     <territory id="PT">
       <generalDesc>
-        <nationalNumberPattern>1\d{2}</nationalNumberPattern>
-        <possibleNumberPattern>\d{3}</possibleNumberPattern>
+        <nationalNumberPattern>1\d{2,5}</nationalNumberPattern>
+        <possibleNumberPattern>\d{3,6}</possibleNumberPattern>
       </generalDesc>
       <shortCode>
-        <nationalNumberPattern>11[25-8]</nationalNumberPattern>
+        <nationalNumberPattern>
+          11(?:
+            [2578]|
+            6(?:
+              000|
+              111
+            )
+          )
+        </nationalNumberPattern>
         <exampleNumber>112</exampleNumber>
       </shortCode>
       <emergency>
         <nationalNumberPattern>11[25]</nationalNumberPattern>
         <exampleNumber>112</exampleNumber>
       </emergency>
+      <expandedEmergency>
+        <nationalNumberPattern>
+          116(?:
+            000|
+            111
+          )
+        </nationalNumberPattern>
+        <possibleNumberPattern>\d{6}</possibleNumberPattern>
+        <exampleNumber>116000</exampleNumber>
+      </expandedEmergency>
+      <tollFree>
+        <nationalNumberPattern>
+          116(?:
+            000|
+            111
+          )
+        </nationalNumberPattern>
+        <possibleNumberPattern>\d{6}</possibleNumberPattern>
+        <exampleNumber>116000</exampleNumber>
+      </tollFree>
     </territory>
 
     <!-- Palau -->

data/data/libphonenumber/resources/carrier/en/225.txt

@@ -52,3 +52,4 @@
 22575|MTN
 22577|Orange
 22578|Orange
+22587|Orange

data/data/libphonenumber/resources/carrier/en/234.txt

@@ -12,6 +12,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+# NITEL and Mtel are brand names of the same consortium. They are merged under
+# NATCOM, and as of Nov 2015 are known as Ntel.
+
 234173|Starcomms
 234174|Starcomms
 2341804|Starcomms
@@ -136,18 +139,23 @@
 2346987|Starcomms
 2346988|Starcomms
 2346989|Starcomms
-2347021|M-Tel
-2347022|M-Tel
+234701|Airtel
+2347020|Smile
+2347021|Ntel
+2347022|Ntel
+2347023|Zoom
+2347024|Prestel
 2347025|Visafone
 2347026|Visafone
+2347027|Multilinks
 2347028|Starcomms
 2347029|Starcomms
 234703|MTN
 234704|Visafone
 234705|Glo
 234706|MTN
-234707|Glo
 234708|Airtel
+234709|Multilinks
 2347380|Starcomms
 2347381|Starcomms
 2347382|Starcomms
@@ -167,9 +175,11 @@
 2347782|Starcomms
 2347783|Starcomms
 2347784|Starcomms
+2348010|Megatech
+2348011|Megatech
 234802|Airtel
 234803|MTN
-234804|M-Tel
+234804|Ntel
 234805|Glo
 234806|MTN
 234807|Glo
@@ -241,6 +251,7 @@
 234902|Airtel
 234903|MTN
 234905|Glo
+234908|Etisalat
 234909|Etisalat
 234980|Starcomms
 234987|Starcomms

data/data/libphonenumber/resources/carrier/en/235.txt

@@ -13,4 +13,5 @@
 # limitations under the License.
 
 2356|Airtel
+23577|Sotel
 2359|Millicom

data/data/libphonenumber/resources/carrier/en/251.txt

@@ -17,3 +17,4 @@
 25193|Ethio Telecom
 25194|Ethio Telecom
 25195|Ethio Telecom
+251966|Ethio Telecom

data/data/libphonenumber/resources/carrier/en/675.txt

@@ -13,17 +13,18 @@
 # limitations under the License.
 
 # http://www.itu.int/oth/T02020000A4/en
-#
-# bmobile changed its name in 2009 to bemobile,
-# which is the name used in the ITU document,
-# but most online sources including the company's own web site still refer to bmobile.
+# bmobile changed its name in 2009 to bemobile, which is the name used in the
+# ITU document, but most online sources including the company's own web site
+# still refer to bmobile.
 
 67520150|bmobile/Telikom
 67570|Digicel
 67571|Digicel
 67572|Digicel
 67573|Digicel
+67574|Digicel
+67575|bmobile
 67576|bmobile
 675775|Telikom
+67578|Telikom
 67579|Digicel
-

data/data/libphonenumber/resources/carrier/en/91.txt

@@ -218,6 +218,7 @@
 917308|Reliance
 917309|Idea
 917310|Vodafone
+917319|Airtel
 917350|Idea
 917351|Idea
 917352|Idea

data/data/libphonenumber/resources/carrier/en/993.txt

@@ -12,6 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+99361|TM-Cell
 99365|TM-Cell
 99366|MTS (BARASH Communication)
 99367|MTS (BARASH Communication)

data/data/libphonenumber/resources/geocoding/en/1.txt

@@ -8567,6 +8567,7 @@
 1361994|Corpus Christi, TX
 1364|Kentucky
 1365|Ontario
+1380|Ohio
 1385|Utah
 1386|Florida
 1386218|Orange City, FL
@@ -29141,6 +29142,7 @@
 1819983|Saint-André-Avellin, QC
 1819985|Thurso, QC
 1819986|Gatineau, QC
+1825|Alberta
 1828|North Carolina
 1828210|Asheville, NC
 1828213|Asheville, NC

data/data/libphonenumber/resources/geocoding/en/212.txt

@@ -18,6 +18,7 @@
 
 212520|Casablanca
 212521|Casablanca/Central Morocco
+2125220|Casablanca
 2125222|Casablanca
 2125223|Casablanca
 2125224|Casablanca

data/data/libphonenumber/resources/geocoding/en/46.txt

@@ -36,6 +36,7 @@
 46159|Mariefred
 4616|Eskilstuna-Torshälla
 46171|Enköping
+46173|Öregrund-Östhammar
 46174|Alunda
 46175|Hallstavik-Rimbo
 46176|Norrtälje
@@ -45,10 +46,12 @@
 46220|Hallstahammar-Surahammar
 46221|Köping
 46222|Skinnskatteberg
+46223|Fagersta-Norberg
 46224|Sala-Heby
 46225|Hedemora-Säter
 46226|Avesta-Krylbo
 46227|Kungsör
+4623|Falun
 46240|Ludvika-Smedjebacken
 46241|Gagnef-Floda
 46243|Borlänge
@@ -58,6 +61,7 @@
 46250|Mora-Orsa
 46251|Älvdalen
 46253|Idre-Särna
+46258|Furudal
 4626|Gävle-Sandviken
 46270|Söderhamn
 46271|Alfta-Edsbyn
@@ -73,7 +77,9 @@
 46297|Ockelbo-Hamrånge
 46300|Kungsbacka
 46301|Hindås
+46302|Lerum
 46303|Kungälv
+46304|Orust-Tjörn
 4631|Gothenburg
 46320|Kinna
 46321|Ulricehamn
@@ -134,6 +140,7 @@
 46492|Vimmerby
 46493|Gamleby
 46494|Kisa
+46495|Hultsfred-Virserum
 46496|Mariannelund
 46498|Gotland
 46499|Mönsterås
@@ -147,6 +154,7 @@
 46510|Lidköping
 46511|Skara-Götene
 46512|Vara-Nossebro
+46513|Herrljunga
 46514|Grästorp
 46515|Falköping
 46520|Trollhättan
@@ -168,6 +176,7 @@
 46552|Deje
 46553|Molkom
 46554|Kil
+46555|Grums
 46560|Torsby
 46563|Hagfors-Munkfors
 46564|Sysslebäck
@@ -181,6 +190,7 @@
 46583|Askersund
 46584|Laxå
 46585|Fjugesta-Svartå
+46586|Karlskoga-Degerfors
 46587|Nora
 46589|Arboga
 46590|Filipstad
@@ -221,6 +231,7 @@
 46691|Torpshammar
 46692|Liden
 46693|Bräcke-Gällö
+46695|Stugun
 46696|Hammarstrand
 468|Stockholm
 4690|Umeå
@@ -228,6 +239,7 @@
 46911|Piteå
 46912|Byske
 46913|Lövånger
+46914|Burträsk
 46915|Bastuträsk
 46916|Jörn
 46918|Norsjö
@@ -249,14 +261,17 @@
 46940|Vilhelmina
 46941|Åsele
 46942|Dorotea
+46943|Fredrika
 46950|Lycksele
 46951|Storuman
 46952|Sorsele
 46953|Malå
 46954|Tärnaby
+46960|Arvidsjaur
 46961|Arjeplog
 46970|Gällivare
 46971|Jokkmokk
+46973|Porjus
 46975|Hakkas
 46976|Vuollerim
 46977|Korpilombolo

data/data/libphonenumber/resources/geocoding/fr/212.txt

@@ -17,6 +17,7 @@
 
 212520|Casablanca
 212521|Casablanca/Maroc Central
+2125220|Casablanca
 2125222|Casablanca
 2125223|Casablanca
 2125224|Casablanca

data/data/libphonenumber/resources/phonemetadata.proto

@@ -82,7 +82,7 @@ message NumberFormat {
   // commonly seen this number written by people without the leading 0, for
   // example as (20) XXXX XXXX, this field would be set to true. This will be
   // inherited from the value set for the territory in the XML file, unless a
-  // national_prefix_formatting_rule is defined specifically for this
+  // national_prefix_optional_when_formatting is defined specifically for this
   // NumberFormat.
   optional bool national_prefix_optional_when_formatting = 6;
 

data/data/libphonenumber/tools/java/common/src/com/google/i18n/phonenumbers/BuildMetadataFromXml.java

@@ -294,10 +294,10 @@ public class BuildMetadataFromXml {
   }
 
   /**
-   *  Extracts the available formats from the provided DOM element. If it does not contain any
-   *  nationalPrefixFormattingRule, the one passed-in is retained. The nationalPrefix,
-   *  nationalPrefixFormattingRule and nationalPrefixOptionalWhenFormatting values are provided from
-   *  the parent (territory) element.
+   * Extracts the available formats from the provided DOM element. If it does not contain any
+   * nationalPrefixFormattingRule, the one passed-in is retained; similarly for
+   * nationalPrefixOptionalWhenFormatting. The nationalPrefix, nationalPrefixFormattingRule and
+   * nationalPrefixOptionalWhenFormatting values are provided from the parent (territory) element.
    */
   // @VisibleForTesting
   static void loadAvailableFormats(PhoneMetadata metadata,
@@ -324,7 +324,6 @@ public class BuildMetadataFromXml {
         } else {
           format.nationalPrefixFormattingRule = nationalPrefixFormattingRule;
         }
-
         if (numberFormatElement.hasAttribute(NATIONAL_PREFIX_OPTIONAL_WHEN_FORMATTING)) {
           format.nationalPrefixOptionalWhenFormatting =
               Boolean.valueOf(numberFormatElement.getAttribute(

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

@@ -13,7 +13,7 @@
   <name>Libphonenumber Data tools</name>
 
   <properties>
-    <gae.version>1.5.4</gae.version>
+    <gae.version>1.9.32</gae.version>
   </properties>
 
   <repositories>

data/lib/phonelib/core.rb

@@ -77,6 +77,19 @@ module Phonelib
       @@parse_special = special
     end
 
+    # strict check for validator, doesn't sanitize number
+    @@strict_check = false
+
+    # getter for strict check flag
+    def strict_check
+      @@strict_check
+    end
+
+    # setter for strict check flag
+    def strict_check=(strict)
+      @@strict_check = strict
+    end
+
     # gem constants definition
 
     # Main data file

data/lib/phonelib/phone.rb

@@ -34,7 +34,11 @@ module Phonelib
 
     # method to get sanitized phone number (only numbers)
     def sanitized
-      @sanitized ||= @original && @original.gsub(/[^0-9]+/, '') || ''
+      @sanitized = if Phonelib.strict_check
+                     @original
+                   else
+                     @original && @original.gsub(/[^0-9]+/, '') || ''
+                   end
     end
 
     # Returns all phone types that matched valid patterns
@@ -135,21 +139,23 @@ module Phonelib
     end
 
     # Returns formatted national number
-    def national
+    def national(formatted = true)
       return @national_number unless valid?
       format_match, format_string = get_formatting_data
 
       if format_match
-        format_string.gsub(/\$\d/) { |el| format_match[el[1].to_i] }
+        out = format_string.gsub(/\$\d/) { |el| format_match[el[1].to_i] }
+        formatted ? out : out.gsub(/[^0-9]/, '')
       else
         @national_number
       end
     end
 
     # Returns e164 formatted phone number
-    def international
+    def international(formatted = true)
       return nil if sanitized.nil? || sanitized.empty?
       return "+#{sanitized}" unless valid?
+      return "#{@data[country][Core::COUNTRY_CODE]}#{@national_number}" unless formatted
 
       format = @data[country][:format]
       if matches = @national_number.match(/#{format[Core::PATTERN]}/)