phonelib 0.5.0 → 0.5.1

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

@@ -14,7 +14,7 @@
 
 88011|Citycell
 88015|TeleTalk
-88016|Beeong3G
+88016|Airtel
 88017|Grameenphone
 88018|Robi
 88019|Banglalink

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

@@ -153,8 +153,34 @@
 917241|Idea
 917247|Idea
 917248|Idea
-917250|AirTel
-917259|AirTel
+9172490|Telewings
+9172491|Telewings
+9172492|Telewings
+9172493|Telewings
+9172494|Telewings
+9172495|Telewings
+9172496|Telewings
+9172498|Telewings
+9172499|Vodafone
+917250|Airtel
+917251|Vodafone
+917252|Vodafone
+917253|Vodafone
+917254|Idea
+917255|Idea
+917256|Idea
+9172570|Idea
+9172578|Airtel
+9172579|Airtel
+917258|Airtel
+917259|Airtel
+917260|Airtel
+9172610|Airtel
+9172618|Airtel
+9172619|Vodafone
+917262|Vodafone
+917263|Vodafone
+917264|Vodafone
 917265|Idea
 917266|Telewings
 917267|Telewings
@@ -1138,6 +1164,9 @@
 918521|AirTel
 918522|Telewings
 918523|Telewings
+9185239|Vodafone
+918524|Vodafone
+918525|Vodafone
 918526|Aircel
 918527|AirTel
 918528|Videocon
@@ -1413,6 +1442,10 @@
 918827|AirTel
 9188280|Airtel
 9188285|Idea
+9188286|Idea
+9188287|Idea
+9188288|Idea
+9188289|Idea
 918829|Tata Docomo
 918852|Tata Docomo
 918853|AirTel
@@ -1650,7 +1683,7 @@
 919103|Reliance
 919104|Telewings
 919105|Loop Mobile
-919106|Loop Mobile
+919106|Tata Docomo
 919107|Loop Mobile
 919108|Airtel
 919109|Loop Mobile
@@ -2058,7 +2091,7 @@
 919512|Vodafone
 919513|ETISALAT
 919514|ETISALAT
-919515|Etisalat DB(cheers)
+919515|Airtel
 919516|Etisalat DB(cheers)
 919517|ETISALAT
 919518|ETISALAT

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

@@ -12,6 +12,35 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+959250|Huawei
+959251|Huawei
+959252|Huawei
+959253|Huawei
+959254|Huawei
+9592557|ASB
+9592558|ASB
+9592559|ASB
+959256|ZTE
+959257|ZTE
+959258|ZTE
+959259|ZTE
+959260|Huawei
+959261|Huawei
+959262|Huawei
+959263|Huawei
+959264|Huawei
+959265|ZTE
+95930|MECTel
+95931|MECTel
+95932|MECTel
+95933|MECTel
+95936|MECTel
+959426|ZTE
+959427|ZTE
+95951|ZTE
+95955|ZTE
+95977|Telenor
 95978|Telenor
 95979|Telenor
+95996|Ooredoo
 95997|Ooredoo

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

@@ -30181,6 +30181,7 @@
 1850983|Milton, FL
 1850994|Milton, FL
 1850997|Monticello, FL
+1854|Ohio
 1856|New Jersey
 1856205|Vineland, NJ
 1856216|Cherry Hill, NJ

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

@@ -365,6 +365,7 @@
 26463297|Noordoewer
 26463345|Mariental
 26463626|Helmeringhausen
+26463683|Keetmanshoop
 26463693|South
 264637034|Keetmanshoop
 264637035|Luderitz

data/data/libphonenumber/tools/java/java-build/src/com/google/i18n/phonenumbers/BuildMetadataProtoFromXml.java

