meplato-money 0.2.0 → 0.2.1

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+# 0.2.1, released 2012-09-14
+
+* Allow both string and symbol for `locale` parameter, 
+  both when formatting and parsing.
+  This allows to use `m.format(locale: I18n.locale)` 
+  in Rails instead of `m.format(locale: I18n.locale.to_s)`.
+  Same with `Money.parse("123,56", "EUR", :locale => :de)`.
+
 # 0.2.0, released 2012-08-01
 
 * Thread safety (remove autoload and class variables)

data/lib/money/money.rb

@@ -139,11 +139,11 @@ module Money
         :bank => default_bank,
         :currency => currency || default_currency
       }.merge(options)
-      format = FORMATS[opts[:locale]]
+      format = FORMATS[opts[:locale].to_s]
       # TODO there's a special case e.g. "($12,345,678.90)" that has to be converted to -12345678.90
       s = value.gsub(/[^0-9\-#{format[:decimal_sep]}]/, '')
       s.gsub!(format[:decimal_sep], '.')
-      Money.new(s.to_f, opts[:currency], opts)
+      Money.new(s.to_f, opts[:currency].to_s, opts)
     end
   end
 end

data/lib/money/money_formatter.rb

@@ -21,7 +21,7 @@ module Money
     
     def initialize(money, options = {})
       @money = money
-      @locale = options[:locale] || Money.default_locale
+      @locale = (options[:locale] || Money.default_locale).to_s
       @locale.gsub!(/_/, '-')
       @bank = options[:bank] || Money.default_bank
       @format = FORMATS[@locale]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: meplato-money
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-02 00:00:00.000000000 Z
+date: 2012-09-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler