phony 2.15.49 → 2.16.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f2d261312b89cd2670ec6b20a58f8464b85a3371
-  data.tar.gz: 7f2e0bdf26ec96c440b77caac7db75ef00f2c4d1
+  metadata.gz: d831c513f17ed24daad1ad6bd38a46c6b37deb16
+  data.tar.gz: 304941e9a21b1947471bcf3f2fc6de9dc5294ce7
 SHA512:
-  metadata.gz: 88dcbcfac2df06d7692787ac8781d87b94e8ebc24f838b7ee9717a4c6030f90e3522e3e7476afde083c46d69557d55fc7c76592ad8fdd2d065a43db4ac30de6f
-  data.tar.gz: 9515d295a853c699c1301266ad54b7e529a02f64d097b5517eda3e80df38c824256a9c52fb92894793a6783e44c091aa94d89f376bd46bf7c24feb8eaa485e66
+  metadata.gz: 04743bc50ad6da4c0936878ed2a9eb4b2e560de7e36622e41e741da77a7ddd9e1d9f3893db71113045e68217a69ed71ca5c441b29f47d7f7c69562a910de1ff8
+  data.tar.gz: 00dc3f70d706c77aa3d31df5306491d01bf1aefd2cb79bc78ef1977ab15b6184d27f470723b7e3254754e727c3b1c831b300bd65a9b302e717456bc95da32578

data/lib/phony.rb

@@ -76,9 +76,31 @@ module Phony
   # @example
   #   Phony.normalize("Fnork!") # Raises a Phony::NormalizationError.
   #
