phony 2.2.16 → 2.3.0

checksums.yaml

@@ -1,7 +1,15 @@
 ---
-SHA1:
-  metadata.gz: 3d8710a24e82893cf992f1f78257fc8170f63b50
-  data.tar.gz: 14e5ee3227225b131fcfcf44dabf870cd19d0120
-SHA512:
-  metadata.gz: 60b52b683503709334ac1c2f946b81d1715a567b27fd18d010fef5d01180979605821cf4d5c8dfdf2e65e437525668143f72ef0dbce251f047835214ade2d774
-  data.tar.gz: 2bd8cdb967fb9624b268f7bdd009652edc13aea73a979f669d81a52589fe19a9b4190074814366affa1ecdf91c4952990968fa51a3e8d744fcce5fecdc9a35d1
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    MzFlYWI4ZGNmZGYxOTNhOWZjMGZmZTIxZWYxNTNlZjhkZmI1MDdhMg==
+  data.tar.gz: !binary |-
+    MTAyODcwOTk2Zjg2MDFkMjExMzM3MTJmMjY1MTJkYjJiYjgzZTVjZQ==
+!binary "U0hBNTEy":
+  metadata.gz: !binary |-
+    MzYwODJhZmJkNjU2MGUyMDhmZDc2NDM1OGNkYmQ4MzJjN2U2NDYwOWNlMGNh
+    ZDViOGFiNGJjYWUwZTlkY2FkYjhiZjNhNTg1ODZlNjRhMDU2NjhjNDE0NjEz
+    ZjJhNDI1MGRlOWUwYWFmYzkyMTE1ODE4NmZhZDUzZWFkYmIxMDA=
+  data.tar.gz: !binary |-
+    NzU3Y2FlOGMwMTkzNTBhZDQyZTU0NDIyZDdkZWU5ZmVhMDY3MTgwZDI5ZDJl
+    NWMwNGU3YmQyZGFlMWMzNTJkYTI2YWYzYTIyNDY1MDgwY2M2YTJlMDI4NTdj
+    NWQ1MTc3YzRlZDEzZGExNDhlZDc2OTRjMjc4NTdmNTUyOGQwYjk=

data/lib/phony.rb

@@ -53,6 +53,7 @@ require File.expand_path '../phony/countries/sweden', __FILE__
 require File.expand_path '../phony/countries/taiwan', __FILE__
 require File.expand_path '../phony/countries/tajikistan', __FILE__
 require File.expand_path '../phony/countries/turkmenistan', __FILE__
+require File.expand_path '../phony/countries/vietnam', __FILE__
 require File.expand_path '../phony/countries/ukraine', __FILE__
 require File.expand_path '../phony/countries/united_kingdom', __FILE__
 require File.expand_path '../phony/countries/uruguay', __FILE__

data/lib/phony/countries.rb

@@ -23,7 +23,7 @@ Phony.define do
 
   # Reserved.
   #
-  country '0', fixed(1) >> split(10) # Reserved.
+  reserved '0'
 
   # USA, Canada, etc.
   #
@@ -239,10 +239,7 @@ Phony.define do
 
   # country '82' # SouthKorea, see special file.
 
-  country '84', # Viet Nam (Socialist Republic of)
-          one_of('4', '8') >> split(7) |
-          match(/^(2[025679]|3[0136789]|5[23456789]|6[01234678]|7[02345679]|9[0-8])\d/) >> split(6) |
-          fixed(3) >> split(5)
+  # country '84' # Vietnam, see special file.
 
   # country '86' # China, see special file.
 
@@ -881,11 +878,11 @@ Phony.define do
   country '872', todo # Inmarsat (Pacific Ocean)
   country '873', todo # Inmarsat (Indian Ocean)
   country '874', todo # Inmarsat (Atlantic Ocean-West)
-  country '875', todo # Reserved - Maritime Mobile Service Applications
-  country '876', todo # Reserved - Maritime Mobile Service Applications
-  country '877', todo # Reserved - Maritime Mobile Service Applications
+  country '875', todo # Maritime Mobile Service Applications
+  country '876', todo # Maritime Mobile Service Applications
+  country '877', todo # Maritime Mobile Service Applications
   country '878', todo # Universal Personal Telecommunication Service (UPT)
-  country '879', todo # Reserved for national non-commercial purposes
+  reserved '879' # Reserved for national non-commercial purposes
 
   # Bangladesh (People's Republic of)
   #  country '880' # see special file
@@ -899,7 +896,7 @@ Phony.define do
   # country '886' # Taiwan, see special file
 
   country '887', todo # -
-  country '888', todo # Reserved for future global service
+  reserved '888' # Reserved for future global service
   country '889', todo # -
 
   country '890', todo # -
@@ -985,7 +982,7 @@ Phony.define do
   # Oman (Sultanate of), https://www.numberingplans.com/?page=dialling&sub=areacodes
   country '968', fixed(2) >> split(3,3)
 
-  country '969', todo # Reserved - reservation currently under investigation
+  reserved '969' # Reserved - reservation currently under investigation
 
   country '970', # 970 is used in those countries that block access to 972 (Israel)
           one_of('1')                            >> split(3,3,3) | # special numbers
@@ -1057,5 +1054,5 @@ Phony.define do
 
   country '997', todo # Spare code
   country '998', fixed(2) >> split(3, 4) # Uzbekistan (Republic of) http://www.wtng.info/wtng-998-uz.html
-  country '999', todo # Reserved for possible future use within the Telecommunications for Disaster Relief (TDR) concept
+  reserved '999' # Reserved for possible future use within the Telecommunications for Disaster Relief (TDR) concept
 end

data/lib/phony/countries/china.rb

@@ -25,4 +25,4 @@ Phony.define do
                 one_of(mobile)  >> split(4,4) |
                 one_of(ndcs)    >> split(4,4) |
                 fixed(3)        >> split(4,4)
-end
+end

data/lib/phony/countries/italy.rb

@@ -94,53 +94,9 @@ ndcs_4digit = [
   '0971', # Potenza
 ]
 
-mobile = [
- '310',
- '311',
- '313',
- '319',
- '320',
- '322',
- '323',
- '327',
- '328',
- '329',
- '330',
- '331',
- '333',
- '334',
- '335',
- '336',
- '337',
- '338',
- '339',
- '340',
- '341',
- '343',
- '345',
- '346',
- '347',
- '348',
- '349',
- '350',
- '360',
- '361',
- '362',
- '363',
- '366',
- '368',
- '370',
- '373',
- '377',
- '380',
- '388',
- '389',
- '390',
- '391',
- '392',
- '393',
- '397'
-]
+# All 3-- numbers are reserved for mobile phones according to
+# http://en.wikipedia.org/wiki/Telephone_numbers_in_Italy#Mobile_telephones
+mobile = (300..399).collect(&:to_s).to_a
 
 service = [ # Not exhaustive.
  '112',

data/lib/phony/countries/ukraine.rb

@@ -600,6 +600,17 @@ ndcs_with_4_subscriber_numbers = %w(
 57572
 )
 
+seven_digit_mobile_prefixes = [
+  '50', '66', '95', '99',  # MTS-UKR
+  '67', '96', '97', '98',  # Kyivstar
+  '63', '93', # Life:)
+  '39', # Kyivstar(Golden Telecom)
+  '68', # Kyivstar(Beeline)
+  '91', # UTEL
+  '92', # PEOPLEnet
+  '94'  # Intertelecom
+]
+
 ndcs_with_3_subscriber_numbers = %w(433861)
 
 Phony.define do
@@ -608,7 +619,8 @@ Phony.define do
           one_of(ndcs_with_4_subscriber_numbers) >> split(4) |
           one_of(ndcs_with_5_subscriber_numbers) >> split(3,2) |
           one_of(ndcs_with_6_subscriber_numbers) >> split(3,3) |
+          one_of(seven_digit_mobile_prefixes)    >> split(3,2,2) |
           one_of('800') >> split(3,3) | # freephone
           one_of(ndcs_with_7_subscriber_numbers) >> split(4,3) |
-          fixed(3) >> split(3,3) # mobile
+          fixed(3) >> split(3,3) # other
 end

data/lib/phony/countries/vietnam.rb

@@ -0,0 +1,129 @@
+# Vietnamese phone numbers.
+#
+# http://en.wikipedia.org/wiki/Telephone_numbers_in_Vietnam
+# http://www.wtng.info/wtng-84-vn.html
+#
+# Landline numbers are composed of 1 to 3 digit area code + 5 to 8 digits
+# Mobile numbers are composed of 0 (trunk) + 2 to 3 digit carrier code + 5 to 8 digits
+#
+
+ndcs_with_7_subscriber_digits = [
+  '20',  # Lào Cai Province
+  '210', # Phú Thọ Province
+  '211', # Vĩnh Phúc Province
+  '218', # Hòa Bình Province (18 before 24 Nov 2007)
+  '219', # Hà Giang Province (19 before 24 Nov 2007)
+  '22',  # Sơn La Province
+  '230', # Điện Biên Province (23 before 24 Nov 2007)
+  '231', # Lai Châu Province (23 before 24 Nov 2007)
+  '240', # Bắc Giang Province
+  '241', # Bắc Ninh Province
+  '25',  # Lạng Sơn Province
+  '26',  # Cao Bằng Province
+  '27',  # Tuyên Quang Province
+  '280', # Thái Nguyên Province
+  '281', # Bắc Kạn Province
+  '29',  # Yên Bái Province
+
+  '30',  # Ninh Bình Province
+  '31',  # Hai Phong city
+  '320', # Hải Dương Province
+  '321', # Hưng Yên Province
+  '33',  # Quảng Ninh Province
+  '350', # Nam Định Province
+  '351', # Hà Nam Province
+  '36',  # Thái Bình Province
+  '37',  # Thanh Hóa Province
+  '38',  # Nghệ An Province
+  '39',  # Hà Tĩnh Province
+
+  '500', # Đắk Lắk Province (50 before 24 Nov 2007)
+  '501', # Đắk Nông Province (50 before 24 Nov 2007)
+  '510', # Quảng Nam Province
+  '511', # Da Nang city
+  '52',  # Quảng Bình Province
+  '53',  # Quảng Trị Province
+  '54',  # Thừa Thiên–Huế Province
+  '55',  # Quảng Ngãi Province
+  '56',  # Bình Định Province
+  '57',  # Phú Yên Province
+  '58',  # Khánh Hòa Province
+  '59',  # Gia Lai Province
+
+  '60',  # Kon Tum Province
+  '61',  # Đồng Nai Province
+  '62',  # Bình Thuận Province
+  '63',  # Lâm Đồng Province
+  '64',  # Bà Rịa–Vũng Tàu Province
+  '650', # Bình Dương Province
+  '651', # Bình Phước Province
+  '66',  # Tây Ninh Province
+  '67',  # Đồng Tháp Province
+  '68',  # Ninh Thuận Province
+
+  '70',  # Vĩnh Long Province
+  '710', # Cần Thơ city (71 before 24 Nov 2007)
+  '711', # Hậu Giang Province (71 before 24 Nov 2007)
+  '72',  # Long An Province
+  '73',  # Tiền Giang Province
+  '74',  # Trà Vinh Province
+  '75',  # Bến Tre Province
+  '76',  # An Giang Province
+  '77',  # Kiên Giang Province
+  '780', # Cà Mau Province
+  '781', # Bạc Liêu Province
+  '79'   # Sóc Trăng Province
+]
+
+ndcs_with_8_subscriber_digits = [
+  '4', # Hanoi
+  '8'  # Ho Chi Minh City
+]
+
+mobile = [
+  '90', # MobiFone
+  '91', # Vinaphone
+  '92', # Vietnamobile (previously known as HT Mobile)
+  '93', # MobiFone
+  '94', # Vinaphone
+  '95', # S-Fone
+  '96', # previously EVN Telecom, now Viettel Mobile
+  '97', # Viettel Mobile
+  '98', # Viettel Mobile
+  '996', # Gmobile (traded as Beeline)
+  '997', # Gmobile (traded as Beeline)
+  '998', # Indochina Telecom
+  '999', # Indochina Telecom
+  '120', # MobiFone
+  '121', # MobiFone
+  '122', # MobiFone
+  '123', # Vinaphone
+  '124', # Vinaphone
+  '125', # Vinaphone
+  '126', # MobiFone
+  '127', # Vinaphone
+  '128', # MobiFone
+  '129', # Vinaphone
+  '163', # Viettel Mobile
+  '164', # Viettel Mobile
+  '165', # Viettel Mobile
+  '166', # Viettel Mobile
+  '167', # Viettel Mobile
+  '168', # Viettel Mobile
+  '169', # Viettel Mobile
+  '186', # Vietnamobile
+  '188', # Vietnamobile (previously known as HT Mobile)
+  '199'  # GTel (traded as Beeline)
+]
+
+mobile_with_trunk = mobile.map{|num| "0#{num}" }
+
+Phony.define do
+  country '84', one_of(ndcs_with_7_subscriber_digits) >> split(3,4) |
+                one_of(ndcs_with_8_subscriber_digits) >> split(4,4) |
+                one_of(mobile)                        >> split(5..8)|
+                one_of(mobile_with_trunk)             >> split(5..8)|
+                # Govt reserved
+                fixed(80)                             >> split(5)   |
+                fixed(69)                             >> split(1,5)
+end

data/lib/phony/dsl.rb

@@ -54,6 +54,18 @@ module Phony
       Phony::CountryCodes.instance.add country_code, definition
     end
     
+    # Designates a country code as reserved.
+    #
+    def reserved country_code
+      # Does nothing, will just fail with an exception.
+    end
+    
+    # This country still uses a default NDC (and needs to be done, hence the todo).
+    #
+    def todo
+      none >> split(10)
+    end
+    
     #
     #
     def trunk code, options = {}
@@ -131,12 +143,6 @@ module Phony
       
       NationalSplitters::Regex.instance_for regex, options[:on_fail_take], options
     end
-    
-    # This country still uses a default NDC (and needs to be done, hence the todo).
-    #
-    def todo
-      none >> split(10)
-    end
 
     # Local splitters.
     #

data/lib/phony/national_splitters/dsl.rb

@@ -21,6 +21,10 @@ module Phony
         Phony::Country.new Phony::NationalCode.new(self, local_splitter)
       end
       
+      def reserved
+        
+      end
+      
     end
     
   end

data/spec/functional/plausibility_spec.rb

@@ -76,10 +76,15 @@ describe 'plausibility' do
     it 'is correct' do
       Phony.plausible?('0000000').should be_false
     end
+    it 'is correct for zeros in number' do
+      Phony.plausible?('+00 00 000 00 01').should be_false
+    end
+    it 'is correct for zeros in number' do
+      Phony.plausible?('00 00 000 00 01').should be_false
+    end
     it 'is correct' do
       Phony.plausible?('hello').should be_false
     end
-
     it "is correct" do
       Phony.plausible?('+41 44 111 22 33').should be_true
     end
@@ -417,6 +422,15 @@ describe 'plausibility' do
         Phony.plausible?('+41 44 111 22').should be_false
       end
 
+      it "is correct for Vietnamese numbers" do
+        Phony.plausible?('+84 8 3827 9666').should be_true
+        Phony.plausible?('+84 4 3926 1720').should be_true
+        Phony.plausible?('+84 091 123-4567').should be_true
+        Phony.plausible?('+84 0167 123456').should be_true
+        Phony.plausible?('+84 1 1234').should be_false # too short
+        Phony.plausible?('+84 12 3456 7891 0111213').should be_false # too long
+      end
+
       it "is correct for US numbers" do
         # Still need E164 conform numbers.
         #
@@ -773,7 +787,22 @@ describe 'plausibility' do
                                                 '+380 32 2123 456',
                                                 '+380 3259 123 45',
                                                 '+380 32606 1234',
-                                                '+380 981 234 567']
+                                                '+380 50 123 45 67',
+                                                '+380 66 123 45 67',
+                                                '+380 95 123 45 67',
+                                                '+380 99 123 45 67',
+                                                '+380 67 123 45 67',
+                                                '+380 96 123 45 67',
+                                                '+380 97 123 45 67',
+                                                '+380 98 123 45 67',
+                                                '+380 63 123 45 67',
+                                                '+380 93 123 45 67',
+                                                '+380 39 123 45 67',
+                                                '+380 68 123 45 67',
+                                                '+380 91 123 45 67',
+                                                '+380 92 123 45 67',
+                                                '+380 94 123 45 67'
+                                              ]
       it_is_correct_for 'United Arab Emirates', :samples => ['+971 800 12',
                                                              '+971 800 12 345 6789',
                                                              '+971 2 123 4567',

data/spec/lib/phony/countries_spec.rb

@@ -348,6 +348,7 @@ describe 'country descriptions' do
     describe 'Italy' do
       it_splits '3934869528',   ['39', '348', '695', '28']   # Mobile
       it_splits '393357210488', ['39', '335', '721', '0488'] # Mobile
+      it_splits '393248644272', ['39', '324', '864', '4272'] # Mobile
       it_splits '390612341234', ['39', '06', '1234', '1234'] # Roma
       it_splits '390288838883', ['39', '02', '8883', '8883'] # Milano
       it_splits '390141595661', ['39', '0141', '595', '661'] # Asti
@@ -562,7 +563,7 @@ describe 'country descriptions' do
       it { Phony.split('421212345678').should == ['421', '2', '12345678'] } # Bratislava
       it { Phony.split('421371234567').should == ['421', '37', '1234567'] } # Nitra / Other
     end
-    
+
     describe 'Spain' do
       it_splits '34600123456', ['34', '600', '123', '456'] # Mobile
       it_splits '34900123456', ['34', '900', '123', '456'] # Special
@@ -570,7 +571,7 @@ describe 'country descriptions' do
       it_splits '34975123456', ['34', '975', '12', '34', '56'] # Landline
       it_splits '34123456789', ['34', '123', '456', '789'] # Default
     end
-    
+
     describe 'Sri Lanka' do
       it { Phony.split('94711231212').should == ['94', '71', '123', '12', '12'] } # Mobile
     end
@@ -662,7 +663,7 @@ describe 'country descriptions' do
     describe 'Vietnam' do
       it { Phony.split('8498123456').should == ['84', '98', '123456'] } # Viettel Mobile
       it { Phony.split('8499612345').should == ['84', '996', '12345'] } # GTel
-      it { Phony.split('8441234567').should == ['84', '4', '1234567'] } # Hanoi
+      it { Phony.split('84412345678').should == ['84', '4', '1234', '5678'] } # Hanoi
     end
     describe 'Zambia' do
       it_splits '260977640895', ['260', '97', '7640895'] # mobile
@@ -1060,7 +1061,21 @@ describe 'country descriptions' do
       it_splits '380320123456', %w(380 32 0123 456)
       it_splits '380325912345', %w(380 3259 123 45)
       it_splits '380326061234', %w(380 32606 1234)
-      it_splits '380981234567', %w(380 981 234 567)
+      it_splits '380391234567', %w(380 39 123 45 67)
+      it_splits '380501234567', %w(380 50 123 45 67)
+      it_splits '380631234567', %w(380 63 123 45 67)
+      it_splits '380661234567', %w(380 66 123 45 67)
+      it_splits '380671234567', %w(380 67 123 45 67)
+      it_splits '380681234567', %w(380 68 123 45 67)
+      it_splits '380911234567', %w(380 91 123 45 67)
+      it_splits '380921234567', %w(380 92 123 45 67)
+      it_splits '380931234567', %w(380 93 123 45 67)
+      it_splits '380941234567', %w(380 94 123 45 67)
+      it_splits '380951234567', %w(380 95 123 45 67)
+      it_splits '380961234567', %w(380 96 123 45 67)
+      it_splits '380971234567', %w(380 97 123 45 67)
+      it_splits '380981234567', %w(380 98 123 45 67)
+      it_splits '380991234567', %w(380 99 123 45 67)
     end
     describe 'United Arab Emirates' do
       it_splits '97180012', %w(971 800 12)

data/spec/lib/phony_spec.rb

@@ -32,6 +32,11 @@ describe Phony do
           Phony.normalize nil
         }.to raise_error(ArgumentError, 'Phone number cannot be nil. Use e.g. number && Phony.normalize(number).')
       end
