Skip to content
This repository has been archived by the owner on Jun 10, 2018. It is now read-only.

Allow E161 substitution to be skipped #48

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions lib/global_phone/context.rb
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ def default_territory_name=(territory_name)
@default_territory_name = territory_name.to_s.intern
end

def parse(string, territory_name = default_territory_name)
db.parse(string, territory_name)
def parse(string, territory_name = default_territory_name, skip_e161=false)
db.parse(string, territory_name, skip_e161)
end

def normalize(string, territory_name = default_territory_name)
Expand Down
10 changes: 5 additions & 5 deletions lib/global_phone/number.rb
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@ class Number
NON_DIALABLE_CHARS = /[^,#+\*\d]/
SPLIT_FIRST_GROUP = /^(\d+)(.*)$/

def self.normalize(string)
string.to_s.
gsub(VALID_ALPHA_CHARS) { |c| E161_MAPPING[c.downcase] }.
gsub(LEADING_PLUS_CHARS, "+").
gsub(NON_DIALABLE_CHARS, "")
def self.normalize(string, skip_e161=false)
str = string.to_s

str = str.gsub(VALID_ALPHA_CHARS) { |c| E161_MAPPING[c.downcase] } unless skip_e161
str.gsub(LEADING_PLUS_CHARS, '+').gsub(NON_DIALABLE_CHARS, '')
end

attr_reader :territory, :national_string
Expand Down
4 changes: 2 additions & 2 deletions lib/global_phone/parsing.rb
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@

module GlobalPhone
module Parsing
def parse(string, territory_name)
string = Number.normalize(string)
def parse(string, territory_name, skip_e161=false)
string = Number.normalize(string, skip_e161)
territory = self.territory(territory_name)
raise ArgumentError, "unknown territory `#{territory_name}'" unless territory

Expand Down