phony 2.18.4 → 2.18.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: db79646f3b77b08c8894645615cfb86ac101c27f7aa7f45ff11f3b5465ce6ec4
-  data.tar.gz: 3c4b444c507b434adbe52651941b444019313c1c09473e64a8dc779036b8b549
+  metadata.gz: 062a3448529e9cd54a3b989ab0522ee2035821af37c7b194a1b3167bdb8f1693
+  data.tar.gz: 6f2b104415be34d29daf0569326a5a7480c6e44f243533e5e0ed51dbe554c699
 SHA512:
-  metadata.gz: 267251e1d56ab1b335c3779b5a28a7b15d8b73b9635a1e60a604cf48b500f376c65fcd6a158e94d4eb07db97e392410443094da02694224561f1a48d4175c037
-  data.tar.gz: f496ad6a5854fbdaa919fb5fc175dbba898fcd5261096fe3df43929f98b4bf1af476bc80853b16116703ab99aae3b34eb014ed7903e46fb0dbc93bfe829dcedb
+  metadata.gz: c1e05a38ac40ddf8b69792071ceaf62fe90a66f79ee0ba6992f6022a4ab88ff5d33d33fa9276612e135231f3554f01eb83f551b5c163e7e2f0faf8e0a52417d0
+  data.tar.gz: d2f5667fd4d32a6bd33961eca81928c2140a5383837f4a027203cad67afa34107560ea80291f35fee06fce9a43417f8e4272cc08b436eed6d5036c9f0aa18769

data/lib/phony.rb

@@ -24,6 +24,7 @@ load File.expand_path '../phony/dsl.rb', __FILE__
 #
 # The ones that need more space to define.
 #
+load File.expand_path '../phony/countries/argentina.rb', __FILE__
 load File.expand_path '../phony/countries/austria.rb', __FILE__
 load File.expand_path '../phony/countries/bangladesh.rb', __FILE__
 load File.expand_path '../phony/countries/belarus.rb', __FILE__

data/lib/phony/countries.rb

@@ -213,14 +213,7 @@ Phony.define do
           fixed(3)                           >> split(7)   # 3-digit NDCs
 
   # Argentine Republic.
-  #
-  country '54',
-          one_of('11', '911') >> split(4,4) | # Fixed & Mobile
-          match(/^(22[0137]|237|26[14]|29[179]|34[1235]|35[138]|38[1578])/) >> split(3,4) |        # Fixed
-          match(/^(922[0137]|9237|926[14]|929[179]|934[1235]|935[138]|938[1578])/) >> split(3,4) | # Mobile
-          match(/^(9\d{4})/) >> split(2,4) | # Mobile
-          match(/^([68]\d{2})/) >> split(3,4) | # Service
-          fixed(4) >> split(2,4) # Fixed
+  # country '54' # argentina, see special file.
 
   # Brazil (Federative Republic of).
   # http://en.wikipedia.org/wiki/Telephone_numbers_in_Brazil
@@ -738,11 +731,12 @@ Phony.define do
   # Monaco
   #
   country '377',
-          one_of('6')  >> split(2,2,2,2) | # mobile
+          one_of('6') >> split(2,2,2,2) | # mobile
           fixed(2) >> split(2,2,2)
 
   # San Marino
   country '378',
