phoney 0.1.3 → 0.2.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA256:
+  metadata.gz: 91ea215316dbde0a1e0ab7c0a8ee480c17021db9264ad5949f20ad87a9fb01c2
+  data.tar.gz: 8010af03683d901660a83ecd03a2b8fa6ff9e5e4ae19ce50a7c74b04d33f20ab
+SHA512:
+  metadata.gz: 9803f88389d58b814d942589496dbca4e74b3891066c8501f375e2a6ebc6c5a97dc946f91287f5867d5a8f48a2fce8e31149ad2ca08db3abe3790a4280047d29
+  data.tar.gz: b8a687dcb6fbf2d00d4f4491aa36eb5d74a7ba45c2ec466ed48fba9000fbd3f3183a16ae3218e06dbcb8fbb9356b8d38f0908d18f1bbeeec9b157a378c5133a4

data/Gemfile

@@ -1,6 +1,2 @@
 source "http://rubygems.org"
-
-gemspec
-
-# To use debugger
-# gem 'debugger'
+gemspec

data/Gemfile.lock

@@ -1,26 +1,18 @@
 PATH
   remote: .
   specs:
-    phoney (0.1.3)
+    phoney (0.9.9)
 
 GEM
   remote: http://rubygems.org/
   specs:
-    diff-lcs (1.1.3)
+    minitest (4.6.2)
     rake (0.9.2.2)
-    rspec (2.11.0)
-      rspec-core (~> 2.11.0)
-      rspec-expectations (~> 2.11.0)
-      rspec-mocks (~> 2.11.0)
-    rspec-core (2.11.1)
-    rspec-expectations (2.11.2)
-      diff-lcs (~> 1.1.3)
-    rspec-mocks (2.11.2)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
+  minitest
   phoney!
   rake
-  rspec (= 2.11.0)

data/{LICENCE → MIT-LICENCE}

@@ -1,4 +1,4 @@
-Copyright (c) 2010 Jan Habermann
+Copyright (c) 2013 Jan Habermann
  
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.rdoc

@@ -1,7 +1,7 @@
 = phoney
 
 This is a library for representing phone numbers.
-It provides a PhoneNumber class that can format phone numbers depending on the region you set.
+It provides a Phoney class that can format phone numbers depending on the region you set.
 
 == Installation
 
@@ -14,7 +14,7 @@ Source:: <tt>git clone git://github.com/habermann24/phoney.git</tt>
 
     require 'phoney'
     # region defaults to US
-    pn = PhoneNumber.new("+17041234567")
+    pn = Phoney.new("+17041234567")
     pn.to_s          # "+1 (704) 123-4567"
     pn.area_code     # "704"
     pn.country_code  # "1"
@@ -24,30 +24,30 @@ Source:: <tt>git clone git://github.com/habermann24/phoney.git</tt>
 
     require 'phoney'
     
-    PhoneNumber.default_region = :de
+    Phoney.region = :de
     
-    pn = PhoneNumber.new("04105456789")
+    pn = Phoney.new("04105456789")
     pn.to_s           # "+49 4105 456789"
     pn.area_code      # "4105"
     pn.country_code   # "49"
     pn.number         # "456789"
     
-== Creating PhoneNumber instances
+== Creating Phoney instances
 
-Phoney gives you a PhoneNumber class that wraps all the logic of phone number parsing and representation.
-The default region phoney uses for formatting is the US-region format. So if you want to parse phone numbers from a different country, you have to set PhoneNumber.default_region or pass the region code every time!
+Phoney gives you a Phoney class that wraps all the logic of phone number parsing and representation.
+The default region phoney uses for formatting is the US-region format. So if you want to parse phone numbers from a different country, you have to set Phoney.region or pass the region code every time!
 
-  PhoneNumber.default_region = :us
+  Phoney.region = :us
 
-The most common way to create a PhoneNumber object is by parsing from a string:
-  PhoneNumber.new("7041231234")         # uses region :us
-  PhoneNumber.new("01805708090", :de)   # uses region :de
+The most common way to create a Phoney object is by parsing from a string:
+  Phoney.new("7041231234")         # uses region :us
+  Phoney.new("01805708090", :de)   # uses region :de
   
 Or instead of parsing a string, you can provide a hash for the first parameter:
-  PhoneNumber.new(:number => "1231234", :area_code => "704", :country_code => "1")
+  Phoney.new(:number => "1231234", :area_code => "704", :country_code => "1")
   
   # falls back to US region, so also uses "1" for <tt>country_code</tt>
-  PhoneNumber.new(:number => "1231234", :area_code => "704")
+  Phoney.new(:number => "1231234", :area_code => "704")
   
 == Formatting  
 
@@ -59,13 +59,13 @@ When given a string, it interpolates the string with the following fields:
 * %a - area_code (91)
 * %n - number (5125486)
 
-    pn = PhoneNumber.new('+446546546546')
+    pn = Phoney.new('+446546546546')
     
     pn.to_s                     # => "+44 65 4654 6546"
     pn.format("%a/%n")          # => "64/46546546"
     pn.format("+ %c (%a) %n")   # => "+ 44 (65) 46546546"
     
-Usually you will just want PhoneNumber to figure out how to format the number correctly.
+Usually you will just want Phoney to figure out how to format the number correctly.
 When given a symbol you can let the parser guess the best format and pass in one of the following auto-formatting symbols:
     pn.format(:default) # => "+44 65 4654 6546"
     
@@ -77,8 +77,4 @@ When given a symbol you can let the parser guess the best format and pass in one
 
 == TODOs
 
-- More test specs for different countries
-
-== Licence
-
-see LICENSE
+- More tests for different countries

data/Rakefile

@@ -1,29 +1,13 @@
-#!/usr/bin/env rake
-begin
-  require 'bundler/setup'
-rescue LoadError
-  puts 'You must `gem install bundler` and `bundle install` to run rake tasks'
-end
-
-require 'rdoc/task'
-
-Rake::RDocTask.new do |rdoc|
-  rdoc.rdoc_dir = 'doc/rdoc'
-  rdoc.template = ENV['template'] if ENV['template']
-  rdoc.title = "Phoney Documentation"
-  rdoc.options << '--line-numbers' << '--inline-source'
-  rdoc.options << '--charset' << 'utf-8'
-  rdoc.rdoc_files.include('README.rdoc')
-  rdoc.rdoc_files.include('lib/**/*.rb')
-end
-
-require 'rspec/core/rake_task'
+require 'rubygems'
+require 'bundler/setup'
+require 'rake'
+require 'rake/testtask'
 
-desc 'Default: run specs.'
-task :default => :spec
+task :default => :test
 
-RSpec::Core::RakeTask.new do |t|
-  t.pattern = "./spec/**/*_spec.rb"
+Rake::TestTask.new do |t|
+  t.libs << 'test/lib'
+  t.pattern = 'test/**/*_test.rb'
 end
 
-Bundler::GemHelper.install_tasks
+Dir.glob('resources/tasks/*.rake').each { |r| import r }

data/lib/phoney.rb

