phonelib 0.4.9 → 0.5.0

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

@@ -0,0 +1,18 @@
+# Copyright (C) 2013 The Libphonenumber Authors
+
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+
+# http://www.apache.org/licenses/LICENSE-2.0
+
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+97680|Unitel
+97686|Unitel
+97688|Unitel
+97689|Unitel

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

@@ -22,20 +22,27 @@
 26316|West Nicholson
 26317|Filabusi
 26318|Dete
-26320|Mutare
+26319|Plumtree
 263204|Odzi
 263205|Pengalonga
+26320|Mutare
+263213284|Victoria Falls
+263213|Victoria Falls
+263219|Plumtree
 26321|Murambinda
 263220|Mutare
+263221|Murambinda
 263222|Wedza
 263225|Rusape
 263227|Chipinge
 263228|Hauna
-26324|Chipangayi
 263248|Birchenough Bridge
-26325|Rusape
+26324|Chipangayi
 2632582|Headlands
 2632583|Nyazura
+26325|Rusape
+263261|Kariba
+263264|Karoi
 26326|Chimanimani
 263270|Chitungwiza
 263271|Bindura
@@ -47,7 +54,6 @@
 263277|Mvurwi
 263278|Murewa
 263279|Marondera
-263280|Plumtree
 263281|Hwange
 263282|Kezi
 263283|Figtree
@@ -57,16 +63,18 @@
 263287|Nyamandhlovu
 263288|Esigodini
 263289|Jotsholo
-26329|Juliasdale
+26329246|Bellevue
 263298|Nyanga
-26330|Gutu
+26329|Juliasdale
 263308|Chatsworth
-26331|Chiredzi
+26330|Luveve
 263317|Checheche
+26331|Chiredzi
+263329|Nyanga
 26332|Mvuma
-26333|Triangle
 263337|Nyaningwe
 263338|Nyika
+26333|Triangle
 26334|Jerera
 26335|Mashava
 26336|Ngundu
@@ -74,43 +82,53 @@
 263375|Concession
 263376|Glendale
 263379|Macheke
-263383|Matopos
+263383|Matopose
 263387|Tsholotsho
-26339|Masvingo
 263398|Lupane
-2634|Harare
+26339|Masvingo
+26342722|Chitungwiza
+26342723|Chitungwiza
+26342728|Marondera
 26342729|Marondera
-26350|Shangani
-26351|Zvishavane
-263516|Mberengwa
+2634|Harare
+26350|Shanagani
 263517|Mataga
+263518|Mberengwa
+26351|Zvishavane
 26352|Shurugwi
 26353|Chegutu
-26354|Gweru
 2635483|Lalapanzi
-26355|Kwekwe
+26354|Gweru
 263557|Munyati
 263558|Nkayi
+26355|Kwekwe
 26356|Chivhu
 26357|Centenary
 26358|Guruve
 26359|Gokwe
 26360|Mhangura
 26361|Kariba
-26362|Norton
 263628|Selous
-26363|Makuti
+26362|Norton
 263637|Chirundu
+26363|Makuti
 26364|Karoi
 26365|Beatrice
-26366|Banket
 263667|Raffingora
 263668|Mutorashanga
-26367|Chinhoyi
+26366|Banket
 263675|Murombedzi
-26368|Kadoma
+26367|Chinhoyi
 263687|Sanyati
 263688|Chakari
-26369|Darwendale
+26368|Kadoma
 263698|Trelawney
+26369|Darwendale
+263920|Northend
+263922|Queensdale
+263924|Hillside
+263940|Mabutewni
+263947|Bellevue
+263948|Nkulumane
+263952|Luveve
 2639|Bulawayo

data/data/libphonenumber/resources/timezones/map_data.txt

@@ -13,7 +13,7 @@
 # limitations under the License.
 
 # Generated from:
-# Internal statistics data (2015-05-05).
+# Internal statistics data (2015-08-06).
 
 1|America/Anguilla&America/Antigua&America/Barbados&America/Cayman&America/Chicago&America/Denver&America/Dominica&America/Edmonton&America/Grand_Turk&America/Grenada&America/Halifax&America/Jamaica&America/Juneau&America/Los_Angeles&America/Lower_Princes&America/Montserrat&America/Nassau&America/New_York&America/Port_of_Spain&America/Puerto_Rico&America/St_Johns&America/St_Kitts&America/St_Lucia&America/St_Thomas&America/St_Vincent&America/Toronto&America/Tortola&America/Vancouver&America/Winnipeg&Atlantic/Bermuda&Pacific/Guam&Pacific/Honolulu&Pacific/Pago_Pago&Pacific/Saipan
 1201|America/New_York
@@ -29,6 +29,7 @@
 1208251|America/Denver
 1208253|America/Denver
 1208255|America/Los_Angeles
