phony 2.15.47 → 2.15.48

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3e978c5a79c5540145b9bb9b8988924ff0be4d22
-  data.tar.gz: 58f070c2f6fa6eb27396554f7221487c8475dc72
+  metadata.gz: f656832e7311c29b6d9cd2c4d38fdeba7701f4f7
+  data.tar.gz: 8abed66486b0361361d39cd6270f36c11340a0ce
 SHA512:
-  metadata.gz: ed80ee547d6a0c3adc4552769346bf66b6b18af05898d10e682d05c8f909856dd0676e0426239e7367a2388dca961deb0ee2dc8148520fb7b27fa1f6fd79ce6d
-  data.tar.gz: b1eb46a6f89898db4c82efae75eaa670bf4f0bb81eb5286fb5fd915a68995098cb725c43c5ac02f7ddcec5dafb9659b621bdaff8d6b65a354f3986e737afbe3b
+  metadata.gz: c44871ae99e9b3a31a20134c603f7520144bcfe65d534fedbae73d2311c808f18ce40e2318dec72ebd56de0d433001259196e77a77da12691627a8e5c5414827
+  data.tar.gz: 88847020258becb45f509a7c0de97bc8ec1c2c8df918d76ab4ac5df2a4ae7a43615075aa4c67d896429f112e7b76f4cd0ec3005b15327d9113a1ace0c4fa32ab

data/lib/phony/countries.rb

@@ -279,7 +279,10 @@ Phony.define do
   # Singapore (Republic of).
   #
   country '65',
-    none >> split(4,4) # TODO Short Codes.
+    none >> matched_split(
+        /^(800)\d{7}$/ => [3,3,4], # International Toll Free Service (ITFS) and Home Country Direct Service (HCDS) Numbers
+        /^\d{8}$/ => [4,4]         # TODO Short Codes
+    )
 
   # Thailand.
   #

data/lib/phony/country_codes.rb

@@ -77,7 +77,7 @@ module Phony
       country, cc, national_number = partial_split number
       
       # Split the national number into ndc and local part.
-      trunk, ndc, *local = country.split national_number
+      _, ndc, *local = country.split national_number
       
       [cc, ndc, *local]
     end

data/spec/functional/plausibility_spec.rb

@@ -268,6 +268,8 @@ describe 'plausibility' do
                                                ['+381 62 12 34567', '+381 62 12 3456'],
                                                ['+381 65 12 34567', '+381 65 12 3456']]
       it_is_correct_for 'Sierra Leone', :samples => '+232 42 393 972'
+      it_is_correct_for 'Singapore', :samples => ['+65 6123 1234',
+                                                  '+65 800 852 1234']
       it_is_correct_for 'Solomon Islands', :samples => '+677  97851'
       it_is_correct_for 'Somali Democratic Republic', :samples => ['+252 1034 123 45',
                                                                    '+252 1313 123',

data/spec/lib/phony/countries_spec.rb

@@ -661,7 +661,8 @@ describe 'country descriptions' do
     end
 
     describe 'Singapore' do
-      it_splits '6561231234', ['65', false, '6123', '1234'] # Fixed line
+      it_splits '6561231234',   ['65', false, '6123', '1234'] # Fixed line
+      it_splits '658008521234', ['65', false, '800', '852', '1234'] # International Toll Free Service (ITFS) and Home Country Direct Service (HCDS) Numbers
     end
     describe 'Slovakia' do
       it_splits '421912123456', ['421', '912', '123456'] # Mobile

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: phony
 version: !ruby/object:Gem::Version
-  version: 2.15.47
+  version: 2.15.48
 platform: ruby
 authors:
 - Florian Hanke
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-16 00:00:00.000000000 Z
+date: 2017-09-03 00:00:00.000000000 Z
 dependencies: []
 description: 'Fast international phone number (E164 standard) normalizing, splitting
   and formatting. Lots of formatting options: International (+.., 00..), national
@@ -111,7 +111,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.7
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Fast international phone number (E164 standard) normalizing, splitting and