phony 2.2.15 → 2.2.16

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    MDVjMDIxMGQ4ZTkyZGM3MWQ0YzAzNTAzMjM3OTA1OTc3MzU4Y2Q0ZA==
-  data.tar.gz: !binary |-
-    ZTU1MjQ2YWM2NGVjN2YxNTFjZjIyMmY4MjQ2MGUzYTMzMzRhNTQ3Yw==
-!binary "U0hBNTEy":
-  metadata.gz: !binary |-
-    NDA4YjdhYTk0MGE4MTkxMzNhZWE5MDZiOWJlMTRkMGQ1YWJiZDVmZjdhNTc4
-    ZDA2YjliYTYyMzc2NWEzYzljYWMyYWVjNjFmMjA2YmY5Y2ZkZjI3OTA2NWNl
-    MmY3Y2UzODg3MWY2OGMwYTMxYzQ1NzAyZDdiMzk4MjRlMzFmMmU=
-  data.tar.gz: !binary |-
-    NDI1NGJjOWQ5MDgyZDhhZGRiMGI0MjE4OWZhNDAzYmViZGZlMTBjYTFjMmQx
-    N2JlMzIyY2U3OTIxNDYxOTk4NDkxNmViZGJiZjFjNWM3ZDg4ODljZTJkNzVm
-    ZjEyOWNiM2Y2Zjg0OGI3MThiOWRmMGY0YjI0MDIwODc5ZjZiYzk=
+SHA1:
+  metadata.gz: 3d8710a24e82893cf992f1f78257fc8170f63b50
+  data.tar.gz: 14e5ee3227225b131fcfcf44dabf870cd19d0120
+SHA512:
+  metadata.gz: 60b52b683503709334ac1c2f946b81d1715a567b27fd18d010fef5d01180979605821cf4d5c8dfdf2e65e437525668143f72ef0dbce251f047835214ade2d774
+  data.tar.gz: 2bd8cdb967fb9624b268f7bdd009652edc13aea73a979f669d81a52589fe19a9b4190074814366affa1ecdf91c4952990968fa51a3e8d744fcce5fecdc9a35d1

data/lib/phony/countries.rb

@@ -80,8 +80,14 @@ Phony.define do
 
   # Spain.
   #
+  # http://www.minetur.gob.es/telecomunicaciones/es-es/servicios/numeracion/paginas/plan.aspx
+  #
   country '34',
-          fixed(2, :zero => false) >> split(3,4)
+    match(/^([67]\d{2})\d+$/) >> split(3,3)   | # Mobile
+    match(/^([89]0\d)\d+$/)   >> split(3,3)   | # Special 80X & 90X numbers
+    one_of(%w(91 93))         >> split(3,2,2) | # Landline large regions
+    match(/^(9\d{2})\d+$/)    >> split(2,2,2) | # Landline
+    fixed(3, :zero => false)  >> split(3,3)
 
   # Hungary.
   #

data/lib/phony/countries/austria.rb