+      it 'raises if number starts with reserved zero code' do
+        expect do
+          Phony.normalize '+00 00 00 00 01'
+        end.to raise_error(Phony::NormalizationError, 'Phony could not normalize the given number. Is it a phone number?')
+      end
       it 'raises a nice error message' do
         expect do
           Phony.normalize 'test'

metadata

@@ -1,16 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: phony
 version: !ruby/object:Gem::Version
-  version: 2.2.16
+  version: 2.3.0
 platform: ruby
 authors:
 - Florian Hanke
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-02 00:00:00.000000000 Z
+date: 2014-09-13 00:00:00.000000000 Z
 dependencies: []
-description: 'Fast international phone number (E164 standard) normalizing, splitting
+description: ! 'Fast international phone number (E164 standard) normalizing, splitting
   and formatting. Lots of formatting options: International (+.., 00..), national
   (0..), and local.'
 email: florian.hanke+phony@gmail.com
@@ -19,9 +19,6 @@ extensions: []
 extra_rdoc_files:
 - README.textile
 files:
-- README.textile
-- lib/phony.rb
-- lib/phony/countries.rb
 - lib/phony/countries/austria.rb
 - lib/phony/countries/bangladesh.rb
 - lib/phony/countries/belarus.rb
@@ -58,7 +55,9 @@ files:
 - lib/phony/countries/ukraine.rb
 - lib/phony/countries/united_kingdom.rb
 - lib/phony/countries/uruguay.rb
+- lib/phony/countries/vietnam.rb
 - lib/phony/countries/zimbabwe.rb
+- lib/phony/countries.rb
 - lib/phony/country.rb
 - lib/phony/country_codes.rb
 - lib/phony/dsl.rb
@@ -73,6 +72,8 @@ files:
 - lib/phony/national_splitters/variable.rb
 - lib/phony/trunk_code.rb
 - lib/phony/vanity.rb
+- lib/phony.rb
+- README.textile
 - spec/functional/error_spec.rb
 - spec/functional/normalize_spec.rb
 - spec/functional/plausibility_spec.rb
@@ -99,17 +100,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.0
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: Fast international phone number (E164 standard) normalizing, splitting and