-  class NormalizationError < StandardError
-    def initialize(input)
-      super %Q{Phony could not normalize the given number. Is #{input.inspect} a phone number?}
+  class NormalizationError < ArgumentError
+    def initialize
+      super %Q{Phony could not normalize the given number. Is it a phone number?}
+    end
+  end
+  
+  # Raised in case Phony can't split a given number.
+  #
+  # @example
+  #   Phony.split("Fnork!") # Raises a Phony::SplittingError.
+  #
+  class SplittingError < ArgumentError
+    def initialize number
+      super %Q{Phony could not split the given number. Is #{number.blank? ? 'it' : number.inspect} a phone number?}
+    end
+  end
+  
+  # Raised in case Phony can't format a given number.
+  #
+  # @example
+  #   Phony.format("Fnork!") # Raises a Phony::FormattingError.
+  #
+  class FormattingError < ArgumentError
+    def initialize
+      super %Q{Phony could not format the given number. Is it a phone number?}
     end
   end
 
@@ -121,6 +143,7 @@ module Phony
     #
     def normalize phone_number, options = {}
       raise ArgumentError, "Phone number cannot be nil. Use e.g. number && Phony.normalize(number)." unless phone_number
+      
       normalize! phone_number.dup, options
     end
     # A destructive version of {#normalize}.
@@ -143,7 +166,7 @@ module Phony
     def normalize! phone_number, options = {}
       @codes.normalize phone_number, options
     rescue
-      raise NormalizationError.new phone_number
+      raise NormalizationError.new
     end
 
     # Splits the phone number into pieces according to the country codes.
@@ -162,7 +185,8 @@ module Phony
     #
     def split phone_number
       raise ArgumentError, "Phone number cannot be nil. Use e.g. number && Phony.split(number)." unless phone_number
-      split! phone_number.dup
+      
+      split! phone_number.dup, phone_number
     end
     # A destructive version of {#split}.
     #
@@ -178,8 +202,11 @@ module Phony
     # @example Split a NANP number.
     #   Phony.split!("13015550100") # => ["1", "301", "555", "0100"]
     #
-    def split! phone_number
+    def split! phone_number, error_number = nil
       @codes.split phone_number
+    rescue
+      # NB The error_number (reference) is used because phone_number is destructively handled.
+      raise SplittingError.new(error_number)
     end
 
     # Formats a normalized E164 number according to a country's formatting scheme.
@@ -231,6 +258,8 @@ module Phony
     #
     def format! phone_number, options = {}
       @codes.format phone_number, options
+    rescue
+      raise FormattingError.new
     end
     alias formatted  format
     alias formatted! format!

data/lib/phony/countries/indonesia.rb

@@ -34,7 +34,8 @@ Phony.define do
     match(/\A(81\d|82\d|83\d|84\d|85\d|86\d|87\d|88\d|89\d)\d+\z/) >> matched_split(  # mobile
         /\A\d{6}\z/ => [3,3],
         /\A\d{7}\z/ => [3,4],
-        /\A\d+\z/ => [4,4]) |
+        /\A\d{8}\z/ => [4,4],
+        /\A\d+\z/ => [4,5]) |
     one_of(%w(9)) >> matched_split( # geographic
         /\A\d{7}\z/ => [4,3],
         /\A\d+\z/ => [3,3,3]) |

data/spec/functional/plausibility_spec.rb

@@ -25,11 +25,11 @@ describe 'plausibility' do
           incorrect = [shortest.sub(/\d\s*\z/, '')] # , longest + '0']
 
           correct.each do |value|
-            Phony.plausible?(value).should be_true,
+            Phony.plausible?(value).should be_truthy,
               "It should validate #{value}, but does not."
           end
           incorrect.each do |value|
-            Phony.plausible?(value).should be_false,
+            Phony.plausible?(value).should be_falsey,
               "It should not validate #{value}, but does."
           end
         end
@@ -38,7 +38,7 @@ describe 'plausibility' do
           invalid = [*sample]
 
           invalid.each do |value|
-            Phony.plausible?(value).should be_false,
+            Phony.plausible?(value).should be_falsey,
               "It should not validate #{value}, but does."
           end
         end
@@ -54,14 +54,14 @@ describe 'plausibility' do
       it_is_correct_for 'Cook Islands', :samples => '+682  71928'
       it_is_correct_for 'Costa Rica', :samples => '+506 2 234 5678'
       it 'is correct for Croatia' do
-          Phony.plausible?('+385 21 695 900').should be_true  # Landline
-          Phony.plausible?('+385 1 4566 666').should be_true  # Landline (Zagreb)
-          Phony.plausible?('+385 99 444 999').should be_true  # Mobile
-          Phony.plausible?('+385 91 896 7509').should be_true # Mobile
-          Phony.plausible?('+385 800 1234').should be_true    # Toll free
-          Phony.plausible?('+385 800 123 456').should be_true # Toll free
-          Phony.plausible?('+385 60 12 345').should be_true   # Premium rate
-          Phony.plausible?('+385 62 123 456').should be_true  # Premium, personal and UAN
+          Phony.plausible?('+385 21 695 900').should be_truthy  # Landline
+          Phony.plausible?('+385 1 4566 666').should be_truthy  # Landline (Zagreb)
+          Phony.plausible?('+385 99 444 999').should be_truthy  # Mobile
+          Phony.plausible?('+385 91 896 7509').should be_truthy # Mobile
+          Phony.plausible?('+385 800 1234').should be_truthy    # Toll free
+          Phony.plausible?('+385 800 123 456').should be_truthy # Toll free
+          Phony.plausible?('+385 60 12 345').should be_truthy   # Premium rate
+          Phony.plausible?('+385 62 123 456').should be_truthy  # Premium, personal and UAN
       end
       it_is_correct_for "Côte d'Ivoire", :samples => '+225  9358 8764'
       it_is_correct_for 'Democratic Republic of Timor-Leste', :samples => ['+670 465 7886', '+670 7465 7886']
@@ -69,30 +69,30 @@ describe 'plausibility' do
       it_is_correct_for 'Diego Garcia', :samples => '+246  123 7686'
       it_is_correct_for 'Djibouti', :samples => '+253  3671 1431'
       it 'is correct for Ecuador' do
-        Phony.plausible?('+593 22 000 0000').should be_true
-        Phony.plausible?('+593 23 000 0000').should be_true
-        Phony.plausible?('+593 26 000 0000').should be_true
-        Phony.plausible?('+593 27 000 0000').should be_true
-        Phony.plausible?('+593 44 000 0000').should be_true
-        Phony.plausible?('+593 45 000 0000').should be_true
-        Phony.plausible?('+593 47 000 0000').should be_true
-        Phony.plausible?('+593 2 200 0000').should be_true
-        Phony.plausible?('+593 2 300 0000').should be_true
-        Phony.plausible?('+593 2 400 0000').should be_true
-        Phony.plausible?('+593 2 500 0000').should be_true
-        Phony.plausible?('+593 2 700 0000').should be_true
-        Phony.plausible?('+593 3 000 0000').should be_true
-        Phony.plausible?('+593 4 000 0000').should be_true
-        Phony.plausible?('+593 4 500 0000').should be_true
-        Phony.plausible?('+593 4 600 0000').should be_true
-        Phony.plausible?('+593 5 200 0000').should be_true
-        Phony.plausible?('+593 5 300 0000').should be_true
-        Phony.plausible?('+593 6 200 0000').should be_true
-        Phony.plausible?('+593 7 200 0000').should be_true
-        Phony.plausible?('+593 7 300 0000').should be_true
-        Phony.plausible?('+593 7 400 0000').should be_true
-        Phony.plausible?('+593 7 600 0000').should be_true
-        Phony.plausible?('+593 9 0000 0000').should be_true # mobile
+        Phony.plausible?('+593 22 000 0000').should be_truthy
+        Phony.plausible?('+593 23 000 0000').should be_truthy
+        Phony.plausible?('+593 26 000 0000').should be_truthy
+        Phony.plausible?('+593 27 000 0000').should be_truthy
+        Phony.plausible?('+593 44 000 0000').should be_truthy
+        Phony.plausible?('+593 45 000 0000').should be_truthy
+        Phony.plausible?('+593 47 000 0000').should be_truthy
+        Phony.plausible?('+593 2 200 0000').should be_truthy
+        Phony.plausible?('+593 2 300 0000').should be_truthy
+        Phony.plausible?('+593 2 400 0000').should be_truthy
+        Phony.plausible?('+593 2 500 0000').should be_truthy
+        Phony.plausible?('+593 2 700 0000').should be_truthy
+        Phony.plausible?('+593 3 000 0000').should be_truthy
+        Phony.plausible?('+593 4 000 0000').should be_truthy
+        Phony.plausible?('+593 4 500 0000').should be_truthy
+        Phony.plausible?('+593 4 600 0000').should be_truthy
+        Phony.plausible?('+593 5 200 0000').should be_truthy
+        Phony.plausible?('+593 5 300 0000').should be_truthy
+        Phony.plausible?('+593 6 200 0000').should be_truthy
+        Phony.plausible?('+593 7 200 0000').should be_truthy
+        Phony.plausible?('+593 7 300 0000').should be_truthy
+        Phony.plausible?('+593 7 400 0000').should be_truthy
+        Phony.plausible?('+593 7 600 0000').should be_truthy
+        Phony.plausible?('+593 9 0000 0000').should be_truthy # mobile
       end
       it_is_correct_for 'Equatorial Guinea', :samples => ['+240 222 201 123',
                                                           '+240 335 201 123']
@@ -102,21 +102,21 @@ describe 'plausibility' do
       it_is_correct_for 'Faroe Islands', :samples => '+298  969 597'
       it_is_correct_for 'Fiji (Republic of)', :samples => '+679  998 2441'
       it 'is correct for Finland' do
-        Phony.plausible?('+358 50 123 4').should be_true
-        Phony.plausible?('+358 50 123 45').should be_true
-        Phony.plausible?('+358 50 123 45 6').should be_true
-        Phony.plausible?('+358 50 123 45 67').should be_true
-        Phony.plausible?('+358 50 123 45 678').should be_true
-        Phony.plausible?('+358 49 123 456 789').should be_true
-        Phony.plausible?('+358 18 1234').should be_true
-        Phony.plausible?('+358 9 1234').should be_true
-        Phony.plausible?('+358 9 123 45').should be_true
-        Phony.plausible?('+358 9 123 456').should be_true
-        Phony.plausible?('+358 9 123 4567').should be_true
-        Phony.plausible?('+358 20 1470 740').should be_true
-        Phony.plausible?('+358 29 123 4567').should be_true
-        Phony.plausible?('+358 75323 1234').should be_true
-        Phony.plausible?('+358 50 123 456 789').should be_false
+        Phony.plausible?('+358 50 123 4').should be_truthy
+        Phony.plausible?('+358 50 123 45').should be_truthy
+        Phony.plausible?('+358 50 123 45 6').should be_truthy
+        Phony.plausible?('+358 50 123 45 67').should be_truthy
+        Phony.plausible?('+358 50 123 45 678').should be_truthy
+        Phony.plausible?('+358 49 123 456 789').should be_truthy
+        Phony.plausible?('+358 18 1234').should be_truthy
+        Phony.plausible?('+358 9 1234').should be_truthy
+        Phony.plausible?('+358 9 123 45').should be_truthy
+        Phony.plausible?('+358 9 123 456').should be_truthy
+        Phony.plausible?('+358 9 123 4567').should be_truthy
+        Phony.plausible?('+358 20 1470 740').should be_truthy
+        Phony.plausible?('+358 29 123 4567').should be_truthy
+        Phony.plausible?('+358 75323 1234').should be_truthy
+        Phony.plausible?('+358 50 123 456 789').should be_falsey
       end
       it_is_correct_for 'French Guiana (French Department of)', :samples => '+594 594 123 456'
       it_is_correct_for "French Polynesia (Territoire français d'outre-mer)", :samples => '+689 87 27 84 00'
@@ -177,9 +177,9 @@ describe 'plausibility' do
                                                 '+961 81 123 456']
       it_is_correct_for 'Lesotho', :samples => '+266  7612 6866'
       it 'is correct for Liberia' do
