The personal finance app for everyone
Add formatting for EUR locales (#1231)
Zach Gollwitzer82c298307d1b
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rbindex b2c90a2a..5c8e38c3 100644--- a/app/helpers/application_helper.rb+++ b/app/helpers/application_helper.rb@@ -138,13 +138,13 @@ module ApplicationHelperdef format_money(number_or_money, options = {})money = Money.new(number_or_money)- options.reverse_merge!(money.default_format_options)+ options.reverse_merge!(money.format_options(I18n.locale))number_to_currency(money.amount, options)enddef format_money_without_symbol(number_or_money, options = {})money = Money.new(number_or_money)- options.reverse_merge!(money.default_format_options)+ options.reverse_merge!(money.format_options(I18n.locale))ActiveSupport::NumberHelper.number_to_delimited(money.amount.round(options[:precision] || 0), { delimiter: options[:delimiter], separator: options[:separator] })enddiff --git a/lib/money.rb b/lib/money.rbindex 9aeb0d75..37ab7cdb 100644--- a/lib/money.rb+++ b/lib/money.rb@@ -1,5 +1,5 @@class Money- include Comparable, Arithmetic+ include Comparable, Arithmetic, Formattinginclude ActiveModel::Validationsclass ConversionError < StandardError@@ -54,29 +54,6 @@ class Moneyendend- def cents_str(precision = currency.default_precision)- format_str = "%.#{precision}f"- amount_str = format_str % amount- parts = amount_str.split(currency.separator)-- if parts.length < 2- ""- else- parts.last.ljust(precision, "0")- end- end-- # Use `format` for basic formatting only.- # Use the Rails number_to_currency helper for more advanced formatting.- def format- whole_part, fractional_part = sprintf("%.#{currency.default_precision}f", amount).split(".")- whole_with_delimiters = whole_part.chars.to_a.reverse.each_slice(3).map(&:join).join(currency.delimiter).reverse- formatted_amount = "#{whole_with_delimiters}#{currency.separator}#{fractional_part}"-- currency.default_format.gsub("%n", formatted_amount).gsub("%u", currency.symbol)- end- alias_method :to_s, :format-def as_json{ amount: amount, currency: currency.iso_code }.as_jsonend@@ -97,16 +74,6 @@ class Moneyendend- def default_format_options- {- unit: currency.symbol,- precision: currency.default_precision,- delimiter: currency.delimiter,- separator: currency.separator,- format: currency.default_format- }- end-privatedef source_must_be_of_known_typeunless @source.is_a?(Money) || @source.is_a?(Numeric) || @source.is_a?(BigDecimal)diff --git a/lib/money/formatting.rb b/lib/money/formatting.rbnew file mode 100644index 00000000..3a5cb092--- /dev/null+++ b/lib/money/formatting.rb@@ -0,0 +1,35 @@+module Money::Formatting+ # Fallback formatting. For advanced formatting, use Rails number_to_currency helper.+ def format+ whole_part, fractional_part = sprintf("%.#{currency.default_precision}f", amount).split(".")+ whole_with_delimiters = whole_part.chars.to_a.reverse.each_slice(3).map(&:join).join(currency.delimiter).reverse+ formatted_amount = "#{whole_with_delimiters}#{currency.separator}#{fractional_part}"++ currency.default_format.gsub("%n", formatted_amount).gsub("%u", currency.symbol)+ end+ alias_method :to_s, :format++ def format_options(locale = nil)+ local_option_overrides = locale_options(locale)++ {+ unit: currency.symbol,+ precision: currency.default_precision,+ delimiter: currency.delimiter,+ separator: currency.separator,+ format: currency.default_format+ }.merge(local_option_overrides)+ end++ private+ def locale_options(locale)+ case [ currency.iso_code, locale.to_sym ]+ when [ "EUR", :nl ], [ "EUR", :pt ]+ { delimiter: ".", separator: ",", format: "%u %n" }+ when [ "EUR", :en ], [ "EUR", :en_IE ]+ { delimiter: ",", separator: "." }+ else+ {}+ end+ end+enddiff --git a/test/helpers/application_helper_test.rb b/test/helpers/application_helper_test.rbindex d25531aa..d4c1be45 100644--- a/test/helpers/application_helper_test.rb+++ b/test/helpers/application_helper_test.rb@@ -25,9 +25,9 @@ class ApplicationHelperTest < ActionView::TestCasetest "#totals_by_currency(collection: collection, money_method: money_method)" doassert_equal "$3.00", totals_by_currency(collection: [ @account1, @account2 ], money_method: :balance_money)- assert_equal "$3.00 | -€7,00", totals_by_currency(collection: [ @account1, @account2, @account3 ], money_method: :balance_money)+ assert_equal "$3.00 | -€7.00", totals_by_currency(collection: [ @account1, @account2, @account3 ], money_method: :balance_money)assert_equal "", totals_by_currency(collection: [], money_method: :balance_money)assert_equal "$0.00", totals_by_currency(collection: [ Account.new(currency: "USD", balance: 0) ], money_method: :balance_money)- assert_equal "-$3.00 | €7,00", totals_by_currency(collection: [ @account1, @account2, @account3 ], money_method: :balance_money, negate: true)+ assert_equal "-$3.00 | €7.00", totals_by_currency(collection: [ @account1, @account2, @account3 ], money_method: :balance_money, negate: true)endenddiff --git a/test/lib/money/currency_test.rb b/test/lib/money/currency_test.rbindex bc5d9f7a..d4fee930 100644--- a/test/lib/money/currency_test.rb+++ b/test/lib/money/currency_test.rb@@ -28,25 +28,6 @@ class Money::CurrencyTest < ActiveSupport::TestCaseassert_equal 2, @currency.default_precisionend- test "can extract cents string from amount" do- value1 = Money.new(100)- value2 = Money.new(100.1)- value3 = Money.new(100.12)- value4 = Money.new(100.123)- value5 = Money.new(200, :jpy)-- assert_equal "00", value1.cents_str- assert_equal "10", value2.cents_str- assert_equal "12", value3.cents_str- assert_equal "12", value4.cents_str- assert_equal "", value5.cents_str-- assert_equal "", value4.cents_str(0)- assert_equal "1", value4.cents_str(1)- assert_equal "12", value4.cents_str(2)- assert_equal "123", value4.cents_str(3)- end-test "step returns the smallest value of the currency" doassert_equal 0.01, @currency.stependdiff --git a/test/lib/money_test.rb b/test/lib/money_test.rbindex e13a00e7..ec1f2084 100644--- a/test/lib/money_test.rb+++ b/test/lib/money_test.rb@@ -85,8 +85,8 @@ class MoneyTest < ActiveSupport::TestCaseendtest "can cast to string with basic formatting" do- assert_equal "$1,000.90", Money.new(1000.899).format- assert_equal "€1.000,12", Money.new(1000.12, :eur).format+ assert_equal "$1,000.90", Money.new(1000.899).to_s+ assert_equal "€1.000,12", Money.new(1000.12, :eur).to_sendtest "converts currency when rate available" do