phony 2.8.3 → 2.8.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 18b2b6b4d8894f7063f3f1ffdb80cc0f5ed8eb17
-  data.tar.gz: 9f7222a28e4ed77f6d7835078efd734f65c23e2a
+  metadata.gz: 5b20a704d057c3295d795f4dfcf235a5bf2b1220
+  data.tar.gz: fb1ffb2faf783720497b8d3f758edd0183f2bc7e
 SHA512:
-  metadata.gz: 3dce67e5a63cf8a758548797d635e9fb11ef9fc8e146a0e30d1c4d7cff79373ff18efe5fc17f51a4ac5a1b3989747bfc05f9570e92b9440fda06cbcd31128783
-  data.tar.gz: ed5c196a136597a22540715db57bf7bb63128904a86db0fb0c97646ffc3bb885f188aab933829c4659dceaadee1ddee8549e4c545cf0e27e16a42aa3007f27f4
+  metadata.gz: 3abcaf915fec92569f7ea4c74d72aa76e685341dafeeb238c0434d9a05e22c30ce787e965bc0b79a050e074c672dc7bf0fa9686c8fe852d94662bbd564423a70
+  data.tar.gz: 4dca85b010dc5009d7e698fb325d785781546096f2943887ffaf203d9e4791c3d123abebcf1a3e2540a9ee039ac4649a2be9546a90c1ac7f9179f6ca7deaa304

data/lib/phony/countries/austria.rb

@@ -89,7 +89,7 @@ Phony.define do
                 one_of(corporate) >> split(5..5) |
                 one_of(ndcs)      >> split(6..6) |
                 one_of('663')     >> split(6..6) | # 6 digit mobile.
-                one_of(mobile)    >> split(4,3..4) |
+                one_of(mobile)    >> split(4,3..9) |
                 one_of(mobile_2digit) >> split(7..7) | # Separate as mobile contains 676 - 67 violates the prefix rule.
                 fixed(4)          >> split(7..7)
 end

data/lib/phony/countries/italy.rb

