phonelib 0.5.2 → 0.5.4

data/data/libphonenumber/resources/ShortNumberMetadata.xml

@@ -730,17 +730,22 @@
     <!-- http://www.itu.int/oth/T0202000013/en -->
     <territory id="BB">
       <generalDesc>
-        <nationalNumberPattern>[235]\d{2}</nationalNumberPattern>
+        <nationalNumberPattern>[2-689]\d{2}</nationalNumberPattern>
         <possibleNumberPattern>\d{3}</possibleNumberPattern>
       </generalDesc>
       <shortCode>
-        <nationalNumberPattern>[235]11</nationalNumberPattern>
+        <nationalNumberPattern>[2-689]11</nationalNumberPattern>
         <exampleNumber>211</exampleNumber>
       </shortCode>
       <emergency>
-        <nationalNumberPattern>[235]11</nationalNumberPattern>
+        <nationalNumberPattern>[2359]11</nationalNumberPattern>
         <exampleNumber>211</exampleNumber>
       </emergency>
+      <directoryServices>
+        <nationalNumberPattern>411</nationalNumberPattern>
+        <possibleNumberPattern>\d{3}</possibleNumberPattern>
+        <exampleNumber>411</exampleNumber>
+      </directoryServices>
     </territory>
 
     <!-- Bangladesh -->
@@ -6766,15 +6771,21 @@
         </nationalNumberPattern>
         <exampleNumber>112</exampleNumber>
       </shortCode>
+      <tollFree>
+        <nationalNumberPattern>116117</nationalNumberPattern>
+        <possibleNumberPattern>\d{6}</possibleNumberPattern>
+        <exampleNumber>116117</exampleNumber>
+      </tollFree>
       <emergency>
-        <nationalNumberPattern>
-          11(?:
-             [023]|
-             6117
-            )
-        </nationalNumberPattern>
+        <nationalNumberPattern>11[023]</nationalNumberPattern>
+        <possibleNumberPattern>\d{3}</possibleNumberPattern>
         <exampleNumber>112</exampleNumber>
       </emergency>
+      <expandedEmergency>
+        <nationalNumberPattern>116117</nationalNumberPattern>
+        <possibleNumberPattern>\d{6}</possibleNumberPattern>
+        <exampleNumber>116117</exampleNumber>
+      </expandedEmergency>
     </territory>
 
     <!-- Nepal -->

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

@@ -22,11 +22,19 @@
 1246252|LIME
 1246253|LIME
 1246254|LIME
+1246255|LIME
 1246256|Digicel
+1246257|Digicel
 1246258|Digicel
+1246259|Digicel
 124626|Digicel
+124628|LIME
 124645|Sunbeach Communications
 124682|Digicel
+124683|Digicel
+124684|Digicel
+124685|Digicel
+1246883|Digicel
 1264536|Weblinks Limited
 1264537|Weblinks Limited
 1264538|Weblinks Limited

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

@@ -12,5 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-2455|Orange
-2456|Areeba
+245955|Orange
+245966|Spacetel
+245969|Spacetel
+245977|Guinetel

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

@@ -23,3 +23,11 @@
 25269|Nationlink
 25279|Somtel
 252907|Golis Telecom
+25292|STG
+25293|STG
+25294|STG
+25295|STG
+25296|STG
+25297|STG
+25298|STG
+25299|STG

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

@@ -21,6 +21,7 @@
 37360|Orange
 373610|Orange
 373611|Orange
+373620|Orange
 373621|Orange
 373671|Moldtelecom
 373672|Moldtelecom

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

@@ -680,6 +680,7 @@
 62887|Smartfren
 62888|Smartfren
 62889|Smartfren
+62895|Hutchison
 62896|3
 62897|3
 62898|3

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

@@ -12,6 +12,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+67850|Digicel
+67851|Digicel
+67852|Digicel
 67853|Digicel
 67854|Digicel
 67855|Digicel