@@ -1,8 +1,105 @@
-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 'phoney/version'
+require 'phoney/rules'
+require 'phoney/region'
+require 'phoney/formatter'
+require 'phoney/parser'
+
+module Phoney
+  PLACEHOLDER_CHAR = '#'
+  DIGITS           = '0123456789'
+  NUMPAD_CHARS     = '+#*'+DIGITS
+  
+  class << self
+    def region
+      @region ||= Region[:us]
+    end
+
+    def region=(region)
+      @region = Region[region.to_s.to_sym]
+    end
+
+    def country_code
+      @country_code ||= region.country_code.to_s
+    end
+
+    def area_code
+      @area_code ||= nil
+    end
+
+    def area_code=(area_code)
+      @area_code = area_code
+    end
+    
+    def version
+      VERSION::STRING
+    end
+  end
+
+  def initialize(params, region_code=nil)
+    region       = Region.find(region_code)
+    country_code = region.country_code.to_s if region
+    
+    if params.is_a?(String)
+      params = Parser.parse_to_parts(params, region_code)
+    end 
+
+    self.number = params[:number].to_s
+    # The rare case when some digits are in front of the area code
+    self.prefix_code = params[:prefix_code].to_s
+    # Can be empty, because some special numbers just don't have an area code (e.g. 911)
+    self.area_code = params[:area_code].to_s || self.class.area_code
+    self.country_code = params[:country_code].to_s || country_code || self.class.country_code
+    
+    raise "Must enter number" if(self.number.nil? || self.number.empty?)
+    raise "Must enter country code or set default country code" if(self.country_code.nil? || self.country_code.empty?)
+  end
+
+  # Does this number belong to the default country code?
+  def has_default_country_code?
+    country_code.to_s == self.class.country_code.to_s
+  end
+
+  # Does this number belong to the default area code?
+  def has_default_area_code?
+    (!area_code.to_s.empty? && area_code.to_s == self.class.area_code.to_s)
+  end
+  
+  # Formats the phone number.
+  # If the method argument is a String, it is used as a format string, with the following fields being interpolated:
+  #
+  # * %c - country_code (385)
+  # * %a - area_code (91)
+  # * %n - number (5125486)
+  #
+  # If the method argument is a Symbol, we use one of the default formattings and let the parser do the rest.
+  def format(fmt)
+    if fmt.is_a?(Symbol)
+      case fmt
+      when :default
+        Parser::parse("+#{country_code} #{prefix_code}#{area_code} #{number}", country_code)
+      when :national
+        Parser::parse("#{area_code} #{number}", country_code)
+      when :local
+        STDERR.puts "Warning: Using local format without setting a default area code!?" if Phoney.area_code.nil?
+        Parser::parse(number, country_code)
+      else
+        raise "The format #{fmt} doesn't exist'"
+      end
+    else
+      format_number(fmt)
+    end
+  end
+
+  # The default format is the canonical format: "+{country_code} {area_code} {number}"
+  def to_s
+    format(:default)
+  end
+  
+  private
+    def format_number(fmt)
+      fmt.gsub("%c", country_code || "").gsub("%a", area_code || "").gsub("%n", number || "")
+    end
+end
 
 # Load our region file when we require the library
-PhoneNumber::Region.load
+Phoney::Region.load

data/lib/phoney/formatter.rb

