phony 2.0.0.beta9 → 2.0.0.beta10

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MDUwMWM5M2UxOGE1OGRhZGJjMDI1MzA3NGIwZTZlMzhkNDVhYTQyYQ==
+    M2RiYWE2YjE2ZmM4NWFjZmQyMTI1NmFiYzQxNjNiOWQzYTM3M2VjZA==
   data.tar.gz: !binary |-
-    OGUyM2RhOWFmMzgyNzZlNmZiMTU0ZjY5MzU0YjVjZGI0ZDNhNWY1YQ==
+    NDg1OGQwNGMxYzZlZDYyYjFkZjM0OGQ4YTVjZTYzODJjZjAwZjdhNw==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    M2M4MWQxZmUyYzlhOTAwYjAwMGRjMzJhMTA1MTllNTRjMDcwM2QyZDQ0MWQy
-    MjE3ZGFiZjcyMGMyY2I2YWFlNTFmODE2ZDJlNzJiMTNhYmRiZjgzOWJjNDE3
-    MmI1MzI3YmM5YTJjNzU0YWQ5NDlmYTdhODEzYWY4NTU1MTkyYTY=
+    NTgxN2I0ZGVmZTZlZjU2M2Q5OGI4ZjcxMTAyMzQxMTA5N2ZkNGRiNWM5NDkx
+    M2FlNTNmNDA0Y2JkYjc1Yjc0M2QxNTk0Y2Q4MjBmNjFlMDUxMDBiN2JjMzg1
+    YTJhY2UxOGRiNjU4YzA5ZTNkMDY4YWI3NDg3ZGQ1ZmUwYTk1YmY=
   data.tar.gz: !binary |-
-    MmM2ZTQ3MWQ2NzA5ODA2ZWYwOTlhMDk2NTgyYWNlZjhhNTFlY2MyYTQ1OTM2
-    NzRmNjVkNTI5M2M3OTg1ZmZlMmQwMWEyZjA4OTI1NWM5YjY5ZWZiYjk0ZWM2
-    NTEyM2NlN2ZlNmY0OTZjZjU4MmFmMWM3MTQ4NjZmYzU4YmVkM2E=
+    ZmVjNmYzNTY3ZDkyYzI0MDQwYTc3N2FhZjI5OWMzNjlhMDE2NTNjNTYyNzcw
+    MTJiNmVlN2EzYjU5ZDg2NTYwNmIzY2U1NDFhZDdiMzRmMzkxOTBjYWYyNDU5
+    MmEyOTBhNWM4ZWFlMThhNmVjNjI4MmU2OGY3MzI0OWUwNGNmMDU=

data/lib/phony/countries.rb

@@ -74,12 +74,12 @@ Phony.define do
   # France.
   #
   country '33', fixed(1) >> split(2,2,2,2) # :service? => /^8.*$/, :mobile? => /^[67].*$/
-  
+
   # Spain.
   #
   country '34',
           fixed(2) >> split(3,4)
-          
+
   # Hungary.
   #
   country '36',
@@ -231,7 +231,7 @@ Phony.define do
           one_of('4', '8') >> split(7) |
           match(/^(2[025679]|3[0136789]|5[23456789]|6[01234678]|7[02345679]|9[0-8])\d/) >> split(6) |
           fixed(3) >> split(5)
-          
+
   # country '86' # China, see special file.
 
   # Turkey.
@@ -351,7 +351,7 @@ Phony.define do
 
   # Kenya
   # http://en.wikipedia.org/wiki/Telephone_numbers_in_Kenya
-  country '254', 
+  country '254',
           match(/^(7\d\d)/)  >> split(6) | # mobile
           fixed(2)           >> split(7)   # landline
 
@@ -853,7 +853,7 @@ Phony.define do
   # Cambodia (Kingdom of)
   # http://en.wikipedia.org/wiki/Telephone_numbers_in_Cambodia
   country '855',
-          fixed(2) >> split(3,4)
+          fixed(2) >> matched_split(/^\d{6}$/ => [3,3], /^\d{7}$/ => [3,4])
 
   # Lao People's Democratic Republic http://www.wtng.info/wtng-856-la.html, https://www.numberingplans.com
   country '856',

data/spec/lib/phony/validations_spec.rb

@@ -34,15 +34,15 @@ describe 'validations' do
         end
       end
     end
-    
+
     it 'does not change the given number' do
       number = "123-123-1234"
-      
+
       Phony.plausible? number
-      
+
       number.should == '123-123-1234'
     end
-    
+
     it 'handles small numbers' do
       Phony.plausible?('353').should be_false
     end
@@ -80,7 +80,7 @@ describe 'validations' do
     it 'is correct' do
       Phony.plausible?('hello').should be_false
     end
-    
+
     it "is correct" do
       Phony.plausible?('+41 44 111 22 33').should be_true
     end
@@ -105,16 +105,16 @@ describe 'validations' do
     it "works with regexps" do
       Phony.plausible?('+41 44 111 22 33', cc: /4(0|1)/, ndc: /4(4|5)/).should be_true
     end
-    
+
     context 'Length validation' do
       it 'works for Swiss cases' do
         Phony.plausible?('+41 44 111 22 3').should be_false   # Not long enough is not ok.
         # Phony.plausible?('+41 44 111 22 33 4').should be_true # TODO Too long is ok – we don't know about extensions.
       end
     end
-    
+
     context 'specific countries' do
-      
+
       # TODO: more needs to be done here
       #
       it "is correct for Swiss numbers" do
@@ -178,7 +178,7 @@ describe 'validations' do
         # Sorry, still need E164 conform numbers.
         #
         Phony.plausible?('4346667777', cc: '1').should be_false
-        
+
         # Automatic country checking.
         #
         Phony.plausible?('1-4346667777').should be_true
@@ -187,13 +187,13 @@ describe 'validations' do
         Phony.plausible?('1-911-123-1234').should be_false
         Phony.plausible?('143466677777').should be_false # too long
         Phony.plausible?('143466677').should be_false # too short
-        
+
         # With string constraints.
         #
         Phony.plausible?('14346667777', cc: '1').should be_true
         Phony.plausible?('14346667777', ndc: '434').should be_true
         Phony.plausible?('14346667777', cc: '1', ndc: '434').should be_true
-        
+
         # With regexp constraints.
         #
         Phony.plausible?('14346667777', cc: /[123]/).should be_true
@@ -323,6 +323,10 @@ describe 'validations' do
       it_is_correct_for 'Brunei Darussalam', :samples => '+673 5 523 876'
       it_is_correct_for 'Burkina Faso', :samples => '+226  1476 2312'
       it_is_correct_for 'Burundi', :samples => '+257  1234 5678'
+      it_is_correct_for "Cambodia", :samples => [["+855 12 236 142",
+                                                "+855 97 710 0872"],
+                                                ["+855 234 601 183",
+                                                "855 33 123 456"]]
       it_is_correct_for 'Cameroon', :samples => '+237  7372 8186'
       it_is_correct_for 'Cape Verde', :samples => '+238  642 3843'
       it_is_correct_for 'Central African Republic', :samples => '+236  1234 5678'
@@ -649,7 +653,7 @@ describe 'validations' do
                                                  '+263 86 1235 4567']
 
     end
-    
+
   end
-  
-end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: phony
 version: !ruby/object:Gem::Version
-  version: 2.0.0.beta9
+  version: 2.0.0.beta10
 platform: ruby
 authors:
 - Florian Hanke