phonelib 0.6.2 → 0.6.3

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

@@ -47,15 +47,12 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-compiler-plugin</artifactId>
+        <version>2.0.2</version>
         <configuration>
           <source>1.6</source>
           <target>1.6</target>
         </configuration>
       </plugin>
-      <plugin>
-        <groupId>net.kindleit</groupId>
-        <artifactId>maven-gae-plugin</artifactId>
-      </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-assembly-plugin</artifactId>
@@ -80,13 +77,6 @@
           </execution>
         </executions>
       </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-war-plugin</artifactId>
-        <configuration>
-          <warSourceDirectory>webapp</warSourceDirectory>
-        </configuration>
-      </plugin>
       <plugin>
         <groupId>org.mortbay.jetty</groupId>
         <artifactId>maven-jetty-plugin</artifactId>

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

@@ -43,6 +43,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-compiler-plugin</artifactId>
+        <version>2.0.2</version>
         <configuration>
           <source>1.5</source>
           <target>1.5</target>
@@ -51,6 +52,7 @@
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>build-helper-maven-plugin</artifactId>
+        <version>1.9.1</version>
         <executions>
           <execution>
             <id>add-source</id>

data/lib/phonelib.rb

@@ -1,15 +1,16 @@
-# main module definition
+# main Phonelib module definition
 module Phonelib
-  # load gem classes
+  # load phonelib classes/modules
   autoload :Core, 'phonelib/core'
   autoload :Phone, 'phonelib/phone'
+  autoload :PhoneFormatter, 'phonelib/phone_formatter'
   autoload :PhoneAnalyzer, 'phonelib/phone_analyzer'
   autoload :PhoneAnalyzerHelper, 'phonelib/phone_analyzer_helper'
   autoload :PhoneExtendedData, 'phonelib/phone_extended_data'
 
-  extend Module.new {
-    include Core
-  }
+  extend Core
 end
 
-autoload :PhoneValidator, 'validators/phone_validator' if defined?(ActiveModel) || defined?(Rails)
+if defined?(ActiveModel) || defined?(Rails)
+  autoload :PhoneValidator, 'validators/phone_validator'
+end

data/lib/phonelib/core.rb

@@ -1,191 +1,222 @@
 module Phonelib
   # main module that includes all basic data and methods
   module Core
-    # variable will include hash with data for validation
+    # @private variable will include hash with data for validation
     @@phone_data = nil
 
     # getter for phone data for other modules of gem, can be used outside
+    # @return [Hash] all data for phone parsing
     def phone_data
       @@phone_data ||= load_data.freeze
     end
 
-    # used to cache frequently-used regular expressions
+    # @private used to cache frequently-used regular expressions
     @@phone_regexp_cache = {}
 
-    # getter for phone regexp cache (internal use only)
+    # @private getter for phone regexp cache (internal use only)
     def phone_regexp_cache
       @@phone_regexp_cache
     end
 
-    # variable for storing geo/carrier/timezone data
+    # @private variable for storing geo/carrier/timezone data
     @@phone_ext_data = nil
 
-    # getter for extended phone data
+    # @private getter for extended phone data
     def phone_ext_data
       @@phone_ext_data ||= load_ext_data.freeze
     end
 
-    # default country for parsing variable setting
+    # @private default country for parsing variable setting
     @@default_country = nil
 
     # getter method for default_country variable
+    # @return [String|nil] Default country set for parsing or nil
     def default_country
       @@default_country
     end
 
     # setter method for default_country variable
+    # @param country [String|Symbol] default country ISO2 code used for parsing
+    # @return [String|nil] Default country set for parsing or nil
     def default_country=(country)
       @@default_country = country
     end
 
-    # extension separator
+    # @private extension separator
     @@extension_separator = ';'
 
     # getter method for extension_separator variable
+    # @return [String] Default extension separator used for formatting
     def extension_separator
       @@extension_separator
     end
 
     # setter method for extension_separator variable
