phony 2.15.40 → 2.15.41

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 025fd5f44739a955cee2b09ef250e2e820de8ecd
-  data.tar.gz: fea5fd6630d91521f8dcfaa1f3c0a22fb4025a2f
+  metadata.gz: 82b503c2e5f9f3b3a81043a38c68f15552ef5d6b
+  data.tar.gz: 9572b6582b657cbefa87f1f516b47e89cc062068
 SHA512:
-  metadata.gz: 356f262ce1fc0eb730c0ed00d8c1fb4f09862b96a5afae1bdf6c12e7fe42e7f3b8a9fd86e4fe585d616bb0241038d3fd1c5f87a062f992669902dada5b0a878a
-  data.tar.gz: 641cec9186c42bb03bae365c8d1a54e20b39d26a3e287dc7134aeb52504e6b2668d766f9bf8f779f272731393ffbc24339f8a6a7bcbe732491865e41143ce2a6
+  metadata.gz: 43eef5656724b34b4e9f71201423570572bae9db6b21bdc8bd3a1c5f8d2be58f20533402aa3a2f02447c950160b7146bd62cf3aed04ba8aa9cec64d026d3b6c8
+  data.tar.gz: 3031b7bb1f87f64349e123aac3be733f748a9a1d5afa436484bbeeb0fe92b35442cceab3a66119a38fb48b31026aad3decf012efe31fb54f7ca8229473ffe87e

data/lib/phony.rb

@@ -77,8 +77,8 @@ module Phony
   #   Phony.normalize("Fnork!") # Raises a Phony::NormalizationError.
   #
   class NormalizationError < StandardError
