phony 1.9.0 → 2.0.0.beta1

data/spec/lib/phony_spec.rb

@@ -60,6 +60,20 @@ describe Phony do
       it "should not normalize a number with a correct zero inside" do
         Phony.normalize('+390909709511').should == '390909709511'
       end
+
+      context 'special trunk prefixes' do
+        it 'normalizes Hungary' do
+          Phony.normalize('36 0630245506').should == '3630245506'
+        end
+        it 'normalizes Russia' do
+          Phony.normalize('7 8 342 1234567').should == '73421234567'
+        end
+        it 'normalizes Lithuania' do
+          Phony.normalize('370 8 5 1234567').should == '37051234567'
+        end
+        it 'normalizes Belarus'
+      end
+
     end
   end
 
@@ -150,16 +164,16 @@ describe Phony do
       end
       describe '"unsupported" countries' do
         it 'should format as a single block' do
-          Phony.format('88032155605220').should == '+880 32155605220'
+          Phony.format('88132155605220').should == '+881 32155605220'
         end
         it 'should format as a single block, regardless of format' do
-          Phony.format('8801819372205', :format => :international).should == '+880 1819372205'
+          Phony.format('8811819372205', :format => :international).should == '+881 1819372205'
         end
         it 'should format as a single block, respecting custom spaces' do
-          Phony.format('8801819372205', :spaces => :-).should == '+880-1819372205'
+          Phony.format('8811819372205', :spaces => :-).should == '+881-1819372205'
         end
         it 'should format as a single block, even without spaces' do
-          Phony.format('8801819372205', :spaces => '').should == '+8801819372205'
+          Phony.format('8811819372205', :spaces => '').should == '+8811819372205'
         end
       end
     end
@@ -219,10 +233,10 @@ describe Phony do
     end
     context '"unsupported" countries' do
       it 'handles formatting' do
-        Phony.format('88032155605220').should == '+880 32155605220'
+        Phony.format('88132155605220').should == '+881 32155605220'
       end
       it 'handles normalizing' do
-        Phony.normalize('+880-321 5560 5220').should == '88032155605220'
+        Phony.normalize('+881-321 5560 5220').should == '88132155605220'
       end
     end
   end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: phony
 version: !ruby/object:Gem::Version
-  version: 1.9.0
-  prerelease: 
+  version: 2.0.0.beta1
+  prerelease: 6
 platform: ruby
 authors:
 - Florian Hanke
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-21 00:00:00.000000000 Z
+date: 2013-04-18 00:00:00.000000000 Z
 dependencies: []
 description: ! 'Fast international phone number (E164 standard) normalizing, splitting
   and formatting. Lots of formatting options: International (+.., 00..), national
@@ -21,17 +21,40 @@ extra_rdoc_files:
 - README.textile
 files:
 - lib/phony/countries/austria.rb
+- lib/phony/countries/bangladesh.rb
+- lib/phony/countries/belarus.rb
 - lib/phony/countries/brazil.rb
 - lib/phony/countries/china.rb
+- lib/phony/countries/georgia.rb
 - lib/phony/countries/germany.rb
+- lib/phony/countries/india.rb
+- lib/phony/countries/indonesia.rb
 - lib/phony/countries/ireland.rb
 - lib/phony/countries/italy.rb
+- lib/phony/countries/japan.rb
+- lib/phony/countries/kyrgyzstan.rb
+- lib/phony/countries/latvia.rb
+- lib/phony/countries/libya.rb
 - lib/phony/countries/malaysia.rb
+- lib/phony/countries/moldova.rb
+- lib/phony/countries/montenegro.rb
+- lib/phony/countries/namibia.rb
+- lib/phony/countries/nepal.rb
 - lib/phony/countries/netherlands.rb
+- lib/phony/countries/pakistan.rb
+- lib/phony/countries/paraguay.rb
 - lib/phony/countries/russia_kazakhstan_abhasia_south_osetia.rb
+- lib/phony/countries/serbia.rb
+- lib/phony/countries/somali.rb
 - lib/phony/countries/south_korea.rb
 - lib/phony/countries/sweden.rb