+    # @param separator [String] extension separator used for formatting
+    # @return [String] Default extension separator used for formatting
     def extension_separator=(separator)
       @@extension_separator = separator
     end
 
-    # extension separator symbols for parsing
+    # @private extension separator symbols for parsing
     @@extension_separate_symbols = '#;'
 
     # getter method for extension_separate_symbols variable
+    # @return [String] Default extension separator symbols used for parsing
     def extension_separate_symbols
       @@extension_separate_symbols
     end
 
     # setter method for extension_separate_symbols variable
+    # @param separator [String] extension separator symbols used for parsing
+    # @return [String] Default extension separator symbols used for parsing
     def extension_separate_symbols=(separator)
       @@extension_separate_symbols = separator
     end
 
-    # flag identifies whether to use special phone types, like short code
+    # @private flag identifies whether to use special phone types, \
+    #   like short code
     @@parse_special = false
 
     # getter for flag for special phone types parsing
+    # @return [Boolean] Flag defines whether to parse special phone types
     def parse_special
       @@parse_special
     end
 
     # setter for flag for special phone types parsing
+    # @param special [Boolean] parse special phone types value
+    # @return [Boolean] Flag defines whether to parse special phone types
     def parse_special=(special)
       @@parse_special = special
     end
 
-    # strict check for validator, doesn't sanitize number
+    # @private strict check for validator, doesn't sanitize number
     @@strict_check = false
 
     # getter for strict check flag
+    # @return [Boolean] Flag defines whether to do strict parsing check
     def strict_check
       @@strict_check
     end
 
     # setter for strict check flag
+    # @param strict [Boolean] make a strict parsing or not
+    # @return [Boolean] Flag defines whether to do strict parsing check
     def strict_check=(strict)
       @@strict_check = strict
     end
 
     # gem constants definition
 
-    # Main data file
+    # @private Main data file
     FILE_MAIN_DATA = 'data/phone_data.dat'
-    # Extended data file
+    # @private Extended data file
     FILE_EXT_DATA = 'data/extended_data.dat'
 
     # constants for phone types
 
     # Validation patterns keys constants
-    # General pattern for country key
+    # @private General pattern for country key
     GENERAL = :general_desc
-    # Freephone line pattern key
+    # @private Freephone line pattern key
     PREMIUM_RATE = :premium_rate
-    # Freephone line pattern key
+    # @private Freephone line pattern key
     TOLL_FREE = :toll_free
-    # Shared cost pattern key. The cost of this call is shared between caller
-    # and recipient, and is hence typically less than PREMIUM_RATE calls
+    # @private Shared cost pattern key. The cost of this call is shared
+    # between caller and recipient, and is hence typically less than
+    # PREMIUM_RATE calls
     SHARED_COST = :shared_cost
-    # VoIP pattern key. This includes TSoIP (Telephony Service over IP)
+    # @private VoIP pattern key. This includes TSoIP (Telephony Service over IP)
     VOIP = :voip
-    # A personal number is associated with a particular person, and may be
-    # routed to either a MOBILE or FIXED_LINE number.
+    # @private A personal number is associated with a particular person,
+    # and may be routed to either a MOBILE or FIXED_LINE number.
     PERSONAL_NUMBER = :personal_number
-    # Pager phone number pattern key
+    # @private Pager phone number pattern key
     PAGER = :pager
-    # Used for 'Universal Access Numbers' or 'Company Numbers'. They may be
-    # further routed to specific offices, but allow one number to be used for a
-    # company.
+    # @private Used for 'Universal Access Numbers' or 'Company Numbers'.
+    #   They may be further routed to specific offices, but allow one number
+    #   to be used for a company.
     UAN = :uan
-    # Used for 'Voice Mail Access Numbers'.
+    # @private Used for 'Voice Mail Access Numbers'.
     VOICEMAIL = :voicemail
-    # Fixed line pattern key
+    # @private Fixed line pattern key
     FIXED_LINE = :fixed_line