@@ -112,7 +112,7 @@ service = [ # Not exhaustive.
 Phony.define do
   country '39', trunk('0', :normalize => false) |
                 one_of(*service)     >> split(3,3) |
-                one_of(*mobile)      >> split(3,4) |
+                one_of(*mobile)      >> split(3,4,-1..1) |
                 one_of(*ndcs_2digit) >> split(4,4) |
                 one_of(*ndcs_3digit) >> split(6..7) |
                 one_of(*ndcs_4digit) >> split(3,3)

data/lib/phony/countries.rb

@@ -63,7 +63,7 @@ Phony.define do
     one_of(%w(901 909)) >> split(3,4) | # premium rate
     one_of(%w(21 22 23 24 25 26 27 28)) >> split(4,4) |
     one_of('50') >> split(4,4) | # VPN
-    one_of('69') >> split(4,4) | # mobile, pager
+    match(/^(69\d)\d+$/) >> split(3,4) | # mobile, pager
     one_of('70') >> split(4,4) | # universal access
     fixed(4) >> split(6)   # 3-digit NDCs
 
@@ -612,8 +612,8 @@ Phony.define do
   # Estonia
   #
   country '372',
-          match(/^(5\d\d\d)\d+$/)          >> split(4) | # Mobile
-          match(/^((?:70|8[12])\d\d)\d+$/) >> split(4) | # Mobile
+          match(/^(5\d\d\d)\d+$/)          >> split(3..4) | # Mobile
+          match(/^((?:70|8[12])\d\d)\d+$/) >> split(4)    | # Mobile
           fixed(3)                         >> split(4)   # 3-digit NDCs
 
   # country '373' # Moldova, see special file
@@ -652,7 +652,15 @@ Phony.define do
 
   # country '385' # Croatia, see special file.
 
-  country '386', trunk('0') | fixed(2) >> split(3, 2, 2) # Slovenia
+  # Slovenia
+  # http://www.itu.int/oth/default.aspx?lang=en&parent=T02020000BE
+  # http://en.wikipedia.org/wiki/Telephone_numbers_in_Slovenia
+  country '386',
+          trunk('0') |
+          one_of('30','31','40','41','51','64','65','66','67','68','69','70','71')  >> split(3,3) | # Mobile
+          one_of('1','2','3','4','5','7')  >> split(3,4) | # Ljubljana, Maribor, Celje, Kranj, Nova Gorica, Novo mesto
+          fixed(3)                         >> split(2,3)   # catchall
+
   country '387', trunk('0') | fixed(2) >> split(3,2,2) # Bosnia and Herzegovina
   country '388', trunk('0') | fixed(2) >> split(3,2,2) # Group of countries, shared code
   country '389', trunk('0') | fixed(2) >> split(3,2,2) # The Former Yugoslav Republic of Macedonia

data/spec/functional/plausibility_spec.rb

@@ -148,6 +148,11 @@ describe 'plausibility' do
         Phony.plausible?('+43 699 00000000').should be_true
         # 663 mobile numbers have 6 digits
         Phony.plausible?('+43 663 000000').should be_true
+        # mobile numbers can have from 7 to 10 digits in the subscriber number
+        Phony.plausible?('+43 664 1234 567').should be_true
+        Phony.plausible?('+43 664 1234 5678').should be_true
+        Phony.plausible?('+43 664 1234 56789').should be_true
+        Phony.plausible?('+43 664 1234 567890').should be_true
       end
 
       it "is correct for Belgian numbers" do
@@ -304,6 +309,22 @@ describe 'plausibility' do
         Phony.plausible?('+45 44 55 22 33').should be_true
       end
 
+      it "is correct for Estonia" do
+        # the 5xxxx mobile numbers can be 7 or 8 digits (ndc + subscriber) long
+        Phony.plausible?('+372 532 12345').should be_true
+        Phony.plausible?('+372 532 1234').should be_true
+        Phony.plausible?('+372 532 123').should be_false
+        Phony.plausible?('+372 532 123456').should be_false
+
+        # the 81x/82x are only 8 digits
+        Phony.plausible?('+372 822 12345').should be_true
+        Phony.plausible?('+372 812 12345').should be_true
+        Phony.plausible?('+372 822 1234').should be_false
+        Phony.plausible?('+372 812 1234').should be_false
+        Phony.plausible?('+372 822 123').should be_false
+        Phony.plausible?('+372 822 123456').should be_false
+      end
+
       it 'is correct for Netherlands' do
         Phony.plausible?('+31 6 12 34 56 78').should be_true
         Phony.plausible?('+31 6 12 34 56 7').should be_false
@@ -384,8 +405,12 @@ describe 'plausibility' do
         Phony.plausible?('+39 0471 123 456').should be_true
 
         # Mobile
-        Phony.plausible?('+39 335 123 4567').should be_true
         Phony.plausible?('+39 335 123').should be_false
+        Phony.plausible?('+39 335 123 45').should be_false
+        Phony.plausible?('+39 335 123 456').should be_true
+        Phony.plausible?('+39 335 123 4567').should be_true
+        Phony.plausible?('+39 335 123 45678').should be_true
+        Phony.plausible?('+39 335 123 456789').should be_false
       end
 
       it 'is correct for Malaysia' do
@@ -429,6 +454,12 @@ describe 'plausibility' do
         Phony.plausible?('796030123451').should be_false # too long
       end
 
+      it "is correct for Slovenian numbers" do
+        Phony.plausible?('+386 41 123 456').should be_true
+        Phony.plausible?('+386 1 320 1234').should be_true
+        Phony.plausible?('+386 41 123 4567').should be_false
+      end
+
       # TODO: more needs to be done here
       #
       it "is correct for Swiss numbers" do

data/spec/lib/phony/countries_spec.rb

@@ -45,6 +45,12 @@ describe 'country descriptions' do
       it_splits '4366900000000',   %w( 43 669 0000 0000 )  # Mobile
       it_splits '433161234567891', %w( 43 316 1234567891 ) # Graz
       it_splits '432164123456789', %w( 43 2164 123456789 ) # Rohrau
+
+      # mobile numbers can have from 7 to 10 digits in the subscriber number
+      it_splits '436641234567',    %w( 43 664 1234 567 )
+      it_splits '4366412345678',   %w( 43 664 1234 5678 )
+      it_splits '43664123456789',  %w( 43 664 1234 56789 )
+      it_splits '436641234567890', %w( 43 664 1234 567890 )
     end
 
     describe 'Australia' do
@@ -188,7 +194,8 @@ describe 'country descriptions' do
       it_splits '3728001234',  ['372', '800', '1234']   # Freephone
       it_splits '37281231234', ['372', '8123', '1234']  # Mobile
       it_splits '37282231234', ['372', '8223', '1234']  # Mobile
-      it_splits '37283212345', ['372', '832', '12345']  # Mobile
+      it_splits '37252212345', ['372', '5221', '2345']  # Mobile
+      it_splits '3725221234', ['372',  '5221', '234']  # Mobile
       it_splits '37270121234', ['372', '7012', '1234']  # Premium
     end
     describe 'Finland' do
@@ -243,7 +250,7 @@ describe 'country descriptions' do
       it_splits '302142345678', %w(30 21 4234 5678)
       it_splits '302442345678', %w(30 24 4234 5678)
       it_splits '305034571234', %w(30 50 3457 1234)
-      it_splits '306901234567', %w(30 69 0123 4567)
+      it_splits '306901234567', %w(30 690 123 4567)
       it_splits '307001234567', %w(30 70 0123 4567)
       it_splits '308001001234', %w(30 800 100 1234)
       it_splits '308011001234', %w(30 801 100 1234)
@@ -351,7 +358,9 @@ describe 'country descriptions' do
       it_splits '9701700123123', ['970', '1', '700', '123', '123']  # Cable Phone Services
     end
     describe 'Italy' do
-      it_splits '3934869528',   ['39', '348', '695', '28']   # Mobile
+      it_splits '39348695281',  ['39', '348', '695', '281']        # Mobile (6-digit subscriber no. - rare, but still used)
+      it_splits '393486952812', ['39', '348', '695', '2812']       # Mobile (7-digit subscriber no. - common)
+      it_splits '3934869528123',['39', '348', '695', '2812', '3']  # Mobile (8-digit subscriber no - new)
       it_splits '393357210488', ['39', '335', '721', '0488'] # Mobile
       it_splits '393248644272', ['39', '324', '864', '4272'] # Mobile
       it_splits '390612341234', ['39', '06', '1234', '1234'] # Roma
@@ -570,6 +579,11 @@ describe 'country descriptions' do
       it { Phony.split('421371234567').should == ['421', '37', '1234567'] } # Nitra / Other
     end
 
+    describe 'Slovenia' do
+      it { Phony.split('38651234567').should == ['386', '51', '234', '567'] }  # Mobile
+      it { Phony.split('38611234567').should == ['386', '1', '123', '4567'] }  # LJUBLJANA
+    end
+
     describe 'Spain' do
       it_splits '34600123456', ['34', '600', '123', '456'] # Mobile
       it_splits '34900123456', ['34', '900', '123', '456'] # Special

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: phony
 version: !ruby/object:Gem::Version
-  version: 2.8.3
+  version: 2.8.4
 platform: ruby
 authors:
 - Florian Hanke
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-20 00:00:00.000000000 Z
+date: 2014-12-02 00:00:00.000000000 Z
 dependencies: []
 description: 'Fast international phone number (E164 standard) normalizing, splitting
   and formatting. Lots of formatting options: International (+.., 00..), national