phony 2.7.1 → 2.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b98c697126632e45ed3dfc739db33485690e62eb
-  data.tar.gz: 9ab5998082caef35ab68faa2193986bd46574ebd
+  metadata.gz: dd36ebf747e5d7267d9ebc733be37f3e44fe9a03
+  data.tar.gz: 09ea3cc54099fe93a3a1e8344989a6fe635d34d8
 SHA512:
-  metadata.gz: fa170648c998124add0388d410af347dc2133ec4b8cd3b3716ef470d6e5040cd9c6842f1eab48ce9ebdcf0f281ed2e8ac720408fc2f3a6d8e2e9a69226279c28
-  data.tar.gz: a985480e774bedda8e3b6f3628d00e3b857b28f36d7246a6ff9616079a26cf02b1135ec402a5c9e6ae7dd90771d2976168565f11831ae61b2efbcd2147c11b48
+  metadata.gz: 53b4870d90edfe19ef2bfedea402a9e1eb23452fb451170bdd14644226b55a95016020b1c3c35a2c654366e3e671a24880b52581a9eea1076131594f8c363268
+  data.tar.gz: c211186914ba9feb78535ad85e7018bd4b60718054e948b737a8531df5cbe2340830b881804246698e31f079b8fd39de3b83eb63ba558a2c244db1354deaacdc

data/lib/phony.rb

@@ -29,6 +29,7 @@ require File.expand_path '../phony/countries/croatia', __FILE__
 require File.expand_path '../phony/countries/china', __FILE__
 require File.expand_path '../phony/countries/georgia', __FILE__
 require File.expand_path '../phony/countries/germany', __FILE__
+require File.expand_path '../phony/countries/guinea', __FILE__
 require File.expand_path '../phony/countries/india', __FILE__
 require File.expand_path '../phony/countries/indonesia', __FILE__
 require File.expand_path '../phony/countries/ireland', __FILE__

data/lib/phony/countries.rb

@@ -31,7 +31,8 @@ Phony.define do
   # USA, Canada, etc.
   #
   country '1',
-    trunk('1 ', normalize: true) | # http://en.wikipedia.org/wiki/Trunk_prefix
+    # The US has a delimiter between NDC and local number.
+    trunk('1%s', normalize: true) | # http://en.wikipedia.org/wiki/Trunk_prefix
     fixed(3) >> split(3,4),
     :invalid_ndcs => ['911']
 
@@ -302,7 +303,9 @@ Phony.define do
   country '221', none >> split(4,5) # Senegal http://www.wtng.info/wtng-221-sn.html
   country '222', none >> split(4,4) # Mauritania http://www.wtng.info/wtng-222-mr.html
   country '223', none >> split(4,4) # Mali http://www.wtng.info/wtng-223-ml.html
-  country '224', none >> split(4,4) # Guinea http://www.wtng.info/wtng-224-gn.html
+
+  # country '224' # Guinea, see special file
+
   country '225', none >> split(4,4) # Côte d'Ivoire http://www.wtng.info/wtng-225-ci.html
   country '226', none >> split(4,4) # Burkina Faso http://www.wtng.info/wtng-226-bf.html
   country '227', none >> split(4,4) # Niger http://www.wtng.info/wtng-227-ne.html

data/lib/phony/countries/guinea.rb

@@ -0,0 +1,44 @@
+# Guinea (sometimes Guinea-Conakry; officially Republic of Guinea)
+# http://www.itu.int/oth/T020200005B/en
+
+land_ndcs_with_4_digits = [
+  '3031', # Boké
+  '3046', # Boussoura
+  *['3041', '3043', '3045', '3047'], # Conakry
+  '3069', # Delaba
+  '3081', # Faranah
+  '3024', # Fria
+  '3097', # Guéckédou
+  '3032', # Kamsar
+  '3071', # Kankan
+  '3061', # Kindia
+  '3098', # Kissidougou
+  '3051', # Labé
+  '3094', # Macenta
+  '3068', # Mamou
+  '3091', # N'Zérékoré
+  '3053', # Pita
+  '3042'  # Sangoya
+]
+
+land_ndcs_with_5_digits = [
+  '30613' # Télimélé
+]
+
+mobile_ndcs_with_3_digits = [
+  ('660'..'669').to_a, # Areeba
+  ('620'..'629').to_a, # Orange
+  ('650'..'659').to_a, # Cellcom
+  ('630'..'639').to_a, # Intercel
+  ('600'..'609').to_a  # Sotelgui
+]
+
+Phony.define do
+  country '224',
+    one_of(land_ndcs_with_5_digits)   >> split(2, 2)    | # 2-2-2-2
+    one_of(land_ndcs_with_4_digits)   >> split(2, 2)    | # 2-2-2-2
+    one_of(mobile_ndcs_with_3_digits) >> split(2, 2, 2) | # 3-2-2-2
+    match(/^(7\d{2})\d{6}/)           >> split(2, 2)    | # voip numbers
+    fixed(3)                          >> split(2, 2, 2) | # catch all formatter
+    fixed(4)                          >> split(2, 2)      # catch all formatter
+end

