phony 2.8.2 → 2.8.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c5db8b2a510f9d2e363fc24ade7837ace9db8d9b
-  data.tar.gz: e53b10c977d397d9b0c6dca770dbddd560b808e7
+  metadata.gz: 18b2b6b4d8894f7063f3f1ffdb80cc0f5ed8eb17
+  data.tar.gz: 9f7222a28e4ed77f6d7835078efd734f65c23e2a
 SHA512:
-  metadata.gz: ded8e1e3d7206b255f7fe25978878a6e52866d466e5bf58bb2b382a107da7802775eb035425924b069a30a515f1300b6846ec126b508f7214033eec0aaa2763f
-  data.tar.gz: 5c8474e09d66faed68e6111212cd0b528e2da1f47ee696773264d1b18cf3a10eb9733115bb6b879f66438dd8270a096c67d41891aafb5b29f29e00c70fc3cd1b
+  metadata.gz: 3dce67e5a63cf8a758548797d635e9fb11ef9fc8e146a0e30d1c4d7cff79373ff18efe5fc17f51a4ac5a1b3989747bfc05f9570e92b9440fda06cbcd31128783
+  data.tar.gz: ed5c196a136597a22540715db57bf7bb63128904a86db0fb0c97646ffc3bb885f188aab933829c4659dceaadee1ddee8549e4c545cf0e27e16a42aa3007f27f4

data/lib/phony/countries/guinea.rb

@@ -26,11 +26,11 @@ land_ndcs_with_5_digits = [
 ]
 
 mobile_ndcs_with_3_digits = [
-  ('660'..'669').to_a, # Areeba
-  ('620'..'629').to_a, # Orange
-  ('650'..'659').to_a, # Cellcom
-  ('630'..'639').to_a, # Intercel
-  ('600'..'609').to_a  # Sotelgui
+  *('660'..'669'), # Areeba
+  *('620'..'629'), # Orange
+  *('650'..'659'), # Cellcom
+  *('630'..'639'), # Intercel
+  *('600'..'609')  # Sotelgui
 ]
 
 Phony.define do
@@ -38,7 +38,6 @@ Phony.define do
     one_of(land_ndcs_with_5_digits)   >> split(2, 2)    | # 2-2-2-2
     one_of(land_ndcs_with_4_digits)   >> split(2, 2)    | # 2-2-2-2
     one_of(mobile_ndcs_with_3_digits) >> split(2, 2, 2) | # 3-2-2-2
-    match(/^(7\d{2})\d{6}/)           >> split(2, 2)    | # voip numbers
-    fixed(3)                          >> split(2, 2, 2) | # catch all formatter
-    fixed(4)                          >> split(2, 2)      # catch all formatter
+    match(/^(7\d{2})\d{6}/)           >> split(2, 2, 2) | # voip numbers
+    fixed(3)                          >> split(2, 2, 2)
 end

data/lib/phony/countries/netherlands.rb