+1208258|America/Denver
 120826|America/Los_Angeles
 120827|America/Denver
 120828|America/Denver
@@ -36,6 +37,7 @@
 1208292|America/Los_Angeles
 1208297|America/Denver
 12083|America/Denver
+120840|America/Denver
 120841|America/Denver
 120842|America/Denver
 1208433|America/Denver
@@ -352,12 +354,14 @@
 1308423|America/Denver
 1308425|America/Chicago
 130843|America/Denver
+130844|America/Chicago
 130845|America/Chicago
 130846|America/Chicago
 13085|America/Chicago
 130862|America/Denver
 130863|America/Denver
 130866|America/Denver
+130867|America/Chicago
 130869|America/Chicago
 130872|America/Chicago
 130874|America/Chicago
@@ -969,6 +973,7 @@
 181249|America/Chicago
 181252|America/New_York
 181253|America/New_York
+1812542|America/New_York
 1812546|America/New_York
 1812547|America/Chicago
 181259|America/New_York
@@ -1108,6 +1113,7 @@
 1850539|America/New_York
 1850545|America/New_York
 1850547|America/Chicago
+185055|America/New_York
 185056|America/New_York
 185057|America/New_York
 1850580|America/New_York
@@ -1236,6 +1242,7 @@
 190624|America/New_York
 190625|America/New_York
 190626|America/Chicago
+190627|America/New_York
 190629|America/New_York
 19063|America/New_York
 19064|America/New_York
@@ -1646,7 +1653,7 @@
 52326|America/Mexico_City
 52327|America/Mazatlan
 52328|America/Mexico_City
-52329|America/Mazatlan&America/Mexico_City
+52329|America/Mexico_City&America/Mazatlan
 5233|America/Mexico_City
 5234|America/Mexico_City
 5235|America/Mexico_City
@@ -1713,8 +1720,8 @@
 5297|America/Mexico_City
 52981|America/Mexico_City
 52982|America/Mexico_City
-52983|America/Mexico_City&America/New_York
-52984|America/Mexico_City&America/New_York
+52983|America/New_York&America/Mexico_City
+52984|America/New_York&America/Mexico_City
 52985|America/Mexico_City
 52986|America/Mexico_City
 52987|America/New_York
@@ -1726,7 +1733,7 @@
 52995|America/Mexico_City
 52996|America/Mexico_City
 52997|America/Mexico_City
-52998|America/Mexico_City&America/New_York
+52998|America/New_York&America/Mexico_City
 52999|America/Mexico_City
 53|America/Havana
 54|America/Buenos_Aires
@@ -1747,6 +1754,7 @@
 5569|America/Manaus
 557|America/Sao_Paulo
 558|America/Sao_Paulo
+5581|America/Noronha
 5591|America/Manaus
 5592|America/Manaus
 5593|America/Manaus
@@ -1759,6 +1767,7 @@
 56|America/Santiago&Pacific/Easter
 562|America/Santiago
 563|America/Santiago
+5632|Pacific/Easter
 564|America/Santiago
 565|America/Santiago
 566|America/Santiago
@@ -1803,13 +1812,15 @@
 6238|Asia/Makassar
 62401|Asia/Makassar
 62402|Asia/Makassar
-62403|Asia/Jayapura&Asia/Makassar
+62403|Asia/Makassar&Asia/Jayapura
 62404|Asia/Makassar
 62405|Asia/Makassar
 62408|Asia/Makassar
+62409|Asia/Makassar
 6241|Asia/Makassar
 6242|Asia/Makassar
 6243|Asia/Makassar
+6244|Asia/Makassar
 6245|Asia/Makassar
 6246|Asia/Makassar
 6247|Asia/Makassar
@@ -1823,7 +1834,7 @@
 62519|Asia/Jakarta
 62522|Asia/Jakarta
 62525|Asia/Jakarta
-62526|Asia/Makassar
+62526|Asia/Jakarta&Asia/Makassar
 62527|Asia/Makassar
 62528|Asia/Jakarta
 6253|Asia/Jakarta
@@ -1848,7 +1859,9 @@
 62966|Asia/Jayapura
 62967|Asia/Jayapura
 62969|Asia/Jayapura
-6297|Asia/Jayapura
+62971|Asia/Jayapura
+62975|Asia/Jayapura
+62979|Asia/Jakarta&Asia/Jayapura
 6298|Asia/Jayapura
 63|Asia/Manila
 64|Pacific/Auckland&Pacific/Chatham
@@ -1903,7 +1916,7 @@
 7301|Asia/Irkutsk
 7302|Asia/Yakutsk
 733|Asia/Almaty
-7341|Europe/Moscow
+7341|Europe/Moscow&Europe/Samara
 7342|Asia/Yekaterinburg
 7343|Asia/Yekaterinburg
 7345|Asia/Yekaterinburg
@@ -1956,9 +1969,9 @@
 7843|Europe/Moscow
 7844|Europe/Moscow
 7845|Europe/Moscow
-7846|Europe/Moscow
+7846|Europe/Moscow&Europe/Samara
 7847|Europe/Moscow
-7848|Europe/Moscow
+7848|Europe/Moscow&Europe/Samara
 785|Europe/Moscow
 786|Europe/Moscow
 787|Europe/Moscow

data/data/libphonenumber/tools/java/cpp-build/pom.xml

@@ -142,7 +142,7 @@
     <dependency>
       <groupId>com.google.protobuf</groupId>
       <artifactId>protobuf-java</artifactId>
-      <version>2.4.0a</version>
+      <version>2.6.1</version>
     </dependency>
   </dependencies>
 

data/lib/phonelib.rb

@@ -4,6 +4,7 @@ module Phonelib
   autoload :Core, 'phonelib/core'
   autoload :Phone, 'phonelib/phone'
   autoload :PhoneAnalyzer, 'phonelib/phone_analyzer'
+  autoload :PhoneExtendedData, 'phonelib/phone_extended_data'
 
   extend Module.new {
     include Core

data/lib/phonelib/core.rb

@@ -158,6 +158,7 @@ module Phonelib
       area_code_optional: 'Are code optional'
     }
 
