phoney 0.0.3 → 0.0.4

data/README.rdoc

@@ -78,7 +78,7 @@ When given a symbol you can let the parser guess the best format and pass in one
 == TODOs
 
 - More test specs for different countries
-- Regions with dialout prefixes that use wild-cards are not yet implemented
+- Correctly handle numbers that have some digits BEFORE the area_code!
 
 == Licence
 

data/lib/phoney.rb

@@ -2,4 +2,7 @@ require File.join(File.dirname(__FILE__), 'phoney', 'version')
 require File.join(File.dirname(__FILE__), 'phoney', 'utils')
 require File.join(File.dirname(__FILE__), 'phoney', 'region')
 require File.join(File.dirname(__FILE__), 'phoney', 'parser')
-require File.join(File.dirname(__FILE__), 'phoney', 'base')
+require File.join(File.dirname(__FILE__), 'phoney', 'base')
+
+# Load our region file when we require the library
+PhoneNumber::Region.load

data/lib/phoney/parser.rb

@@ -26,22 +26,28 @@ class PhoneNumber
         national_prefix = get_national_prefix(phone_number, region)
         dialout_region  = get_dialout_region(phone_number, region)
         dialout_country = ''
-        rule_sets       = get_rule_sets_for_region(phone_number, dialout_region || region)
+        
+        # No dialout prefix without a dialout region, and no dialout region without a prefix
+        if((dialout_region && dialout_prefix.empty?) || (!dialout_region && !dialout_prefix.empty?))
+          rule_sets = []
+        else
+          rule_sets = get_rule_sets_for_region(phone_number, dialout_region || region)
+        end
         
         # build our total prefix
         if dialout_region
-          prefix       = dialout_prefix.delete(' ') + dialout_region.country_code.to_s
-          country_code = dialout_region.country_code.to_s
+          prefix          = dialout_prefix.delete(' ') + dialout_region.country_code.to_s
+          country_code    = dialout_region.country_code.to_s
           dialout_country = country_code
         else
           prefix  = national_prefix
-          prefix += dialout_prefix unless(dialout_prefix.empty?)
+          prefix += dialout_prefix.delete(' ') unless(dialout_prefix.empty?)
         end
         
         # strip the total prefix from the beginning of the number
         phone_number = phone_number[prefix.length..-1]
         number       = phone_number
-        
+
         prefered_type = 0 # for sorting the priority
         
         # if we're dialing out or using the national prefix
@@ -54,7 +60,7 @@ class PhoneNumber
         rule_sets.each do |rule_set|
           rule_set[:rules] = rule_set[:rules].sort_by do |rule|
             # [ prefered rule type ASC, total_digits ASC ]
-            [ (rule[:type]==prefered_type) ? -1 : rule[:type], rule[:total_digits] ]
+            [ (rule[:type]==prefered_type) ? -1 : rule[:type], rule[:total_digits], rule[:index] ]
           end
         end
         
@@ -105,14 +111,16 @@ class PhoneNumber
         # strip possible whitespace
         phone_number.rstrip!
         phone_number.lstrip!
+        # remove possible non-numeric characters from the (invalid) number
+        number.gsub!(/[^0-9]/,'') if number
         
         # Finally...we can output our parts as a hash
-        { :formatted_number => phone_number, :area_code => area_code, :country_code => country_code, :number => normalize(number) }
+        { :formatted_number => phone_number, :area_code => area_code, :country_code => country_code, :number => number }
       end
       
-      private
+      # private
       def get_rule_sets_for_region(string, region)
-        rule_sets      = []
+        rule_sets = []
         
         if(region && region.rule_sets)
           rule_sets = region.rule_sets.select do |rule_set|
@@ -123,14 +131,15 @@ class PhoneNumber
         rule_sets
       end
       
-      def find_matching_rule(string, rule_sets)
+      def find_matching_rule(number, rule_sets)
+        return nil if !number.match(/\A[0-9]+\Z/)
         match = nil
         
         # go through all our given rules
         for rule_set in rule_sets do
           digits = rule_set[:digits]
-          prefix = string[0,digits].to_i
-          rules  = rule_set[:rules].select { |rule| rule[:total_digits] >= string.length }
+          prefix = number[0,digits].to_i
+          rules  = rule_set[:rules].select { |rule| rule[:total_digits] >= number.length }
 
           rules.each do |rule|
             if(prefix >= rule[:min] && prefix <= rule[:max])

data/lib/phoney/region.rb

@@ -50,6 +50,16 @@ class PhoneNumber
       @dialout_prefixes = hash[:dialout_prefixes]
     
       @rule_sets = hash[:rule_sets]
+      
+      if(@rule_sets)
+        for rule_set in @rule_sets do
+          if(rule_set[:rules])
+            rule_set[:rules].each_with_index do |rule,index|
+              rule.merge!(:index => index)
+            end
+          end
+        end
+      end
     end
     
     def to_s

data/lib/phoney/version.rb

@@ -3,7 +3,7 @@ class PhoneNumber
   module VERSION #:nodoc:
     MAJOR = 0
     MINOR = 0
-    TINY  = 3
+    TINY  = 4
     
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

data/phoney.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{phoney}
-  s.version = "0.0.3"
+  s.version = "0.0.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jan Habermann"]

data/spec/parser/br_spec.rb

@@ -8,6 +8,8 @@ describe PhoneNumber::Parser do
     end
     
     it "should format a [:br] (Brazil) phone number" do
+      PhoneNumber::Parser.parse("03001234567").should == "0300 123-4567"
+      
       PhoneNumber::Parser.parse("123").should == "123"
       PhoneNumber::Parser.parse("1234").should == "123-4"
       PhoneNumber::Parser.parse("12345").should == "123-45"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: phoney
 version: !ruby/object:Gem::Version 
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors: 
 - Jan Habermann