phony 2.5.4 → 2.6.0

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    MjgwYTAxZTZiNTRiOTViNDdiZDI5OTA4ZmE3Nzc5MmQ4NjM2Y2IxYQ==
-  data.tar.gz: !binary |-
-    NTM2M2M1NmE3YmZhZTg4MDM2MGY3ZTlkYmU4ZmQzMGRjNGViMzdkYQ==
-!binary "U0hBNTEy":
-  metadata.gz: !binary |-
-    NWY2NWYyNjlhMTFmOWZhZDM3YWZiNTM1NjVmNGU1ZWIxYTQ4NWJmOGEyYjZl
-    ZTg5NDYwNjg3NDBmODRhYjYzMjk0ZWVjZDFiOTU2MTYyNWIyMWFmNjg3YTcy
-    Mjk4ZmQ1NzIzZmY1MjJkYzI4ZGU2OWZhMmJkZjczYjU5YTAwYjM=
-  data.tar.gz: !binary |-
-    MzRiZjM0ZDUxNTE3OThiMzQyM2VkMDJjMjUwNjE0ZDU5MzhhYTIwYTZmNjM5
-    NWY5MzA5NWUzMmYzYTNiODg3OTdjMTRjZTBhNTE3YmM3MDc5OTAxODQ2MDc5
-    ZTQzZGQ3MWU2MmE5MWYzZDcxNGVlYWM3MGEzM2IyNDU4ZDgxYTE=
+SHA1:
+  metadata.gz: 0c1360362a2bca58b46e145890a6dac68b27ebc6
+  data.tar.gz: d467a28c0261fe8e1cfc46e6f268dbb582d40862
+SHA512:
+  metadata.gz: 5985885fe5ad19b0f3d8b69c4c909e93101ad51985a9f816b069403f342e651a6d034b9acbf21352242cae89e6e7d2fcb091cd0503d4302e8a6c6f410ece722e
+  data.tar.gz: b74ae8f82233134f546ef5db139d6f405055d2e909e08205e985704aa788ca04b0a2f637cb0ce42e99d9f10e4083b083ceb7dbb04aa736c11708d5560b83ff03

data/lib/phony/countries.rb

@@ -31,7 +31,7 @@ Phony.define do
   # USA, Canada, etc.
   #
   country '1',
-    trunk('1', normalize: true) | # http://en.wikipedia.org/wiki/Trunk_prefix
+    trunk('1 ', normalize: true) | # http://en.wikipedia.org/wiki/Trunk_prefix
     fixed(3) >> split(3,4),
     :invalid_ndcs => ['911']
 

data/lib/phony/country_codes.rb

@@ -90,8 +90,8 @@ module Phony
 
     # Formats country code and national destination code.
     #
-    def format_cc_ndc_local format, space, cc, zero, ndc, *parts
-      cc_ndc = format_cc_ndc format, space, cc, zero, ndc
+    def format_cc_ndc_local format, space, cc, trunk, ndc, *parts
+      cc_ndc = format_cc_ndc format, space, cc, trunk, ndc
       local  = if parts.empty?
                  cc_ndc = cc_ndc.slice 0...cc_ndc.rindex(space.to_s)
                  EMPTY_STRING
@@ -103,7 +103,7 @@ module Phony
     #
     # TODO This method needs an overhaul.
     #
-    def format_cc_ndc format, space, cc, zero, ndc
+    def format_cc_ndc format, space, cc, trunk, ndc
       case format
       when nil, :international_absolute, :international, :+
         ndc ?
@@ -115,8 +115,8 @@ module Phony
           @international_relative_format % [cc, nil, nil]
       when :national
         ndc && !ndc.empty? ?
-          @national_format % [zero, ndc] :
-          @national_format % [zero, nil]
+          @national_format % [trunk, ndc] :
+          @national_format % [trunk, nil]
       when :local
         EMPTY_STRING
       end

data/lib/phony/trunk_code.rb

@@ -11,7 +11,7 @@ module Phony
     #
     def initialize code, options = {}
       @code = code
-      @trunk_code_replacement = /\A#{code}/
+      @trunk_code_replacement = /\A#{code.rstrip}/
       @normalize = options[:normalize]
       @split     = options[:split]
     end

data/spec/lib/phony/country_codes_spec.rb

@@ -42,7 +42,7 @@ describe Phony::CountryCodes do
 
       # Removes CC 1, but adds national call prefix 1.
       #
-      @countries.formatted('11231231234', :format => :national).should eql '1123 123 1234'
+      @countries.formatted('11231231234', :format => :national).should eql '1 123 123 1234'
 
       @countries.national_format = old_format
     end

data/spec/lib/phony_spec.rb

@@ -171,7 +171,7 @@ describe Phony do
         Phony.format('43198110', :format => :national).should eql '01 98110'
       end
       it 'should format US numbers with a leading trunk 1' do
-        Phony.format('14159224711', :format => :national).should eql '1415 922 4711'
+        Phony.format('14159224711', :format => :national).should eql '1 415 922 4711'
       end
       it 'should format Dutch numbers with a trunk code' do
         Phony.format('311012341234', :format => :national).should eql '010 123 41234'

metadata

@@ -1,16 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: phony
 version: !ruby/object:Gem::Version
-  version: 2.5.4
+  version: 2.6.0
 platform: ruby
 authors:
 - Florian Hanke
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-14 00:00:00.000000000 Z
+date: 2014-10-27 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
@@ -57,7 +60,6 @@ files:
 - lib/phony/countries/uruguay.rb
 - lib/phony/countries/vietnam.rb
 - lib/phony/countries/zimbabwe.rb
-- lib/phony/countries.rb
 - lib/phony/country.rb
 - lib/phony/country_codes.rb
 - lib/phony/dsl.rb
@@ -72,8 +74,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
@@ -100,17 +100,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.2
 signing_key: 
 specification_version: 4
 summary: Fast international phone number (E164 standard) normalizing, splitting and
@@ -132,4 +132,3 @@ test_files:
 - spec/lib/phony/national_splitters/variable_spec.rb
 - spec/lib/phony/vanity_spec.rb
 - spec/lib/phony_spec.rb
-has_rdoc: false