phony 2.9.1 → 2.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 117a11d3df055c88a892d0cbb32a1106e72d2ed6
-  data.tar.gz: 6b9d3d5ab8e6e2c1559a0b670865fb9727006492
+  metadata.gz: 149c31aeeafd871ed8e08201ade25314998da9e1
+  data.tar.gz: f9160fe2f2da602bbb10259d95f4a12bea57290b
 SHA512:
-  metadata.gz: 4cc3f3eed1456898a67e536a3a996b3a32ea81b10fcbec18082a80d0dcf096a41bf731ffb4822bc66a03f48d16df350aee5a2b1696b3a0a1b690c1a3d42bdb3a
-  data.tar.gz: 1fa24b6a8326fe7989b3f8f25be1af5a101238515c87fa2d39b3f08f50593263f17ba470d8ae97aa712b26c52b48304b4fe68860d6f5ef8516ef60fcb650f603
+  metadata.gz: 62f5e978d9aa5331c924f14c86efc9251d057f6c140ef606ff8d33c05a10d30735a2aa2e2745ad1f68f4d6ed398405bf3933614af3d356c2b80527bf140b4d89
+  data.tar.gz: 3fec76eb6b6359e3ee54e9f6c373f062a1e25850650e1d7291db71d69005787269893e8463770973bf04e8b7125e8fa20e509ce18e773a28fc45b193ab9b6f09

data/lib/phony/countries/russia_kazakhstan_abkhasia_south_ossetia.rb

@@ -124,5 +124,6 @@ Phony.define do
     one_of(ndcs_with_7_subscriber_digits)  >> split(3, 2, 2) |
     one_of(%w(800))                        >> split(3, 2, 2) | # Russia free number
     one_of(%w(995344 9971 99744 9976 997)) >> split(2, 4) | # South Osetia
-    fixed(3)                               >> split(2, 5)
+    fixed(3)                               >> split(2, 5),
+    :local_space => :-
 end

data/lib/phony/country.rb

@@ -3,7 +3,8 @@ module Phony
   #
   #
   class Country
-
+    
+    attr_reader :format, :space, :local_space
     attr_accessor :codes
 
     #
@@ -26,6 +27,9 @@ module Phony
     def with cc, options = {}
       @cc           = cc
       @invalid_ndcs = options[:invalid_ndcs] || []
+      @format       = options[:format]
+      @space        = options[:space]
+      @local_space  = options[:local_space]
     end
 
     # A number is split with the code handlers as given in the initializer.

data/lib/phony/country_codes.rb

@@ -80,15 +80,22 @@ module Phony
     # Splits this number into cc, ndc and locally split number parts.
     #
     def split number
+      country, *cc_split_rest = internal_split number
+      cc_split_rest
+    end
+    
+    def internal_split number
       country, cc, rest = split_cc number
-      [cc, *country.split(rest)]
+      [country, cc, *country.split(rest)]
     end
 
     def format number, options = {}
-      format_cc_ndc_local options[:format],
-        options[:spaces] || @default_space,
-        options[:local_spaces] || options[:spaces] || @default_local_space,
-        *split(number)
+      country, *split_number = internal_split number
+      format_cc_ndc_local \
+        options[:format]       || country.format,
+        options[:spaces]       || country.space                           || @default_space,
+        options[:local_spaces] || country.local_space || options[:spaces] || @default_local_space,
+        *split_number
     end
     alias formatted format
 

data/spec/functional/format_spec.rb

@@ -70,13 +70,13 @@ describe 'Phony#format' do
         Phony.format(Phony.normalize('+370 800 12345'), :format => :international).should eql '+370 800 12 345'
       end
       it 'should format Russian numbers' do
-        Phony.format(Phony.normalize('+7 812 123 4567'), :format => :international).should eql '+7 812 123 45 67'
+        Phony.format(Phony.normalize('+7 812 123 4567'), :format => :international).should eql '+7 812 123-45-67'
       end
       it 'should format Russian numbers' do
         Phony.format(Phony.normalize('+370 800 12345'), :format => :national).should eql '8800 12 345'
       end
       it 'should format Russian numbers' do
-        Phony.format(Phony.normalize('+7 812 123 4567'), :format => :national).should eql '8812 123 45 67'
+        Phony.format(Phony.normalize('+7 812 123 4567'), :format => :national).should eql '8812 123-45-67'
       end
     end
     describe 'international' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: phony
 version: !ruby/object:Gem::Version
-  version: 2.9.1
+  version: 2.10.0
 platform: ruby
 authors:
 - Florian Hanke