-        Phony.plausible?('+231 2 123 4567').should be_true
-        Phony.plausible?('+231 4 123 456').should be_true
-        Phony.plausible?('+231 77 123 4567').should be_true
+        Phony.plausible?('+231 2 123 4567').should be_truthy
+        Phony.plausible?('+231 4 123 456').should be_truthy
+        Phony.plausible?('+231 77 123 4567').should be_truthy
       end
       it_is_correct_for 'Macao', :samples => ['+853 28 12 3456',
                                               '+853 8 123 4567',
@@ -219,8 +219,8 @@ describe 'plausibility' do
                                               '+977 98 1234 5678']
       it_is_correct_for "New Caledonia (Territoire français d'outre-mer)", :samples => '+687  546 835'
       it 'is correct for New Zealand' do
-        Phony.plausible?('+64800123123').should be_true # Free phone
-        Phony.plausible?('+648001231234').should be_true # Free phone
+        Phony.plausible?('+64800123123').should be_truthy # Free phone
+        Phony.plausible?('+648001231234').should be_truthy # Free phone
       end
       it_is_correct_for 'Nicaragua', :samples => '+505 12 345 678'
       it_is_correct_for 'Niger', :samples => '+227  1234 5678'
@@ -378,11 +378,11 @@ describe 'plausibility' do
                                               '+967 77 123 4567',
                                               '+967 58 1234']
       it 'is correct for Zambia' do