+- lib/phony/countries/taiwan.rb
+- lib/phony/countries/tajikistan.rb
+- lib/phony/countries/turkmenistan.rb
+- lib/phony/countries/ukraine.rb
 - lib/phony/countries/united_kingdom.rb
+- lib/phony/countries/uruguay.rb
+- lib/phony/countries/zimbabwe.rb
 - lib/phony/countries.rb
 - lib/phony/country.rb
 - lib/phony/country_codes.rb
@@ -45,8 +68,6 @@ files:
 - lib/phony/national_splitters/none.rb
 - lib/phony/national_splitters/regex.rb
 - lib/phony/national_splitters/variable.rb
-- lib/phony/validator.rb
-- lib/phony/validators.rb
 - lib/phony/vanity.rb
 - lib/phony.rb
 - README.textile
@@ -79,12 +100,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Fast international phone number (E164 standard) normalizing, splitting and
@@ -104,4 +125,3 @@ test_files:
 - spec/lib/phony/validations_spec.rb
 - spec/lib/phony/vanity_spec.rb
 - spec/lib/phony_spec.rb
-has_rdoc: false

data/lib/phony/validator.rb

@@ -1,26 +0,0 @@
-module Phony
-  
-  class Validator
-  
-    attr_reader :ndc_checks 
-  
-    def initialize
-      @ndc_checks = []
-    end
-  
-    def plausible? ndc, rest
-      ndc_checks && ndc_checks.each do |ndc_check|
-        return false if ndc_check === ndc
-      end
-      
-      true
-    end
-  
-    def ndc_check ndc
-      @ndc_checks << ndc
-      self
-    end
-    
-  end
-  
-end

data/lib/phony/validators.rb

@@ -1,88 +0,0 @@
-# # Number: A possible phone number, E164 or not.
-# # Hints: Information that helps or constricts the plausibility check.
-# #
-# plausible? number, hints = {}
-#
-
-# plausible? number # Uses the definitions from the country definition to plausibility check.
-# plausible? number, cc: 1 # => Checks cc.
-# plausible? number, pattern: /[^5]/ # Uses def, checks against split.
-# plausible? number, country: 1, pattern: [3, 4, 3] # Uses given country – adds cc.
-#
-
-# Basic plausibility is:
-# * Max digits are 15.
-# * Min digits are 2 (?)
-#
-
-module Phony
-  
-  class Validators
-    
-    def initialize
-      @validators = {}
-    end
-    
-    def self.instance
-      @instance ||= new
-    end
-    
-    # Add a specific country validator.
-    #
-    def add cc, validator
-      @validators[cc] = validator
-    end
-    
-    # Is the given number plausible?
-    #
-    def plausible? number, hints = {}
-      normalized = CountryCodes.instance.clean number
-      
-      # False if it fails the basic check.
-      #
-      return false unless (4..15) === normalized.size
-      
-      # Hint based checking.
-      #
-      cc, ndc, *rest = Phony.split normalized
-      
-      # Element based checking.
-      #
-      # Note: ndc == false means the country has none.
-      #
-      return false if ndc.nil?
-      return false if ndc && ndc.empty?
-      
-      # A valid range for the rest is 0 or 3+ total digits.
-      #
-      return false if (1..2) === rest.reduce(0) { |total, string| total + string.size }
-      
-      # CC.
-      #
-      cc_needed = hints[:cc]
-      return false if cc_needed && !(cc_needed === cc)
-      
-      # NDC.
-      #
-      ndc_needed = hints[:ndc]
-      return false if ndc_needed && !(ndc_needed === ndc)
-      
-      # Country specific checks.
-      #
-      validator = validator_for cc
-      validator.plausible? ndc, rest
-    rescue StandardError
-      return false
-    end
-    
-    def validator_for cc
-      @validators[cc] || default_validator
-    end
-    
-    def default_validator
-      @default_validator ||= Validator.new
-    end
-    
-  end
-  
-end