+    # short codes types keys
     SHORT_CODES = [
         :short_code, :emergency, :carrier_specific, :sms_services,
         :expanded_emergency, :no_international_dialling, :carrier_services,

data/lib/phonelib/data_importer_helper.rb

@@ -1,4 +1,5 @@
 module Phonelib
+  # helper module for parsing raw libphonenumber data
   module DataImporterHelper
     # xml comments attributes names that should not be parsed
     XML_COMMENT_ATTRIBUTES = %w(text comment)

data/lib/phonelib/phone.rb

@@ -2,10 +2,14 @@ module Phonelib
   # class for parsed phone number, includes validation and formatting methods
   class Phone
     # defining reader methods for class variables
-    attr_reader :original # original phone number passed for parsing
+    # original phone number passed for parsing
+    attr_reader :original
+    # phone extension passed for parsing after a number
+    attr_reader :extension
 
     # including module that has all phone analyzing methods
     include Phonelib::PhoneAnalyzer
+    include Phonelib::PhoneExtendedData
 
     # class initialization method
     #
@@ -16,7 +20,8 @@ module Phonelib
     #   country (2 letters) like 'US', 'us' or :us for United States
     #
     def initialize(original, country = nil)
-      @original = original
+      @original, @extension = separate_extension(original)
+      @extension.gsub!(/[^0-9]/, '') if @extension
 
       if sanitized.empty?
         @data = {}
@@ -29,7 +34,7 @@ module Phonelib
 
     # method to get sanitized phone number (only numbers)
     def sanitized
-      @original && @original.gsub(/[^0-9]+/, '') || ''
+      @sanitized ||= @original && @original.gsub(/[^0-9]+/, '') || ''
     end
 
     # Returns all phone types that matched valid patterns
@@ -69,13 +74,14 @@ module Phonelib
       end
     end
 
+    # Return valid country
+    def valid_country
+      @valid_country ||= get_main_country(valid_countries)
+    end
+
     # Returns first country that matched valid patterns
     def country
-      @country ||= begin
-        valid_countries.find do |iso2|
-          @data[iso2][Core::MAIN_COUNTRY_FOR_CODE] == 'true'
-        end || valid_countries.first || countries.first
-      end
+      @country ||= valid_country || get_main_country(countries)
     end
 
     # Returns the country code from the original phone number.
@@ -105,18 +111,36 @@ module Phonelib
       !possible?
     end
 
+    # returns area code of parsed number
+    def area_code
+      return nil unless possible?
+      format_match, format_string = get_formatting_data
+
+      if format_string =~ /^.*[0-9]+.*\$1/ && format_match
+        format_string.gsub(/\$1.*$/, format_match[1]).gsub(/[^\d]+/, '')
+      end
+    end
+
+    # returns local number
+    def local_number
+      return national unless possible?
+      format_match, format_string = get_formatting_data
+
+      if format_string =~ /^.*[0-9]+.*\$1/ && format_match
+        format_string.gsub(/^.*\$2/, '$2').
+            gsub(/\$\d/) { |el| format_match[el[1].to_i] }
+      else
+        national
+      end
+    end
+
     # Returns formatted national number
     def national
       return @national_number unless valid?
-      format, prefix, rule = get_formatting_data
-
-      # add space to format groups, change first group to rule,
-      # change rule's constants to values
-      format_string = format[:format].gsub(/(\d)\$/, '\\1 $').gsub('$1', rule)
-          .gsub(/(\$NP|\$FG)/, '$NP' => prefix, '$FG' => '$1')
+      format_match, format_string = get_formatting_data
 
-      if matches = @national_number.match(/#{format[Core::PATTERN]}/)
-        format_string.gsub(/\$\d/) { |el| matches[el[1].to_i] }
+      if format_match
+        format_string.gsub(/\$\d/) { |el| format_match[el[1].to_i] }
       else
         @national_number
       end
@@ -124,7 +148,6 @@ module Phonelib
 
     # Returns e164 formatted phone number
     def international
-      sanitized = self.sanitized
       return nil if sanitized.nil? || sanitized.empty?
       return "+#{sanitized}" unless valid?
 
@@ -155,9 +178,9 @@ module Phonelib
     #
     def valid_for_country?(country)
       country = country.to_s.upcase
-      @data.select do |iso2, data|
+      @data.find do |iso2, data|
         country == iso2 && data[:valid].any?
-      end.any?
+      end.is_a? Array
     end
 
     # Returns whether a current parsed phone number is invalid for specified
@@ -172,78 +195,38 @@ module Phonelib
       !valid_for_country?(country)
     end
 
-    # Returns geo name of parsed phone number or nil if number is invalid or
-    # there is no geo name specified in db for this number
-    def geo_name
-      get_ext_name Phonelib::Core::EXT_GEO_NAMES,
-                   Phonelib::Core::EXT_GEO_NAME_KEY
-    end
-
-    # Returns timezone of parsed phone number or nil if number is invalid or
-    # there is no timezone specified in db for this number
-    def timezone
-      get_ext_name Phonelib::Core::EXT_TIMEZONES,
-                   Phonelib::Core::EXT_TIMEZONE_KEY
-    end
-
-    # Returns carrier of parsed phone number or nil if number is invalid or
-    # there is no carrier specified in db for this number
-    def carrier
-      get_ext_name Phonelib::Core::EXT_CARRIERS,
-                   Phonelib::Core::EXT_CARRIER_KEY
-    end
-
     private
 
-    # get name from extended phone data by keys
-    #
-    # ==== Attributes
-    #
-    # * +name_key+ - names array key from extended data hash
-    # * +id_key+   - parameter id key in resolved extended data for number
-    #
-    def get_ext_name(names_key, id_key)
-      if ext_data[id_key] > 0
-        res = Phonelib.phone_ext_data[names_key][ext_data[id_key]]
-        res.size == 1 ? res.first : res
-      end
+    # extracts extension from passed phone number if provided
+    def separate_extension(original)
+      splitted = (original || '').split /[;#]/
+      [splitted.first, splitted[1..-1] && splitted[1..-1].join]
     end
 
-    # returns extended data ids for current number
-    def ext_data
-      return @ext_data if @ext_data
-
-      ext_keys = [
-          Phonelib::Core::EXT_GEO_NAME_KEY,
-          Phonelib::Core::EXT_TIMEZONE_KEY,
-          Phonelib::Core::EXT_CARRIER_KEY
-      ]
-      result = {}
-      ext_keys.each { |key| result[key] = 0 }
-
-      return result unless possible?
-
-      drill = Phonelib.phone_ext_data[Phonelib::Core::EXT_PREFIXES]
-
-      e164.gsub('+', '').each_char do |num|
-        drill = drill[num.to_i] || break
-
-        ext_keys.each do |key|
-          result[key] = drill[key] if drill[key]
-        end
-      end
-
-      @ext_data = result
+    # get main country for code among provided countries
+    def get_main_country(countries_array)
+      countries_array.find do |iso2|
+        @data[iso2][Core::MAIN_COUNTRY_FOR_CODE] == 'true'
+      end || countries_array.first
     end
 
     # Get needable data for formatting phone as national number
     def get_formatting_data
+      return @formatting_data if @formatting_data
+
       format = @data[country][:format]
       prefix = @data[country][Core::NATIONAL_PREFIX]
       rule = (format[Core::NATIONAL_PREFIX_RULE] ||
           @data[country][Core::NATIONAL_PREFIX_RULE] || '$1')
 
-      [format, prefix, rule]
+      # change rule's constants to values
+      rule.gsub!(/(\$NP|\$FG)/, '$NP' => prefix, '$FG' => '$1')
+
+      # add space to format groups, change first group to rule,
+      format_string = format[:format].gsub(/(\d)\$/, '\\1 $').gsub('$1', rule)
+
+      @formatting_data =
+          [@national_number.match(/#{format[Core::PATTERN]}/), format_string]
     end
   end
 end