+          trunk('', :normalize => false) |
           none >> matched_split(
               /\A\d{6}\z/ => [3,3],
               /\A\d+\z/ => [3,3,4]

data/lib/phony/countries/argentina.rb

@@ -0,0 +1,355 @@
+# frozen_string_literal: true
+
+# Argentinian numbers are all ten digits long.
+# Information taken from:
+# https://www.enacom.gob.ar/multimedia/normativas/1997/Resolucion%2046_97.pdf
+# http://www.wtng.info/wtng-54-ar.html
+# https://en.wikipedia.org/wiki/Telephone_numbers_in_Argentina
+# Area codes collected from https://www.enacom.gob.ar/indicativos-interurbanos_p366 (06/27/19)
+
+
+# Landline
+area_codes_2digits = [
+    '11',
+]
+
+area_codes_3digits = [
+    '220',
+    '221',
+    '223',
+    '230',
+    '236',
+    '237',
+    '249',
+    '260',
+    '261',
+    '263',
+    '264',
+    '266',
+    '280',
+    '291',
+    '294',
+    '297',
+    '298',
+    '299',
+    '336',
+    '341',
+    '342',
+    '343',
+    '345',
+    '348',
+    '351',
+    '353',
+    '358',
+    '362',
+    '364',
+    '370',
+    '376',
+    '379',
+    '380',
+    '381',
+    '383',
+    '385',
+    '387',
+    '388',
+]
+
+area_codes_4digits = [
+    '2202',
+    '2221',
+    '2223',
+    '2224',
+    '2225',
+    '2226',
+    '2227',
+    '2229',
+    '2241',
+    '2242',
+    '2243',
+    '2244',
+    '2245',
+    '2246',
+    '2252',
+    '2254',
+    '2255',
+    '2257',
+    '2261',
+    '2262',
+    '2264',
+    '2265',
+    '2266',
+    '2267',
+    '2268',
+    '2271',
+    '2272',
+    '2273',
+    '2274',
+    '2281',
+    '2283',
+    '2284',
+    '2285',
+    '2286',
+    '2291',
+    '2292',
+    '2296',
+    '2297',
+    '2302',
+    '2314',
+    '2316',
+    '2317',
+    '2320',
+    '2323',
+    '2324',
+    '2325',
+    '2326',
+    '2331',
+    '2333',
+    '2334',
+    '2335',
+    '2336',
+    '2337',
+    '2338',
+    '2342',
+    '2343',
+    '2344',
+    '2345',
+    '2346',
+    '2352',
+    '2353',
+    '2354',
+    '2355',
+    '2356',
+    '2357',
+    '2358',
+    '2392',
+    '2393',
+    '2394',
+    '2395',
+    '2396',
+    '2473',
+    '2474',
+    '2475',
+    '2477',
+    '2478',
+    '2622',
+    '2624',
+    '2625',
+    '2626',
+    '2646',
+    '2647',
+    '2648',
+    '2651',
+    '2655',
+    '2656',
+    '2657',
+    '2658',
+    '2901',
+    '2902',
+    '2903',
+    '2920',
+    '2921',
+    '2922',
+    '2923',
+    '2924',
+    '2925',
+    '2926',
+    '2927',
+    '2928',
+    '2929',
+    '2931',
+    '2932',
+    '2933',
+    '2934',
+    '2935',
+    '2936',
+    '2940',
+    '2942',
+    '2945',
+    '2946',
+    '2948',
+    '2952',
+    '2953',
+    '2954',
+    '2962',
+    '2963',
+    '2964',
+    '2966',
+    '2972',
+    '2982',
+    '2983',
+    '3327',
+    '3329',
+    '3382',
+    '3385',
+    '3387',
+    '3388',
+    '3400',
+    '3401',
+    '3402',
+    '3404',
+    '3405',
+    '3406',
+    '3407',
+    '3408',
+    '3409',
+    '3435',
+    '3436',
+    '3437',
+    '3438',
+    '3442',
+    '3444',
+    '3445',
+    '3446',
+    '3447',
+    '3454',
+    '3455',
+    '3456',
+    '3458',
+    '3460',
+    '3462',
+    '3463',
+    '3464',
+    '3465',
+    '3466',
+    '3467',
+    '3468',
+    '3469',
+    '3471',
+    '3472',
+    '3476',
+    '3482',
+    '3483',
+    '3487',
+    '3489',
+    '3491',
+    '3492',
+    '3493',
+    '3496',
+    '3497',
+    '3498',
+    '3521',
+    '3522',
+    '3524',
+    '3525',
+    '3532',
+    '3533',
+    '3537',
+    '3541',
+    '3542',
+    '3543',
+    '3544',
+    '3546',
+    '3547',
+    '3548',
+    '3549',
+    '3562',
+    '3563',
+    '3564',
+    '3571',
+    '3572',
+    '3573',
+    '3574',
+    '3575',
+    '3576',
+    '3582',
+    '3583',
+    '3584',
+    '3585',
+    '3711',
+    '3715',
+    '3716',
+    '3718',
+    '3721',
+    '3725',
+    '3731',
+    '3734',
+    '3735',
+    '3741',
+    '3743',
+    '3751',
+    '3754',
+    '3755',
+    '3756',
+    '3757',
+    '3758',
+    '3772',
+    '3773',
+    '3774',
+    '3775',
+    '3777',
+    '3781',
+    '3782',
+    '3786',
+    '3821',
+    '3825',
+    '3826',
+    '3827',
+    '3832',
+    '3835',
+    '3837',
+    '3838',
+    '3841',
+    '3843',
+    '3844',
+    '3845',
+    '3846',
+    '3854',
+    '3855',
+    '3856',
+    '3857',
+    '3858',
+    '3861',
+    '3862',
+    '3863',
+    '3865',
+    '3867',
+    '3868',
+    '3869',
+    '3873',
+    '3876',
+    '3877',
+    '3878',
+    '3885',
+    '3886',
+    '3887',
+    '3888',
+    '3891',
+    '3892',
+    '3894',
+]
+
+# Mobile
+# Mobile phone numbers in Argentina are assigned the same geographic area codes as fixed lines,
+# according to the subscriber's choice or residence, and can be 6, 7 or 8 digits long, just as
+# landline numbers are. The difference with landline numbers is that a prefix 15, never used for
+# landlines, must be dialed.
+
+
+
+# International: +54 + 9 + area code + subscriber number (without '15' prefix)
+# Domestic: area code + 15 + subscriber number
+# Mobile numbers in Argentina may be listed as 15-xxxxxxx. However, the leading '15'
+# is a domestic prefix which must be omitted when calling these from outside Argentina,
+# with the xxxxxxx being the actual subscriber number portion.
+
+# Non-geographic numbers 0ppp-nnn-nnnn
+special_numbers = [
+  '800', # toll-free telephone numbers
+  '810', # calls from any area chargeable at local rate
+  '822', # toll-free numbers used for calling card access
+  '600', # premium-rate telephone numbers
+  '609', # premium, fixed-rate gaming numbers
+  '610', # dial-up Internet access numbers, usually cheaper than a local call, less frequently used as dial-up Internet access decreased
+  '605', # premium-rate telephone numbers for charity donations
+]
+
+Phony.define do
+  country '54', trunk('0')                                |
+      one_of(area_codes_4digits) >> split(2, 4) | # landline
+      one_of(area_codes_3digits) >> split(3, 4) | # landline
+      one_of(area_codes_2digits) >> split(4, 4) | # landline
+      one_of(area_codes_2digits.map{|x| "9#{x}" }) >> split(4, 4) | # mobile
+      one_of(area_codes_3digits.map{|x| "9#{x}" }) >> split(3, 4) | # mobile
+      one_of(area_codes_4digits.map{|x| "9#{x}" }) >> split(2, 4) | # mobile
+      one_of(special_numbers)            >> split(3, 4)
+end

data/lib/phony/countries/austria.rb

@@ -85,7 +85,7 @@ service = [
  '939'
 ]
 
-# https://www.rtr.at/en/tk/E129/2312_Austrian_Numbering_Plan_2011-03-30.pdf
+# https://www.rtr.at/en/tk/E129/Austrian_Numbering_Plan_2011-03-30.pdf
 #
 # TODO Add more details.
 #
@@ -97,7 +97,7 @@ Phony.define do
                 one_of('800')            >> split(6..10)  | # Free number length is 9..13
                 one_of(corporate_2digit) >> split(3..11)  | # Corporate number length is 5..13
                 one_of(corporate)        >> split(2..10)  | # Corporate number length is 5..13
-                one_of(ndcs)             >> split(6..10)  |
+                one_of(ndcs)             >> split(5..10)  |
                 one_of('663')            >> split(6..8)   | # 6..8 digit mobile.
                 one_of(mobile)           >> split(4,3..9) |
                 one_of(mobile_2digit)    >> split(7..7)   | # Separate as mobile contains 676 - 67 violates the prefix rule.

data/lib/phony/countries/germany.rb

@@ -4090,7 +4090,7 @@ Phony.define do
      one_of(*service)        >> split(3,1..9) |
      one_of(*mobile_4digits) >> split(3,4) |
      one_of(*mobile_3digits) >> split(4,3..4) |
-     one_of(*ndcs2)          >> split(3,2..10) |
+     one_of(*ndcs2)          >> split(3,1..10) |
      one_of(*ndcs3)          >> split(3,1..9) |
      one_of(*ndcs4)          >> split(3,0..8) |
      fixed(5)                >> split(3,0..7)

data/spec/functional/plausibility_spec.rb

@@ -46,7 +46,8 @@ describe 'plausibility' do
     end
 
     context 'specific countries' do
-      it_is_correct_for 'Austria', :samples => '+43 720 116987' # VoIP
+      it_is_correct_for 'Austria', :samples => ['+43 720 116987', # VoIP
+                                                '+43 463 12345'] # Klagenfurt
       it_is_correct_for 'Bosnia and Herzegovina', :samples => ['+387 66 666 666',
                                                                '+387 37 123 456',
                                                                '+387 33 222 111']
@@ -251,6 +252,7 @@ describe 'plausibility' do
       it_is_correct_for 'Gabonese Republic', :samples => '+241 1 627 739'
       it_is_correct_for 'Gambia', :samples => '+220  989 5148'
       it_is_correct_for 'Germany', :samples => [
+        '+49 69 155 1',
         '+49 1577 536 8701'
       ]
       it_is_correct_for 'Georgia', :samples => ['+995 220 123 45',

data/spec/lib/phony/countries_spec.rb

@@ -33,13 +33,13 @@ describe 'country descriptions' do
     end
 
     describe 'Argentina' do
-      it_splits '541112345678', ['54', '11', '1234', '5678']
-      it_splits '542911234567', ['54', '291', '123', '4567']
-      it_splits '542965123456', ['54', '2965', '12', '3456']
-      it_splits '5491112345678', ['54', '911', '1234', '5678']
-      it_splits '5492201234567', ['54', '9220', '123', '4567']
-      it_splits '5492221123456', ['54', '92221', '12', '3456']
-      it_splits '548001234567', ['54', '800', '123', '4567']
+      it_splits '541112345678', ['54', '11', '1234', '5678']    # 2-digit area code / landline
+      it_splits '542911234567', ['54', '291', '123', '4567']    # 3-digit area code / landline
+      it_splits '542903123456', ['54', '2903', '12', '3456']    # 4-digit area code / landline
+      it_splits '5491112345678', ['54', '911', '1234', '5678']  # 2-digit area code / international mobile
+      it_splits '5492201234567', ['54', '9220', '123', '4567']  # 3-digit area code / international mobile
+      it_splits '5492221123456', ['54', '92221', '12', '3456']  # 4-digit area code / international mobile
+      it_splits '548001234567', ['54', '800', '123', '4567']    # Non-geographic number
     end
 
     describe 'Austria' do

data/spec/lib/phony/country_spec.rb

@@ -23,7 +23,7 @@ describe Phony::Country do
   end
   
   context 'regression' do
-    describe 'iceland' do
+    describe 'Iceland' do
       let(:country) do
         national_splitter = Phony::NationalSplitters::None.instance_for
         local_splitter    = Phony::LocalSplitters::Fixed.instance_for [3, 4]
@@ -35,6 +35,14 @@ describe Phony::Country do
         country.split('112').should == [nil, false, '112']
       end
     end
+    describe 'San Marino' do
+      it 'normalizes correctly' do
+        Phony.normalize('+3780549903549').should == '3780549903549'
+      end
+      xit 'automatically adds the sole NC' do
+        Phony.normalize('+378903549').should == '3780549903549'
+      end
+    end
   end
   
   context "without special cases (with switzerland)" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: phony
 version: !ruby/object:Gem::Version
-  version: 2.18.4
+  version: 2.18.9
 platform: ruby
 authors:
 - Florian Hanke
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-28 00:00:00.000000000 Z
+date: 2019-11-09 00:00:00.000000000 Z
 dependencies: []
 description: 'Fast international phone number (E164 standard) normalizing, splitting
   and formatting. Lots of formatting options: International (+.., 00..), national
@@ -23,6 +23,7 @@ files:
 - lib/phony.rb
 - lib/phony/config.rb
 - lib/phony/countries.rb
+- lib/phony/countries/argentina.rb
 - lib/phony/countries/austria.rb
 - lib/phony/countries/bangladesh.rb
 - lib/phony/countries/belarus.rb
@@ -113,8 +114,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Fast international phone number (E164 standard) normalizing, splitting and