@@ -22,6 +25,7 @@
 678575|Digicel
 678576|Digicel
 678577|Digicel
+67858|Digicel
 67859|Digicel
 67870|SMILE
 67871|SMILE

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

@@ -12,7 +12,13 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-96894|Nawras
-96895|Nawras
-96896|Nawras
-96897|Nawras
+96890|Omantel/Ooredoo
+96891|Omantel
+96892|Omantel
+96893|Omantel
+96894|Ooredoo
+96895|Ooredoo
+96896|Ooredoo
+96897|Ooredoo
+96898|Omantel
+96899|Omantel

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

@@ -27,3 +27,4 @@
 98937|Irancell
 98938|Irancell
 98939|Irancell
+98990|IR-MCI

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

@@ -14,23 +14,25 @@
 
 # Translated from pt/245.txt using Freebase and Wikipedia.
 
-245320|Bissau
-245321|Bissau
-245322|St. Luzia
-245325|Brá
-245331|Mansôa
-245332|Bigene/Bissora
-245334|Mansaba
-245335|Farim
-245341|Bafatá
-245342|Bambadinca
-245351|Gabu
-245352|Sonaco
-245353|Pirada
-245354|Pitche
-245370|Buba
-245391|Canchungo
-245392|Cacheu
-245393|S. Domingos
-245394|Bula
-245396|Ingoré
+24544320|Bissau
+24544321|Bissau
+24544322|St. Luzia
+24544325|Brá
+24544331|Mansôa
+24544332|Bissora
+24544334|Mansaba
+24544335|Farim
+24544341|Bafatá
+24544342|Bambadinca
+24544351|Gabu
+24544352|Sonaco
+24544353|Pirada
+24544354|Pitche
+24544370|Buba
+24544391|Canchungo
+24544392|Cacheu
+24544393|S. Domingos
+24544394|Bula
+24544396|Ingoré
+24544397|Bigene
+

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

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

data/lib/phonelib/core.rb

@@ -38,6 +38,32 @@ module Phonelib
       @@default_country = country
     end
 
+    # extension separator
+    @@extension_separator = ';'
+
+    # getter method for extension_separator variable
+    def extension_separator
+      @@extension_separator
+    end
+
+    # setter method for extension_separator variable
+    def extension_separator=(separator)
+      @@extension_separator = separator
+    end
+
+    # extension separator symbols for parsing
+    @@extension_separate_symbols = '#;'
+
+    # getter method for extension_separate_symbols variable
+    def extension_separate_symbols
+      @@extension_separate_symbols
+    end
+
+    # setter method for extension_separate_symbols variable
+    def extension_separate_symbols=(separator)
+      @@extension_separate_symbols = separator
+    end
+
     # flag identifies whether to use special phone types, like short code
     @@parse_special = false
 

data/lib/phonelib/phone.rb

@@ -162,6 +162,16 @@ module Phonelib
       "+#{@data[country][Core::COUNTRY_CODE]} #{national}"
     end
 
+    # returns international formatted number with extension added
+    def full_international
+      "#{international}#{formatted_extension}"
+    end
+
+    # returns e164 format of phone with extension added
+    def full_e164
+      "#{e164}#{formatted_extension}"
+    end
+
     # Returns e164 unformatted phone number
     def e164
       international = self.international
@@ -197,10 +207,18 @@ module Phonelib
 
     private
 
+    # returns extension with separator defined
+    def formatted_extension
+      return '' unless @extension
+
+      "#{Phonelib.extension_separator}#{@extension}"
+    end
+
     # extracts extension from passed phone number if provided
     def separate_extension(original)
