telephone_number 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 02f11c8fa7070815c05cde535d3edc3364a562de
-  data.tar.gz: 0f275f02c5f79f178febfaa876a04348e31d6b13
+  metadata.gz: 6d1182623bbe38dba05f732f29020d92b4e3bf06
+  data.tar.gz: b27bc63b6dd33e0310ee271a89e08d9b9a4c7e8e
 SHA512:
-  metadata.gz: 06f0513469c217c5823d72bf943b9ee2876f71d154f55961e6b36210346cc8a08fcba4edd78e3ea6f982c1b1a4a84186024bb6af048f9a74a63d0143c953ea6c
-  data.tar.gz: 87ef4aaec4af3c8467b45a786ffc6c3746871689744c11b0bb3131248f380d33ed20cc5a5006296daa394c0f003ed10a775bcd2ad2a6c0864cb7ab24262f24d5
+  metadata.gz: 1c9df0dffe26550bfa71de2083dcaf9a8b45fa936a548e75f5fcf6c9cc7248016e366e1e3b38c3f9a8a74deae28b34b18c4dadd391c66ea83ebc723c7006ee8c
+  data.tar.gz: c6f5876994fadb4cc44095e311548309703ffcec06ef5661512ab1fe9416340cea732b95b18d2230ea10dd754ef21c810d9dbf75c42febc79f09f302143073e6

data/.hound.yml

@@ -1,3 +1,4 @@
 fail_on_violations: true
+
 ruby:
-  config_file: .ruby.yml
+  config_file: .rubocop.yml

data/{.ruby.yml → .rubocop.default.yml}

@@ -1,3 +1,5 @@
+# These are all the cops that are enabled in the default configuration.
+
 Style/AccessModifierIndentation:
   Description: Check indentation of private/protected visibility modifiers.
   StyleGuide: '#indent-public-private-protected'
@@ -964,6 +966,8 @@ Style/ZeroLengthPredicate:
   Description: 'Use #empty? when testing for objects of length 0.'
   Enabled: true
 
+#################### Metrics ###############################
+
 Metrics/AbcSize:
   Description: >-
                  A calculated magnitude based on number of assignments,
@@ -1015,6 +1019,9 @@ Metrics/PerceivedComplexity:
                  human reader.
   Enabled: true
 
+#################### Lint ##################################
+### Warnings
+
 Lint/AmbiguousOperator:
   Description: >-
                  Checks for ambiguous operators in the first argument of a
@@ -1272,6 +1279,7 @@ Lint/UselessAccessModifier:
   Description: 'Checks for useless access modifiers.'
   Enabled: true
   ContextCreatingMethods: []
+  MethodCreatingMethods: []
 
 Lint/UselessAssignment:
   Description: 'Checks for useless assignment to a local variable.'
@@ -1294,6 +1302,8 @@ Lint/Void:
   Description: 'Possible use of operator/literal/variable in void context.'
   Enabled: true
 
+#################### Performance ###########################
+
 Performance/Casecmp:
   Description: >-
              Use `casecmp` rather than `downcase ==`, `upcase ==`, `== downcase`, or `== upcase`..
@@ -1400,7 +1410,9 @@ Performance/RedundantSortBy:
   Enabled: true
 
 Performance/RegexpMatch:
-  Description: 'Use `match?` instead of `Regexp#match`, `String#match`, `Symbol#match`, `Regexp#===` or `=~` when `MatchData` is not used.'
+  Description: >-
+                  Use `match?` instead of `Regexp#match`, `String#match`, `Symbol#match`,
+                  `Regexp#===`, or `=~` when `MatchData` is not used.
   Enabled: true
 
 Performance/ReverseEach:
@@ -1447,6 +1459,8 @@ Performance/TimesMap:
   Description: 'Checks for .times.map calls.'
   Enabled: true
 
+#################### Rails #################################
+
 Rails/ActionFilter:
   Description: 'Enforces consistent use of action filter methods.'
   Enabled: true
@@ -1569,6 +1583,8 @@ Rails/Validation:
   Description: 'Use validates :attribute, hash of validations.'
   Enabled: true
 
+#################### Security ##############################
+
 Security/Eval:
   Description: 'The use of eval represents a serious security risk.'
   Enabled: true
@@ -1597,6 +1613,8 @@ Security/YAMLLoad:
   Reference: 'https://ruby-doc.org/stdlib-2.3.3/libdoc/yaml/rdoc/YAML.html#module-YAML-label-Security'
   Enabled: true
 
+#################### Bundler ###############################
+
 Bundler/DuplicatedGem:
   Description: 'Checks for duplicate gem entries in Gemfile.'
   Enabled: true

data/.rubocop.yml

@@ -0,0 +1,4 @@
+inherit_from: .rubocop.default.yml
+
+Style/StringLiterals:
+  EnforcedStyle: single_quotes

data/.travis.yml