-        Phony.plausible?('+260 211 123456').should be_true  # Fixed
-        Phony.plausible?('+260 955 123456').should be_true  # Mobile
-        Phony.plausible?('+260 967 123456').should be_true  # Mobile
-        Phony.plausible?('+260 978 123456').should be_true  # Mobile
-        Phony.plausible?('+260 800 123 456').should be_true # Toll free
+        Phony.plausible?('+260 211 123456').should be_truthy  # Fixed
+        Phony.plausible?('+260 955 123456').should be_truthy  # Mobile
+        Phony.plausible?('+260 967 123456').should be_truthy  # Mobile
+        Phony.plausible?('+260 978 123456').should be_truthy  # Mobile
+        Phony.plausible?('+260 800 123 456').should be_truthy # Toll free
       end
       it_is_correct_for 'Zimbabwe', :samples => [['+263 2582 123 456', '+263 2582 123'],
                                                  ['+263 147 123 456', '+263 147 123'],
@@ -390,15 +390,15 @@ describe 'plausibility' do
                                                  '+263 86 1235 4567']
 
       it 'is correct for Indonesia' do
-        Phony.plausible?('+62 22 000 0').should be_false
-        Phony.plausible?('+62 22 000 00').should be_true
-        Phony.plausible?('+62 22 000 0000').should be_true
-        Phony.plausible?('+62 22 0000 0000').should be_true
-        Phony.plausible?('+62 22 000 000 000').should be_true
+        Phony.plausible?('+62 22 000 0').should be_falsey
+        Phony.plausible?('+62 22 000 00').should be_truthy
+        Phony.plausible?('+62 22 000 0000').should be_truthy
+        Phony.plausible?('+62 22 0000 0000').should be_truthy
+        Phony.plausible?('+62 22 000 000 000').should be_truthy
       end
 
       it 'is correct for Russia' do
-        Phony.plausible?('+7 3522 000 000').should be_true
+        Phony.plausible?('+7 3522 000 000').should be_truthy
       end
     end
   end

data/spec/lib/phony/countries_spec.rb

@@ -356,6 +356,7 @@ describe 'country descriptions' do
       it_splits '62877123456', %w(62 877 123 456)
       it_splits '62881123456', %w(62 881 123 456)
       it_splits '6288112345656', %w(62 881 1234 5656)
+      it_splits '62881123456567', %w(62 881 1234 56567)
       it_splits '628990344805', %w(62 899 034 4805)
       it_splits '6291234567', %w(62 9 1234 567)
       it_splits '629123456789', %w(62 9 123 456 789)

data/spec/lib/phony/local_splitters/regex_spec.rb

@@ -53,35 +53,35 @@ describe Phony::LocalSplitters::Regex do
     context 'Local splitter without mappings' do
       let(:local_splitter) { described_class.instance_for({})}
       it 'returns false' do
-        result.should be_false
+        result.should be_falsey
       end
     end
 
     context 'Mapping does not exist for a number' do
       let(:local_splitter) { described_class.instance_for(/\A5/ => [1,2,3])}
       it 'returns false' do
