Skip to content
Merged
Show file tree
Hide file tree
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
7 changes: 0 additions & 7 deletions .rubocop_todo.yml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion lib/money/money.rb
Original file line number Diff line number Diff line change
Expand Up @@ -314,7 +314,7 @@ def self.disallow_currency_conversion!
#
# @see #initialize
def self.from_amount(amount, currency = default_currency, options = {})
raise ArgumentError, "'amount' must be numeric" unless Numeric === amount
raise ArgumentError, "'amount' must be numeric" unless amount.is_a?(Numeric)

currency = Currency.wrap(currency) || Money.default_currency
raise Currency::NoCurrency, "must provide a currency" if currency.nil?
Expand Down
2 changes: 1 addition & 1 deletion lib/money/money/formatter.rb
Original file line number Diff line number Diff line change
Expand Up @@ -339,7 +339,7 @@ def lookup_default(key)

def symbol_value_from(rules)
if rules.has_key?(:symbol)
if rules[:symbol] === true
if rules[:symbol] == true
if rules[:disambiguate] && currency.disambiguate_symbol
currency.disambiguate_symbol
else
Expand Down