phony 2.14.3 → 2.14.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cefb31abcc6e35e6d23212b756d008129f3b6163
-  data.tar.gz: db8fc173a095f55f81069fad6aebd4b13928bf23
+  metadata.gz: 5435a9ae0cf44bc8a237cbc27ba101bb7a1c563c
+  data.tar.gz: 61cad1ebaec418406a7376691e14cf88a196e1ba
 SHA512:
-  metadata.gz: c5d504bf4dcb20083053fb1b84659c1a6b70c7270d9dbe0cf4f1a75ebfd6ee7bb48a085d0772711b24b15adfc7fa62e40f24c9010e9e567aff2f56010b235368
-  data.tar.gz: 4e015f2dab7863d757dadc1b0829ea5fe13a7b391ab4b28d1604a658fde0b25c9a7b1e277aca3d33ba056f0511ec9a0ac35af40eb243f13bf0099bd64c0198a3
+  metadata.gz: b48ca5377879ea3588e65a5e33ad19fcafb672b211597514d6da9bd6681414c20b9df997709aedcdd91eda5d969348d95a6f7589c55aa36a0665e5e00869531c
+  data.tar.gz: cc47f05ba132af603a54ab8823ba8403c1ecadd35cf063edeeb90a5b31631259cb492b9d15c39ee4d53dc2deae0cc0c439101077ee87671341aae86b396d1a0a

data/README.textile

@@ -27,7 +27,7 @@ E164 numbers are international numbers with a country dial prefix, usually an ar
 
 It currently handles the countries listed at the end of this README.
 
-It is covered by roughly 1,800 tests (June 2105).
+It is covered by roughly 1,800 tests (June 2015).
 If it doesn't work, please "enter an issue":http://github.com/floere/phony/issues or better, fork and "send a pull request":http://github.com/floere/phony/pulls.
 
 h2. Installation
@@ -74,6 +74,10 @@ Split a number into its parts: CC, NDC, local.
 
 @Phony.split('3928061371').assert == ['39', '2', '806', '1371']@
 
+NB If a country does not have an NDC, @#split@ will return @false@ in the NDC position, for example for Denmark:
+
+@Phony.split('4512121212').assert == ['45', false, '12', '12', '12', '12']@
+
 h2. List of Handled Countries
 
 Mildly unmaintained list: Abhas, Afghan, Algerian, Argentinan, Austrian, Australian, Azerbaijani, Belgian, Brazilian, Cambodian, Chilean, Chinese, Croatian, Cuban, Cypriot, Czech, Danish, Dutch, Egyptian, El Salvadorian, Estonian, French, German, Ghanan, Gibraltar, Greek, Haiti, Hong Kong, Hungarian, Indian, Iran, Irish, Israel, Italian, Kazakh, Liberian, Lithuanian, Luxembourgian, Malaysian, Malta, Mexican, Monaco, Morocco, New Zealand, Nigerian, Norwegian, Peruvian, Polish, Romanian, Russian, Rwandan, Seychelles, Singapore, Slovakian, South African, South Korean, South Osetian, Spanish, Sri Lankan, Sudan, Swedish, Swiss, Thailand, Tunisian, Turkish, Liechtenstein, UK, US, Venezuelan, Vietnamese, and Zambian numbers.
@@ -81,4 +85,4 @@ Mildly unmaintained list: Abhas, Afghan, Algerian, Argentinan, Austrian, Austral
 h2. License
 
 MIT.
-See "LICENSE":./LICENSE file.
+See "LICENSE":./LICENSE file.

data/lib/phony/country.rb

@@ -48,22 +48,26 @@ module Phony
     #
     # Note: If the ndc is nil, it will not return it.
     #
+    # @return [Trunk, String (ndc), Array<String> (national pieces)]
+    #
     def split national_number
+      _, trunk, ndc, *rest = internal_split national_number
+      [trunk, ndc, *rest]
+    end
+    #
+    #
+    # @return [Splitters::Local, Trunk, String (ndc), Array<String> (national pieces)]
+    #
+    def internal_split national_number
       trunk = nil
-      @codes.each do |code|
-        new_trunk, ndc, *rest = code.split national_number
+      @codes.each do |national_splitter|
+        new_trunk, ndc, *rest = national_splitter.split national_number
         trunk ||= new_trunk
-        return [trunk, ndc, *rest] if rest && !rest.empty?
-      end
-      # Best effort in error case.
-      #
-      [trunk, national_number, []]
-    end
-    def split_ndc national_number
-      @codes.each do |code|
-        zero, ndc, *rest = code.split national_number
-        return [code.local_splitter, zero, ndc, *rest] if rest && !rest.empty?
+        return [national_splitter.local_splitter, trunk, ndc, *rest] if rest && !rest.empty?
       end
+      
+      # Best effort.
+      [nil, trunk, national_number, []]
     end
     
     # Format the number, given the national part of it.
@@ -163,7 +167,7 @@ module Phony
     # Tests for plausibility of this national number.
     #
     def plausible? rest, hints = {}
-      local, _, ndc, *rest = split_ndc rest
+      local, _, ndc, *rest = internal_split rest
 
       # Element based checking.
       #

data/lib/phony/country_codes.rb

@@ -73,16 +73,20 @@ module Phony
     # Splits this number into cc, ndc and locally split number parts.
     #
     def split number
-      # TODO Think about reordering.
-      country, cc, trunk, *pieces = internal_split number
-      [cc, *pieces]
+      # Split the number into country, cc, and national part.
+      country, cc, national_number = partial_split number
+      
+      # Split the national number into ndc and local part.
+      trunk, ndc, *local = country.split national_number
+      
+      [cc, ndc, *local]
     end
 
     # Format the number.
     #
     def format number, options = {}
-      country, _, national = partial_split number
-      country.format national, options
+      country, _, national_number = partial_split number
+      country.format national_number, options
     end
     alias formatted format
 
@@ -130,14 +134,7 @@ module Phony
         country, _ = partial_split number
         country
       end
-      
-      # Return a country and the split pieces of a number. 
-      #
-      def internal_split number
-        country, cc, national = partial_split number
-        [country, cc, *country.split(national)]
-      end
-    
+          
       # Split off the country and the cc, and also return the national number part.
       #
       def partial_split number

data/lib/phony/national_splitters/default.rb

@@ -9,7 +9,7 @@ module Phony
       def self.instance_for
         @instance ||= new
       end
-
+      
       # "Splits" the national part of a phone number into a single piece.
       #
       # @param [String] national_number An national part of a number.
@@ -20,7 +20,7 @@ module Phony
       #   Phony.split("1234567") # => ["1234567"]
       #
       def split national_number
-        [national_number]
+        [nil, national_number]
       end
       
       # By default, the national part of a number is always plausible.

data/spec/lib/phony/national_splitters/default_spec.rb

@@ -12,8 +12,8 @@ describe Phony::NationalSplitters::Default do
     let(:splitter) { described_class.instance_for }
     
     describe 'split' do
-      it 'does not split' do
-        splitter.split(:anything).should == [:anything]
+      it 'does only pretend split' do
+        splitter.split(:anything).should == [nil, :anything]
       end
     end
     

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: phony
 version: !ruby/object:Gem::Version
-  version: 2.14.3
+  version: 2.14.4
 platform: ruby
 authors:
 - Florian Hanke
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-12 00:00:00.000000000 Z
+date: 2015-06-15 00:00:00.000000000 Z
 dependencies: []
 description: 'Fast international phone number (E164 standard) normalizing, splitting
   and formatting. Lots of formatting options: International (+.., 00..), national