phony 2.0.0.beta10 → 2.0.0.beta11

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    M2RiYWE2YjE2ZmM4NWFjZmQyMTI1NmFiYzQxNjNiOWQzYTM3M2VjZA==
+    OGU2OTIyNGI5NGE1MjkxNWNmYzBlYzRiM2Y3YWRhMjc0ZWFkZTM3Yg==
   data.tar.gz: !binary |-
-    NDg1OGQwNGMxYzZlZDYyYjFkZjM0OGQ4YTVjZTYzODJjZjAwZjdhNw==
+    YTE2MWIzODdiYWE0Y2I1NTczZDIyOTBkMjBiOTEyOWEzYTMwYTFlYQ==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    NTgxN2I0ZGVmZTZlZjU2M2Q5OGI4ZjcxMTAyMzQxMTA5N2ZkNGRiNWM5NDkx
-    M2FlNTNmNDA0Y2JkYjc1Yjc0M2QxNTk0Y2Q4MjBmNjFlMDUxMDBiN2JjMzg1
-    YTJhY2UxOGRiNjU4YzA5ZTNkMDY4YWI3NDg3ZGQ1ZmUwYTk1YmY=
+    YzAzM2UwYmQ2NDc2Njg5MWI2ZWYxZmQzOGU5NGY5YTQ0Yzc0ZjhjZmM3ZTM2
+    Njg1ZGNhYzM5Y2E2NWU4NjM0OGQ3NDcwOWQ5NWQ4NjcxMGMwM2FkNDc3NmIw
+    ODhmZTA5ZWE1MDFlZDE3NWI2YTI1ZmE5YzEwNzM5YTRkYmQ2NjQ=
   data.tar.gz: !binary |-
-    ZmVjNmYzNTY3ZDkyYzI0MDQwYTc3N2FhZjI5OWMzNjlhMDE2NTNjNTYyNzcw
-    MTJiNmVlN2EzYjU5ZDg2NTYwNmIzY2U1NDFhZDdiMzRmMzkxOTBjYWYyNDU5
-    MmEyOTBhNWM4ZWFlMThhNmVjNjI4MmU2OGY3MzI0OWUwNGNmMDU=
+    NDU3NWJiYWIyODQxMDg0ZDYxNjg5MjVmNDhiZmQyNzcxMjZiNzljZTg3NGZm
+    ODhiZjU4YzlkZWYzZDdjZGJjZmVhY2NmMTVjOThkODRlOGNhMDc5ODQ1NWUz
+    ZDczYzgwZWUyNjg4MWRlN2M3ODRhNTAwMzA4YjFlZTM2ZGM2Nzg=

data/README.textile

@@ -8,7 +8,7 @@ There's also a Rails wrapper: https://github.com/joost/phony_rails.
 
 h2. Description
 
-This gem can normalize, format and split E164 numbers.
+This gem can normalize, format and split E164 numbers. E164 numbers are international numbers with a country dial prefix, usually an area code and a subscriber number. Here's an example from Australia: +61 412 345 678. 61 is the country code of Australia, 4 denotes a mobile number and 12 345 678 is the subscriber number.
 "More about E164 numbers in this Wiki":http://en.wikipedia.org/wiki/E.164.
 
 The (admittedly crazy) *goal* of this Gem is to be able to format/split all phone numbers in the world.

data/lib/phony.rb

@@ -72,17 +72,27 @@ module Phony
   @codes = CountryCodes.instance
 
   class << self
+    
+    # Get the Country for the given CC.
+    #
+    # Example:
+    #   us = Phony['1']
+    #   normalized_number = us.normalize number
+    #
+    def [] cc
+      @codes[cc]
+    end
 
     # Normalizes the given number.
     #
     # Useful before inserting the number into a database.
     #
-    def normalize phone_number
+    def normalize phone_number, options = {}
       raise ArgumentError, "Phone number cannot be nil. Use e.g. number && Phony.normalize(number)." unless phone_number
-      normalize! phone_number.dup
+      normalize! phone_number.dup, options
     end
-    def normalize! phone_number
-      @codes.normalize phone_number
+    def normalize! phone_number, options = {}
+      @codes.normalize phone_number, options
     rescue
       raise NormalizationError.new
     end

data/lib/phony/countries/india.rb