data/lib/phony/country_codes.rb

@@ -20,13 +20,13 @@ module Phony
     def self.instance
       @instance ||= new
     end
-    
+
     # Get the Country object for the given CC.
     #
     def [] cc
       countries[cc.size][cc]
     end
-    
+
     # Clean number of all non-numeric characters, initial zeros or (0).
     #
     @@basic_cleaning_pattern = /\A00?|\(0\)|\D/
@@ -40,7 +40,7 @@ module Phony
     def clean! number
       number.gsub!(@@basic_cleaning_pattern, EMPTY_STRING) || number
     end
-    
+
     # Adds the country code to the front
     # if it does not already start with it.
     #
@@ -114,6 +114,8 @@ module Phony
           @international_relative_format % [cc, space, ndc] :
           @international_relative_format % [cc, nil, nil]
       when :national
+        # Replaces the %s in the trunk code with a "space".
+        trunk = trunk % space if trunk && trunk.size > 1
         ndc && !ndc.empty? ?
           @national_format % [trunk, ndc] :
           @national_format % [trunk, nil]
@@ -153,7 +155,7 @@ module Phony
       country, cc, rest = split_cc vanity_number
       "#{cc}#{country.vanity_to_number(rest)}"
     end
-    
+
     def split_cc rest
       presumed_cc = ''
       1.upto(3) do |i|
@@ -163,14 +165,14 @@ module Phony
       end
       # This line is never reached as CCs are in prefix code.
     end
-    
+
     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?

data/lib/phony/trunk_code.rb

@@ -11,7 +11,7 @@ module Phony
     #
     def initialize code, options = {}
       @code = code
-      @trunk_code_replacement = /\A#{code.rstrip}/
+      @trunk_code_replacement = /\A#{code.gsub(%r{%s}, '')}/
       @normalize = options[:normalize] || options[:normalize].nil?
       @split     = options[:split]
     end

data/spec/functional/plausibility_spec.rb

@@ -531,7 +531,13 @@ describe 'plausibility' do
       it_is_correct_for 'Guadeloupe (French Department of)', :samples => '+590 123 456 789'
       it_is_correct_for 'Guatemala (Republic of)', :samples => ['+502 19 123 456 789',
                                                                 '+502 2 123 4567']
-      it_is_correct_for 'Guinea', :samples => '+224 1234 5678'
+      context 'test' do
+        it_is_correct_for 'Guinea', :samples => [
+          '+224 664 12 34 56',
+          '+224 30 31 12 34',
+          '+224 3041 12 34'
+        ]
+      end
       it_is_correct_for 'Guinea-Bissau', :samples => '+245  728 6998'
       it_is_correct_for 'Guyana', :samples => '+592 263 1234'
       it_is_correct_for 'Honduras (Republic of)', :samples => '+504 12 961 637'

data/spec/lib/phony/countries_spec.rb

@@ -772,7 +772,8 @@ describe 'country descriptions' do
       it_splits '50221234567', ['502', '2', '123', '4567']
     end
     describe 'Guinea' do
-      it_splits '22412345678', ['224', false, '1234', '5678']
+      it_splits '22430311234', ['224', '3031', '12', '34']
+      it_splits '224662123456', ['224', '662', '12', '34', '56']
     end
     describe 'Guinea-Bissau' do
       it_splits '2453837652', ['245', false, '383', '7652']

data/spec/lib/phony/country_codes_spec.rb

@@ -77,6 +77,9 @@ describe Phony::CountryCodes do
       it 'formats Cambodia correctly' do
         @countries.formatted('85512239123', :format => :national).should eql '012 239 123'
       end
+      it 'formats the US correctly' do
+        @countries.formatted('18005551212', :format => :national, :spaces => :-).should eql '1-800-555-1212'
+      end
     end
     context 'default' do
       it "should format swiss numbers" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: phony
 version: !ruby/object:Gem::Version
-  version: 2.7.1
+  version: 2.8.1
 platform: ruby
 authors:
 - Florian Hanke
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-03 00:00:00.000000000 Z
+date: 2014-11-20 00:00:00.000000000 Z
 dependencies: []
 description: 'Fast international phone number (E164 standard) normalizing, splitting
   and formatting. Lots of formatting options: International (+.., 00..), national
@@ -31,6 +31,7 @@ files:
 - lib/phony/countries/croatia.rb
 - lib/phony/countries/georgia.rb
 - lib/phony/countries/germany.rb
+- lib/phony/countries/guinea.rb
 - lib/phony/countries/india.rb
 - lib/phony/countries/indonesia.rb
 - lib/phony/countries/ireland.rb