-    def initialize
-      super %Q{Phony could not normalize the given number. Is it a phone number?}
+    def initialize(input)
+      super %Q{Phony could not normalize the given number. Is #{input.inspect} a phone number?}
     end
   end
 
@@ -143,7 +143,7 @@ module Phony
     def normalize! phone_number, options = {}
       @codes.normalize phone_number, options
     rescue
-      raise NormalizationError.new
+      raise NormalizationError.new phone_number
     end
 
     # Splits the phone number into pieces according to the country codes.

data/lib/phony/countries/russia_kazakhstan_abkhasia_south_ossetia.rb

@@ -112,8 +112,8 @@ ndcs_with_6_subscriber_digits = %w(3012 3022 3412 3435 3439 3452 3456 3462 3463
 
 ndcs_with_7_subscriber_digits = %w(342 343 347 351 383 391 473 495 496 498 499 812 818 831 843 844 846 861 863
   901 902 903 904 905 906 908 909 910 911 912 913 914 915 916 917 918 919 920 921 922 923 924 925 926 927 928 929
-  930 931 932 933 934 936 937 938 950 951 952 953 960 961 962 963 964 965 967 968 980 981 982 983 984 985 987 988
-  989 997
+  930 931 932 933 934 936 937 938 950 951 952 953 960 961 962 963 964 965 967 968 969 977 980 981 982 983 984 985
+  987 988 989 996 997 999
 )
 
 Phony.define do

data/lib/phony/vanity.rb

@@ -20,7 +20,7 @@ module Phony
     end
     
     # Returns true if there is a character in the number
-    # after the first four numbers.
+    # after the first three numbers.
     #
     @@vanity_regexp = /\A\d{3}[a-zA-Z]{6,12}\Z/
     def self.vanity? number

data/spec/lib/phony/countries_spec.rb

@@ -594,17 +594,23 @@ describe 'country descriptions' do
       it_splits '40791231234', ['40', '79', '123', '1234'] # mobile
       it_splits '40249123123', ['40', '249', '123', '123'] # Olt
     end
+
     describe 'Russia' do
       it_splits '78122345678',   ['7', '812', '234', '56', '78'] # Russia 3-digit
       it_splits '74012771077',   ['7', '4012', '77', '10', '77'] # Russia 4-digit
       it_splits '78402411212',   ['7', '84024', '1', '12', '12'] # Russia 5-digit
-      it_splits '79296119119',   ['7', '929', '611', '91', '19'] # Russia 3-digit, Megafon Mobile.
+      it_splits '79296119119',   ['7', '929', '611', '91', '19'] # Russia 3-digit, Megafon Mobile
+      it_splits '79691234567',   ['7', '969', '123', '45', '67'] # Russia 3-digit, Beeline
+      it_splits '79771234567',   ['7', '977', '123', '45', '67'] # Russia 3-digit
+      it_splits '79961234567',   ['7', '996', '123', '45', '67'] # Russia 3-digit
+      it_splits '79991234567',   ['7', '999', '123', '45', '67'] # Russia 3-digit
       it_splits '7840121212',    ['7', '840', '12', '1212']  # Abhasia
       it_splits '7799121212',    ['7', '799', '12', '1212']  # Kazachstan
-      it_splits '7995344121212', ['7','995344','12','1212']   # South Osetia
+      it_splits '7995344121212', ['7','995344','12','1212']  # South Osetia
       it_splits '7209175276',    ['7', '209', '17', '5276']  # Fantasy number
     end
-		describe 'Rwanda' do
+
+    describe 'Rwanda' do
       it_splits '250781234567', ['250', '78', '1234567'] # mobile
       it_splits '250721234567', ['250', '72', '1234567'] # mobile
       it_splits '250731234567', ['250', '73', '1234567'] # mobile

data/spec/lib/phony/country_codes_spec.rb

@@ -5,6 +5,50 @@ describe Phony::CountryCodes do
   before(:all) do
     @countries = Phony::CountryCodes.instance
   end
+  
+  describe '#[]' do
+    it 'returns a country' do
+      @countries['41'].class.should eql Phony::Country
+    end
+  end
+  
+  describe '#country_for' do
+    it 'returns a country' do
+      @countries.send(:country_for, '41').class.should eql Phony::Country
+    end
+  end
+  
+  describe '#countrify' do
+    it 'returns a country' do
+      @countries.send(:countrify, '441231212', '41').should eql '41441231212'
+    end
+  end
+  describe '#countrify!' do
+    it 'in-place replaces the number' do
+      number = '441231212'
+      @countries.send(:countrify!, number, '41').should eql number
+      
+      number.should == '41441231212'
+    end
+  end
+  
+  describe '#vanity?' do
+    it 'returns true if so' do
+      @countries.vanity?('1800HELLOES').should eql true
+    end
+    it 'returns false if not' do
+      @countries.vanity?('18001234567').should eql false
+    end
+  end
+
+  describe 'normalize' do
+    it 'normalizes correctly' do
+      @countries.normalize('0041-44-364-35-32').should eql '41443643532'
+    end
+    it 'normalizes correctly with CC option' do
+      @countries.normalize('044-364-35-32', cc: '41').should eql '41443643532'
+    end
+  end
 
   describe 'formatted' do
     it 'formats correctly' do

data/spec/lib/phony/country_spec.rb

@@ -2,45 +2,64 @@ require 'spec_helper'
 
 describe Phony::Country do
   
+  describe 'general' do
+    let(:country) do
+      national_splitter = Phony::NationalSplitters::Variable.new 4, ['44']
+      local_splitter    = Phony::LocalSplitters::Fixed.instance_for [3, 2, 2]
+      national_code     = Phony::NationalCode.new national_splitter, local_splitter
+      
+      Phony::Country.new national_code
+    end
+    describe '#clean' do
+      it 'cleans the number' do
+        country.clean('+41-44-123-12-12').should eql '41441231212'
+      end
+    end
+    describe '#vanity_to_number' do
+      it 'turns the vanity number into a number' do
+        country.vanity_to_number('1-800-HELLO').should eql '1-800-43556'
+      end
+    end
+  end
+  
   context 'regression' do
     describe 'iceland' do
-      before(:each) do
+      let(:country) do
         national_splitter = Phony::NationalSplitters::None.instance_for
         local_splitter    = Phony::LocalSplitters::Fixed.instance_for [3, 4]
 
         national_code     = Phony::NationalCode.new national_splitter, local_splitter
-        @iceland          = described_class.new national_code
+        described_class.new national_code
       end
       it 'splits correctly' do
-        @iceland.split('112').should == [nil, false, '112']
+        country.split('112').should == [nil, false, '112']
       end
     end
   end
   
-  context "without special cases" do
-    before(:each) do
+  context "without special cases (with switzerland)" do
+    let(:country) do
       national_splitter = Phony::NationalSplitters::Variable.new 4, ['44']
       local_splitter    = Phony::LocalSplitters::Fixed.instance_for [3, 2, 2]
       national_code     = Phony::NationalCode.new national_splitter, local_splitter
       
-      @switzerland      = Phony::Country.new national_code
-      @switzerland.with '41' # TODO Remove this kludge.
+      Phony::Country.new national_code
     end
     
     describe "split" do
       it "should handle ZH" do
-        @switzerland.split('443643532').should == [nil, '44', '364', '35', '32']
+        country.split('443643532').should == [nil, '44', '364', '35', '32']
       end
     end
     describe 'normalize' do
       it "should handle ZH" do
-        @switzerland.normalize('0443643532').should == '443643532'
+        country.normalize('0443643532').should == '443643532'
       end
     end
   end
   
   context "without special cases" do
-    before(:each) do
+    let(:country) do
       special_national_splitter = Phony::NationalSplitters::Variable.new nil, ['800']
       special_local_splitter    = Phony::LocalSplitters::Fixed.instance_for [3, 3]
       special_code              = Phony::NationalCode.new special_national_splitter, special_local_splitter
@@ -49,15 +68,15 @@ describe Phony::Country do
       local_splitter            = Phony::LocalSplitters::Fixed.instance_for [3, 2, 2]
       national_code             = Phony::NationalCode.new national_splitter, local_splitter
       
-      @switzerland              = Phony::Country.new special_code, national_code
+      Phony::Country.new special_code, national_code
     end
     
     describe "split" do
       it "should handle ZH" do
-        @switzerland.split('443643532').should == [nil, '44', '364', '35', '32']
+        country.split('443643532').should == [nil, '44', '364', '35', '32']
       end
       it "should handle 800" do
-        @switzerland.split('800333666').should == [nil, '800', '333', '666']
+        country.split('800333666').should == [nil, '800', '333', '666']
       end
     end
   end

data/spec/lib/phony/vanity_spec.rb

@@ -0,0 +1,30 @@
+# encoding: utf-8
+#
+require 'spec_helper'
+
+describe Phony::Vanity do
+  
+  let(:vanity) { described_class }
+
+  describe '.replace' do
+    it 'replaces letters with digits' do
+      vanity.replace('1-800-HELLO').should == '1-800-43556'
+    end
+  end
+  
+  describe '.vanity?' do
+    it 'returns true on a vanity number' do
+      vanity.vanity?('800HELLOES').should == true
+    end
+    it 'returns false on a non-vanity number' do
+      vanity.vanity?('8004355637').should == false
+    end
+  end
+  
+  describe '.normalized' do
+    it 'normalizes the vanity number' do
+      vanity.normalized('1-800-HELLO').should == '1800HELLO'
+    end
+  end
+
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: phony
 version: !ruby/object:Gem::Version
-  version: 2.15.40
+  version: 2.15.41
 platform: ruby
 authors:
 - Florian Hanke
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-22 00:00:00.000000000 Z
+date: 2017-02-13 00:00:00.000000000 Z
 dependencies: []
 description: 'Fast international phone number (E164 standard) normalizing, splitting
   and formatting. Lots of formatting options: International (+.., 00..), national
@@ -90,6 +90,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/vanity_spec.rb
 homepage: http://github.com/floere/phony
 licenses:
 - MIT
@@ -129,3 +130,4 @@ test_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/vanity_spec.rb