phony 2.18.23 → 2.19.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: db67ba76e70a6de9c44cc306e4e07eac25c092b456b7a89fbbccd4f5298172b0
-  data.tar.gz: f94e5219ec1808746635853d3cafdca6c91895330bf6b201b259301736b3e3eb
+  metadata.gz: cbadf1b4b8c2d79d7f32c069ee47175e879d57eaf582c93a6098efb068860945
+  data.tar.gz: 644bf8449040256b95af0a1d47bcc15ce0ff35b8dfbc0ee36dd72bdaec20bc4c
 SHA512:
-  metadata.gz: 1119176e19553809a782b8300f263a4791bdb0cd45cf82356ba9dff7871ddc31866628de206734d830a6730eadd8cf1c0286aad0b8342ce95e0cbeb8383647ac
-  data.tar.gz: 1e2eaf69ad9f1b5d2160c0ad7b1b720f54d51c9ad2fcf9708fb23bf43ef91ddb812571a5962e7808ba3c309657acfc5849b95ed788bad629a953a6cf5c3e016f
+  metadata.gz: 994d683a1954d9136d9ee1fe9086e328c14b547c12db01beaf004c81beafa5625ae02f131269cfe6c945fb9666d544318663fa34b35f9d40a611066025583a82
+  data.tar.gz: 43de3b0bf711cae8010b8b61c7c96b1ec89c88730044ae16acc68a6d866725e937811b33891a9663069f1f039d0c269fd1d1930413a168bce13957354694eba6

data/README.textile

@@ -104,7 +104,7 @@ For example, when just loading the NANP CC, the retained memory usage is ~63kB.
 
 h2. List of Handled Countries
 
-Mildly unmaintained list: Abhas, Afghan, Algerian, Argentina, Austrian, Australian, Azerbaijani, Belgian, Brazilian, Cambodian, Chilean, Chinese, Croatian, Cuban, Cypriot, Czech, Danish, Dutch, Egyptian, El Salvadorian, Estonian, French, German, Ghanan, Gibraltar, Greek, Haiti, Hong Kong, Hungarian, Indian, Iran, Irish, Israel, Italian, Kazakh, Liberian, Lithuanian, Luxembourgian, Malaysian, Malta, Mexican, Monaco, Morocco, New Zealand, Nigerian, Norwegian, Peruvian, Polish, Romanian, Russian, Rwandan, Seychelles, Singapore, Slovakian, South African, South Korean, South Osetian, Spanish, Sri Lankan, Sudan, Swedish, Swiss, Thailand, Tunisian, Turkish, Liechtenstein, UK, US, Venezuelan, Vietnamese, and Zambian numbers.
+Mildly unmaintained list: Abhas, Afghan, Algerian, Argentina, Austrian, Australian, Azerbaijani, Belgian, Brazilian, Cambodian, Chilean, Chinese, Croatian, Cuban, Cypriot, Czech, Danish, Dutch, Egyptian, El Salvadorian, Estonian, French, German, Ghanan, Gibraltar, Greek, Haiti, Hong Kong, Hungarian, Indian, Iran, Irish, Israel, Italian, Japanese, Kazakh, Liberian, Lithuanian, Luxembourgian, Malaysian, Malta, Mexican, Monaco, Morocco, New Zealand, Nigerian, Norwegian, Peruvian, Polish, Romanian, Russian, Rwandan, Seychelles, Singapore, Slovakian, South African, South Korean, South Osetian, Spanish, Sri Lankan, Sudan, Swedish, Swiss, Thailand, Tunisian, Turkish, Liechtenstein, UK, US, Venezuelan, Vietnamese, and Zambian numbers.
 
 h2. License
 

data/lib/phony/countries/italy.rb

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

data/lib/phony/countries/japan.rb

