phony 2.9.0 → 2.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4183dcc6d47df59a308089bef203e7946735dd6f
-  data.tar.gz: 395ef432f8497cc175b20b424dfabf41011a0afa
+  metadata.gz: 117a11d3df055c88a892d0cbb32a1106e72d2ed6
+  data.tar.gz: 6b9d3d5ab8e6e2c1559a0b670865fb9727006492
 SHA512:
-  metadata.gz: 7a0b6e84eb116e0b018ae6930af4a9833373805a7ba719d7083a235353bca9798f247e3e42061c43bd4500b26dac307fd8554fff4b31ea43c555f86d4d5e8d31
-  data.tar.gz: 18b922a9c4e066cc2f579ab00a4c5e0120ad9b2c280a34419ec1132f24b6888945405c89aeeecf7f6ddaac313f38a5b2294337c7a17ec0c1843430af717b1f97
+  metadata.gz: 4cc3f3eed1456898a67e536a3a996b3a32ea81b10fcbec18082a80d0dcf096a41bf731ffb4822bc66a03f48d16df350aee5a2b1696b3a0a1b690c1a3d42bdb3a
+  data.tar.gz: 1fa24b6a8326fe7989b3f8f25be1af5a101238515c87fa2d39b3f08f50593263f17ba470d8ae97aa712b26c52b48304b4fe68860d6f5ef8516ef60fcb650f603

data/lib/phony/countries/russia_kazakhstan_abkhasia_south_ossetia.rb

@@ -110,19 +110,19 @@ ndcs_with_6_subscriber_digits = %w(3012 3022 3412 3435 3439 3452 3456 3462 3463
   862 8634 8635 8636 8639 8652 8662 8672 8712 8722 8732 8772 8782 8793
 )
 
-ndcs_with_7_subscriber_digits = %w(342 343 347 351 383 391 473 495 496 498 499 812 818 831 843 844 846 861 862 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 
+ndcs_with_7_subscriber_digits = %w(342 343 347 351 383 391 473 495 496 498 499 812 818 831 843 844 846 861 862 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
 )
 
 Phony.define do
-  country '7', 
+  country '7',
     trunk('8', normalize: false) |
-    one_of(ndcs_with_5_subscriber_digits)  >> split(1, 4) |
-    one_of(ndcs_with_6_subscriber_digits)  >> split(2, 4) |
-    one_of(ndcs_with_7_subscriber_digits)  >> split(3, 4) |
-    one_of(%w(800))                        >> split(3, 4) | # Russia free number
+    one_of(ndcs_with_5_subscriber_digits)  >> split(1, 2, 2) |
+    one_of(ndcs_with_6_subscriber_digits)  >> split(2, 2, 2) |
+    one_of(ndcs_with_7_subscriber_digits)  >> split(3, 2, 2) |
+    one_of(%w(800))                        >> split(3, 2, 2) | # Russia free number
     one_of(%w(995344 9971 99744 9976 997)) >> split(2, 4) | # South Osetia
     fixed(3)                               >> split(2, 5)
 end

data/spec/functional/format_spec.rb

@@ -7,7 +7,7 @@ describe 'Phony#format' do
       Phony.formatted('41443643532').should eql '+41 44 364 35 32'
     end
   end
-  
+
   describe 'with templates' do
     it 'handles a basic template correctly' do
       Phony.format('41443643532', :format => 'A%{cc}B%{ndc}C%{local}').should eql 'A41B44C364 35 32'
@@ -25,7 +25,7 @@ describe 'Phony#format' do
   end
 
   describe 'cases' do
-    
+
     describe 'exceptions' do
       it 'raises on nil' do
         expect {
@@ -70,13 +70,13 @@ describe 'Phony#format' do
         Phony.format(Phony.normalize('+370 800 12345'), :format => :international).should eql '+370 800 12 345'
       end
       it 'should format Russian numbers' do
-        Phony.format(Phony.normalize('+7 812 123 4567'), :format => :international).should eql '+7 812 123 4567'
+        Phony.format(Phony.normalize('+7 812 123 4567'), :format => :international).should eql '+7 812 123 45 67'
       end
       it 'should format Russian numbers' do
         Phony.format(Phony.normalize('+370 800 12345'), :format => :national).should eql '8800 12 345'
       end
       it 'should format Russian numbers' do
-        Phony.format(Phony.normalize('+7 812 123 4567'), :format => :national).should eql '8812 123 4567'
+        Phony.format(Phony.normalize('+7 812 123 4567'), :format => :national).should eql '8812 123 45 67'
       end
     end
     describe 'international' do
@@ -183,7 +183,7 @@ describe 'Phony#format' do
         Phony.format('493038625454', :format => :local).should eql '386 25454'
       end
     end
-    
+
   end
 
 end

data/spec/lib/phony/countries_spec.rb

@@ -527,10 +527,10 @@ describe 'country descriptions' do
       it_splits '40249123123', ['40', '249', '123', '123'] # Olt
     end
     describe 'Russia' do
-      it_splits '78122345678',   ['7', '812', '234', '5678'] # Russia 3-digit
-      it_splits '74012771077',   ['7', '4012', '77', '1077'] # Russia 4-digit
-      it_splits '78402411212',   ['7', '84024', '1', '1212'] # Russia 5-digit
-      it_splits '79296119119',   ['7', '929', '611', '9119'] # Russia 3-digit, Megafon Mobile.
+      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 '7840121212',    ['7', '840', '12', '1212']  # Abhasia
       it_splits '7799121212',    ['7', '799', '12', '1212']  # Kazachstan
       it_splits '7995344121212', ['7','995344','12','1212']   # South Osetia

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: phony
 version: !ruby/object:Gem::Version
-  version: 2.9.0
+  version: 2.9.1
 platform: ruby
 authors:
 - Florian Hanke
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-23 00:00:00.000000000 Z
+date: 2015-01-06 00:00:00.000000000 Z
 dependencies: []
 description: 'Fast international phone number (E164 standard) normalizing, splitting
   and formatting. Lots of formatting options: International (+.., 00..), national