Skip to content

feat: Support for numbers formatted with "0.00\\ [$EUR]" #636

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
mmustala wants to merge 1 commit into
base: master
Choose a base branch
from
Open

feat: Support for numbers formatted with "0.00\\ [$EUR]" #636

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
15 changes: 10 additions & 5 deletions lib/roo/excelx/cell/number.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,14 +28,14 @@ def create_numeric(number)
end
end

def formatted_value
return @cell_value if Excelx::ERROR_VALUES.include?(@cell_value)
def formatted_value(format = @format, cell_value = @cell_value)
return cell_value if Excelx::ERROR_VALUES.include?(cell_value)

formatter = generate_formatter(@format)
formatter = generate_formatter(format)
if formatter.is_a? Proc
formatter.call(@cell_value)
formatter.call(cell_value)
else
Kernel.format(formatter, @cell_value)
Kernel.format(formatter, cell_value)
end
end

Expand Down Expand Up @@ -76,6 +76,11 @@ def generate_formatter(format)
formatted_number = generate_formatter($2).call(number)
"#{$1}#{formatted_number}"
end
when /^([^\\]+)\\?\s*\[\$([A-Z]+)\]$/ # 0.00\\ [$EUR]
proc do |number|
formatted_number = formatted_value($1, number)
"#{formatted_number} #{$2}"
end
else
raise "Unknown format: #{format.inspect}"
end
Expand Down
3 changes: 2 additions & 1 deletion test/excelx/cell/test_number.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,8 @@ def test_formats
['#,##0.00;[Red](#,##0.00)', '1,042.00'],
['##0.0E+0', '1.0E+03'],
["_-* #,##0.00\\ _€_-;\\-* #,##0.00\\ _€_-;_-* \"-\"??\\ _€_-;_-@_-", '1,042.00'],
['@', '1042']
['@', '1042'],
['0.00\\ [$EUR]', '1042.00 EUR']
].each do |style_format, result|
cell = Roo::Excelx::Cell::Number.new '1042', nil, [style_format], nil, nil, nil
assert_equal result, cell.formatted_value, "Style=#{style_format}"
Expand Down