-        result.should be_false
+        result.should be_falsey
       end
     end
 
     context "Mapping exists, but the length is greater" do
       let(:local_splitter) { described_class.instance_for(/\A123/ => [2,2])}
       it 'returns false' do
-        result.should be_false
+        result.should be_falsey
       end
     end
 
     context "Mapping exists, but the length is less" do
       let(:local_splitter) { described_class.instance_for(/\A123/ => [2,2,3])}
       it 'returns false' do
-        result.should be_false
+        result.should be_falsey
       end
     end
 
     context 'Mapping exists and the length is equal' do
       let(:local_splitter) { described_class.instance_for(/\A123/ => [2,2,2])}
       it 'returns true' do
-        result.should be_true
+        result.should be_truthy
       end
     end
 

data/spec/lib/phony/national_splitters/default_spec.rb

@@ -19,7 +19,7 @@ describe Phony::NationalSplitters::Default do
     
     describe 'plausible?' do
       it 'is always plausible' do
-        splitter.plausible?(:anything, :anything).should be_true
+        splitter.plausible?(:anything, :anything).should be_truthy
       end
     end
     

data/spec/lib/phony_spec.rb

@@ -0,0 +1,74 @@
+require 'spec_helper'
+
+describe Phony do
+  
+  describe described_class::NormalizationError do
+    it 'is correctly raised on normalize' do
+      expect do
+        described_class.normalize('000')
+      end.to raise_error(described_class::NormalizationError)
+    end
+    it 'is correctly raised on normalize' do
+      expect do
+        described_class.normalize('000')
+      end.to raise_error(%Q{Phony could not normalize the given number. Is it a phone number?})
+    end
+    it 'is correctly raised on normalize!' do
+      expect do
+        described_class.normalize!('000')
+      end.to raise_error(described_class::NormalizationError)
+    end
+    it 'is correctly raised on normalize!' do
+      expect do
+        described_class.normalize!('000')
+      end.to raise_error(%Q{Phony could not normalize the given number. Is it a phone number?})
+    end
+  end
+
+  describe described_class::SplittingError do
+    it 'is correctly raised on split' do
+      expect do
+        described_class.split('000')
+      end.to raise_error(described_class::SplittingError)
+    end
+    it 'is correctly raised on split' do
+      expect do
+        described_class.split('000')
+      end.to raise_error(%Q{Phony could not split the given number. Is "000" a phone number?})
+    end
+    it 'is correctly raised on split!' do
+      expect do
+        described_class.split!('000')
+      end.to raise_error(described_class::SplittingError)
+    end
+    it 'is correctly raised on split!' do
+      expect do
+        described_class.split!('000')
+      end.to raise_error(%Q{Phony could not split the given number. Is it a phone number?})
+    end
+  end
+  
+  describe described_class::FormattingError do
+    it 'is correctly raised on format' do
+      expect do
+        described_class.format('000')
+      end.to raise_error(described_class::FormattingError)
+    end
+    it 'is correctly raised on format' do
+      expect do
+        described_class.format('000')
+      end.to raise_error(%Q{Phony could not format the given number. Is it a phone number?})
+    end
+    it 'is correctly raised on format!' do
+      expect do
+        described_class.format!('000')
+      end.to raise_error(described_class::FormattingError)
+    end
+    it 'is correctly raised on format!' do
+      expect do
+        described_class.format!('000')
+      end.to raise_error(%Q{Phony could not format the given number. Is it a phone number?})
+    end
+  end
+  
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: phony
 version: !ruby/object:Gem::Version
-  version: 2.15.49
+  version: 2.16.1
 platform: ruby
 authors:
 - Florian Hanke
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-24 00:00:00.000000000 Z
+date: 2017-12-08 00:00:00.000000000 Z
 dependencies: []
 description: 'Fast international phone number (E164 standard) normalizing, splitting
   and formatting. Lots of formatting options: International (+.., 00..), national
@@ -91,6 +91,7 @@ files:
 - spec/lib/phony/national_splitters/regex_spec.rb
 - spec/lib/phony/national_splitters/variable_spec.rb
 - spec/lib/phony/vanity_spec.rb
+- spec/lib/phony_spec.rb
 homepage: http://github.com/floere/phony
 licenses:
 - MIT
@@ -131,3 +132,4 @@ test_files:
 - spec/lib/phony/national_splitters/regex_spec.rb
 - spec/lib/phony/national_splitters/variable_spec.rb
 - spec/lib/phony/vanity_spec.rb
+- spec/lib/phony_spec.rb