raise UnknownCurrency error when currency is invalid

lib/money/helpers.rb

@@ -52,16 +52,7 @@ def value_to_currency(currency)
       when 'xxx', 'XXX'
         Money::NULL_CURRENCY
       when String
-        begin
-          Currency.find!(currency)
-        rescue Money::Currency::UnknownCurrency => error
-          if Money.config.legacy_deprecations
-            Money.deprecate(error.message)
-            Money::NULL_CURRENCY
-          else
-            raise error
-          end
-        end
+        Currency.find!(currency)
       else
         raise ArgumentError, "could not parse as currency #{currency.inspect}"
       end

spec/helpers_spec.rb

@@ -89,11 +89,8 @@
       expect(subject.value_to_currency('usd')).to eq(Money::Currency.new('USD'))
     end
 
-    it 'returns the null currency when invalid iso is passed' do
-      configure(legacy_deprecations: true) do
-        expect(Money).to receive(:deprecate).once
-        expect(subject.value_to_currency('invalid')).to eq(Money::NULL_CURRENCY)
-      end
+    it 'raises error when invalid iso is passed' do
+      expect { subject.value_to_currency('invalid') }.to raise_error(Money::Currency::UnknownCurrency)
     end
 
     it 'raises on invalid object' do

spec/money_column_spec.rb

@@ -101,14 +101,11 @@ class MoneyClassInheritance2 < MoneyWithCustomAccessors
     expect(record.price_usd).to eq(Money.new(1.44, 'USD'))
   end
 
-  it 'returns money with null currency when the currency in the DB is invalid' do
-    configure(legacy_deprecations: true) do
-      expect(Money).to receive(:deprecate).once
-      record.update_columns(currency: 'invalid')
-      record.reload
-      expect(record.price.currency).to be_a(Money::NullCurrency)
-      expect(record.price.value).to eq(1.23)
-    end
+  it 'raises UnknownCurrency error when the currency in the DB is invalid' do
+    record.update_columns(currency: 'invalid')
+    record.reload
+    expect { record.price.currency }.to raise_error(Money::Currency::UnknownCurrency)
+    expect { record.price.value }.to raise_error(Money::Currency::UnknownCurrency)
   end
 
   it 'handles legacy support for saving floats' do
@@ -248,15 +245,12 @@ class MoneyWithWrongCurrencyArguments < ActiveRecord::Base
       expect(record.price.currency.to_s).to eq('USD')
     end
 
-    it 'reads an invalid currency from the db and generates a no currency object' do
-      configure(legacy_deprecations: true) do
-        expect(Money).to receive(:deprecate).once
-        record = MoneyWithReadOnlyCurrency.create
-        record.update_columns(currency: 'invalid', price: 1)
-        record.reload
-        expect(record.price.value).to eq(1)
-        expect(record.price.currency.to_s).to eq('')
-      end
+    it 'raises UnknownCurrency error when reads an invalid currency from the DB' do
+      record = MoneyWithReadOnlyCurrency.create
+      record.update_columns(currency: 'invalid', price: 1)
+      record.reload
+      expect { record.price.value }.to raise_error(Money::Currency::UnknownCurrency)
+      expect { record.price.currency } .to raise_error(Money::Currency::UnknownCurrency)
     end
 
     it 'sets the currency correctly when the currency is changed' do