@@ -53,6 +53,7 @@ public class BuildMetadataProtoFromXml extends Command {
   private static final String DATA_PREFIX = "data-prefix";
   private static final String MAPPING_CLASS = "mapping-class";
   private static final String COPYRIGHT = "copyright";
+  private static final String SINGLE_FILE = "single-file";
   private static final String LITE_BUILD = "lite-build";
 
   private static final String HELP_MESSAGE =
@@ -62,12 +63,17 @@ public class BuildMetadataProtoFromXml extends Command {
       "  --" + OUTPUT_DIR + "=PATH     Use PATH as the root directory for output files.\n" +
       "  --" + DATA_PREFIX +
           "=PATH    Use PATH (relative to " + OUTPUT_DIR + ") as the basename when\n" +
-      "                        writing phone number metadata (one file per region) in\n" +
-      "                        proto format.\n" +
+      "                        writing phone number metadata in proto format.\n" +
+      "                        One file per region will be written unless " + SINGLE_FILE + "\n" +
+      "                        is set, in which case a single file will be written with\n" +
+      "                        metadata for all regions.\n" +
       "  --" + MAPPING_CLASS + "=NAME  Store country code mappings in the class NAME, which\n" +
       "                        will be written to a file in " + OUTPUT_DIR + ".\n" +
       "  --" + COPYRIGHT + "=YEAR      Use YEAR in generated copyright headers.\n" +
       "\n" +
+      "  [--" + SINGLE_FILE + "=<true|false>] Optional (default: false). Whether to write\n" +
+      "                               metadata to a single file, instead of one file\n" +
+      "                               per region.\n" +
       "  [--" + LITE_BUILD + "=<true|false>]  Optional (default: false). In a lite build,\n" +
       "                               certain metadata will be omitted. At this\n" +
       "                               moment, example numbers information is omitted.\n" +
@@ -79,6 +85,7 @@ public class BuildMetadataProtoFromXml extends Command {
       "  --" + DATA_PREFIX + "=data/PhoneNumberMetadataProto \\\n" +
       "  --" + MAPPING_CLASS + "=CountryCodeToRegionCodeMap \\\n" +
       "  --" + COPYRIGHT + "=2010 \\\n" +
+      "  --" + SINGLE_FILE + "=false \\\n" +
       "  --" + LITE_BUILD + "=false\n";
 
   private static final String GENERATION_COMMENT =
@@ -101,6 +108,7 @@ public class BuildMetadataProtoFromXml extends Command {
     String dataPrefix = null;
     String mappingClass = null;
     String copyright = null;
+    boolean singleFile = false;
     boolean liteBuild = false;
 
     for (int i = 1; i < getArgs().length; i++) {
@@ -122,6 +130,9 @@ public class BuildMetadataProtoFromXml extends Command {
         mappingClass = value;
       } else if (COPYRIGHT.equals(key)) {
         copyright = value;
+      } else if (SINGLE_FILE.equals(key) &&
+                 ("true".equalsIgnoreCase(value) || "false".equalsIgnoreCase(value))) {
+        singleFile = "true".equalsIgnoreCase(value);
       } else if (LITE_BUILD.equals(key) &&
                  ("true".equalsIgnoreCase(value) || "false".equalsIgnoreCase(value))) {
         liteBuild = "true".equalsIgnoreCase(value);
@@ -147,19 +158,26 @@ public class BuildMetadataProtoFromXml extends Command {
       PhoneMetadataCollection metadataCollection =
           BuildMetadataFromXml.buildPhoneMetadataCollection(inputFile, liteBuild);
 
-      for (PhoneMetadata metadata : metadataCollection.getMetadataList()) {
-        String regionCode = metadata.getId();
-        // For non-geographical country calling codes (e.g. +800), or for alternate formats, use the
-        // country calling codes instead of the region code to form the file name.
-        if (regionCode.equals("001") || regionCode.isEmpty()) {
-          regionCode = Integer.toString(metadata.getCountryCode());
-        }
-        PhoneMetadataCollection outMetadataCollection = new PhoneMetadataCollection();
-        outMetadataCollection.addMetadata(metadata);
-        FileOutputStream outputForRegion = new FileOutputStream(filePrefix + "_" + regionCode);
-        ObjectOutputStream out = new ObjectOutputStream(outputForRegion);
-        outMetadataCollection.writeExternal(out);
+      if (singleFile) {
+        FileOutputStream output = new FileOutputStream(filePrefix);
+        ObjectOutputStream out = new ObjectOutputStream(output);
+        metadataCollection.writeExternal(out);
         out.close();
+      } else {
+        for (PhoneMetadata metadata : metadataCollection.getMetadataList()) {
+          String regionCode = metadata.getId();
+          // For non-geographical country calling codes (e.g. +800), or for alternate formats, use the
+          // country calling codes instead of the region code to form the file name.
+          if (regionCode.equals("001") || regionCode.isEmpty()) {
+            regionCode = Integer.toString(metadata.getCountryCode());
+          }
+          PhoneMetadataCollection outMetadataCollection = new PhoneMetadataCollection();
+          outMetadataCollection.addMetadata(metadata);
+          FileOutputStream outputForRegion = new FileOutputStream(filePrefix + "_" + regionCode);
+          ObjectOutputStream out = new ObjectOutputStream(outputForRegion);
+          outMetadataCollection.writeExternal(out);
+          out.close();
+        }
       }
 
       Map<Integer, List<String>> countryCodeToRegionCodeMap =

data/lib/phonelib/core.rb

@@ -38,6 +38,19 @@ module Phonelib
       @@default_country = country
     end
 
+    # flag identifies whether to use special phone types, like short code
+    @@parse_special = false
+
+    # getter for flag for special phone types parsing
+    def parse_special
+      @@parse_special
+    end
+
+    # setter for flag for special phone types parsing
+    def parse_special=(special)
+      @@parse_special = special
+    end
+
     # gem constants definition
 
     # Main data file
@@ -118,6 +131,8 @@ module Phonelib
     INTERNATIONAL_PREFIX = :international_prefix
     # Main country for code key
     MAIN_COUNTRY_FOR_CODE = :main_country_for_code
+    # Double country prefix flag key
+    DOUBLE_COUNTRY_PREFIX_FLAG = :double_prefix
     # Types key
     TYPES = :types
     # Formats key

data/lib/phonelib/data_importer.rb

@@ -17,6 +17,9 @@ module Phonelib
     class Importer
       include Phonelib::DataImporterHelper
 
+      # countries that can have double country prefix in number
+      DOUBLE_COUNTRY_CODES_COUNTRIES = %w(IN DE BR)
+
       # main data file in repo
       MAIN_FILE = 'resources/PhoneNumberMetadata.xml'
       # short number metadata
@@ -93,6 +96,7 @@ module Phonelib
           country[:types] = {}
 
           country.merge! get_types_and_formats(el.children)
+          country = add_double_country_flag country
           @data[country[:id]] = country
         end
       end
@@ -158,6 +162,14 @@ module Phonelib
                               :c)
       end
 
+      # adds double country code flag in case country allows
+      def add_double_country_flag(country)
+        if DOUBLE_COUNTRY_CODES_COUNTRIES.include?(country[:id])
+          country[:double_prefix] = true
+        end
+        country
+      end
+
       # method extracts formats and types from xml data
       def get_types_and_formats(children)
         types = {}

data/lib/phonelib/phone_analyzer.rb

@@ -1,14 +1,12 @@
 module Phonelib
   # phone analyzing methods module
   module PhoneAnalyzer
+    # extending with helper methods for analyze
+    include Phonelib::PhoneAnalyzerHelper
+
     # array of types not included for validation check in cycle
     NOT_FOR_CHECK = [:general_desc, :fixed_line, :mobile, :fixed_or_mobile]
 
-    # caches regular expression, reusing it for later lookups
-    def cr(regexp)
-      Phonelib.phone_regexp_cache[regexp] ||= Regexp.new(regexp)
-    end
-
     # parses provided phone if it is valid for  country data and returns result of
     # analyze
     #
@@ -79,21 +77,14 @@ module Phonelib
       result = {}
       Phonelib.phone_data.each do |key, data|
         parsed = parse_single_country(phone, data)
+        if allows_double_prefix(data, phone, parsed && parsed[key])
+          parsed = parse_single_country("#{data[:country_code]}#{phone}", data)
+        end
         result.merge!(parsed) unless parsed.nil?
       end
       result
     end
 
-    # Get country that was provided or default country in needable format
-    #
-    # ==== Attributes
-    #
-    # * +country+ - country passed for parsing
-    def country_or_default_country(country)
-      country = country || Phonelib.default_country
-      country && country.to_s.upcase
-    end
-
     # Create phone representation in e164 format
     #
     # ==== Attributes
@@ -113,27 +104,6 @@ module Phonelib
       end
     end
 
-    # constructs full regex for phone validation for provided phone data
-    # (international prefix, country code, national prefix, valid number)
-    #
-    # ==== Attributes
-    #
-    # * +data+ - country data hash
-    # * +country_optional+ - whether to put country code as optional group
-    def full_regex_for_data(data, type, country_optional = true)
-      regex = []
-      regex << "(#{data[Core::INTERNATIONAL_PREFIX]})?"
-      regex << if country_optional
-                 "(#{data[Core::COUNTRY_CODE]})?"
-               else
-                 data[Core::COUNTRY_CODE]
-               end
-      regex << "(#{data[Core::NATIONAL_PREFIX_FOR_PARSING] || data[Core::NATIONAL_PREFIX]})?"
-      regex << "(#{data[Core::TYPES][Core::GENERAL][type]})"
-
-      cr("^#{regex.join}$")
-    end
-
     # returns national number and analyzing results for provided phone number
     #
     # ==== Attributes
@@ -152,21 +122,6 @@ module Phonelib
       { result[:id] => result }
     end
 
-    # Check if phone match country data
-    #
-    # ==== Attributes
-    #
-    # * +phone+ - phone number for parsing
-    # * +data+  - country data
-    def phone_match_data?(phone, data, possible = false)
-      country_code = "#{data[Core::COUNTRY_CODE]}"
-      inter_prefix = "(#{data[Core::INTERNATIONAL_PREFIX]})?"
-      return unless phone.match cr("^#{inter_prefix}#{country_code}")
-
-      type = possible ? Core::POSSIBLE_PATTERN : Core::VALID_PATTERN
-      phone.match full_regex_for_data(data, type, false)
-    end
-
     # Returns all valid and possible phone number types for currently parsed
     # phone for provided data hash.
     #
@@ -189,28 +144,6 @@ module Phonelib
       sanitize_fixed_mobile(response)
     end
 
-    # checks if types has both :mobile and :fixed_line and replaces it with
-    # :fixed_or_mobile in case both present
-    def sanitize_fixed_mobile(types)
-      fixed_mobile = [Core::FIXED_LINE, Core::MOBILE]
-      [:possible, :valid].each do |key|
-        if (fixed_mobile - types[key]).empty?
-          types[key] = types[key] - fixed_mobile + [Core::FIXED_OR_MOBILE]
-        end
-      end
-      types
-    end
-
-    # returns array of phone types for check for current country data
-    #
-    # ==== Attributes
-    #
-    # * +data+  - country data hash
-    def types_for_check(data)
-      Core::TYPES_DESC.keys - PhoneAnalyzer::NOT_FOR_CHECK +
-          fixed_and_mobile_keys(data)
-    end
-
     # Gets matched number formatting rule or default one
     #
     # ==== Attributes
@@ -225,20 +158,6 @@ module Phonelib
       end || Core::DEFAULT_NUMBER_FORMAT
     end
 
-    # Checks if fixed line pattern and mobile pattern are the same and returns
-    # appropriate keys
-    #
-    # ==== Attributes
-    #
-    # * +data+  - country data
-    def fixed_and_mobile_keys(data)
-      if data[Core::FIXED_LINE] == data[Core::MOBILE]
-        [Core::FIXED_OR_MOBILE]
-      else
-        [Core::FIXED_LINE, Core::MOBILE]
-      end
-    end
-
     # Returns possible and valid patterns for validation for provided type
     #
     # ==== Attributes
@@ -255,27 +174,5 @@ module Phonelib
         [patterns[Core::POSSIBLE_PATTERN], patterns[Core::VALID_PATTERN]]
       end
     end
-
-    # Checks if passed number matches valid and possible patterns
-    #
-    # ==== Attributes
-    #
-    # * +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)
-      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
-      valid = false
-      if 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
-      end
-
-      [valid && possible, possible]
-    end
   end
 end