Skip to content
Merged
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
14 changes: 9 additions & 5 deletions lib/monetize/parser.rb
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,8 @@ class Parser
MULTIPLIER_REGEXP = Regexp.new(format('^(.*?\d)(%s)\b([^\d]*)$', MULTIPLIER_SUFFIXES.keys.join('|')), 'i')

DEFAULT_DECIMAL_MARK = '.'.freeze
DEFAULT_MINOR = "00".freeze
private_constant :DEFAULT_MINOR

def initialize(input, fallback_currency = Money.default_currency, options = {})
@input = input.to_s.strip
Expand Down Expand Up @@ -111,7 +113,7 @@ def extract_major_minor(num)

case used_delimiters.length
when 0
[num, 0]
[num, DEFAULT_MINOR]
when 2
thousands_separator, decimal_mark = used_delimiters
split_major_minor(num.gsub(thousands_separator, ''), decimal_mark)
Expand All @@ -138,7 +140,7 @@ def extract_major_minor_with_single_delimiter(num, delimiter)
if delimiter == currency.decimal_mark
split_major_minor(num, delimiter)
elsif Monetize.enforce_currency_delimiters && delimiter == currency.thousands_separator
[num.gsub(delimiter, ''), 0]
[num.gsub(delimiter, ''), DEFAULT_MINOR]
else
extract_major_minor_with_tentative_delimiter(num, delimiter)
end
Expand All @@ -148,7 +150,7 @@ def extract_major_minor_with_single_delimiter(num, delimiter)
def extract_major_minor_with_tentative_delimiter(num, delimiter)
if num.scan(delimiter).length > 1
# Multiple matches; treat as thousands separator
[num.gsub(delimiter, ''), '00']
[num.gsub(delimiter, ''), DEFAULT_MINOR]
else
possible_major, possible_minor = split_major_minor(num, delimiter)

Expand All @@ -161,7 +163,7 @@ def extract_major_minor_with_tentative_delimiter(num, delimiter)
if is_decimal_mark
[possible_major, possible_minor]
else
["#{possible_major}#{possible_minor}", '00']
["#{possible_major}#{possible_minor}", DEFAULT_MINOR]
end
end
end
Expand All @@ -185,7 +187,9 @@ def split_major_minor(num, delimiter)
splits = num.split(delimiter)
fail ParseError, 'Invalid amount (multiple delimiters)' if splits.length > 2

[splits[0], splits[1] || '00']
splits[1] ||= DEFAULT_MINOR

splits
end
end
end