@@ -83,12 +83,12 @@ service = [
 # TODO Add more details.
 #
 Phony.define do
-  country '43', one_of('1')       >> split(4..4) | # Vienna
+  country '43', one_of('1')       >> split(3..12) | # Vienna
                 one_of(service)   >> split(9..9) |
                 one_of(corporate) >> split(5..5) |
                 one_of(ndcs)      >> split(6..6) |
                 one_of('663')     >> split(6..6) | # 6 digit mobile.
-                one_of(mobile)    >> split(7..7) |
+                one_of(mobile)    >> split(4,3..4) |
                 one_of(mobile_2digit) >> split(7..7) | # Separate as mobile contains 676 - 67 violates the prefix rule.
                 fixed(4)          >> split(7..7)
 end

data/lib/phony/country_codes.rb

@@ -166,18 +166,18 @@ module Phony
     
     def plausible? number, hints = {}
       normalized = clean number
-      
+
       # False if it fails the basic check.
       #
       return false unless (4..15) === normalized.size
       
       country, cc, rest = split_cc normalized
-      
+
       # Country code plausible?
       #
       cc_needed = hints[:cc]
       return false if cc_needed && !(cc_needed === cc)
-      
+
       # Country specific tests.
       #
       country.plausible? rest, hints

data/spec/functional/plausibility_spec.rb

@@ -113,7 +113,13 @@ describe 'plausibility' do
     end
 
     context 'specific countries' do
+      it "" do
+        Phony.plausible?('+43 699 00000000').should be_true
+      end
+
       it "is correct for Austria" do
+        Phony.plausible?('+43 1 000000').should be_true
+        Phony.plausible?('+43 1 0000000').should be_true
         Phony.plausible?('+43 501 12345').should be_true
         Phony.plausible?('+43 501 1234').should be_false # too short
         Phony.plausible?('+43 501 123456').should be_false # too long
@@ -121,6 +127,9 @@ describe 'plausibility' do
 
         # Mobile
         Phony.plausible?('+43 676 0000000').should be_true
+        Phony.plausible?('+43 681 00000000').should be_true
+        Phony.plausible?('+43 688 0000000').should be_true
+        Phony.plausible?('+43 699 00000000').should be_true
         # 663 mobile numbers have 6 digits
         Phony.plausible?('+43 663 000000').should be_true
       end

data/spec/lib/phony/countries_spec.rb

@@ -16,13 +16,16 @@ describe 'country descriptions' do
     describe 'Ascension Island' do
       it_splits '2473551', ['247', false, '3551']
     end
+
     describe 'Afghanistan' do
       it_splits '93201234567', ['93', '20', '1234567'] # Kabul
     end
+
     describe 'Algeria' do
       it_splits '213211231234', ['213', '21', '123', '1234'] # Algiers
       it_splits '213331231234', ['213', '33', '123', '1234'] # Batna
     end
+
     describe 'Argentina' do
       it_splits '541112345678', ['54', '11', '1234', '5678']
       it_splits '542911234567', ['54', '291', '123', '4567']
@@ -32,13 +35,18 @@ describe 'country descriptions' do
       it_splits '5492221123456', ['54', '92221', '12', '3456']
       it_splits '548001234567', ['54', '800', '123', '4567']
     end
+
     describe 'Austria' do
-      it_splits '43198110',        ['43', '1', '98110']        # Vienna
-      it_splits '43800123456789',  ['43', '800', '123456789']  # Free
-      it_splits '4366914093902',   ['43', '669', '14093902']   # Mobile
-      it_splits '433161234567891', ['43', '316', '1234567891'] # Graz
-      it_splits '432164123456789', ['43', '2164', '123456789'] # Rohrau
+      it_splits '43198110',        %w( 43 1 98110 )        # Vienna
+      it_splits '4310000000',      %w( 43 1 0000000 )      # Vienna
+      it_splits '43800123456789',  %w( 43 800 123456789 )  # Free
+      it_splits '4368100000000',   %w( 43 681 0000 0000 )  # Mobile
+      it_splits '436880000000',    %w( 43 688 0000 000 )   # Mobile
+      it_splits '4366900000000',   %w( 43 669 0000 0000 )  # Mobile
+      it_splits '433161234567891', %w( 43 316 1234567891 ) # Graz
+      it_splits '432164123456789', %w( 43 2164 123456789 ) # Rohrau
     end
+
     describe 'Australia' do
       it_splits '61512341234', ['61', '5', '1234', '1234'] # Landline
       it_splits '61423123123', ['61', '423', '123', '123'] # Mobile
@@ -554,7 +562,15 @@ describe 'country descriptions' do
       it { Phony.split('421212345678').should == ['421', '2', '12345678'] } # Bratislava
       it { Phony.split('421371234567').should == ['421', '37', '1234567'] } # Nitra / Other
     end
-
+    
+    describe 'Spain' do
+      it_splits '34600123456', ['34', '600', '123', '456'] # Mobile
+      it_splits '34900123456', ['34', '900', '123', '456'] # Special
+      it_splits '34931234567', ['34', '93', '123', '45', '67'] # Landline large regions
+      it_splits '34975123456', ['34', '975', '12', '34', '56'] # Landline
+      it_splits '34123456789', ['34', '123', '456', '789'] # Default
+    end
+    
     describe 'Sri Lanka' do
       it { Phony.split('94711231212').should == ['94', '71', '123', '12', '12'] } # Mobile
     end

data/spec/lib/phony/country_codes_spec.rb

@@ -70,7 +70,7 @@ describe Phony::CountryCodes do
         @countries.formatted("353411231234", :format => :national).should eql '041 123 1234'
       end
       it 'formats spain correctly' do
-        @countries.formatted("34123456789", :format => :national).should eql '12 345 6789'
+        @countries.formatted("34123456789", :format => :national).should eql '123 456 789'
       end
     end
     context 'default' do

metadata

@@ -1,16 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: phony
 version: !ruby/object:Gem::Version
-  version: 2.2.15
+  version: 2.2.16
 platform: ruby
 authors:
 - Florian Hanke
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-28 00:00:00.000000000 Z
+date: 2014-09-02 00:00:00.000000000 Z
 dependencies: []
-description: ! 'Fast international phone number (E164 standard) normalizing, splitting
+description: 'Fast international phone number (E164 standard) normalizing, splitting
   and formatting. Lots of formatting options: International (+.., 00..), national
   (0..), and local.'
 email: florian.hanke+phony@gmail.com
@@ -19,6 +19,9 @@ extensions: []
 extra_rdoc_files:
 - README.textile
 files:
+- README.textile
+- lib/phony.rb
+- lib/phony/countries.rb
 - lib/phony/countries/austria.rb
 - lib/phony/countries/bangladesh.rb
 - lib/phony/countries/belarus.rb
@@ -56,7 +59,6 @@ files:
 - lib/phony/countries/united_kingdom.rb
 - lib/phony/countries/uruguay.rb
 - lib/phony/countries/zimbabwe.rb
-- lib/phony/countries.rb
 - lib/phony/country.rb
 - lib/phony/country_codes.rb
 - lib/phony/dsl.rb
@@ -71,8 +73,6 @@ files:
 - lib/phony/national_splitters/variable.rb
 - lib/phony/trunk_code.rb
 - lib/phony/vanity.rb
-- lib/phony.rb
-- README.textile
 - spec/functional/error_spec.rb
 - spec/functional/normalize_spec.rb
 - spec/functional/plausibility_spec.rb
@@ -99,17 +99,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.2.0
 signing_key: 
 specification_version: 4
 summary: Fast international phone number (E164 standard) normalizing, splitting and