Skip to content

Commit f5d1fc4

Browse files
committedApr 24, 2024
Allow nil to be set as default currency
1 parent df7a030 commit f5d1fc4

File tree

3 files changed

+26
-2
lines changed

3 files changed

+26
-2
lines changed
 

‎lib/money-rails/configuration.rb

+2-2
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ def configure
2020
# Configuration parameters
2121

2222
def default_currency
23-
Money::Currency.new(Money.default_currency)
23+
Money::Currency.new(Money.default_currency) if Money.default_currency
2424
end
2525

2626
# Set default currency of money library
@@ -35,7 +35,7 @@ def register_currency=(currency_options)
3535
end
3636

3737
def set_currency_column_for_default_currency!
38-
iso_code = default_currency.iso_code
38+
iso_code = default_currency&.iso_code
3939
currency_column.merge! default: iso_code
4040
end
4141

‎spec/active_record/monetizable_spec.rb

+21
Original file line numberDiff line numberDiff line change
@@ -949,6 +949,27 @@ class SubProduct < Product
949949
expect(price.amount).not_to eq(value.amount)
950950
end
951951

952+
context 'without a default currency' do
953+
let(:product) { OtherProduct.new }
954+
955+
before do
956+
around do |example|
957+
default_currency = MoneyRails::Configuration.default_currency
958+
MoneyRails::Configuration.default_currency = nil
959+
960+
example.run
961+
962+
MoneyRails::Configuration.default_currency = default_currency
963+
end
964+
end
965+
966+
it "errors when" do
967+
expect do
968+
product.write_monetized :price, :price_cents, 10.5, false, nil, {}
969+
end.to raise_error(Money::Currency::NoCurrency)
970+
end
971+
end
972+
952973
describe "instance_currency_name" do
953974
it "updates instance_currency_name attribute" do
954975
product.write_monetized :sale_price, :sale_price_amount, value, false, :sale_price_currency_code, {}
+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
class OtherProduct < ActiveRecord::Base
2+
monetize :price_cents
3+
end

0 commit comments

Comments
 (0)