phony 2.0.0.beta5 → 2.0.0.beta7

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NWVhNDYzYzZjYTZiYTMzNjU0N2YwNzE5M2FkMzA2NmU2M2Q4N2EyYQ==
+    Mjc3MTQzMDcxZTgxYWJjYzhiODY5OTU5ZjNiYzc3MTIxYjdmMmI0Yw==
   data.tar.gz: !binary |-
-    OTNkM2Q5NjQxNTliZjE1MmQxNjhkMDQ5NjhlZmI4NTRjN2MzNmZjYQ==
+    OTUzMjAxNDMwMmRhODAzMDZhNjA1YWVkMmI1ZDQ0MDhlMzc5MDU0ZQ==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    YWU4ZmQ5ZjFlMGJkNDI1OWNjOTJhNmI0NTlkNGMzYzcwMjcxYzFjNzJmMjg4
-    YjUzYjQyMDg4ZjU2M2Y3OGEwZjExNDM0YTIyZDEwYzdiOTZhMGQ5NjQ0Mzk3
-    ZWRmMWQwNTgxMTU2MzUxNmQyNmEwYzhlOWQ5NDNmNjQ2ZTY4ZjE=
+    NjdmYTJkOTk1NjA1NmNjNmExNDI2OWU4YTAyNTQ2ZWQyMjUwMmVmYWZkM2Vi
+    ODA1YTMzOWY3ZGJjNGFhOWRkYTM2M2MxZWVhZDZjOTlkMWQ5Y2QzZTdkZjZl
+    YzQxNzM5NDM2MWIzMWQxODBhNGQwOTc4MTYwYmM1MjFjY2FmYmE=
   data.tar.gz: !binary |-
-    YzAxOTUxMDg3YzViNTZjMDBlYjgyYzk4MzUwY2E3OTkyZjZkNmZiMzI4YTc3
-    MGZhYWQ5ODZhZmRmMzZhNzVhODdlNmRhZThhZmFjM2JlOGYxOTY1YjUzMmQ4
-    NWI1YTg1ZWNjYzY2YzNhOGY5NjA5NTgzMDA2NjUzZTJmOGNiM2I=
+    NWI3MTg5Zjc3NGI4ODFjZWY4NDViYzAxMjhlYmRiZTk1NjYwY2MzY2VjZTRm
+    NTg3YjgzNTQwN2U4ZmJlOTQxMGIyNDgxOWU3YjZhMWQ0ZWUwOWIwODc2Yzhm
+    ODI1Yjk2MTE2YjhiYWE2ZTM1ZDlmNDNmOGE2MDViMGRmMDU5M2U=

data/lib/phony/countries.rb

@@ -207,10 +207,9 @@ Phony.define do
 
   # New Zealand.
   #
-  # TODO Mobile?
-  #
   country '64',
-          fixed(1) >> split(3,4)
+          match(/^(2\d)\d+$/) >> split(3,4) | # Mobile
+          fixed(1) >> split(3,4)              # Rest
 
   # Singapore (Republic of).
   #

data/lib/phony/countries/russia_kazakhstan_abkhasia_south_ossetia.rb

@@ -110,14 +110,18 @@ 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)
+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', one_of(ndcs_with_5_subscriber_digits)      >> trunk('8') >> split(1, 2, 2) |
                one_of(ndcs_with_6_subscriber_digits)      >> trunk('8') >> split(2, 2, 2) |
                one_of(ndcs_with_7_subscriber_digits)      >> trunk('8') >> split(3, 2, 2) |
                one_of(%w(800))                            >> trunk('8') >> split(3, 2, 2) | # Russia free number
-               one_of(%w(929 995344 9971 99744 9976 997)) >> trunk('8') >> split(2, 2, 2) | # South Osetia
+               one_of(%w(995344 9971 99744 9976 997)) >> trunk('8') >> split(2, 2, 2) | # South Osetia
                
                # The two following lines have been replaced by fixed(3).
                #
@@ -125,4 +129,4 @@ Phony.define do
                # one_of(%w(840 940))                   >> split(2,2,2) # Abhasia
                
                fixed(3) >> trunk('8') >> split(2,2,3) # TODO 2,2,3 or 2,2,2?
-end
+end

data/spec/lib/phony/countries_spec.rb

@@ -468,6 +468,7 @@ describe 'country descriptions' 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 '7840121212',    ['7', '840', '12', '12', '12']  # Abhasia
       it_splits '7799121212',    ['7', '799', '12', '12', '12']  # Kazachstan
       it_splits '7995344121212', ['7','995344','12','12','12']   # South Osetia

data/spec/lib/phony_spec.rb

@@ -100,6 +100,12 @@ describe Phony do
       it 'should format american numbers' do
         Phony.format('18705551122').should == '+1 870 555 1122'
       end
+      it 'should format New Zealand 021 mobile numbers' do
+        Phony.format('64211234567').should == '+64 21 123 4567'
+      end
+      it 'should format New Zealand landline numbers' do
+        Phony.format('6493791234').should == '+64 9 379 1234'
+      end
     end
     describe 'international' do
       it 'should format north american numbers' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: phony
 version: !ruby/object:Gem::Version
-  version: 2.0.0.beta5
+  version: 2.0.0.beta7
 platform: ruby
 authors:
 - Florian Hanke
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-27 00:00:00.000000000 Z
+date: 2013-05-30 00:00:00.000000000 Z
 dependencies: []
 description: ! 'Fast international phone number (E164 standard) normalizing, splitting
   and formatting. Lots of formatting options: International (+.., 00..), national