-    # Mobile phone number pattern key
+    # @private Mobile phone number pattern key
     MOBILE = :mobile
-    # In case MOBILE and FIXED patterns are the same, this type is returned
+    # @private In case MOBILE and FIXED patterns are the same,
+    #   this type is returned
     FIXED_OR_MOBILE = :fixed_or_mobile
-    # Short code
+    # @private Short code
     SHORT_CODE = :short_code
-    # emergency numbers
+    # @private emergency numbers
     EMERGENCY = :emergency
-    # carrier specific type
+    # @private carrier specific type
     CARRIER_SPECIFIC = :carrier_specific
-    # SMS Services only type
+    # @private SMS Services only type
     SMS_SERVICES = :sms_services
-    # expendad emergency type
+    # @private expendad emergency type
     EXPANDED_EMERGENCY = :expanded_emergency
-    # no international dialling type
+    # @private no international dialling type
     NO_INTERNATIONAL_DIALING = :no_international_dialling
-    # carrier services type
+    # @private carrier services type
     CARRIER_SERVICES = :carrier_services
-    # directory services
+    # @private directory services
     DIRECTORY_SERVICES = :directory_services
-    # standard rate type
+    # @private standard rate type
     STANDARD_RATE = :standard_rate
-    # carrier selection codes
+    # @private carrier selection codes
     CARRIER_SELECTION_CODES = :carrier_selection_codes
-    # area code optional type
+    # @private area code optional type
     AREA_CODE_OPTIONAL = :area_code_optional
 
     # Internal use keys for validations
-    # Valid regex pattern key
+    # @private Valid regex pattern key
     VALID_PATTERN = :national_number_pattern
-    # Possible regex pattern key
+    # @private Possible regex pattern key
     POSSIBLE_PATTERN = :possible_number_pattern
-    # National prefix key
+    # @private National prefix key
     NATIONAL_PREFIX = :national_prefix
-    # National prefix for parsing key
+    # @private National prefix for parsing key
     NATIONAL_PREFIX_FOR_PARSING = :national_prefix_for_parsing
-    # National prefix rule key
+    # @private National prefix rule key
     NATIONAL_PREFIX_RULE = :national_prefix_formatting_rule
-    # Country code key
+    # @private Country code key
     COUNTRY_CODE = :country_code
-    # Leading digits key
+    # @private Leading digits key
     LEADING_DIGITS = :leading_digits
-    # International prefix key
+    # @private International prefix key
     INTERNATIONAL_PREFIX = :international_prefix
-    # Main country for code key
+    # @private Main country for code key
     MAIN_COUNTRY_FOR_CODE = :main_country_for_code
-    # Double country prefix flag key
+    # @private Double country prefix flag key
     DOUBLE_COUNTRY_PREFIX_FLAG = :double_prefix
-    # Types key
+    # @private Types key
     TYPES = :types
-    # Formats key
+    # @private Formats key
     FORMATS = :formats
-    # Pattern key
+    # @private Pattern key
     PATTERN = :pattern
 
-    # Default number formatting data hash
+    # @private Area code possible types
+    AREA_CODE_TYPES = [FIXED_LINE, FIXED_OR_MOBILE, MOBILE]
+
+    # @private Area code countries for mobile type
+    AREA_CODE_MOBILE_COUNTRIES = %w(AR MX BR)
+
+    # @private Area code mobile phone token
+    AREA_CODE_MOBILE_TOKENS = {
+      'MX' => '1',
+      'AR' => '9'
+    }
+
+    # @private Default number formatting data hash
     DEFAULT_NUMBER_FORMAT = {
       pattern: '(\\d+)(\\d{3})(\\d{4})',
       format: '$1 $2 $3'
     }
 
-    # hash of all phone types with human representation
+    # @private hash of all phone types with human representation
     TYPES_DESC = {
       general_desc: 'General Pattern',
       premium_rate: 'Premium Rate',
@@ -212,74 +243,91 @@ module Phonelib
       area_code_optional: 'Are code optional'
     }
 