@@ -1,7 +1,9 @@
 sudo: false
 language: ruby
 rvm:
-  - 2.1.0
-  - 2.2.5
-  - 2.3.0
+  - 2.0.0-p648
+  - 2.1.10
+  - 2.2.6
+  - 2.3.3
+  - 2.4.0
 before_install: gem install bundler -v 1.13.7

data/{LICENSE.txt → LICENSE}

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2017 Adam Fernung
+Copyright (c) 2017 MOBI Wireless Management
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/README.md

@@ -1,6 +1,8 @@
+[![Code Climate](https://codeclimate.com/github/mobi/telephone_number/badges/gpa.svg)](https://codeclimate.com/github/mobi/telephone_number)
+
 # What is it?
 
-TelephoneNumber is global phone number validation gem based on Google's [libphonenumber](https://www.google.com) library. We're currently providing parsing and validation functionality and are actively working on formatting as well as providing extended data. 
+TelephoneNumber is global phone number validation gem based on Google's [libphonenumber](https://github.com/googlei18n/libphonenumber) library. We're currently providing parsing and validation functionality and are actively working on formatting as well as providing extended data.
 
 ## Installation
 
@@ -25,39 +27,44 @@ TelephoneNumber requires a country when parsing and validating phone numbers.
 **To validate a phone number:**
 
     TelephoneNumber.valid?("(555) 555-5555", "US") ==> false
-    
-You can pass an optional array of keys to check the validity against. 
+
+You can pass an optional array of keys to check the validity against.
 
     TelephoneNumber.valid?("(555) 555-5555", "US", [:mobile, :fixed_line]) ==> false
 
 **To parse a phone number:**
 
-    TelephoneNumber.parse("(317) 508-3348", "US") ==>  
-        
-        #<TelephoneNumber::Number:0x007fe3bc146cf0 
-          @country="US", 
+    TelephoneNumber.parse("(317) 508-3348", "US") ==>
+
+        #<TelephoneNumber::Number:0x007fe3bc146cf0
+          @country="US",
           @e164_number="13175083348",
           @national_number="3175083348",
           @original_number="3175083348">
-          
+
 **To fetch valid types:**
 
     TelephoneNumber.parse("(317) 508-3348", "US").valid_types ==>  ["mobile", "fixed_line"]
-    
+
+**To format nationally:**
+
+    TelephoneNumber.parse("(317) 508-3348", "US").national_number ==> "(317) 508-3348"
+    TelephoneNumber.parse("(317) 508-3348", "US").national_number(formatted: false) ==> "3175083348"
+
 ## Configuration
 
-In the event that you need to override the data that Google is providing, you can do so by setting an override file. This file is expected to be in the same format as Google's as well as serialized using Marshal. 
+In the event that you need to override the data that Google is providing, you can do so by setting an override file. This file is expected to be in the same format as Google's as well as serialized using Marshal.
 
-To generate a serialized override file: 
+To generate a serialized override file:
 
     TelephoneNumber.generate_override_file("/path/to/file")
-    
+
 In this instance, `/path/to/file` represents an xml file that has your custom data in the same structure that Google's data is in.
 
 You can set the override file with:
-    
+
     TelephoneNumber.override_file = "/path/to_file.dat"
-    
+
 ## Todo
 
 - Build custom validator to integrate with Rails
@@ -68,7 +75,9 @@ You can set the override file with:
 
 After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake test` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
 
-To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).
+While developing new functionality, you may want to test against specific phone numbers. In order to do this, add the number to `lib/telephone_number/test_data_generator.rb` and then run `rake data:test:import`. This command will reach out to the demo application provided by Google and pull the correct formats to test against.
+
+To install this gem onto your local machine, run `bundle exec rake install`.
 
 ## Contributing
 

data/Rakefile

@@ -16,4 +16,10 @@ namespace :data do
       TelephoneNumber::DataImporter.new(File.expand_path("data/telephone_number_data_file.xml")).import!
     end
   end
+
+  namespace :test do
+    task :import  do
+      TelephoneNumber::TestDataGenerator.import!
+    end
+  end
 end

data/data/telephone_number_data_file.xml

@@ -870,11 +870,8 @@
                mobileNumberPortableRegion="true">
       <references>
         <sourceUrl>http://www.itu.int/oth/T0202000009/en</sourceUrl>
-        <!-- On the following link, click on Indicativos Interurbanos to access detailed
-             information. -->
-        <sourceUrl>http://www.cnc.gov.ar/infotecnica/numeracion/Index.asp</sourceUrl>
-        <!-- Download XLS spreadsheet from "Númeración Geográfica" link on following page: -->
-        <sourceUrl>http://www.cnc.gob.ar/asignaciones-a-la-fecha_p445</sourceUrl>
+        <sourceUrl>https://www.enacom.gob.ar/indicativos-de-servicio_p141</sourceUrl>
+        <sourceUrl>https://www.enacom.gob.ar/indicativos-interurbanos_p143</sourceUrl>
         <sourceUrl>http://en.wikipedia.org/wiki/+54</sourceUrl>
       </references>
       <availableFormats>
@@ -1356,7 +1353,7 @@
           )
         </nationalNumberPattern>
         <possibleNumberPattern>\d{6,11}</possibleNumberPattern>
-        <possibleLengths national="11" localOnly="6,7,8"/>
+        <possibleLengths national="10,11" localOnly="6,7,8"/>
         <exampleNumber>91123456789</exampleNumber>
       </mobile>
       <tollFree>
@@ -6575,8 +6572,7 @@
         <exampleNumber>21360003</exampleNumber>
       </fixedLine>
       <mobile>
-        <!-- 77[0-2] added from numbers found online and user reports. -->
-        <nationalNumberPattern>77[0-26-8]\d{5}</nationalNumberPattern>
+        <nationalNumberPattern>77\d{6}</nationalNumberPattern>
         <possibleLengths national="8"/>
         <exampleNumber>77831001</exampleNumber>
       </mobile>
@@ -8110,37 +8106,49 @@
 
     <!-- United Kingdom -->
     <!-- Note that this excludes Isle of Man, Jersey and Guernsey prefixes for the purposes of
-         validation, although the formatting rules are shared. -->
+         validation, although the formatting rules are shared. Also numbers are fine-grained where
+         needed in order to disambiguate between the 4 regions. -->
     <territory id="GB" countryCode="44" internationalPrefix="00"
                nationalPrefix="0" preferredExtnPrefix=" x" nationalPrefixFormattingRule="$NP$FG"
                mainCountryForCode="true" mobileNumberPortableRegion="true">
       <references>
+        <sourceUrl>http://static.ofcom.org.uk/static/numbering/</sourceUrl>
         <sourceUrl>http://stakeholders.ofcom.org.uk/telecoms/numbering/</sourceUrl>
         <sourceUrl>http://en.wikipedia.org/wiki/List_of_United_Kingdom_dialling_codes</sourceUrl>
         <sourceUrl>http://www.numberingplans.com/?page=dialling&amp;sub=areacodes&amp;ac=GB</sourceUrl>
       </references>
       <availableFormats>
-        <!-- 2d, 55, 56, 70 and 76 pager numbers (excludes 7624) with 10 digits. -->
-        <numberFormat pattern="(\d{2})(\d{4})(\d{4})">
+        <!-- 7ddd (not 70, 76) with 10 digits. Includes 76242 for IM. -->
+        <numberFormat pattern="(7\d{3})(\d{6})">
           <leadingDigits>
-            2|
-            5[56]|
             7(?:
-              0|
-              6[013-9]
+              [1-5789]|
+              62
             )
           </leadingDigits>
           <leadingDigits>
-            2|
-            5[56]|
             7(?:
-              0|
-              6(?:
-                [013-9]|
-                2[0-35-9]
-              )
+              [1-5789]|
+              624
+            )
+          </leadingDigits>
+          <leadingDigits>
+            7(?:
+              [1-5789]|
+              6242
             )
           </leadingDigits>
+          <format>$1 $2</format>
+        </numberFormat>
+        <!-- 2d, 55, 56, 70 and 76 pager numbers (excludes 76242) with 10 digits. We aren't
+             fine-grained about 76 in the leading digits here for easier maintenance, and this works
+             because the above format applies to 76242 due to ordering. -->
+        <numberFormat pattern="(\d{2})(\d{4})(\d{4})">
+          <leadingDigits>
+            2|
+            5[56]|
+            7[06]
+          </leadingDigits>
           <format>$1 $2 $3</format>
         </numberFormat>
         <!-- 11d, 1d1, 3dd, 9dd with 10 digits. -->
@@ -8201,22 +8209,6 @@
           <leadingDigits>1</leadingDigits>
           <format>$1 $2</format>
         </numberFormat>
-        <!-- 7ddd (not 70, 76) with 10 digits. Note: DOES include 7624 when used for IM. -->
-        <numberFormat pattern="(7\d{3})(\d{6})">
-          <leadingDigits>
-            7(?:
-              [1-5789]|
-              62
-            )
-          </leadingDigits>
-          <leadingDigits>
-            7(?:
-              [1-5789]|
-              624
-            )
-          </leadingDigits>
-          <format>$1 $2</format>
-        </numberFormat>
         <!-- 800 1111 : UK ChildLine. -->
         <numberFormat pattern="(800)(\d{4})">
           <leadingDigits>800</leadingDigits>
@@ -8582,29 +8574,41 @@
              7100-7599, 7700-7999 with 10 digits; excluding ranges used in GG, IM, JE. -->
         <nationalNumberPattern>
           7(?:
-            [1-4]\d\d|
+            [1-3]\d{3}|
+            4(?:
+              [0-46-9]\d{2}|
+              5(?:
+                [0-689]\d|
+                7[0-57-9]
+              )
+            )|
             5(?:
               0[0-8]|
               [13-9]\d|
               2[0-35-9]
-            )|
+            )\d|
             7(?:
-              0[1-9]|
-              [1-7]\d|
-              8[02-9]|
-              9[0-689]
+              0(?:
+                0[01]|
+                [1-9]\d
+              )|
+              [1-7]\d{2}|
+              8[02-9]\d|
+              9[0-689]\d
             )|
             8(?:
               [014-9]\d|
               [23][0-8]
-            )|
+            )\d|
             9(?:
-              [04-9]\d|
-              1[02-9]|
-              2[0-35-9]|
-              3[0-689]
+              [024-9]\d{2}|
+              1(?:
+                [02-9]\d|
+                1[028]
+              )|
+              3[0-689]\d
             )
-          )\d{6}
+          )\d{5}
         </nationalNumberPattern>
         <possibleNumberPattern>\d{10}</possibleNumberPattern>
         <possibleLengths national="10"/>
@@ -8614,15 +8618,18 @@
         <!-- 76 with 10 digits; excluding ranges used in IM. -->
         <nationalNumberPattern>
           76(?:
-            0[012]|
-            2[356]|
-            4[0134]|
-            5[49]|
-            6[0-369]|
-            77|
-            81|
-            9[39]
-          )\d{6}
+            0[012]\d|
+            2(?:
+              [356]\d|
+              4[013-9]
+            )|
+            4[0134]\d|
+            5[49]\d|
+            6[0-369]\d|
+            77\d|
+            81\d|
+            9[39]\d
+          )\d{5}
         </nationalNumberPattern>
         <possibleNumberPattern>\d{10}</possibleNumberPattern>
         <possibleLengths national="10"/>
@@ -8953,10 +8960,13 @@
     </territory>
 
     <!-- Guernsey -->
-    <!-- Inherits formatting rules from the UK. -->
+    <!-- Inherits formatting rules from the UK. Note that the numbers are fine-grained where
+         needed in order to disambiguate between the 4 regions i.e UK, Isle of Man, Jersey
+         and Guernsey. -->
     <territory id="GG" countryCode="44" internationalPrefix="00"
                nationalPrefix="0" preferredExtnPrefix=" x" nationalPrefixFormattingRule="$NP$FG">
       <references>
+        <sourceUrl>http://static.ofcom.org.uk/static/numbering/</sourceUrl>
         <sourceUrl>http://en.wikipedia.org/wiki/Telephone_numbers_in_the_United_Kingdom</sourceUrl>
       </references>
       <generalDesc>
@@ -8977,13 +8987,12 @@
         <exampleNumber>1481456789</exampleNumber>
       </fixedLine>
       <mobile>
-        <!-- 7781, 7839, 7911 with 10 digits. -->
         <nationalNumberPattern>
           7(?:
-            781|
-            839|
-            911
-          )\d{6}
+            781\d|
+            839\d|
+            911[17]
+          )\d{5}
         </nationalNumberPattern>
         <possibleNumberPattern>\d{10}</possibleNumberPattern>
         <possibleLengths national="10"/>
@@ -9150,8 +9159,7 @@
           (?:
             2[034678]\d|
             5(?:
-              [047]\d|
-              5[3-6]|
+              [0457]\d|
               6[01]
             )
           )\d{6}
@@ -10426,7 +10434,11 @@
           </leadingDigits>
           <format>$1 $2</format>
         </numberFormat>
-        <numberFormat pattern="(8\d{2})(\d{3,4})(\d{3,5})">
+        <numberFormat pattern="(8\d{2})(\d{3,4})(\d{3})">
+          <leadingDigits>8[1-35-9]</leadingDigits>
+          <format>$1-$2-$3</format>
+        </numberFormat>
+        <numberFormat pattern="(8\d{2})(\d{4})(\d{4,5})">
           <leadingDigits>8[1-35-9]</leadingDigits>
           <format>$1-$2-$3</format>
         </numberFormat>
@@ -11039,10 +11051,13 @@
     </territory>
 
     <!-- Isle of Man -->
-    <!-- Inherits formatting rules from the UK. -->
+    <!-- Inherits formatting rules from the UK. Note that the numbers are fine-grained where
+         needed in order to disambiguate between the 4 regions i.e UK, Isle of Man, Jersey
+         and Guernsey. -->
     <territory id="IM" countryCode="44" internationalPrefix="00"
                nationalPrefix="0" preferredExtnPrefix=" x" nationalPrefixFormattingRule="$NP$FG">
       <references>
+        <sourceUrl>http://static.ofcom.org.uk/static/numbering/</sourceUrl>
         <sourceUrl>http://en.wikipedia.org/wiki/Telephone_numbers_in_the_United_Kingdom</sourceUrl>
       </references>
       <generalDesc>
@@ -11063,12 +11078,22 @@
         <exampleNumber>1624456789</exampleNumber>
       </fixedLine>
       <mobile>
-        <!-- 7524, 7624, 7924 with 10 digits. -->
-        <nationalNumberPattern>7[569]24\d{6}</nationalNumberPattern>
+        <nationalNumberPattern>
+          7(?:
+            4576|
+            [59]24\d
+          )\d{5}
+        </nationalNumberPattern>
         <possibleNumberPattern>\d{10}</possibleNumberPattern>
         <possibleLengths national="10"/>
         <exampleNumber>7924123456</exampleNumber>
       </mobile>
+      <pager>
+        <nationalNumberPattern>76242\d{5}</nationalNumberPattern>
+        <possibleNumberPattern>\d{10}</possibleNumberPattern>
+        <possibleLengths national="10"/>
+        <exampleNumber>7624212345</exampleNumber>
+      </pager>
       <tollFree>
         <!-- 808 162 with 10 digits. -->
         <nationalNumberPattern>808162\d{4}</nationalNumberPattern>
@@ -11140,23 +11165,17 @@
     </territory>
 
    <!-- India -->
-    <!-- Note that several changes in area codes have occurred since the numbering plan was released
-         - fixed line changes are notified on the http://www.bsnl.co.in website. Area codes can be
-         verified here at http://dq.ndc.bsnl.co.in/bsnl-web/stdSearch.seam. -->
     <territory id="IN" countryCode="91" internationalPrefix="00" nationalPrefix="0"
                leadingZeroPossible="true" nationalPrefixFormattingRule="$NP$FG"
                nationalPrefixOptionalWhenFormatting="true" mobileNumberPortableRegion="true">
       <references>
         <sourceUrl>http://www.itu.int/oth/T0202000063/en</sourceUrl>
         <sourceUrl>http://en.wikipedia.org/wiki/%2B91</sourceUrl>
-        <sourceUrl>http://www.coai.in/msccodes.php</sourceUrl>
-        <sourceUrl>http://www.dot.gov.in/access-services/allotment-msc-codes</sourceUrl>
+        <sourceUrl>http://www.bsnl.co.in</sourceUrl>
+        <sourceUrl>http://dq.ndc.bsnl.co.in/bsnl-web/stdSearch.seam</sourceUrl>
       </references>
       <availableFormats>
-        <!-- This format is for mobile numbers. Note: 8912 is mentioned as Airtel's mobile number
-             range in their IR.21 doc but these are landline numbers as per online results. As it
-             is not clear we support 8912 as FIXED_LINE_OR_MOBILE and format these numbers in
-             fixed-line way. -->
+        <!-- Mobile numbers. We also use this pattern for FIXED_LINE_OR_MOBILE numbers. -->
         <numberFormat pattern="(\d{5})(\d{5})">
           <leadingDigits>
             7(?:
@@ -11230,7 +11249,7 @@
                 1[7-9]|
                 2[089]|
                 4[1-9]|
-                60
+                6[07]
               )|
               [45]|
               6(?:
@@ -11250,14 +11269,13 @@
               )|
               9(?:
                 [035-9]|
-                19|
+                1[29]|
                 2[2-9]|
                 4[0-8]
               )
             )|
             9
           </leadingDigits>
-          <!-- For 5 digit prefix mobile numbers. -->
           <leadingDigits>
             7(?:
               0|
@@ -11419,7 +11437,10 @@
                   8[0-6]
                 )|
                 4[1-9]|
-                60
+                6(?:
+                  0|
+                  7[02-7]
+                )
               )|
               [45]|
               6(?:
@@ -11443,7 +11464,7 @@
               )|
               9(?:
                 [035-9]|
-                19|
+                1[29]|
                 2[2-9]|
                 4[0-8]
               )
@@ -11452,7 +11473,7 @@
           </leadingDigits>
           <format>$1 $2</format>
         </numberFormat>
-        <!-- 2 digits area code -->
+        <!-- 2-digit area codes. -->
         <numberFormat pattern="(\d{2})(\d{4})(\d{4})">
           <leadingDigits>
             11|
@@ -11464,7 +11485,7 @@
           </leadingDigits>
           <format>$1 $2 $3</format>
         </numberFormat>
-        <!-- 3 digit area codes that don't clash with mobile patterns. -->
+        <!-- 3-digit area codes. -->
         <numberFormat pattern="(\d{3})(\d{3})(\d{4})">
           <leadingDigits>
             1(?:
@@ -11520,13 +11541,7 @@
               6[13]|
               7[14]|
               80
-            )
-          </leadingDigits>
-          <format>$1 $2 $3</format>
-        </numberFormat>
-        <!-- Three-digit area codes that potentially overlap with mobile. -->
-        <numberFormat pattern="(\d{3})(\d{3})(\d{4})">
-          <leadingDigits>
+            )|
             7(?:
               12|
               2[14]|
@@ -11535,26 +11550,7 @@
               5[15]|
               [67]1|
               88
-            )
-          </leadingDigits>
-          <leadingDigits>
-            7(?:
-              12|
-              2[14]|
-              3[134]|
-              4[47]|
-              5(?:
-                1|
-                5[2-6]
-              )|
-              [67]1|
-              88
-            )
-          </leadingDigits>
-          <format>$1 $2 $3</format>
-        </numberFormat>
-        <numberFormat pattern="(\d{3})(\d{3})(\d{4})">
-          <leadingDigits>
+            )|
             8(?:
               16|
               2[014]|
@@ -11567,8 +11563,7 @@
           </leadingDigits>
           <format>$1 $2 $3</format>
         </numberFormat>
-        <!-- 4 digits area code -->
-        <!-- Fallback for fixed-line numbers. -->
+        <!-- 4-digit area codes. -->
         <numberFormat pattern="(\d{4})(\d{3})(\d{3})">
           <leadingDigits>
             1(?:
@@ -11583,40 +11578,34 @@
           <leadingDigits>008</leadingDigits>
           <format>$1 $2 $3 $4</format>
         </numberFormat>
-        <numberFormat nationalPrefixFormattingRule="$FG"
-          pattern="(1600)(\d{2})(\d{4})">
+        <numberFormat nationalPrefixFormattingRule="$FG" pattern="(\d{3})(\d{3})(\d{4})">
+          <leadingDigits>140</leadingDigits>
+          <format>$1 $2 $3</format>
+        </numberFormat>
+        <numberFormat nationalPrefixFormattingRule="$FG" pattern="(\d{4})(\d{2})(\d{4})">
           <leadingDigits>160</leadingDigits>
           <leadingDigits>1600</leadingDigits>
           <format>$1 $2 $3</format>
         </numberFormat>
-        <numberFormat nationalPrefixFormattingRule="$FG"
-          pattern="(1800)(\d{4,5})">
+        <numberFormat nationalPrefixFormattingRule="$FG" pattern="(\d{4})(\d{4,5})">
           <leadingDigits>180</leadingDigits>
           <leadingDigits>1800</leadingDigits>
           <format>$1 $2</format>
         </numberFormat>
-        <numberFormat nationalPrefixFormattingRule="$FG"
-          pattern="(18[06]0)(\d{2,4})(\d{4})">
-          <leadingDigits>18[06]</leadingDigits>
-          <leadingDigits>18[06]0</leadingDigits>
+        <numberFormat nationalPrefixFormattingRule="$FG" pattern="(\d{4})(\d{2,4})(\d{4})">
+          <leadingDigits>180</leadingDigits>
+          <leadingDigits>1800</leadingDigits>
           <format>$1 $2 $3</format>
         </numberFormat>
-        <numberFormat nationalPrefixFormattingRule="$FG"
-          pattern="(140)(\d{3})(\d{4})">
-          <leadingDigits>140</leadingDigits>
+        <numberFormat nationalPrefixFormattingRule="$FG" pattern="(\d{4})(\d{3,4})(\d{4})">
+          <leadingDigits>186</leadingDigits>
+          <leadingDigits>1860</leadingDigits>
           <format>$1 $2 $3</format>
         </numberFormat>
-        <!-- Televoting numbers. Formatting information is from
+        <!-- Formatting information for the televoting numbers is from
              http://www.bsnl.co.in/service/telev.htm -->
-        <numberFormat nationalPrefixFormattingRule="$FG"
-          pattern="(\d{4})(\d{3})(\d{3})(\d{3})">
+        <numberFormat nationalPrefixFormattingRule="$FG" pattern="(\d{4})(\d{3})(\d{3})(\d{3})">
           <leadingDigits>18[06]</leadingDigits>
-          <leadingDigits>
-            18(?:
-              0[03]|
-              6[12]
-            )
-          </leadingDigits>
           <format>$1 $2 $3 $4</format>
         </numberFormat>
       </availableFormats>
@@ -11844,7 +11833,7 @@
              numbers. It seems almost impossible to know for some of these numbers whether they are
              land-line or mobile, since the ranges overlap. We go to a maximum depth of five where
              necessary to distinguish between mobile and fixed-line numbers. Extra prefixes added:
-             72878, 74209, 74599, 7601, 768[56], 7695, 8309, 83293, 863[89]0 and 8639[29]. New
+             72878, 74209, 74599, 7601, 768[56], 7695, 8309, 8329[34], 863[89]0 and 8639[29]. New
              prefixes were also added based on the document provided from mobile carriers:
              https://github.com/googlei18n/libphonenumber/issues/260 and
              https://github.com/googlei18n/libphonenumber/pull/692/ -->
@@ -12026,10 +12015,13 @@
                 2(?:
                   0\d|
                   8[0-6]|
-                  93
+                  9[34]
                 )|
                 4[1-9]\d|
-                60\d
+                6(?:
+                  0\d|
+                  7[02-7]
+                )
               )|
               [45]\d{3}|
               6(?:
@@ -12729,10 +12721,13 @@
     </territory>
 
     <!-- Jersey -->
-    <!-- Inherits formatting rules from the UK. -->
+    <!-- Inherits formatting rules from the UK. Note that the numbers are fine-grained where
+         needed in order to disambiguate between the 4 regions i.e UK, Isle of Man, Jersey
+         and Guernsey. -->
     <territory id="JE" countryCode="44" internationalPrefix="00"
                nationalPrefix="0" preferredExtnPrefix=" x" nationalPrefixFormattingRule="$NP$FG">
       <references>
+        <sourceUrl>http://static.ofcom.org.uk/static/numbering/</sourceUrl>
         <sourceUrl>http://en.wikipedia.org/wiki/Telephone_numbers_in_the_United_Kingdom</sourceUrl>
         <sourceUrl>http://www.jcra.je/cms3/v2/public/cmsChild.asp?pageID=1024&amp;childID=1036</sourceUrl>
       </references>
@@ -12754,21 +12749,20 @@
         <exampleNumber>1534456789</exampleNumber>
       </fixedLine>
       <mobile>
-        <!-- 7509, 7700, 7797, 7829, 7937 with 10 digits. -->
         <nationalNumberPattern>
           7(?:
-            509|
+            509\d|
             7(?:
-              00|
-              97
+              00[378]|
+              97[7-9]
             )|
-            829|
-            937
-          )\d{6}
+            829\d|
+            937\d
+          )\d{5}
         </nationalNumberPattern>
         <possibleNumberPattern>\d{10}</possibleNumberPattern>
         <possibleLengths national="10"/>
-        <exampleNumber>7797123456</exampleNumber>
+        <exampleNumber>7797712345</exampleNumber>
       </mobile>
       <pager>
         <!-- Pager numbers as per GB. -->
@@ -16333,11 +16327,11 @@
             5(?:
               2(?:
                 [2-48]|
-                90
+                9[0-7]
               )|
               3(?:
                 [5-79]|
-                80
+                8[0-7]
               )|
               924
             )|
@@ -16390,34 +16384,20 @@
         <nationalNumberPattern>
           5(?:
             2(?:
-              (?:
-                [015-7]\d|
-                2[02-9]|
-                3[2-57]|
-                4[2-8]|
-                8[235-7]
-              )\d|
-              9(?:
-                0\d|
-                [89]0
-              )
-            )|
+              [015-79]\d|
+              2[02-9]|
+              3[2-57]|
+              4[2-8]|
+              8[235-7]
+            )\d|
             3(?:
-              (?:
-                [0-4]\d|
-                [57][2-9]|
-                6[2-8]|
-                9[3-9]
-              )\d|
-              8(?:
-                0\d|
-                [89]0
-              )
-            )|
-            (?:
-              4[067]|
-              5[03]
-            )\d{2}
+              [0-48]\d|
+              [57][2-9]|
+              6[2-8]|
+              9[3-9]
+            )\d|
+            4[067]\d{2}|
+            5[03]\d{2}
           )\d{4}
         </nationalNumberPattern>
         <possibleLengths national="9"/>
@@ -17581,11 +17561,11 @@
         <exampleNumber>596301234</exampleNumber>
       </fixedLine>
       <mobile>
-        <!-- The prefix 69653 is a valid number which was found online in few websites. -->
+        <!-- 6965[2-4] were found in use online. -->
         <nationalNumberPattern>
           696(?:
             [0-479]\d|
-            5[013]|
+            5[0-4]|
             8[0-689]
           )\d{4}
         </nationalNumberPattern>
@@ -18434,7 +18414,7 @@
         <exampleNumber>21123456</exampleNumber>
       </fixedLine>
       <mobile>
-        <nationalNumberPattern>8[23467]\d{7}</nationalNumberPattern>
+        <nationalNumberPattern>8[2-7]\d{7}</nationalNumberPattern>
         <possibleNumberPattern>\d{9}</possibleNumberPattern>
         <possibleLengths national="9"/>
         <exampleNumber>821234567</exampleNumber>
@@ -21240,14 +21220,15 @@
       <references>
         <sourceUrl>http://www.itu.int/oth/T02020000AC/en</sourceUrl>
         <sourceUrl>http://en.wikipedia.org/wiki/Telephone_numbers_in_Romania</sourceUrl>
+        <sourceUrl>http://www.ancom.org.ro/en/presentation-of-romanian-national-numbering-plan-according-to-itu-t-recommendation-e129-_5523</sourceUrl>
       </references>
       <availableFormats>
         <numberFormat pattern="(\d{2})(\d{3})(\d{4})">
           <leadingDigits>[23]1</leadingDigits>
           <format>$1 $2 $3</format>
         </numberFormat>
-        <numberFormat pattern="(21)(\d{4})">
-          <leadingDigits>21</leadingDigits>
+        <numberFormat pattern="(\d{2})(\d{4})">
+          <leadingDigits>[23]1</leadingDigits>
           <format>$1 $2</format>
         </numberFormat>
         <numberFormat pattern="(\d{3})(\d{3})(\d{3})">
@@ -21267,8 +21248,8 @@
       </availableFormats>
       <generalDesc>
         <nationalNumberPattern>
-          2\d{5,8}|
-          [37-9]\d{8}
+          [23]\d{5,8}|
+          [7-9]\d{8}
         </nationalNumberPattern>
         <!-- Although the ITU plan says the number plan is open, this was changed in 2008 according
              to wikipedia and people must dial the full number. However, there are still short
@@ -21292,7 +21273,10 @@
               \d9\d{2}
             )
           )|
-          3[13-6]\d{7}
+          3(?:
+            1\d{4}(?:\d{3})?|
+            [3-6]\d{7}
+          )
         </nationalNumberPattern>
         <possibleLengths national="6,9"/>
         <exampleNumber>211234567</exampleNumber>
@@ -26366,12 +26350,23 @@
       <references>
         <sourceUrl>http://www.itu.int/oth/T02020000C1/en</sourceUrl>
         <sourceUrl>http://en.wikipedia.org/wiki/Telephone_numbers_in_South_Africa</sourceUrl>
+        <sourceUrl>
+          https://www.icasa.org.za/Portals/0/Regulations/Regulations/NumberingPlanReg.pdf
+        </sourceUrl>
       </references>
       <availableFormats>
         <numberFormat pattern="(860)(\d{3})(\d{3})">
           <leadingDigits>860</leadingDigits>
           <format>$1 $2 $3</format>
         </numberFormat>
+        <numberFormat pattern="(\d{2})(\d{3,4})">
+          <leadingDigits>8[1-4]</leadingDigits>
+          <format>$1 $2</format>
+        </numberFormat>
+        <numberFormat pattern="(\d{2})(\d{3})(\d{2,3})">
+          <leadingDigits>8[1-4]</leadingDigits>
+          <format>$1 $2 $3</format>
+        </numberFormat>
         <numberFormat pattern="(\d{2})(\d{3})(\d{4})">
           <leadingDigits>
             [1-79]|
@@ -26382,32 +26377,19 @@
           </leadingDigits>
           <format>$1 $2 $3</format>
         </numberFormat>
-        <numberFormat pattern="(\d{2})(\d{3,4})">
-          <leadingDigits>8[1-4]</leadingDigits>
-          <format>$1 $2</format>
-        </numberFormat>
-        <numberFormat pattern="(\d{2})(\d{3})(\d{2,3})">
-          <leadingDigits>8[1-4]</leadingDigits>
-          <format>$1 $2 $3</format>
-        </numberFormat>
       </availableFormats>
       <generalDesc>
         <nationalNumberPattern>
           [1-79]\d{8}|
-          8(?:
-            [05-7]\d{7}|
-            [1-4]\d{3,7}
-          )
+          8\d{4,8}
         </nationalNumberPattern>
         <possibleNumberPattern>\d{5,9}</possibleNumberPattern>
       </generalDesc>
       <fixedLine>
-        <!-- Wikipedia is missing 020, and the 024 code it lists for Somerset West stopped being
-             used in 1996. -->
         <nationalNumberPattern>
           (?:
             1[0-8]|
-            2[0-378]|
+            2[1-378]|
             3[1-69]|
             4\d|
             5[1346-8]
@@ -26425,7 +26407,7 @@
              national prefix). -->
         <nationalNumberPattern>
           (?:
-            6[0-5]|
+            6\d|
             7[0-46-9]
           )\d{7}|
           8(?:
@@ -26445,7 +26427,7 @@
       <premiumRate>
         <nationalNumberPattern>
           86[2-9]\d{6}|
-          90\d{7}
+          9[0-2]\d{7}
         </nationalNumberPattern>
         <possibleNumberPattern>\d{9}</possibleNumberPattern>
         <possibleLengths national="9"/>
@@ -26457,6 +26439,9 @@
         <possibleLengths national="9"/>
         <exampleNumber>860123456</exampleNumber>
       </sharedCost>
+      <!-- 88 used to be assigned to pagers prior to a migration in 2010, where it was unassigned.
+           According to an official doc from 2016, 88 is "Released" for "Future non-geographic
+           services", but we don't know yet what these are, so we do not validate them. -->
       <voip>
         <nationalNumberPattern>87\d{7}</nationalNumberPattern>
         <possibleNumberPattern>\d{9}</possibleNumberPattern>