-      splitted = (original || '').split /[;#]/
-      [splitted.first, splitted[1..-1] && splitted[1..-1].join]
+      regex = cr("[#{Phonelib.extension_separate_symbols}]")
+      split = (original || '').split regex
+      [split.first, split[1..-1] && split[1..-1].join]
     end
 
     # get main country for code among provided countries

data/lib/phonelib/phone_analyzer_helper.rb

@@ -1,4 +1,5 @@
 module Phonelib
+  # helper methods for analyser
   module PhoneAnalyzerHelper
     private
 

data/lib/phonelib/version.rb

@@ -1,5 +1,5 @@
 # :nodoc:
 module Phonelib
   # :nodoc:
-  VERSION = '0.5.2'
+  VERSION = '0.5.4'
 end

data/lib/validators/phone_validator.rb

@@ -48,7 +48,11 @@ class PhoneValidator < ActiveModel::EachValidator
     phone = parse(value)
     if options[:types]
       method = options[:possible] ? :possible_types : :types
-      valid = (phone.send(method) & types).size > 0
+      phone_types = phone.send(method)
+      if (phone_types & [ Phonelib::Core::FIXED_OR_MOBILE ]).size > 0
+        phone_types += [ Phonelib::Core::FIXED_LINE, Phonelib::Core::MOBILE ]
+      end
+      valid = (phone_types & types).size > 0
     else
       method = options[:possible] ? :possible? : :valid?
       valid = phone.send(method)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: phonelib
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.5.4
 platform: ruby
 authors:
 - Vadim Senderovich
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-07 00:00:00.000000000 Z
+date: 2015-11-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -80,6 +80,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rack-cache
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: '1.2'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: '1.2'
 description: |2
       Google libphonenumber library was taken as a basis for
       this gem. Gem uses its data file for validations and number formatting.
@@ -203,10 +217,10 @@ files:
 - data/libphonenumber/debian/compat
 - data/libphonenumber/debian/control
 - data/libphonenumber/debian/copyright
-- data/libphonenumber/debian/libphonenumber6-dev.install
-- data/libphonenumber/debian/libphonenumber6-java.jlibs
-- data/libphonenumber/debian/libphonenumber6-java.poms
-- data/libphonenumber/debian/libphonenumber6.install
+- data/libphonenumber/debian/libphonenumber7-dev.install
+- data/libphonenumber/debian/libphonenumber7-java.jlibs
+- data/libphonenumber/debian/libphonenumber7-java.poms
+- data/libphonenumber/debian/libphonenumber7.install
 - data/libphonenumber/debian/maven.cleanIgnoreRules
 - data/libphonenumber/debian/maven.ignoreRules
 - data/libphonenumber/debian/maven.properties
@@ -927,6 +941,7 @@ files:
 - data/libphonenumber/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/962_en
 - data/libphonenumber/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/966_ar
 - data/libphonenumber/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/966_en
+- data/libphonenumber/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/968_en
 - data/libphonenumber/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/98_en
 - data/libphonenumber/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/98_fa
 - data/libphonenumber/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/config
@@ -1529,6 +1544,7 @@ files:
 - data/libphonenumber/java/libphonenumber/test/com/google/i18n/phonenumbers/RegionCode.java
 - data/libphonenumber/java/libphonenumber/test/com/google/i18n/phonenumbers/ShortNumberInfoTest.java
 - data/libphonenumber/java/libphonenumber/test/com/google/i18n/phonenumbers/ShortNumberUtilTest.java
+- data/libphonenumber/java/libphonenumber/test/com/google/i18n/phonenumbers/SingleFileMetadataSourceImplTest.java
 - data/libphonenumber/java/libphonenumber/test/com/google/i18n/phonenumbers/TestMetadataTestCase.java
 - data/libphonenumber/java/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_800
 - data/libphonenumber/java/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_979
@@ -1889,6 +1905,7 @@ files:
 - data/libphonenumber/resources/geocoding/en/94.txt
 - data/libphonenumber/resources/geocoding/en/962.txt
 - data/libphonenumber/resources/geocoding/en/966.txt
+- data/libphonenumber/resources/geocoding/en/968.txt
 - data/libphonenumber/resources/geocoding/en/98.txt
 - data/libphonenumber/resources/geocoding/es/228.txt
 - data/libphonenumber/resources/geocoding/es/230.txt