@@ -55,10 +55,11 @@ service3 = [
 
 Phony.define do
   country '31',
-    trunk('0', :normalize => true) |
-    one_of(service) >> split(4,3) |
-    one_of(service3) >> split(4,3) |
-    one_of('6')  >> split(2,2,2,2) | # mobile
-    one_of(ndcs) >> split(3,4)     | # landline (geographic region)
-    fixed(3)     >> split(3,3)       # 3 digit ndc
+    trunk('0', :normalize => true)                |
+    one_of(service)             >> split(4,3)     |
+    match(/\A(800|900)\d{4}\z/) >> split(4)       |
+    one_of(service3)            >> split(4,3)     |
+    one_of('6')                 >> split(2,2,2,2) | # mobile
+    one_of(ndcs)                >> split(3,4)     | # landline (geographic region)
+    fixed(3)                    >> split(3,3)       # 3 digit ndc
 end

data/lib/phony/countries/united_kingdom.rb

@@ -16,10 +16,10 @@
 mobile_ndc = [
   # Mobile [4+6].
   #
-  ('7100'..'7599').to_a,
+  *('7100'..'7599'),
   '7624', # Isle of Man
-  ('7700'..'7999').to_a,
-].flatten
+  *('7700'..'7999')
+]
 
 two_digit_ndc = [
   # Geographic [2+8] - includes (02x) 0 and (02x) 1 as NDO.
@@ -195,7 +195,7 @@ variable_length_number = [
   '1946', # Whitehaven (Mixed area)
   '1949', # Whatton
   '1963', # Wincanton
-  '1995', # Garstang 
+  '1995', # Garstang
 ]
 
 four_digit_ndc = [
@@ -800,5 +800,5 @@ Phony.define do
     one_of(five_digit_ndc)         >> split(5)    | # 5-5
     one_of(variable_length_number) >> split(5..6) | # 4-6 and 4-5, in 40 areas.
     one_of(four_digit_ndc)         >> split(6)    | # 4-6
-    fixed(4)                       >> split(6)      # Catchall for undefined numbers.
+    match(/^([135789]\d{3})/)      >> split(6)      # Catchall for plausible unallocated numbers.
 end

data/spec/functional/plausibility_spec.rb

@@ -13,6 +13,8 @@ describe 'plausibility' do
     #
     def self.it_is_correct_for(country_name, options={})
       samples = [*options[:samples]]
+      invalid_samples = [*options[:invalid_samples]]
+
       raise ArgumentError, ':samples option should be specified' if samples.empty?
 
       it "is correct for #{country_name}" do
@@ -31,6 +33,15 @@ describe 'plausibility' do
               "It should not validate #{value}, but does."
           end
         end
+
+        invalid_samples.each do |sample|
+          invalid = [*sample]
+
+          invalid.each do |value|
+            Phony.plausible?(value).should be_false,
+              "It should not validate #{value}, but does."
+          end
+        end
       end
     end
 
@@ -304,6 +315,7 @@ describe 'plausibility' do
         Phony.plausible?('+31 880 450 24').should be_false
         Phony.plausible?('+31 900 123 4567').should be_true
         Phony.plausible?('+31 900 001 00').should be_false
+        Phony.plausible?('+31 800 6080').should be_true
       end
 
       it 'is correct for Egypt' do
@@ -531,13 +543,13 @@ describe 'plausibility' do
       it_is_correct_for 'Guadeloupe (French Department of)', :samples => '+590 123 456 789'
       it_is_correct_for 'Guatemala (Republic of)', :samples => ['+502 19 123 456 789',
                                                                 '+502 2 123 4567']
-      context 'test' do
-        it_is_correct_for 'Guinea', :samples => [
-          '+224 664 12 34 56',
-          '+224 30 31 12 34',
-          '+224 3041 12 34'
-        ]
-      end
+      it_is_correct_for 'Guinea', :samples => [
+        '+224 664 12 34 56',
+        '+224 30 31 12 34',
+        '+224 3041 12 34',
+        '+224 700 00 00 00'
+      ]
+
       it_is_correct_for 'Guinea-Bissau', :samples => '+245  728 6998'
       it_is_correct_for 'Guyana', :samples => '+592 263 1234'
       it_is_correct_for 'Honduras (Republic of)', :samples => '+504 12 961 637'
@@ -822,7 +834,7 @@ describe 'plausibility' do
                                                              '+971 500 641 234',
                                                              '+971 200 641 234']
 
-      it_is_correct_for 'United Kingdom', :samples => ['+44 1827 50111']
+      it_is_correct_for 'United Kingdom', :samples => ['+44 1827 50111'], :invalid_samples => ['+44 0000 123456']
 
       it_is_correct_for 'Uruguay (Eastern Republic of)', :samples => ['+598 800 123 45',
                                                                       '+598 2 012 3456',
@@ -841,7 +853,5 @@ describe 'plausibility' do
                                                  '+263 86 1235 4567']
 
     end
-
   end
-
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: phony
 version: !ruby/object:Gem::Version
-  version: 2.8.2
+  version: 2.8.3
 platform: ruby
 authors:
 - Florian Hanke