@@ -0,0 +1,144 @@
+module Phoney
+  module Formatter
+    # Returns the string formatted according to a pattern.
+    #
+    # Examples:
+    # format('123456789', 'XXX-XX-XXXX')
+    #    => "123-45-6789"
+    # format('12345', 'XXX-XX-XXXX')
+    #    => "123-45"
+    #
+    # Parameters:
+    # string  -- The string to be formatted.
+    # pattern -- The format string, see above examples.
+    # fill    -- A string for padding. If the empty string, then the pattern is
+    #            filled as much as possible, and the rest of the pattern is
+    #            truncated. If nil, and the string is too long for the pattern,
+    #            the string is returned unchanged.  Otherwise, the string is
+    #            padded to fill the pattern, which is not truncated.
+    def format(input, pattern, options={})
+      fill         = options[:fill]
+      intl_prefix  = options[:intl_prefix]||''
+      trunk_prefix = options[:trunk_prefix]||''
+      slots        = pattern.count(PLACEHOLDER_CHAR)
+      
+      # Return original input if it is too long
+      return input if (fill.nil? && input.length > slots)
+      
+      # Pad and clone the string if necessary.
+      source = (fill.nil? || fill.empty?) ? input : input.ljust(slots, fill)
+      
+      result   = ''
+      slot     = 0
+      has_open = had_c = had_n = false
+      
+      pattern.split('').each_with_index do |chr, index|
+        case chr
+        when 'c'
+          had_c = true
+          result << intl_prefix
+        when 'n'
+          had_n = true
+          result << trunk_prefix
+        when '#'
+          if slot < source.length
+            result << source[slot]
+            slot += 1
+          else
+            result << ' ' if has_open
+          end
+        when '('
+          if slot < source.length
+            has_open = true
+            result << chr
+          end
+        when ')'
+          if (slot < source.length || has_open)
+            has_open = false
+            result << chr
+          end
+        else
+          # Don't show space after n if no trunk prefix or after c if no intl prefix
+          next if (chr == ' ' && pattern[index-1] == 'n' && trunk_prefix.empty?)
+          next if (chr == ' ' && pattern[index-1] == 'c' && intl_prefix.empty?)
+          
+          result << chr if (slot < source.length)
+        end
+      end
+
+      # Not all format strings have a 'c' or 'n' in them.
+      # If we have an international prefix or a trunk prefix but the format string
+      # doesn't explictly say where to put it then simply add it to the beginning.
+      result.prepend trunk_prefix if (!had_n && !trunk_prefix.empty?)
+      result.prepend "#{intl_prefix} " if (!had_c && !intl_prefix.empty?)
+      
+      result.strip
+    end
+    
+    # Strips all non-numberpad characters from a string
+    # => For example: "+45 (123) 023 1.1.1" -> "+45123023111"
+    def normalize(str)
+      str.gsub(/[^0-9+*#]/,'') unless str.nil?
+    end
+    
+    def international_call_prefix_for(input, options={})
+      options[:region] ||= Phoney.region
+      
+      return nil if input.length == 0
+      
+      options[:region].dialout_prefixes.each do |prefix|
+        stripped_prefix = Regexp.escape prefix.delete(' ').split('->').first[0, input.length]
+        regexp = Regexp.new "^#{stripped_prefix.gsub('\\#', '[0-9]')}"
+          
+        return format(input, prefix.gsub(/[\\+0-9]/, '#'), fill: '') if input =~ regexp
+        
+        if (input.start_with?('+') && (stripped_prefix.start_with?(input[1..-1]) || input[1..-1] =~ regexp))
+          return format(input, '#'+prefix.gsub(/[\\+0-9]/, '#'), fill: '')
+        end
+      end
+      
+      input.start_with?('+') ? '+' : nil
+    end
+    
+    # TODO: handle case where international call prefix implicitly specifies country (e.g. tz: "005->254")
+    def extract_country_code(input, options={})
+      options[:region] ||= Phoney.region
+      intl_prefix = international_call_prefix_for(input, region: options[:region])
+      
+      # only try to extract a country code if we're dialing internationally
+      if intl_prefix
+        rest   = input[intl_prefix.count(NUMPAD_CHARS)..-1]
+        region = Phoney::Region.all.find { |r| rest.start_with? r.country_code.to_s }
+        
+        region.country_code.to_s if region
+      end
+    end
+    
+    def extract_trunk_prefix(input, options={})
+      options[:region] ||= Phoney.region
+      
+      intl_prefix  = international_call_prefix_for input
+      country_code = extract_country_code(input, region: options[:region])
+      region_scope = country_code.nil? ? options[:region] : Phoney::Region[country_code]
+      
+      if intl_prefix
+        # Strip international prefix from number
+        input = input[intl_prefix.count(NUMPAD_CHARS)..-1]
+      end
+      
+      if country_code
+        # Strip country code from number
+        input = input[country_code.count(DIGITS)..-1]
+      end
+      
+      region_scope.trunk_prefixes.each do |prefix|
+        stripped_prefix = Regexp.escape prefix.delete(' ')
+        regexp = Regexp.new "^#{stripped_prefix.gsub('\\#', '[0-9]')}"
+      
+        return format(input, prefix.gsub(/[0-9]/, '#'), fill: '') if input =~ regexp
+      end
+      
+      return nil
+    end
+  end
+end

data/lib/phoney/parser.rb

@@ -1,245 +1,89 @@
 require 'strscan'
 
-class PhoneNumber
-
+module Phoney
   module Parser
     class << self
-      include Utils
-      
-      def parse(phone_number, region_code=nil)
-        parse_to_parts(phone_number, region_code)[:formatted_number]
-      end
+      include Formatter
       
-      def parse_to_parts(phone_number, region_code=nil)
-        phone_number = normalize(phone_number.to_s)
-
-        # we don't really need to do anything unless we get more input
-        unless phone_number.length > 1
-          return { :formatted_number => phone_number, :number => normalize(phone_number) }
-        end
-
-        region          = Region.find(region_code) || PhoneNumber.default_region
-        country_code    = region.country_code.to_s
-        prefix_code     = nil
-        area_code       = nil
-
-        dialout_prefix  = get_dialout_prefix(phone_number, region)
-        national_prefix = get_national_prefix(phone_number, region)
-        dialout_region  = get_dialout_region(phone_number, region)
-        dialout_country = ''
-        
-        # 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)
+      def parse(input, options={})
+        number       = normalize(input)
+        intl_prefix  = international_call_prefix_for number
+        country_code = extract_country_code number
+        trunk_prefix = extract_trunk_prefix number
+        region       = options[:region] || Phoney.region
+        flags        = []
+        
+        if intl_prefix
+          # Strip international prefix from number
+          number = number[intl_prefix.count(NUMPAD_CHARS)..-1]
+          region = Phoney::Region[country_code]
+          flags << :c
         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
-          dialout_country = country_code
-        else
-          prefix  = national_prefix
-          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
-        if(dialout_region || !national_prefix.empty?)
-          # we need to sort the rules slightly different
-          prefered_type = dialout_region.nil? ? 1 : 2
-        end
-        
-        # sorting for rule priorities
-        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[:index] ]
-          end
-        end
-        
-        # finally...find our matching rule
-        matching_rule = find_matching_rule(phone_number, rule_sets)
-        
-        # now that know how to format the number, do the formatting work...
-        if(matching_rule)
-          if(matching_rule[:areacode_offset] > 0)
-            prefix_code = phone_number[0, matching_rule[:areacode_offset]]
-          end
-          area_code     = phone_number[matching_rule[:areacode_offset], matching_rule[:areacode_length]]
-          number        = phone_number[matching_rule[:areacode_offset]+matching_rule[:areacode_length]..-1]
-          phone_number  = format(phone_number, matching_rule[:format].to_s)
-        
-          # replace 'n' with our national_prefix if it exists
-          if(phone_number[/n/])
-            phone_number.gsub!(/n{1}/, national_prefix)
-
-            # reset the national_prefix so we don't add it twice
-            national_prefix = ''
-          end
-        end
+        if country_code
+          # Strip country code from number
+          number = number[country_code.count(DIGITS)..-1]
           
-        # strip possible whitespace from the left
-        phone_number.lstrip!
-        
-        if(matching_rule && phone_number[/c/])  
-          # format the country code
-          if(dialout_prefix == '+')
-            phone_number.gsub!(/c{1}/, "+#{dialout_country}")
+          if intl_prefix == '+'
+            intl_prefix += country_code
           else
-            phone_number.gsub!(/c{1}/, dialout_country)
-            phone_number = "#{dialout_prefix} #{phone_number}" unless dialout_prefix.empty?
-          end
-        else
-          # default formatting
-          if(dialout_prefix == '+')
-            if(dialout_country.empty?)
-              phone_number = "+#{phone_number}"
-            else
-              phone_number = "+#{dialout_country} #{phone_number}"
-            end
-          else
-            phone_number = "#{dialout_country} #{phone_number}" unless dialout_country.empty?
-            phone_number = "#{dialout_prefix} #{phone_number}" unless dialout_prefix.empty?
-            phone_number = national_prefix + phone_number unless national_prefix.empty?
+            intl_prefix = [intl_prefix, country_code].join(' ')
           end
         end
         
-        # 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,
-          :prefix_code => prefix_code,
-          :area_code => area_code,
-          :country_code => country_code,
-          :number => number }
-      end
-      
-      private
-      # Returns the rule sets that we need to check for a given number and region.
-      # The rule_sets are filtered by the length of the number!
-      def get_rule_sets_for_region(string, region)
-        rule_sets = []
+        rule = find_matching_rule_for number, region: region, flags: flags
+        rule ||= find_matching_rule_for number, region: region
+        return format number, rule.pattern, intl_prefix: intl_prefix if rule
         
