phonelib 0.3.0 → 0.3.1

data/README.rdoc

@@ -48,13 +48,16 @@ Please note that passing blank value also fails.
 
 Additional options:
 
-  validates :attribute, phone: { possible: true, allow_blank: true }
+  validates :attribute, phone: { possible: true, allow_blank: true, types: [:voip, :mobile] }
 
 <tt>possible: true</tt> - enables validation to check whether the passed number is a possible phone number (not strict check).
 Refer to {Google libphonenumber}[http://code.google.com/p/libphonenumber/] for more information on it.
 
 <tt>allow_blank: true</tt> - when no value passed then validation passes
 
+<tt>types: :mobile</tt> or <tt>types: [:voip, :mobile]</tt> - allows to validate against specific phone types patterns,
+if mixed with <tt>possible</tt> will check if number is possible for specified type
+
 === Basic usage
 
 To check if phone number is valid simply run:
@@ -93,8 +96,9 @@ Returned value is object of <tt>Phonelib::Phone</tt> class which have following
 
 You can also fetch matched valid phone types
 
-  phone.types # returns array of all valid types
-  phone.type  # returns first element from array of all valid types
+  phone.types          # returns array of all valid types
+  phone.type           # returns first element from array of all valid types
+  phone.possible_types # returns array of all possible types
 
 Possible types:
 * <tt>:premium_rate</tt> - Premium Rate
@@ -134,3 +138,17 @@ Phone class has following attributes
 Gem includes data from Google libphonenumber which has regex patterns for validations.
 Valid patterns are more specific to phone type and country.
 Possible patterns as usual are patterns with number of digits in number.
+
+=== Development and tests
+
+Everyone can do whatever he wants, the only limit is your imagination.
+Just don't forget to write test before the pull request.
+In order to run test without Rails functionality simply use
+
+  bundle exec rake spec
+
+If you want to run including Rails environment, you need to set <tt>BUNDLE_GEMFILE</tt> while running the spec task, for example:
+
+  BUNDLE_GEMFILE=gemfiles/Gemfile.rails-3.2.x bundle exec rake spec
+
+Gemfiles can be found in <tt>gemfiles</tt> folder, there are gemfiles for Rails 3.1, 3.2 and 4.

data/data/PhoneNumberMetaData.xml

@@ -781,8 +781,8 @@
               )
             )
           </leadingDigits>
