phony 2.15.27 → 2.15.28

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 38db83f2fb323c25ec7338913c408d05750d7ad9
-  data.tar.gz: f8f17fb71c57d268d08915724f40fa7669ea511d
+  metadata.gz: 564bbb19f1a422a0f0c4e35adaa6aeaff0058680
+  data.tar.gz: d451f370b8e093e0dd3df21fb54f918f5acf18d3
 SHA512:
-  metadata.gz: 82b290339b1ca372585f524ba0b034ae342371acd1ad84fac1f742ba2796c185d63f87788906b63a62b5f37b2c0fe51030f48b02730a86fa6846860460b124ca
-  data.tar.gz: da5b4bd8cf4d77a6f116e559027130341c59cdb3b33c9564b3375ab87149f13003e36e35207d0524e546c5d7427e45c6b9efbe6d00add850193c8b36b03a66e4
+  metadata.gz: 0e6b5927b390e7e84e5a577823e853d42ee9514610aa6c713a577c8290b963b80a50d142aa2111b79e6d1bda9619ab72fbc62605c32b1714ef7956a0d7b67fa5
+  data.tar.gz: 5894bca88a3ee1cfeb7ccbabbfca7fc5b6d08d942ee4ded3f2ce82081862c723029bac31360206f7d26f08495cdc8b8ecc15d1d3fb5aadf771ef7d705e2439ed

data/lib/phony/countries.rb

@@ -1090,7 +1090,7 @@ Phony.define do
           one_of('800') >> matched_split(
               /\A\d{2}\z/ => [2],
               /\A\d+\z/ => [2,3,4]) | # freephone
-          one_of(%w(50 52 55 56)) >> split(3,4) | # mobile
+          one_of(%w(50 52 54 55 56)) >> split(3,4) | # mobile
           one_of(%w(2 3 4 6 7 9)) >> split(3,4) |
           fixed(1) >> split(3,4)
 

data/lib/phony/countries/russia_kazakhstan_abkhasia_south_ossetia.rb

@@ -118,6 +118,7 @@ ndcs_with_7_subscriber_digits = %w(342 343 347 351 383 391 473 495 496 498 499 8
 
 Phony.define do
   country '7',
+    # trunk('8', normalize: true, split: true) | # TODO Figure out if this is the way to go.
     trunk('8', normalize: false) |
     one_of(ndcs_with_5_subscriber_digits)  >> split(1, 2, 2) |
     one_of(ndcs_with_6_subscriber_digits)  >> split(2, 2, 2) |

data/lib/phony/countries/sweden.rb

@@ -25,7 +25,6 @@ ndcs = [
   '35', # Halmstad
   '36', # Jönköping-Huskvarna
   '40', # Malmö
- '417', # Tomelilla
   '42', # Helsingborg-Höganäs
   '44', # Kristianstad
   '46', # Lund
@@ -33,8 +32,7 @@ ndcs = [
   '60', # Sundsvall-Timrå
   '63', # Östersund
   '90', # Umeå
- '522', # Uddevalla
-  '77', #Dalarna
+  '77', # Dalarna
 ]
 mobile = [
  '70', # Mobile
@@ -62,7 +60,13 @@ Phony.define do
     trunk('0') |
     one_of(service)       >> split(3,3)   |
     one_of(ndcs + mobile) >> matched_split(
-      /^\d{5}$/ => [3, 2], /^\d{6}$/ => [2, 2, 2], /^\d{7}$/ => [3, 2, 2], /^\d{8}$/ => [3, 2, 3]
+      /^\d{5}$/ => [3, 2],
+      /^\d{6}$/ => [2, 2, 2],
+      /^\d{7}$/ => [3, 2, 2],
+      /^\d{8}$/ => [3, 2, 3]
     ) |
-    fixed(3)              >> split(3,3,2)   # catchall
+    fixed(3)              >> matched_split(
+      /^\d{5}$/ => [3, 2],
+      /^\d{6}$/ => [2, 2, 2]
+    )
 end

data/spec/functional/plausibility_spec.rb

@@ -229,7 +229,7 @@ describe 'plausibility' do
                                                     '+211 973 212 345']
       it_is_correct_for 'Suriname (Republic of)', :samples => ['+597 212 345', '+597 612 3456']
       it_is_correct_for 'Swaziland', :samples => ['+268 2207 1234', '+268 550 1234']
-      it_is_correct_for 'Sweden', :samples => ['+46 42 123 45', ['+46 417 123 45', '+46 522 636 365']]
+      it_is_correct_for 'Sweden', :samples => ['+46 42 123 45', ['+46 417 123 45', '+46 522 636 365', '+46 513 12 34 56']]
       it_is_correct_for 'Syrian Arab Republic', :samples => ['+963 11 123 4567',
                                                              '+963 31 123 4567',
                                                              '+963 15 731 234',
@@ -308,7 +308,8 @@ describe 'plausibility' do
                                                              '+971 50 641 2345',
                                                              '+971 600 641 234',
                                                              '+971 500 641 234',
-                                                             '+971 200 641 234']
+                                                             '+971 200 641 234',
+                                                             '+971 54 999 9999']
 
       it_is_correct_for 'United Kingdom', :samples => ['+44 1827 50111'], :invalid_samples => ['+44 0000 123456']
 

data/spec/lib/phony/countries_spec.rb

@@ -652,9 +652,10 @@ describe 'country descriptions' do
       it_splits '46111234567', ['46', '11', '123', '45', '67']
       it_splits '46721234567', ['46', '72', '123', '45', '67'] # mobile
       it_splits '46791234567', ['46', '79', '123', '45', '67'] # mobile
-      it_splits '46125123456', ['46', '125', '123', '456']
+      it_splits '46125123456', ['46', '125', '12', '34', '56']
       it_splits '46770820180', ['46', '77', '082', '01', '80']
       it_splits '4641712345',  ['46', '417', '123', '45']
+      it_splits '46513123456', ['46', '513', '12', '34', '56']
     end
     describe 'Switzerland' do
       it_splits '41443643532', ['41', '44', '364', '35', '32'] # Zurich (usually)
@@ -1216,6 +1217,7 @@ describe 'country descriptions' do
       it_splits '971600641234', %w(971 600 641 234)
       it_splits '971500641234', %w(971 500 641 234)
       it_splits '971200641234', %w(971 200 641 234)
+      it_splits '971549999999', %w(971 54 999 9999)
     end
     describe 'Uruguay (Eastern Republic of)' do
       it_splits '59880012345', %w(598 800 123 45)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: phony
 version: !ruby/object:Gem::Version
-  version: 2.15.27
+  version: 2.15.28
 platform: ruby
 authors:
 - Florian Hanke
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-25 00:00:00.000000000 Z
+date: 2016-08-10 00:00:00.000000000 Z
 dependencies: []
 description: 'Fast international phone number (E164 standard) normalizing, splitting
   and formatting. Lots of formatting options: International (+.., 00..), national
@@ -110,7 +110,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.0
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Fast international phone number (E164 standard) normalizing, splitting and
@@ -129,4 +129,3 @@ test_files:
 - spec/lib/phony/national_splitters/none_spec.rb
 - spec/lib/phony/national_splitters/regex_spec.rb
 - spec/lib/phony/national_splitters/variable_spec.rb
-has_rdoc: false