-        if(region && region.rule_sets)
-          rule_sets = region.rule_sets.select do |rule_set|
-            rule_set[:digits] <= string.length
+        if trunk_prefix
+          # Strip trunk prefix from number
+          number = number[trunk_prefix.count(DIGITS)..-1]
+          flags << :n
+          
+          if intl_prefix
+            intl_prefix += " (#{trunk_prefix})"
+            trunk_prefix = nil
           end
         end
         
-        rule_sets
-      end
-      
-      # Given any number, find the rule in rule_sets that applies.
-      # Returns nil if no matching rule was found!
-      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 = 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])
-              match = rule
-              break
-            end
-          end
+        if country_code || intl_prefix != '+'
+          rule = find_matching_rule_for number, region: region, flags: flags
+          rule ||= find_matching_rule_for number, region: region
           
-          break if match
+          pattern = '#'*number.length
+          pattern = rule.pattern if rule
+          
+          format number, pattern, intl_prefix: intl_prefix, trunk_prefix: trunk_prefix
+        else
+          input
         end
-        
-        match
-      end
-      
-      # According to the region, is this number input trying to dial out?
-      def dialing_out?(string, region=nil)
-        region ||= PhoneNumber.default_region
-        !get_dialout_prefix(string, region).empty?
       end
       
