Change money-rails so that it is able to accept a lambda as default_c…

…urrency
atstockland · Jun 24, 2014 · 6c62e0c · 6c62e0c
1 parent e89e296
commit 6c62e0c
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/CONTRIBUTORS b/CONTRIBUTORS
@@ -23,6 +23,7 @@ Felipe Rodrigues
 Fotos Georgiadis
 François KLINGLER
 Garrett Lancaster
+Gonzalo Rodríguez-Baltanás Díaz
 Graham Pengelly
 Hosam Aly
 Jacob Vosmaer

diff --git a/lib/money-rails/active_record/monetizable.rb b/lib/money-rails/active_record/monetizable.rb
@@ -166,7 +166,7 @@ def monetized_attributes
               send("#{instance_currency_name}=", money_currency.try(:iso_code))
             else
               current_currency = send("currency_for_#{name}")
-              if money_currency && current_currency != money_currency
+              if money_currency && current_currency != money_currency.id
                 raise "Can't change readonly currency '#{current_currency}' to '#{money_currency}' for field '#{name}'"
               end
             end

diff --git a/lib/money-rails/configuration.rb b/lib/money-rails/configuration.rb
@@ -21,12 +21,12 @@ def configure
     # Configuration parameters
 
     def default_currency
-      Money.default_currency
+      Money::Currency.new(Money.default_currency)
     end
 
     # Set default currency of money library
     def default_currency=(currency_name)
-      Money.default_currency = Money::Currency.new(currency_name)
+      Money.default_currency = currency_name
       set_amount_column_for_default_currency!
       set_currency_column_for_default_currency!
     end