-          <!-- We exclude here several 294X four-digit area codes: 2940, 2942, 2945, 2946 and 2948 -
-               and several 38[3578]X four-digit area codes. -->
+          <!-- We exclude here several 294X four-digit area codes: 2940, 2942, 2945, 2946 and 2948,
+               2983, and several 38[3578]X four-digit area codes. -->
           <leadingDigits>
             9(?:
               2(?:
@@ -792,8 +792,9 @@
                 6[01346]|
                 80|
                 9(?:
-                  [17-9]|
-                  4[13479]
+                  [179]|
+                  4[13479]|
+                  8[0-24-9]
                 )
               )|
               3(?:
@@ -2419,8 +2420,7 @@
       <mobile>
         <nationalNumberPattern>
           6(?:
-            [0-24-689]\d|
-            3[0-7]|
+            [0-689]\d|
             7[0-2]
           )\d{5}|
           7\d{7}
@@ -2966,9 +2966,9 @@
     <!-- http://en.wikipedia.org/wiki/%2B55 -->
     <!-- http://www.itu.int/oth/T020200001D/en -->
     <territory id="BR" countryCode="55"
-               internationalPrefix="00(?:1[45]|2[135]|[34]1|43)"
+               internationalPrefix="00(?:1[45]|2[135]|31|4[13])"
                nationalPrefix="0"
-               nationalPrefixForParsing="0(?:(1[245]|2[135]|[34]1)(\d{10,11}))?"
+               nationalPrefixForParsing="0(?:(1[245]|2[135]|31|4[13])(\d{10,11}))?"
                nationalPrefixTransformRule="$2" mobileNumberPortableRegion="true">
       <!-- The national prefix for parsing here also contains a capturing group for the main number,
            since the carrier codes here may also be area codes, so we want to check the length of
@@ -3123,6 +3123,7 @@
             461|
             502|
             6(?:
+              0[12]|
               12|
               7[67]|
               8[78]|
@@ -4102,7 +4103,7 @@
         <numberFormat pattern="(\d)(\d{4})(\d{4})"
           nationalPrefixFormattingRule="($FG)"
           carrierCodeFormattingRule="$CC ($FG)">
-          <leadingDigits>2</leadingDigits>
+          <leadingDigits>22</leadingDigits>
           <format>$1 $2 $3</format>
         </numberFormat>
         <numberFormat pattern="(\d{2})(\d{3})(\d{4})"
@@ -4148,6 +4149,12 @@
           <leadingDigits>1</leadingDigits>
           <format>$1 $2 $3</format>
         </numberFormat>
+        <numberFormat pattern="(\d{5})(\d{4})"
+          nationalPrefixFormattingRule="($FG)"
+          carrierCodeFormattingRule="$CC ($FG)">
+          <leadingDigits>219</leadingDigits>
+          <format>$1 $2</format>
+        </numberFormat>
         <!-- Format some short numbers as a block. -->
         <numberFormat nationalPrefixFormattingRule="$FG"
           pattern="(\d{4,5})">
@@ -4184,8 +4191,11 @@
                   http://www.subtel.cl/index.php?option=com_content&view=article&id=3081:&catid=3:noticias
              -->
         <nationalNumberPattern>
+          2(?:
+            2\d{7}|
+            1962\d{4}
+          )|
           (?:
-            22|
             3[2-5]|
             [47][1-35]|
             5[1-3578]|
@@ -4491,8 +4501,8 @@
           </leadingDigits>
           <format>$1 $2 $3</format>
         </numberFormat>
-        <numberFormat pattern="(1[3-58]\d)(\d{4})(\d{4})" carrierCodeFormattingRule="$CC $FG">
-          <leadingDigits>1[3-58]</leadingDigits>
+        <numberFormat pattern="(\d{3})(\d{4})(\d{4})" carrierCodeFormattingRule="$CC $FG">
+          <leadingDigits>1[3-578]</leadingDigits>
           <format>$1 $2 $3</format>
         </numberFormat>
         <numberFormat pattern="(10800)(\d{3})(\d{4})">
@@ -4644,11 +4654,13 @@
         <exampleNumber>1012345678</exampleNumber>
       </fixedLine>
       <mobile>
+        <!-- 170, 176, 177 and 178 prefixes are introduced in early 2014 for 4G networks. -->
         <nationalNumberPattern>
           1(?:
             [38]\d|
             4[57]|
-            5[0-35-9]
+            5[0-35-9]|
+            7[06-8]
           )\d{8}
         </nationalNumberPattern>
         <possibleNumberPattern>\d{11}</possibleNumberPattern>
@@ -4806,10 +4818,7 @@
       </fixedLine>
       <mobile>
         <nationalNumberPattern>
-          5(?:
-            0[0-4]|
-            7[0-3]
-          )\d{5}|
+          57[0-3]\d{5}|
           6(?:
             [0-2]\d|
             30
@@ -5386,10 +5395,14 @@
             (?:
               18|
               90
-            )0
+            )0|
+            137
           </leadingDigits>
           <leadingDigits>
-            180|
+            1(?:
+              37|
+              80
+            )|
             900[1359]
           </leadingDigits>
           <format>$1 $2 $3</format>
@@ -5420,6 +5433,10 @@
           <leadingDigits>700</leadingDigits>
           <format>$1 $2 $3</format>
         </numberFormat>
+        <numberFormat pattern="(138)(\d{4})">
+          <leadingDigits>138</leadingDigits>
+          <format>$1 $2</format>
+        </numberFormat>
       </availableFormats>
       <generalDesc>
         <!-- When deciding whether to assume a leading 49 is a country code or not, the number is
@@ -5513,7 +5530,10 @@
         <exampleNumber>8001234567890</exampleNumber>
       </tollFree>
       <premiumRate>
+        <!-- Includes the more expensive of the "televoting" line numbers. See the shared cost
+             section for more information. -->
         <nationalNumberPattern>
+          137[7-9]\d{6}|
           900(?:
             [135]\d{6}|
             9\d{7}
@@ -5523,8 +5543,23 @@
         <exampleNumber>9001234567</exampleNumber>
       </premiumRate>
       <sharedCost>
-        <nationalNumberPattern>180\d{5,11}</nationalNumberPattern>
-        <possibleNumberPattern>\d{8,14}</possibleNumberPattern>
+        <!-- Includes some mass-traffic numbers, used for e.g. phone voting, raffles, since their
+             costs when dialling from a fixed-line phone is similar.
+             Prices:
+             http://www.billiger-telefonieren.de/0180-0137-0900-sonderrufnummern/
+             Documentation:
+             http://www.bundesnetzagentur.de/SharedDocs/Downloads/DE/Sachgebiete/Telekommunikation/Unternehmen_Institutionen/Nummerierung/Rufnummern/0137/0137_Nummernplan.pdf?__blob=publicationFile&v=2
+        -->
+        <nationalNumberPattern>
+          1(?:
+            3(?:
+              7[1-6]\d{6}|
+              8\d{4}
+            )|
+            80\d{5,11}
+          )
+        </nationalNumberPattern>
+        <possibleNumberPattern>\d{7,14}</possibleNumberPattern>
         <exampleNumber>18012345</exampleNumber>
       </sharedCost>
       <personalNumber>
@@ -5644,7 +5679,8 @@
               2[01]|
               4[0-25-9]
             )|
-            50[0-4]
+            50[0-4]|
+            70[1-3]
           )\d{4}
         </nationalNumberPattern>
         <exampleNumber>7674201234</exampleNumber>
@@ -6156,7 +6192,7 @@
              092 and with 5 and 6 for 96. -->
         <nationalNumberPattern>
           (?:
-            1(
+            1(?:
               3[23]\d|
               5(?:
                 [23]|
@@ -6905,26 +6941,38 @@
     <!-- Gabon -->
     <!-- http://www.itu.int/oth/T020200004E/en -->
     <!-- www.arcep.ga -->
-    <territory id="GA" countryCode="241" internationalPrefix="00" leadingZeroPossible="true">
+    <!-- Note: We cannot set nationalPrefix="0" while fixed line numbers can start with a zero
+         as this breaks parsing (it treats all leading zeros as national prefixes. -->
+    <territory id="GA" countryCode="241" internationalPrefix="00" leadingZeroPossible="true" >
       <availableFormats>
-        <numberFormat pattern="(0\d)(\d{2})(\d{2})(\d{2})">
+        <!-- If no leading zero was supplied, format with the national prefix. -->
+        <numberFormat pattern="(\d)(\d{2})(\d{2})(\d{2})" nationalPrefixFormattingRule="0$FG">
+          <leadingDigits>[2-7]</leadingDigits>
           <format>$1 $2 $3 $4</format>
         </numberFormat>
+        <!-- This already has a leading zero so we format is "as is". -->
+        <numberFormat pattern="(\d{2})(\d{2})(\d{2})(\d{2})">
+          <leadingDigits>0</leadingDigits>
+         <format>$1 $2 $3 $4</format>
+        </numberFormat>
       </availableFormats>
       <generalDesc>
-        <nationalNumberPattern>0\d{7}</nationalNumberPattern>
-        <possibleNumberPattern>\d{8}</possibleNumberPattern>
+        <nationalNumberPattern>0?\d{7}</nationalNumberPattern>
+        <possibleNumberPattern>\d{7,8}</possibleNumberPattern>
       </generalDesc>
       <!-- A 7-digit fixed-line plan was scheduled to be implemented on June 17, 2012 to unify fixed
-           line and mobile numbering. However, it seems that this has not happened; their own
-           website now lists numbers as "+241 01 44 68 11" and upon ringing numbers they will not
-           connect without the 0 from outside the country. This was last tested June 2013. -->
+           line and mobile numbering. However, this has only partially happened; mobile numbers can
+           now be dialed without a leading zero, but fixed line numbers still require it. Their own
+           website still lists fixed line numbers as "+241 01 44 68 11" and upon ringing they will
+           not connect from outside the country without the 0. This was last tested March 2014. -->
       <fixedLine>
         <nationalNumberPattern>01\d{6}</nationalNumberPattern>
+        <possibleNumberPattern>\d{8}</possibleNumberPattern>
         <exampleNumber>01441234</exampleNumber>
       </fixedLine>
       <mobile>
-        <nationalNumberPattern>0[2-7]\d{6}</nationalNumberPattern>
+        <!-- Mobile numbers can be 7 or 8 digits (with or without a leading zero). -->
+        <nationalNumberPattern>0?[2-7]\d{6}</nationalNumberPattern>
         <exampleNumber>06031234</exampleNumber>
       </mobile>
     </territory>
@@ -7552,6 +7600,7 @@
               58|
               84
             )|
+            800|
             938
           )\d{4}
         </nationalNumberPattern>
@@ -7561,7 +7610,7 @@
         <nationalNumberPattern>
           473(?:
             4(?:
-              0[3-79]|
+              0[2-79]|
               1[04-9]|
               20|
               58
@@ -7569,7 +7618,8 @@
             5(?:
               2[01]|
               3[3-8]
-            )
+            )|
+            901
           )\d{4}
         </nationalNumberPattern>
         <possibleNumberPattern>\d{10}</possibleNumberPattern>
@@ -7917,9 +7967,12 @@
       <mobile>
         <nationalNumberPattern>
           (?:
-            2[034678]|
-            5[047]
-          )\d{7}
+            2[034678]\d|
+            5(?:
+              [047]\d|
+              54
+            )
+          )\d{6}
         </nationalNumberPattern>
         <possibleNumberPattern>\d{9}</possibleNumberPattern>
         <exampleNumber>231234567</exampleNumber>
@@ -8977,6 +9030,11 @@
         <nationalNumberPattern>[1-9]\d{7,8}</nationalNumberPattern>
         <possibleNumberPattern>\d{6,9}</possibleNumberPattern>
       </generalDesc>
+      <noInternationalDialling>
+        <nationalNumberPattern>[48]0\d{6}</nationalNumberPattern>
+        <possibleNumberPattern>\d{8}</possibleNumberPattern>
+        <exampleNumber>80123456</exampleNumber>
+      </noInternationalDialling>
       <fixedLine>
         <!-- Includes numbers for corporate networks. -->
         <nationalNumberPattern>
@@ -9034,7 +9092,7 @@
                nationalPrefix="0" nationalPrefixFormattingRule="$NP$FG">
       <availableFormats>
         <numberFormat nationalPrefixFormattingRule="($NP$FG)"
-          pattern="(\d{2})(\d{7,8})">
+          pattern="(\d{2})(\d{5,8})">
           <leadingDigits>
             2[124]|
             [36]1
@@ -9064,8 +9122,8 @@
           <leadingDigits>800</leadingDigits>
           <format>$1 $2</format>
         </numberFormat>
-        <numberFormat pattern="(809)(\d)(\d{3})(\d{3})">
-          <leadingDigits>809</leadingDigits>
+        <numberFormat pattern="(80\d)(\d)(\d{3})(\d{3})">
+          <leadingDigits>80[79]</leadingDigits>
           <format>$1 $2 $3 $4</format>
         </numberFormat>
       </availableFormats>
@@ -9078,10 +9136,15 @@
              http://www.telkom.co.id/customer-services/area-and-country-code/?type=area.
              We also added 0770 after user feedback because it seems to be used on Bintan island.
              Where known, fixed mobile prefixes have been represented as Mobile. -->
+        <!-- Very short (5/6 digit) local numbers in Jakarta seem to be special cases for various
+             well known companies (Mc Donalds, KFC etc...). Some of these are listed in:
+             http://cms.binus.edu/datapage/file/io/Spring2014SE/International_Student_Handbook_BINUS.pdf -->
         <nationalNumberPattern>
           2(?:
             1(?:
+              14\d{3}|
               [0-8]\d{6,7}|
+              500\d{3}|
               9\d{6}
             )|
             [24]\d{7,8}
@@ -9243,6 +9306,16 @@
         <possibleNumberPattern>\d{8,11}</possibleNumberPattern>
         <exampleNumber>8001234567</exampleNumber>
       </tollFree>
+      <uan>
+        <nationalNumberPattern>8071\d{6}</nationalNumberPattern>
+        <possibleNumberPattern>\d{10}</possibleNumberPattern>
+        <exampleNumber>8071123456</exampleNumber>
+      </uan>
+      <noInternationalDialling>
+        <nationalNumberPattern>8071\d{6}</nationalNumberPattern>
+        <possibleNumberPattern>\d{10}</possibleNumberPattern>
+        <exampleNumber>8071123456</exampleNumber>
+      </noInternationalDialling>
       <!-- The information below is provided by an Indonesian -->
       <premiumRate>
         <nationalNumberPattern>809\d{7}</nationalNumberPattern>
@@ -9564,7 +9637,7 @@
             47\d|
             6(?:
               5\d|
-              8[08]
+              8[068]
             )|
             7\d{2}|
             8(?:
@@ -9697,6 +9770,7 @@
          <numberFormat pattern="(\d{2})(\d{2})(\d{6})">
            <leadingDigits>
              7(?:
+               0[2-4]|
                2[0579]|
                3[057-9]|
                4[0-389]|
@@ -9719,6 +9793,11 @@
            </leadingDigits>
            <leadingDigits>
              7(?:
+               0(?:
+                 2[2-9]|
+                 3|
+                 4[0-7]
+               )|
                2(?:
                  0[04-9]|
                  5[09]|
@@ -10183,6 +10262,11 @@
         <nationalNumberPattern>
           (?:
             7(?:
+              0(?:
+                2[2-9]|
+                3\d|
+                4[0-7]
+              )|
               2(?:
                 0[04-9]|
                 5[09]|
@@ -12567,7 +12651,8 @@
              started issuing fixed-line numbers like this. Apparently, mobile-company-issued
              fixed-line numbers are one digit longer than government-issued numbers. Moreover, the
              range beginning with 6 seems to include some numbers that are one digit longer as well.
-             Allowing 238\d{6} based on information from Cambodia Yellow Pages. -->
+             Allowing 238\d{6} and 234[234]\d{4} based on information from Cambodia Yellow Pages.
+             Note that numbers beginning with 234 are split across two patterns. -->
         <nationalNumberPattern>
           (?:
             2[3-6]|
@@ -12580,7 +12665,10 @@
             5\d|
             6\d?
           )\d{5}|
-          238\d{6}
+          23(?:
+            4[234]|
+            8\d{2}
+          )\d{4}
         </nationalNumberPattern>
         <possibleNumberPattern>\d{6,9}</possibleNumberPattern>
         <exampleNumber>23756789</exampleNumber>
@@ -12652,7 +12740,8 @@
       <!-- Numbers should be formatted as a block." -->
       <generalDesc>
         <nationalNumberPattern>
-          [2-58]\d{4}|
+          [2458]\d{4}|
+          3\d{4,7}|
           7\d{7}
         </nationalNumberPattern>
         <possibleNumberPattern>\d{5,8}</possibleNumberPattern>
@@ -12682,6 +12771,11 @@
         <possibleNumberPattern>\d{8}</possibleNumberPattern>
         <exampleNumber>72012345</exampleNumber>
       </mobile>
+      <premiumRate>
+        <!-- ITU refers to these as "Telemedia and audiotext". -->
+        <nationalNumberPattern>3001\d{4}</nationalNumberPattern>
+        <exampleNumber>30010000</exampleNumber>
+      </premiumRate>
     </territory>
 
     <!-- Comoros -->
@@ -12744,7 +12838,7 @@
             )|
             302|
             4(?:
-              6[5-9]|
+              6[015-9]|
               70
             )
           )\d{4}
@@ -12764,7 +12858,8 @@
           )\d{4}
         </nationalNumberPattern>
         <possibleNumberPattern>\d{10}</possibleNumberPattern>
-        <exampleNumber>8695561234</exampleNumber>
+        <!-- Example number from the ITU document. -->
+        <exampleNumber>8697652917</exampleNumber>
       </mobile>
       <tollFree>
         <nationalNumberPattern>
@@ -13421,25 +13516,36 @@
         <numberFormat pattern="([2-8]\d)(\d{3})(\d{3})">
           <leadingDigits>
             2[13]|
-            [3-8]
+            3[14]|
+            [4-8]
           </leadingDigits>
           <format>$1 $2 $3</format>
         </numberFormat>
+        <numberFormat pattern="(30)(\d{2})(\d{2})(\d{3})">
+          <leadingDigits>30</leadingDigits>
+          <format>$1 $2 $3 $4</format>
+        </numberFormat>
       </availableFormats>
       <generalDesc>
         <nationalNumberPattern>[2-8]\d{7,9}</nationalNumberPattern>
         <possibleNumberPattern>\d{6,10}</possibleNumberPattern>
       </generalDesc>
       <fixedLine>
+        <!-- The Lonely Planet says that newer WIN phones (fixed phones without a physical landline)
+             start with 030 (and are longer). There are plenty of examples online. -->
         <nationalNumberPattern>
           (?:
             2[13]|
-            [35-7][14]|
+            3(?:
+              0\d|
+              [14]
+            )|
+            [5-7][14]|
             41|
             8[1468]
           )\d{6}
         </nationalNumberPattern>
-        <possibleNumberPattern>\d{6,8}</possibleNumberPattern>
+        <possibleNumberPattern>\d{6,9}</possibleNumberPattern>
         <exampleNumber>21212862</exampleNumber>
       </fixedLine>
       <mobile>
@@ -13545,26 +13651,22 @@
         <possibleNumberPattern>\d{7}(?:\d{3})?</possibleNumberPattern>
       </generalDesc>
       <fixedLine>
-        <!-- Adding 430 and 572 since numbers have been found with these prefixes online. -->
+        <!-- Adding 430 since numbers have been found with these prefixes online. -->
         <nationalNumberPattern>
           758(?:
-            234|
             4(?:
               30|
               5[0-9]|
               6[2-9]|
               8[0-2]
             )|
-            572|
-            638|
-            758
+            57[0-2]|
+            638
           )\d{4}
         </nationalNumberPattern>
-        <exampleNumber>7582345678</exampleNumber>
+        <exampleNumber>7584305678</exampleNumber>
       </fixedLine>
       <mobile>
-        <!-- Adding 72[1256] as these prefixes are found widely on the internet and SMS messages
-             have been successfully delivered to these numbers. -->
         <nationalNumberPattern>
           758(?:
             28[4-7]|
@@ -13580,7 +13682,7 @@
             )|
             7(?:
               1[2-9]|
-              2[0-6]
+              2[0-8]
             )
           )\d{4}
         </nationalNumberPattern>
@@ -13815,12 +13917,12 @@
       <availableFormats>
         <!-- Formatting from Ministry of Agriculture,
         http://www.moa.gov.lr/content.php?sub=Email&?related=Contacts -->
-        <numberFormat pattern="([279]\d)(\d{3})(\d{3})">
-          <leadingDigits>[279]</leadingDigits>
+        <numberFormat pattern="(2\d)(\d{3})(\d{3})">
+          <leadingDigits>2</leadingDigits>
           <format>$1 $2 $3</format>
         </numberFormat>
-        <numberFormat pattern="(7\d{2})(\d{3})(\d{3})">
-          <leadingDigits>7</leadingDigits>
+        <numberFormat pattern="([79]\d{2})(\d{3})(\d{3})">
+          <leadingDigits>[79]</leadingDigits>
           <format>$1 $2 $3</format>
         </numberFormat>
         <numberFormat pattern="([4-6])(\d{3})(\d{3})">
@@ -13834,12 +13936,9 @@
       </availableFormats>
       <generalDesc>
         <nationalNumberPattern>
-          (?:
-            [29]\d|
-            [4-6]|
-            7\d{1,2}|
-            [38]\d{2}
-          )\d{6}
+          2\d{7}|
+          [37-9]\d{8}|
+          [45]\d{6}
         </nationalNumberPattern>
         <possibleNumberPattern>\d{7,9}</possibleNumberPattern>
       </generalDesc>
@@ -13849,34 +13948,38 @@
         <exampleNumber>21234567</exampleNumber>
       </fixedLine>
       <mobile>
-        <!-- According to information from Lonestar Communications Corporation, the prefix 6 is
-             being removed, but as of June 2012 is in parallel running with their new prefix 88.
-             According to Cellcom Liberia, they have issued 9 digit numbers starting with 77. -->
+        <!-- West Africa Telecom seems to be a mobile company from their website. Adding Atlantic
+             Wireless from the document, even though from online news reports it is not clear they
+             are still operating. -->
         <nationalNumberPattern>
           (?:
+            330\d|
             4[67]|
             5\d|
-            6[4-8]|
-            77?\d{2}|
-            88\d{2}
+            77\d{2}|
+            88\d{2}|
+            994\d
           )\d{5}
         </nationalNumberPattern>
-        <exampleNumber>4612345</exampleNumber>
+        <exampleNumber>770123456</exampleNumber>
       </mobile>
       <premiumRate>
-        <!-- Telemedia service is listed under premium rate. -->
-        <!-- Note that as of March 2013, the ITU document talks about the withdrawal of the range
-             (90) 0 XXX XXX. This is a 9 digit range and one we have never supported, but this could
-             be a mistake in the ITU document and refer to (90) 0XX XXX. However as this is unclear
-             at the moment, we decided to leave the (90) range unchanged for now. -->
-        <nationalNumberPattern>90\d{6}</nationalNumberPattern>
-        <possibleNumberPattern>\d{8}</possibleNumberPattern>
-        <exampleNumber>90123456</exampleNumber>
+        <!-- Telelinks and Interactive media service are listed under premium rate. -->
+        <nationalNumberPattern>90[03]\d{6}</nationalNumberPattern>
+        <possibleNumberPattern>\d{9}</possibleNumberPattern>
+        <exampleNumber>900123456</exampleNumber>
       </premiumRate>
       <voip>
         <!-- The plan lists the following range as being assigned to TEMAS. On their homepage they
-             say they are involved in the VoIP sector. -->
-        <nationalNumberPattern>33200\d{4}</nationalNumberPattern>
+             say they are involved in the VoIP sector. Adding WASSCOM and Atlantic Realty &
+             Investment Corporation here as well; no numbers can be found online, nor company
+             information. -->
+        <nationalNumberPattern>
+          332(?:
+            0[02]|
+            5\d
+          )\d{4}
+        </nationalNumberPattern>
         <possibleNumberPattern>\d{9}</possibleNumberPattern>
         <exampleNumber>332001234</exampleNumber>
       </voip>
@@ -15623,7 +15726,7 @@
               [013568]\d|
               2[4-7]
             )|
-            5(
+            5(?:
               44\d|
               471
             )|
@@ -16129,7 +16232,7 @@
         <numberFormat pattern="([28]\d)(\d{3})(\d{3,4})">
           <leadingDigits>
             2|
-            8[246]
+            8[2-7]
           </leadingDigits>
           <format>$1 $2 $3</format>
         </numberFormat>
@@ -16155,7 +16258,7 @@
         <exampleNumber>21123456</exampleNumber>
       </fixedLine>
       <mobile>
-        <nationalNumberPattern>8[246]\d{7}</nationalNumberPattern>
+        <nationalNumberPattern>8[23467]\d{7}</nationalNumberPattern>
         <possibleNumberPattern>\d{9}</possibleNumberPattern>
         <exampleNumber>821234567</exampleNumber>
       </mobile>
@@ -16309,7 +16412,7 @@
       <voip>
         <!-- Including virtual telephone and VOIP services. -->
         <nationalNumberPattern>
-          8(
+          8(?:
             3\d{2}|
             86
           )\d{5}
@@ -16412,12 +16515,12 @@
         <exampleNumber>20201234</exampleNumber>
       </fixedLine>
       <mobile>
-        <!-- Added 90, 91, 92, 97, 98 & 99 from online data. Airtel have confirmed that they use the
-             89 and 97 prefixes, and Orange use 92. -->
+        <!-- Added 90, 91, 92, 95, 97, 98 & 99 from online data. Airtel have confirmed that they use the
+             89 and 97 prefixes, and Orange use 92. MOOV started using 95 in Jan 2014. -->
         <nationalNumberPattern>
           (?:
             89|
-            9[0-46-9]
+            9\d
           )\d{6}
         </nationalNumberPattern>
         <exampleNumber>93123456</exampleNumber>
@@ -17499,8 +17602,7 @@
       <mobile>
         <nationalNumberPattern>
           (?:
-            [27]\d{2}|
-            3[0-79]\d|
+            [237]\d{2}|
             411|
             89\d{3}
           )\d{3}
@@ -18071,17 +18173,9 @@
           </leadingDigits>
           <format>$1 $2 $3 $4</format>
         </numberFormat>
-        <numberFormat pattern="(\d{2})(\d{4,6})">
-          <!-- Pattern for shorter fixed-line numbers. -->
-          <leadingDigits>
-            [124]|
-            3[2-4]|
-            5[24-689]|
-            6[1-3578]|
-            7[14-7]|
-            8[1-7]
-          </leadingDigits>
-          <format>$1 $2</format>
+        <numberFormat pattern="(\d{2})(\d{1})(\d{4})">
+          <leadingDigits>[12]2</leadingDigits>
+          <format>$1 $2 $3</format>
         </numberFormat>
         <!-- We are formatting 70 numbers as per mobile numbers, based on information from some
              Poles that this is more usual. -->
@@ -18107,14 +18201,16 @@
       </availableFormats>
       <generalDesc>
         <nationalNumberPattern>
-          [1-58]\d{6,8}|
-          9\d{8}|
-          [67]\d{5,8}
+          [12]\d{6,8}|
+          [3-57-9]\d{8}|
+          6\d{5,8}
         </nationalNumberPattern>
         <possibleNumberPattern>\d{6,9}</possibleNumberPattern>
       </generalDesc>
       <fixedLine>
-        <!-- Grouped by prefix-length. -->
+        <!-- The plan says all geographical numbers are 9 digits; but in at least Warsaw (22) and
+             Krakow (12) we have found internationally diallable numbers that are 7 digits instead,
+             so we support those too. -->
         <nationalNumberPattern>
           (?:
             1[2-8]|
@@ -18123,14 +18219,11 @@
             4[1-468]|
             5[24-689]|
             6[1-3578]|
-            7[14-6]|
-            8[1-7]
-          )\d{5,7}|
-          77\d{4,7}|
-          (?:
-            89|
+            7[14-7]|
+            8[1-79]|
             9[145]
-          )\d{7}
+          )\d{7}|
+          [12]2\d{5}
         </nationalNumberPattern>
         <exampleNumber>123456789</exampleNumber>
       </fixedLine>
@@ -18147,8 +18240,8 @@
         <exampleNumber>512345678</exampleNumber>
       </mobile>
       <pager>
-        <nationalNumberPattern>642\d{3,6}</nationalNumberPattern>
-        <exampleNumber>642123456</exampleNumber>
+        <nationalNumberPattern>64\d{4,7}</nationalNumberPattern>
+        <exampleNumber>641234567</exampleNumber>
       </pager>
       <tollFree>
         <nationalNumberPattern>800\d{6}</nationalNumberPattern>
@@ -20778,9 +20871,11 @@
         <exampleNumber>1100</exampleNumber>
       </noInternationalDialling>
       <fixedLine>
+        <!-- Numbers online have been found that start with 20, despite the ITU doc not covering
+             these. -->
         <nationalNumberPattern>
           (?:
-            2[1-9]|
+            2\d|
             3[2-9]|
             4[2-5]|
             5[2-6]|
@@ -20808,8 +20903,8 @@
       </premiumRate>
       <voip>
         <!-- The ITU document says that the 89 prefix is also VOIP but there are lots of numbers
-             online to suggest they are actually used as mobile numbers -->
-        <nationalNumberPattern>60\d{7}</nationalNumberPattern>
+             online to suggest they are actually used as mobile numbers. -->
+        <nationalNumberPattern>6[08]\d{7}</nationalNumberPattern>
         <possibleNumberPattern>\d{9}</possibleNumberPattern>
         <exampleNumber>601234567</exampleNumber>
       </voip>
@@ -21407,8 +21502,8 @@
       <availableFormats>
         <numberFormat pattern="([2-8])(\d{3,4})(\d{4})">
           <leadingDigits>
-            [2-7]|
-            8[1-9]
+            [2-6]|
+            [78][1-9]
           </leadingDigits>
           <format>$1 $2 $3</format>
         </numberFormat>
@@ -21419,10 +21514,17 @@
           </leadingDigits>
           <format>$1 $2 $3</format>
         </numberFormat>
+        <numberFormat pattern="(70)(\d{4})(\d{4})">
+          <leadingDigits>70</leadingDigits>
+          <format>$1 $2 $3</format>
+        </numberFormat>
       </availableFormats>
       <generalDesc>
-        <nationalNumberPattern>[2-9]\d{7,8}</nationalNumberPattern>
-        <possibleNumberPattern>\d{8,9}</possibleNumberPattern>
+        <nationalNumberPattern>
+          [2-689]\d{7,8}|
+          7\d{7,9}
+        </nationalNumberPattern>
+        <possibleNumberPattern>\d{8,10}</possibleNumberPattern>
       </generalDesc>
       <fixedLine>
         <nationalNumberPattern>[2-8]\d{7,8}</nationalNumberPattern>
@@ -21444,6 +21546,12 @@
         <possibleNumberPattern>\d{9}</possibleNumberPattern>
         <exampleNumber>900123456</exampleNumber>
       </premiumRate>
+      <!-- http://www.chief.com.tw/telecom_eng/front/bin/ptlist.phtml?Category=107 -->
+      <voip>
+        <nationalNumberPattern>70\d{8}</nationalNumberPattern>
+        <possibleNumberPattern>\d{10}</possibleNumberPattern>
+        <exampleNumber>7012345678</exampleNumber>
+      </voip>
     </territory>
 
     <!-- Tanzania -->
@@ -22266,7 +22374,7 @@
                 7[079]
               )
             )|
-            9(
+            9(?:
               2(?:
                 1[1267]|
                 5\d|
@@ -22448,8 +22556,8 @@
       <mobile>
         <!-- We have no information on mobile numbers from the Vatican. It is probable that they use
              Italian mobile contracts. -->
-        <nationalNumberPattern>N/A</nationalNumberPattern>
-        <possibleNumberPattern>N/A</possibleNumberPattern>
+        <nationalNumberPattern>NA</nationalNumberPattern>
+        <possibleNumberPattern>NA</possibleNumberPattern>
       </mobile>
       <!-- No information exists about other types of numbers. -->
     </territory>
@@ -22463,6 +22571,8 @@
         <nationalNumberPattern>[5789]\d{9}</nationalNumberPattern>
         <possibleNumberPattern>\d{7}(?:\d{3})?</possibleNumberPattern>
       </generalDesc>
+      <!-- For 570, 571 and 572 prefixes, we believe the ITU doc incorrectly listed them to be under
+           area code 758, which should be 784. -->
       <fixedLine>
         <nationalNumberPattern>
           784(?:
@@ -22475,10 +22585,13 @@
             4(?:
               38|
               5[0-36-8]|
-              8\d|
-              9[01]
+              8[0-8]
+            )|
+            5(?:
+              55|
+              7[0-2]|
+              93
             )|
-            555|
             638|
             784
           )\d{4}
@@ -22486,19 +22599,17 @@
         <exampleNumber>7842661234</exampleNumber>
       </fixedLine>
       <mobile>
-        <!-- Adding 784 433 and 784 534 since online numbers can be found with these prefixes, and
-             the latter seems, according to some online sources, to be assigned to Digicell. -->
         <nationalNumberPattern>
           784(?:
             4(?:
               3[0-4]|
               5[45]|
-              9[2-5]
+              89|
+              9[0-5]
             )|
             5(?:
               2[6-9]|
-              3[0-4]|
-              93
+              3[0-4]
             )
           )\d{4}
         </nationalNumberPattern>

data/lib/phonelib/core.rb

@@ -143,7 +143,7 @@ module Phonelib
     # Load data file into memory
     def load_data
       data_file = File.dirname(__FILE__) + '/../../data/phone_data.dat'
-      Marshal.load(File.read(data_file))
+      Marshal.load(File.binread(data_file))
     end
   end
 end

data/lib/phonelib/phone.rb

@@ -37,6 +37,11 @@ module Phonelib
       @data.flat_map { |iso2, data| data[:valid] }.uniq
     end
 
+    # Returns all possible types that matched possible patterns
+    def possible_types
+      @data.flat_map { |iso2, data| data[:possible] }.uniq
+    end
+
     # Returns first phone type that matched
     def type
       types.first

data/lib/phonelib/phone_analyzer.rb

@@ -17,7 +17,7 @@ module Phonelib
 
       result = try_to_parse_single_country(phone, country)
       # if previous parsing failed, trying for all countries
-      if result.nil? || result.values.first[:valid].empty?
+      if result.nil? || result.empty? || result.values.first[:valid].empty?
         result = detect_and_parse phone
       end
       result

data/lib/phonelib/version.rb

@@ -1,5 +1,5 @@
 # :nodoc:
 module Phonelib
   # :nodoc:
-  VERSION = '0.3.0'
+  VERSION = '0.3.1'
 end

data/lib/validators/phone_validator.rb

@@ -25,16 +25,43 @@
 #     attr_accessible :number
 #     validates :number, phone: { allow_blank: true }
 #   end
+#
+# Validates that attribute is a valid phone number of specified type(s).
+# It is also possible to check that attribute is a possible number of specified
+# type(s). Symbol or array accepted.
+#
+#   class Phone < ActiveRecord::Base
+#     attr_accessible :number, :mobile
+#     validates :number, phone: { types: [:mobile, :fixed], allow_blank: true }
+#     validates :mobile, phone: { possible: true, types: :mobile  }
+#   end
+#
+
 class PhoneValidator < ActiveModel::EachValidator
   # Include all core methods
   include Phonelib::Core
 
   # Validation method
   def validate_each(record, attribute, value)
+    return if options[:allow_blank] && value.blank?
+
     phone = parse(value)
-    valid = options[:possible] ? phone.possible? : phone.valid?
-    valid = true if options[:allow_blank] && phone.original.blank?
+    if options[:types]
+      method = options[:possible] ? :possible_types : :types
+      valid = (phone.send(method) & types).size > 0
+    else
+      method = options[:possible] ? :possible? : :valid?
+      valid = phone.send(method)
+    end
 
     record.errors.add(attribute, options[:message] || :invalid) unless valid
   end
+
+  private
+
+  def types
+    types = options[:types].is_a?(Array) ? options[:types] : [options[:types]]
+    types.map &:to_sym
+  end
+
 end

metadata

@@ -1,74 +1,82 @@
 --- !ruby/object:Gem::Specification
 name: phonelib
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
+  prerelease: 
 platform: ruby
 authors:
 - Vadim Senderovich
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-09 00:00:00.000000000 Z
+date: 2014-05-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-description: |2
-      Google libphonenumber library was taken as a basis for
-      this gem. Gem uses its data file for validations and number formatting.
+description: ! "    Google libphonenumber library was taken as a basis for\n    this
+  gem. Gem uses its data file for validations and number formatting.\n"
 email:
 - daddyzgm@gmail.com
 executables: []
@@ -77,42 +85,47 @@ extra_rdoc_files: []
 files:
 - data/phone_data.dat
 - data/PhoneNumberMetaData.xml
-- lib/phonelib.rb
-- lib/phonelib/version.rb
-- lib/phonelib/phone_analyzer.rb
-- lib/phonelib/phone.rb
-- lib/phonelib/core.rb
 - lib/validators/phone_validator.rb
 - lib/tasks/phonelib_tasks.rake
+- lib/phonelib/phone.rb
+- lib/phonelib/core.rb
+- lib/phonelib/version.rb
+- lib/phonelib/phone_analyzer.rb
+- lib/phonelib.rb
 - MIT-LICENSE
 - Rakefile
 - README.rdoc
 homepage: https://github.com/daddyz/phonelib
 licenses:
 - MIT
-metadata: {}
-post_install_message: |2
-      IMPORTANT NOTICE!
-      Phone types were changed from camel case to snake case!
-      Example: ":tollFree" changed to ":toll_free".
-      Please update your app in case you are checking types!
+post_install_message: ! "    IMPORTANT NOTICE!\n    Phone types were changed from
+  camel case to snake case!\n    Example: \":tollFree\" changed to \":toll_free\".\n
+  \   Please update your app in case you are checking types!\n"
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -1226309370824333791
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -1226309370824333791
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 1.8.23
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: Gem validates phone numbers with Google libphonenumber database
 test_files: []

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: 29055d1498d5685ac059d21d2ab2fef9a6041a32
-  data.tar.gz: 8d5047983bdac17132ad444f953522b3271fe593
-SHA512:
-  metadata.gz: ac7f6c81df3e37071500ad19757b105b6937b87b6cae4d43d3ea944c85fc3f093dcad848c176ca00f59d33e2cd5ced6ece6d04e48f69aa3e2b5b044c632fb3a4
-  data.tar.gz: 0af44748bfe52bc18dfae1c36ee1f1de8870b04f318db8bc9a07a3c0c1dc1acf27653ed5aeaa3eacd0812c2a091787ee5f445bf7f16a8725f6eb9366e5d257a3