-      # Get the dialout prefix from the given string.
-      # Returns an empty string if no dialout prefix was found.
-      def get_dialout_prefix(string, region=nil)
-        region ||= PhoneNumber.default_region
-        prefixes = region.dialout_prefixes
-        dialout_prefix = ''
-        
-        # check if we're dialing outside our region
-        if string[0].chr == '+'
-          dialout_prefix = '+'
-        end
-
-        for prefix in prefixes do
-          regexp = Regexp.escape(prefix)
-          match_str = string
+      private
+        def find_matching_rule_for(number, options={})
+          options[:region] ||= Region.new
           
-          # we have matching wild cards
-          if(prefix[/X/] && string =~ Regexp.new("^#{Regexp.escape(prefix.delete('X '))}"))
-            regexp.gsub!(/X/, "[0-9]{0,1}")
-            match_str = format(string[prefix.scan(/[0-9]/).size, prefix.count('X')], prefix)
-            prefix    = match_str
-          end
+          # Consider all rule sets that aren't too specific for the number
+          options[:region].rule_sets.select { |r| number.length >= r.significant_digits }.each do |rule_set|
+            rules = rule_set.rules
+            
+            # Only consider rules with :c flag if this flag is set
+            if options[:flags] && options[:flags].include?(:c)
+              rules = rules.reject { |r| !r.flags.include? :c }
+            else
+              # Only consider rules with :n flag if this flag is set
+              if options[:flags] && options[:flags].include?(:n)
+                rules = rules.reject { |r| !r.flags.include? :n }
+              end
+            end
           
-          if(match_str =~ Regexp.new("^#{regexp}"))
-            dialout_prefix = prefix
-            break
-          end
-        end
-        
-        dialout_prefix
-      end
-      
-      # Get the national prefix from the given string.
-      # Returns an empty string if no national prefix was found.
-      def get_national_prefix(string, region=nil)
-        region ||= PhoneNumber.default_region
-        prefix = region.national_prefix
-        national_prefix = ''
-
-        # in case we're not dialing out and the number starts with the national_prefix
-        if(!dialing_out?(string, region) && string =~ Regexp.new("^#{Regexp.escape(prefix)}"))
-          national_prefix = prefix
-        end
-
-        national_prefix
-      end
-      
-      # Get the dialout region by looking at the string.
-      # Returns a Region object if we're dialing outside a region that is supported.
-      # Otherwise returns nil.
-      def get_dialout_region(string, region)
-        region ||= PhoneNumber.default_region
-        dialout_prefix = get_dialout_prefix(string, region)
-        dialout_region = nil
-        
-        unless dialout_prefix.empty?
-          # region codes are 1 to 3 digits
-          range_end = [string.length-dialout_prefix.delete(' ').length, 3].min
-
-          (1..range_end).each do |i|
-            dialout_region = Region.find(string[dialout_prefix.delete(' ').length, i])
-            break if dialout_region
+            # Find and return the first rule that matches
+            matching_rule = rules.find { |rule| rule.matches? number }
+            return matching_rule unless matching_rule.nil?
           end
+          
+          return nil
         end
-        
-        dialout_region
-      end
     end
   end
-
 end