@@ -13,30 +13,27 @@
 sdca_with_2_digits = %w{ 11 20 22 33 39 40 44 50 60 70 79 80 }
 
 sdca_with_3_digits = %w{
-                         120 121 122 124 129 130 131 132 135 141 144 145 151 154 160 161 164 171 172 175 177 180 181 183 184 186 191 194
-                         210 212 217 230 231 233 239 240 241 249 250 251 254 257 260 261 265 268 270 272 278 281 285 286 288 291 294
-                         326 341 342 343 353 354 360 361 364 369 370 373 374 376 381 385 389
-                         413 416 421 423 424 427 431 435 451 452 461 462 469 470 471 474 475 476 477 478 479 480 481 483 484 485 487 490 491 494 495 496 497
-                         512 515 532 535 542 548 551 562 565 572 581 595
-                         612 621 631 641 651 657 661 663 671 674 680
-                         712 721 724 731 733 734 744 751 755 761 747 788
-                         816 820 821 824 831 832 836 861 863 866 870 877 878 883 884 891
-
-
-                         140
-                         240 249 254 260 270 272
-                         300 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 318 320 327 328 329 340 344 349 350 357 388
-                         412 419 430 438 439 450 453 458 459 460 464 466 467 468
-                         510 513 520 523 529 530 537 538 539 540 543 547 550 553 557 558 559 560 563 570 575 576 577 578 579 580 589 590 593 597 598 599
-                         610 614 616 617 619 620 623 626 628 629 630 635 636 637 638 639 640 644 648 649 650 660 669 670 677 687 688 689
-                         730 735 738 740 750 787 789
-                         812 814 829 843 860 879 880 887 889 890 895 897 898 899
-
+120 121 122 124 129 130 131 132 135 141 144 145 151 154 160 161 164 171 172 175 177 180 181 183 184 186 191 194
+210 212 217 230 231 233 239 240 241 249 250 251 254 257 260 261 265 268 270 272 278 281 285 286 288 291 294
+326 341 342 343 353 354 360 361 364 369 370 373 374 376 381 385 389
+413 416 421 423 424 427 431 435 451 452 461 462 469 470 471 474 475 476 477 478 479 480 481 483 484 485 487 490 491 494 495 496 497
+512 515 532 535 542 548 551 562 565 572 581 595
+612 621 631 641 651 657 661 663 671 674 680
+712 721 724 731 733 734 744 751 755 761 747 788
+816 820 821 824 831 832 836 861 863 866 870 877 878 883 884 891
+140
+240 249 254 260 270 272
+300 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 318 320 327 328 329 340 344 349 350 357 388
+412 419 430 438 439 450 453 458 459 460 464 466 467 468
+510 513 520 523 529 530 537 538 539 540 543 547 550 553 557 558 559 560 563 570 575 576 577 578 579 580 589 590 593 597 598 599
+610 614 616 617 619 620 623 626 628 629 630 635 636 637 638 639 640 644 648 649 650 660 669 670 677 687 688 689
+730 735 738 740 750 787 789
+812 814 829 843 860 879 880 887 889 890 895 897 898 899
 }
 
 
 
-mobile = %w{ 91 92 93 94 97 98 99}
+mobile = %w{ 91 92 93 94 97 98 99 }
 
 pagers = %w{ 96 }
 

data/lib/phony/country.rb

@@ -24,6 +24,7 @@ module Phony
     # TODO Rewrite.
     #
     def with options = {}
+      @cc           = options[:cc]
       @invalid_ndcs = options[:invalid_ndcs] || []
     end
     
@@ -44,6 +45,15 @@ module Phony
       end
     end
     
+    def countrify! number
+      # The sensible default is to add the country code
+      # if it does not already start with it.
+      #
+      # Note: This won't be correct in some cases, but it is the best we can do.
+      #
+      number.sub! /\b#{@cc}?/, @cc
+    end
+    
     # Removes 0s from partially normalized numbers
     # such as 410443643533.
     # 

data/lib/phony/country_codes.rb

@@ -6,7 +6,7 @@ module Phony
   #
   class CountryCodes
 
-    attr_reader   :splitter_mapping
+    attr_reader   :countries
     attr_accessor :international_absolute_format, :international_relative_format, :national_format
 
     def initialize
@@ -21,6 +21,12 @@ module Phony
     def self.instance
       @instance ||= new
     end
+    
+    # Get the Country object for the given CC.
+    #
+    def [] cc
+      countries[cc.size][cc]
+    end
 
     # 00 for the standard international call prefix.
     # http://en.wikipedia.org/wiki/List_of_international_call_prefixes
@@ -37,11 +43,18 @@ module Phony
       #
       number.gsub!(@@basic_normalizing_pattern, EMPTY_STRING) || number
     end
-    def normalize number
+    def normalize number, options = {}
       clean! number
+      countrify! number, options
       country, cc, rest = split_cc number
       @normalize_format % [cc, country.normalize(rest)]
     end
+    
+    def countrify! number, options = {}
+      if cc = options[:cc]
+        self[cc].countrify! number
+      end
+    end
 
     # Splits this number into cc, ndc and locally split number parts.
     #
@@ -123,7 +136,7 @@ module Phony
       presumed_cc = ''
       1.upto(3) do |i|
         presumed_cc << rest.slice!(0..0)
