phony 2.12.14 → 2.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 143ff12241c9fcb474766cc5f9a3d283b021bf83
-  data.tar.gz: e630fcd79e29b65ae18e3f8dce3d9e982100de1c
+  metadata.gz: e19199a57d389032d55f939a10cae73a78287d4d
+  data.tar.gz: 009422959de3b6f962b97413f94a74f4577cef18
 SHA512:
-  metadata.gz: 593fd0b05780350428a7080d2a2f1cb0bff339f4f565a66ccd451a6a7238ba8c094ce864947b4bee4a1f59f7b972bd1e5ec11204af8b2cec1f8da05dc98d420b
-  data.tar.gz: 64c49a926c21d00741428206fa91d15cbd90d435afcb885120e8d42351153b179ff18a361c583a2d36dc2af0d6d3c0b1a77c547ecf469ad87ad7a60393f59ee3
+  metadata.gz: 67a4d6045871dbc59c274fa902be56c78fbe50b754b473d2cc4340ae1426367ae13d52bdc47dcd42636985bf256b2eb753a362006a32d638103195c340115c37
+  data.tar.gz: fe40d41769928ef6a86eb949e88f67a259373392cb051989744a2d0d0e01785815ac6084c9733693691e028bcaaf660d0cec3bc852695d6506e7eb24e8c51f4f

data/lib/phony.rb

@@ -200,6 +200,9 @@ module Phony
     # @example Format a NANP number in local format.
     #   Phony.format("13015550100", :format => :local) # => "555 0100"
     #
+    # @example Format a NANP number in a specific format.
+    #   Phony.format("13015550100", :format => '%{cc} (%{trunk}%{ndc}) %{local}') # => "555 0100"
+    #
     def format phone_number, options = {}
       raise ArgumentError, "Phone number cannot be nil. Use e.g. number && Phony.format(number)." unless phone_number
       format! phone_number.dup, options

data/lib/phony/country_codes.rb

@@ -118,7 +118,8 @@ module Phony
     def format_cc_ndc format, space, cc, trunk, ndc, local
       case format
       when String
-        format % { :cc => cc, :ndc => ndc, :local => local }
+        trunk = trunk % space if trunk && trunk.size > 1
+        format % { :trunk => trunk, :cc => cc, :ndc => ndc, :local => local }
       when nil, :international_absolute, :international, :+
         ndc ?
           format_with_ndc(@international_absolute_format, cc, ndc, local, space) :

data/spec/functional/format_spec.rb

@@ -13,17 +13,20 @@ describe 'Phony#format' do
     
     describe 'Templates' do
       it 'handles a basic template correctly' do
-        Phony.format('41443643532', :format => 'A%{cc}B%{ndc}C%{local}').should eql 'A41B44C364 35 32'
+        Phony.format('41443643532', :format => 'A%{cc}B%{trunk}C%{ndc}D%{local}').should eql 'A41B0C44D364 35 32'
       end
       it 'handles a funky template correctly' do
-        Phony.format('41443643532', :format => '%{local}%{ndc}%{cc}', :local_spaces => '').should eql '36435324441'
+        Phony.format('41443643532', :format => '%{local} %{ndc} %{trunk} %{cc}', :local_spaces => '').should eql '3643532 44 0 41'
       end
       it 'handles local_spaces correctly' do
         Phony.format('41443643532', :format => 'A%{cc}B%{ndc}C%{local}', :local_spaces => '/').should eql 'A41B44C364/35/32'
       end
-      it 'handles a russian example correctly' do
+      it 'handles a Russian example correctly' do
         # https://github.com/floere/phony/issues/214
-        Phony.format('71234567890', :format => '(+%{cc} %{ndc}) %{local}', :local_spaces => '-').should eql '(+7 123) 45-67890'
+        Phony.format('71234567890', :format => '+%{cc} (%{trunk}%{ndc}) %{local}', :local_spaces => '-').should eql '+7 (8123) 45-67890'
+      end
+      it 'handles an American example correctly' do
+        Phony.format('13015550100', :format => '+%{cc} %{trunk}%{ndc} %{local}', :local_spaces => '-').should eql '+1 1 301 555-0100'
       end
     end
     

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: phony
 version: !ruby/object:Gem::Version
-  version: 2.12.14
+  version: 2.13.0
 platform: ruby
 authors:
 - Florian Hanke
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-09 00:00:00.000000000 Z
+date: 2015-05-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