@@ -166,6 +166,7 @@ ndcs_with_6_subscriber_numbers = %w(
 422
 428
 436
+438
 439
 460
 463
@@ -281,7 +282,6 @@ ndcs_with_6_subscriber_numbers = %w(
 846
 847
 848
-849
 852
 853
 854
@@ -361,7 +361,6 @@ ndcs_with_5_subscriber_numbers = %w(
 1374
 1377
 1392
-1394
 1397
 1398
 1456
@@ -393,7 +392,6 @@ ndcs_with_5_subscriber_numbers = %w(
 8477
 8512
 8514
-8636
 9496
 9802
 9912
@@ -403,12 +401,15 @@ ndcs_with_5_subscriber_numbers = %w(
 
 Phony.define do
   country '81',
-    trunk('0') |
-    one_of('20', '50', '60', '70', '90')   >> split(4,4) | # mobile, VoIP telephony
+    trunk('0', normalize: true, format: true, split: true) |
+    one_of(%w(20 50 60 70 90))             >> split(4,4) | # mobile, VoIP telephony
     one_of(ndcs_with_5_subscriber_numbers) >> split(1,4) |
     one_of(ndcs_with_6_subscriber_numbers) >> split(2,4) |
     one_of(%w(120))                        >> split(3,3) | # freephone
-    one_of(%w(120 800))                    >> split(3,4) | # freephone
+    one_of(%w(800))                        >> split(3,4) | # freephone
+    one_of(%w(180 570))                    >> split(3,3) | # Tele-gong/Tele-dome, Navi-dial
+    one_of(%w(170 990))                    >> split(2,4) | # Dengon-dial, Dial Q2 (discontinued)
+    one_of(%w(80))                         >> split(4,4) | # mobile
     one_of(ndcs_with_7_subscriber_numbers) >> split(3,4) |
     one_of(ndcs_with_8_subscriber_numbers) >> split(4,4) |
     # TODO: 91(NDC) N(S)N length: 5-13 - Non-geographic number (Direct subscriber telephone service (legacy))

data/lib/phony/country.rb

@@ -156,10 +156,12 @@ module Phony
     #
     # In some cases it doesn't, like Italy.
     #
-    def normalize national_number
+    # Note: Options such as CC
+    #
+    def normalize national_number, options = {}
       clean! national_number
       normalized = @codes.reduce national_number do |number, code|
-        result = code.normalize number
+        result = code.normalize number, options
         break result if result
         number
       end

data/lib/phony/country_codes.rb

@@ -66,7 +66,7 @@ module Phony
         country, cc, number = partial_split number
         country
       end
-      number = country.normalize number
+      number = country.normalize number, cc: cc
       countrify! number, cc
     end
 

data/lib/phony/national_code.rb

@@ -26,7 +26,7 @@ module Phony
     #
     # Note: Some cases, like Italy, don't remove the relative zero.
     #
-    def normalize national_number
+    def normalize national_number, options = {}
       national_number.gsub(/\A0+/, EMPTY_STRING)
     end
 

data/lib/phony/trunk_code.rb

@@ -6,9 +6,9 @@ module Phony
     #  * code: The trunk code, e.g. 0.
     #
     # Options:
-    #  * normalize: Remove the trunk code when normalizing (only use if number scheme is defined unambiguously).
-    #  * split: Remove the trunk code when splitting (only use if number scheme is defined unambiguously).
-    #  * format: Add the trunk code when formatting (passing `false` will not add it).
+    #  * normalize: [true (default), false] Remove the trunk code when normalizing (only use if number scheme is defined unambiguously).
+    #  * split: [true, false (default)] Remove the trunk code when splitting (only use if number scheme is defined unambiguously).
+    #  * format: [true (default), false] Add the trunk code when formatting (passing `false` will not add it).
     #
     def initialize code, options = {}
       @code = code
@@ -35,8 +35,8 @@ module Phony
     
     # Normalize normalizes the given national number.
     #
-    def normalize national_number
-      national_number.gsub! @trunk_code_replacement, EMPTY_STRING if @normalize
+    def normalize national_number, options = {}
+      national_number.gsub! @trunk_code_replacement, EMPTY_STRING if @normalize && options[:cc]
       return national_number
     end
     

data/spec/lib/phony/countries_spec.rb

@@ -484,6 +484,8 @@ describe 'country descriptions' do
       it_splits '817012345678', %w(81 70 1234 5678) # PHS
       it_splits '818012345678', %w(81 80 1234 5678) # Cellular
       it_splits '819012345678', %w(81 90 1234 5678) # Cellular
+      it_splits '810570123456', %w(81 570 123 456)  # Navi-dial
+      it_splits '810180123456', %w(81 180 123 456)  # Tele-gong/Tele-dome
     end
     describe 'Kenya' do
       it_splits '254201234567', ['254', '20', '1234567'] # Nairobi

data/spec/lib/phony/country_spec.rb

@@ -43,6 +43,18 @@ describe Phony::Country do
         Phony.normalize('+378903549').should == '3780549903549'
       end
     end
+    describe 'Japan' do
+      it 'normalizes correctly' do
+        Phony.normalize('+81-03-1234-5634').should == '81312345634'
+        Phony.normalize('03-1234-5634', cc: '81').should == '81312345634'
+      end
+      it 'formats correctly' do
+        Phony.format('81312345634').should == '+81-3-1234-5634'
+      end
+      it 'splits correctly' do
+        Phony.split('81312345634').should == %w(81 3 1234 5634)
+      end
+    end
   end
   
   context "without special cases (with switzerland)" do

data/spec/lib/phony/trunk_code_spec.rb

@@ -0,0 +1,85 @@
+require 'spec_helper'
+
+describe Phony::TrunkCode do
+  
+  describe '#format' do
+    it 'is correct' do
+      code = described_class.new('0')
+      expect(code.format('%s %s')).to eq '0'
+    end
+    it 'is correct' do
+      code = described_class.new('0', format: true)
+      expect(code.format('%s %s')).to eq '0'
+    end
+    it 'is correct' do
+      code = described_class.new('0', format: false)
+      expect(code.format('%s %s')).to eq nil
+    end
+    it 'is correct' do
+      code = described_class.new('06')
+      expect(code.format('%s %s')).to eq '06'
+    end
+    it 'is correct' do
+      code = described_class.new('06', format: true)
+      expect(code.format('%s %s')).to eq '06'
+    end
+    it 'is correct' do
+      code = described_class.new('06', format: false)
+      expect(code.format('%s %s')).to eq nil
+    end
+  end
+  
+  describe '#normalize' do
+    it 'is correct' do
+      code = described_class.new('0')
+      expect(code.normalize('0123')).to eq '0123'
+    end
+    it 'is correct' do
+      code = described_class.new('0', normalize: true)
+      expect(code.normalize('0123')).to eq '0123'
+    end
+    it 'is correct' do
+      code = described_class.new('0', normalize: false)
+      expect(code.normalize('0123')).to eq '0123'
+    end
+    it 'is correct' do
+      code = described_class.new('06')
+      expect(code.normalize('06123')).to eq '06123'
+    end
+    it 'is correct' do
+      code = described_class.new('06', normalize: true)
+      expect(code.normalize('06123')).to eq '06123'
+    end
+    it 'is correct' do
+      code = described_class.new('06', normalize: false)
+      expect(code.normalize('0123')).to eq '0123'
+    end
+  end
+  
+  describe '#split' do
+    it 'is correct' do
+      code = described_class.new('0')
+      expect(code.split('0123')).to eq [code, '0123']
+    end
+    it 'is correct' do
+      code = described_class.new('0', split: true)
+      expect(code.split('0123')).to eq [code, '123']
+    end
+    it 'is correct' do
+      code = described_class.new('0', split: false)
+      expect(code.split('0123')).to eq [code, '0123']
+    end
+    it 'is correct' do
+      code = described_class.new('06')
+      expect(code.split('06123')).to eq [code, '06123']
+    end
+    it 'is correct' do
+      code = described_class.new('06', split: true)
+      expect(code.split('06123')).to eq [code, '123']
+    end
+    it 'is correct' do
+      code = described_class.new('06', split: false)
+      expect(code.split('06123')).to eq [code, '06123']
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: phony
 version: !ruby/object:Gem::Version
-  version: 2.18.23
+  version: 2.19.1
 platform: ruby
 authors:
 - Florian Hanke
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-06-08 00:00:00.000000000 Z
+date: 2021-06-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
@@ -93,6 +93,7 @@ files:
 - spec/lib/phony/national_splitters/none_spec.rb
 - spec/lib/phony/national_splitters/regex_spec.rb
 - spec/lib/phony/national_splitters/variable_spec.rb
+- spec/lib/phony/trunk_code_spec.rb
 - spec/lib/phony/vanity_spec.rb
 - spec/lib/phony_spec.rb
 homepage: https://github.com/floere/phony
@@ -121,6 +122,7 @@ summary: Fast international phone number (E164 standard) normalizing, splitting
   formatting.
 test_files:
 - spec/lib/phony_spec.rb
+- spec/lib/phony/trunk_code_spec.rb
 - spec/lib/phony/country_spec.rb
 - spec/lib/phony/national_code_spec.rb
 - spec/lib/phony/countries_spec.rb