-    # short codes types keys
+    # @private short codes types keys
     SHORT_CODES = [
-        :short_code, :emergency, :carrier_specific, :sms_services,
-        :expanded_emergency, :no_international_dialling, :carrier_services,
-        :directory_services, :standard_rate, :carrier_selection_codes,
-        :area_code_optional
+      :short_code, :emergency, :carrier_specific, :sms_services,
+      :expanded_emergency, :no_international_dialling, :carrier_services,
+      :directory_services, :standard_rate, :carrier_selection_codes,
+      :area_code_optional
     ]
 
-    # Extended data prefixes hash key
+    # @private Extended data prefixes hash key
     EXT_PREFIXES = :prefixes
-    # Extended data geo names array key
+    # @private Extended data geo names array key
     EXT_GEO_NAMES = :geo_names
-    # Extended data timezones array key
+    # @private Extended data timezones array key
     EXT_TIMEZONES = :timezones
-    # Extended data carriers array key
+    # @private Extended data carriers array key
     EXT_CARRIERS = :carriers
-    # Extended data key for geoname in prefixes hash
+    # @private Extended data key for geoname in prefixes hash
     EXT_GEO_NAME_KEY = :g
-    # Extended data key for timezone in prefixes hash
+    # @private Extended data key for timezone in prefixes hash
     EXT_TIMEZONE_KEY = :t
-    # Extended data key for carrier in prefixes hash
+    # @private Extended data key for carrier in prefixes hash
     EXT_CARRIER_KEY = :c
 
     # method for parsing phone number.
     # On first run fills @@phone_data with data present in yaml file
+    # @param phone [String] the phone number to be parsed
+    # @param passed_country [nil|String|Symbol] country for phone parsing
+    # @return [Phonelib::Phone] parsed phone entity
     def parse(phone, passed_country = nil)
       Phonelib::Phone.new phone, passed_country
     end
 
     # method checks if passed phone number is valid
+    # @param phone_number [String] the phone number to be parsed
+    # @return [Boolean] phone valid or not
     def valid?(phone_number)
       parse(phone_number).valid?
     end
 
     # method checks if passed phone number is invalid
+    # @param phone_number [String] the phone number to be parsed
+    # @return [Boolean] phone invalid or not
     def invalid?(phone_number)
       parse(phone_number).invalid?
     end
 
     # method checks if passed phone number is possible
+    # @param phone_number [String] the phone number to be parsed
+    # @return [Boolean] phone possible or not
     def possible?(phone_number)
       parse(phone_number).possible?
     end
 
     # method checks if passed phone number is impossible
+    # @param phone_number [String] the phone number to be parsed
+    # @return [Boolean] phone impossible or not
     def impossible?(phone_number)
       parse(phone_number).impossible?
     end
 
     # method checks if passed phone number is valid for provided country
+    # @param phone_number [String] the phone number to be parsed
+    # @param country [String] ISO2 country code for phone parsing
+    # @return [Boolean] phone valid for specified country or not
     def valid_for_country?(phone_number, country)
       parse(phone_number, country).valid_for_country?(country)
     end
 
     # method checks if passed phone number is invalid for provided country
+    # @param phone_number [String] the phone number to be parsed
+    # @param country [String] ISO2 country code for phone parsing
+    # @return [Boolean] phone invalid for specified country or not
     def invalid_for_country?(phone_number, country)
       parse(phone_number, country).invalid_for_country?(country)
     end
 
     private
 
-    # Load data file into memory
+    # @private Load data file into memory
     def load_data
       data_file = "#{File.dirname(__FILE__)}/../../#{FILE_MAIN_DATA}"
       Marshal.load(File.binread(data_file))
     end
 
-    # Load extended data file into memory
+    # @private Load extended data file into memory
     def load_ext_data
       data_file = "#{File.dirname(__FILE__)}/../../#{FILE_EXT_DATA}"
       Marshal.load(File.binread(data_file))