-        country = splitter_mapping[i][presumed_cc]
+        country = countries[i][presumed_cc]
         return [country, presumed_cc, rest] if country
       end
       # This line is never reached as CCs are in prefix code.
@@ -163,9 +176,9 @@ module Phony
       country_code = country_code.to_s
       optimized_country_code_access = country_code.size
 
-      @splitter_mapping ||= {}
-      @splitter_mapping[optimized_country_code_access] ||= {}
-      @splitter_mapping[optimized_country_code_access][country_code] = country
+      @countries ||= {}
+      @countries[optimized_country_code_access] ||= {}
+      @countries[optimized_country_code_access][country_code] = country
     end
 
   end

data/lib/phony/dsl.rb

@@ -50,7 +50,7 @@ module Phony
     #   country '27', # CC, followed by rules, for example fixed(2) >> ...
     #
     def country country_code, definition, options = {}
-      definition.with options
+      definition.with options.merge! :cc => country_code
       Phony::CountryCodes.instance.add country_code, definition
     end
     

data/spec/functional/normalize_spec.rb

@@ -0,0 +1,19 @@
+require 'spec_helper'
+
+describe 'Phony.normalize' do
+
+  describe 'cases' do
+    
+    it 'handles the US (with cc) correctly' do
+      Phony.normalize('+1 724 999 9999').should == '17249999999'
+    end
+    it 'handles the US (with cc and cc option) correctly' do
+      Phony.normalize('+1 724 999 9999', cc: '1').should == '17249999999'
+    end
+    it 'handles the US (without cc) correctly' do
+      Phony.normalize('(310) 555-2121', cc: '1').should == '13105552121'
+    end
+    
+  end
+  
+end

data/spec/lib/phony/countries_spec.rb

@@ -7,7 +7,11 @@ describe 'country descriptions' do
   def self.it_splits number, expected
     it { Phony.split(number).should == expected }
   end
-
+  
+  describe 'regression' do
+    it_splits '33630588659', ["33", "6", "30", "58", "86", "59"]
+  end
+  
   describe 'splitting' do
     describe 'Ascension Island' do
       it_splits '2473551', ['247', false, '3551']
@@ -268,7 +272,8 @@ describe 'country descriptions' do
       it_splits '919911182111', ['91', '99', '111', '82', '111'] # mobile
       it_splits '912212345678', ['91', '22', '123', '45', '678'] # New Delhi
       it_splits '911411234567', ['91', '141', '123', '45', '67'] # Jaipur
-      it_splits '913525123456', ['91', '3525', '123', '456' ]    # DALKHOLA
+      it_splits '913525123456', ['91', '3525', '123', '456']     # DALKHOLA
+      it_splits '914433993939', ['91', '44', '339', '93', '939'] # 
     end
 
     describe 'Iran' do

data/spec/lib/phony_spec.rb

@@ -4,6 +4,16 @@ require 'spec_helper'
 
 describe Phony do
 
+  describe 'OO interface' do
+    describe '[]' do
+      it '' do
+        us = described_class['1']
+        us.plausible?('4159224711').should be_true
+        us.countrify!('4159224711').should == '14159224711'
+      end
+    end
+  end
+
   describe 'normalize' do
     describe 'exceptions' do
       it 'raises on nil' do
@@ -106,6 +116,9 @@ describe Phony do
       it 'should format New Zealand landline numbers' do
         Phony.format('6493791234').should == '+64 9 379 1234'
       end
+      it 'should format Indian numbers' do
+        Phony.format('914433993939').should == '+91 44 339 93 939'
+      end
     end
     describe 'international' do
       it 'should format north american numbers' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: phony
 version: !ruby/object:Gem::Version
-  version: 2.0.0.beta10
+  version: 2.0.0.beta11
 platform: ruby
 authors:
 - Florian Hanke
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-17 00:00:00.000000000 Z
+date: 2013-09-17 00:00:00.000000000 Z
 dependencies: []
 description: ! 'Fast international phone number (E164 standard) normalizing, splitting
   and formatting. Lots of formatting options: International (+.., 00..), national
@@ -70,6 +70,7 @@ files:
 - lib/phony/vanity.rb
 - lib/phony.rb
 - README.textile
+- spec/functional/normalize_spec.rb
 - spec/lib/phony/countries_spec.rb
 - spec/lib/phony/country_codes_spec.rb
 - spec/lib/phony/country_spec.rb
@@ -110,6 +111,7 @@ specification_version: 4
 summary: Fast international phone number (E164 standard) normalizing, splitting and
   formatting.
 test_files:
+- spec/functional/normalize_spec.rb
 - spec/lib/phony/countries_spec.rb
 - spec/lib/phony/country_codes_spec.rb
 - spec/lib/phony/country_spec.rb