phony 1.2.8 → 1.2.9

data/lib/phony/countries/all_other.rb

@@ -74,8 +74,9 @@ module Phony
           '43' => Countries::Austria,
           '44' => fixed(2), # TODO United Kingdom of Great Britain and Northern Ireland
           '45' => fixed(2,  # Denmark
-                        :local_format => [2, 2, 2]
-                  ),
+                        :local_format => [2, 2, 2],
+                        :service_ndcs => %w{112 114}
+                  ), # Denmark has no NDC, but 4 groups of 2 digits. I'm faking it here.
           '46' => Countries::Sweden,
           '47' => fixed(4,  # Norway
                     :local_format => [4]

data/lib/phony/countries/belgium.rb

@@ -3,6 +3,7 @@
 # Taken from: http://en.wikipedia.org/wiki/Telephone_numbers_in_Belgium
 #
 Phony::Countries::Belgium = Phony::Country.configured :local_format => [3, 5],
+ :mobile_local_format => [6],
  :ndc_fallback_length => 2,
  :ndc_mapping => {
    :landline => [

data/lib/phony/countries/hungary.rb

@@ -13,7 +13,7 @@ Phony::Countries::Hungary = Phony::Country.configured :local_format => [3, 4], #
     :landline => [
                    '1'
                   ],
-    :mobile   => [], # TODO
+    # TODO :mobile   => [],
     :service  => [
                    '104',
                    '105',

data/lib/phony/countries/peru.rb

@@ -3,7 +3,7 @@
 # http://en.wikipedia.org/wiki/Telephone_numbers_in_Peru
 #
 Phony::Countries::Peru = Phony::Country.configured :local_format => [4, 4],
-  :local_special_format => [3, 3],
+  :service_local_format => [3, 3],
   :ndc_fallback_length => 2,
   :ndc_mapping => {
     :landline => [

data/lib/phony/countries/portugal.rb

@@ -4,6 +4,7 @@
 #
 Phony::Countries::Portugal = Phony::Country.configured :local_format => [3, 4],
   :local_special_format => [3, 3],
+  :local_mobile_format => [3, 3],
   :ndc_fallback_length => 3,
   :ndc_mapping => {
     :landline => [

data/lib/phony/countries/romania.rb

@@ -4,6 +4,7 @@
 #
 Phony::Countries::Romania = Phony::Country.configured :local_format => [3, 4], # Also captures 3, 3 on a fallback.
   :local_special_format => [3, 3],
+  :local_mobile_format => [3, 4],
   :ndc_fallback_length => 3,
   :ndc_mapping => {
     :landline => [

data/lib/phony/country.rb

@@ -4,16 +4,20 @@ module Phony
   #
   class Country
     
-    def initialize national_code, special_code = nil
+    def initialize national_code, special_code = nil, mobile_code = nil
       @national_code = national_code
       @special_code  = special_code
+      @mobile_code   = mobile_code
     end
     
     #
     #
     def split national_number
       ndc, *rest = @special_code.split national_number if @special_code
-      ndc, *rest = @national_code.split national_number unless rest && !rest.empty?
+      return [ndc, *rest] if rest && !rest.empty?
+      ndc, *rest = @mobile_code.split national_number if @mobile_code
+      return [ndc, *rest] if rest && !rest.empty?
+      ndc, *rest = @national_code.split national_number
       [ndc, *rest]
     end
     
@@ -27,8 +31,10 @@ module Phony
     #
     def normalize national_number
       normalized = @special_code.normalize national_number if @special_code
-      normalized = @national_code.normalize national_number unless normalized && !normalized.empty?
-      normalized
+      return normalized if normalized && !normalized.empty?
+      normalized = @mobile_code.normalize national_number if @mobile_code
+      return normalized if normalized && !normalized.empty?
+      @national_code.normalize national_number
     end
     
     # Is this national number a vanity number?
@@ -77,8 +83,14 @@ module Phony
         service_local_splitter    = Phony::LocalSplitter.instance_for options[:service_local_format] || [3, 6]
         service_code              = Phony::NationalCode.new service_national_splitter, service_local_splitter, normalize
       end
+      if ndc_mapping[:mobile]
+        mobile_local_format      = options[:mobile_local_format] || options[:local_format] || [9]
+        mobile_national_splitter = Phony::NationalSplitters::Variable.new nil, :mobile => ndc_mapping[:mobile]
+        mobile_local_splitter    = Phony::LocalSplitter.instance_for mobile_local_format
+        mobile_code              = Phony::NationalCode.new mobile_national_splitter, mobile_local_splitter, normalize
+      end
       
-      new national_code, service_code
+      new national_code, service_code, mobile_code
     end
     
     # Gets a configured country instance with fixed length ndc code.
@@ -104,9 +116,9 @@ module Phony
       
       service_code = nil
       if service_ndcs
-        service_local_format      = options[:service_local_format] || local_format
+        service_local_format      = options[:service_local_format] || local_format || [3, 3]
         service_national_splitter = Phony::NationalSplitters::Variable.new nil, :service => service_ndcs
-        service_local_splitter    = Phony::LocalSplitter.instance_for service_local_format || [3, 3]
+        service_local_splitter    = Phony::LocalSplitter.instance_for service_local_format
         service_code              = Phony::NationalCode.new service_national_splitter, service_local_splitter, normalize
       end
       

data/spec/lib/phony/country_spec.rb

@@ -7,6 +7,7 @@ describe Phony::Country do
       before(:each) do
         @country = Phony::Country.configured :local_format         => [3, 2, 2],
                                              :service_local_format => [3, 3],
+                                             :mobile_local_format  => [1, 2, 4],
                                              :ndc_fallback_length  => 4,
                                              :ndc_mapping => {
                                                :normal  => ['44'],
@@ -21,7 +22,7 @@ describe Phony::Country do
         @country.split('800333666').should == ['800', '333', '666']
       end
       it 'works with mobile numbers' do
-        @country.split('764333532').should == ['76', '433', '35', '32']
+        @country.split('764333532').should == ['76', '4', '33', '3532']
       end
       it 'uses the fallback if it is not in the mapping' do
         @country.split('123456789').should == ['1234', '567', '89']

metadata

@@ -2,7 +2,7 @@
 name: phony
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 1.2.8
+  version: 1.2.9
 platform: ruby
 authors: 
 - Florian Hanke
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-02 00:00:00 +01:00
+date: 2011-02-03 00:00:00 +01:00
 default_executable: 
 dependencies: []