money 2.1.4 → 2.1.5

data/lib/money/money.rb

@@ -73,7 +73,17 @@ class Money
   # Money.ca_dollar and Money.us_dollar 
   def initialize(cents, currency = Money.default_currency, bank = Money.default_bank)
     @cents = cents.round
-    @currency = currency
+    if currency.is_a?(Hash)
+      # Earlier versions of Money wrongly documented the constructor as being able
+      # to accept something like this:
+      #
+      #   Money.new(50, :currency => "USD")
+      #
+      # We retain compatibility here.
+      @currency = currency[:currency] || Money.default_currency
+    else
+      @currency = currency
+    end
     @bank = bank
   end
 
@@ -94,7 +104,7 @@ class Money
     if currency == other_money.currency
       Money.new(cents + other_money.cents, other_money.currency)
     else
-      Money.new(cents + other_money.exchange_to(currency).cents,currency)
+      Money.new(cents + other_money.exchange_to(currency).cents, currency)
     end
   end
 
@@ -163,31 +173,31 @@ class Money
   # Whether a money symbol should be prepended to the result string. The default is true.
   # This method attempts to pick a symbol that's suitable for the given currency.
   #
-  #  Money.new(100, :currency => "USD")  => "$1.00"
-  #  Money.new(100, :currency => "GBP")  => "£1.00"
-  #  Money.new(100, :currency => "EUR")  => "€1.00"
+  #  Money.new(100, "USD")  => "$1.00"
+  #  Money.new(100, "GBP")  => "£1.00"
+  #  Money.new(100, "EUR")  => "€1.00"
   #  
   #  # Same thing.
-  #  Money.new(100, :currency => "USD").format(:symbol => true)  => "$1.00"
-  #  Money.new(100, :currency => "GBP").format(:symbol => true)  => "£1.00"
-  #  Money.new(100, :currency => "EUR").format(:symbol => true)  => "€1.00"
+  #  Money.new(100, "USD").format(:symbol => true)  => "$1.00"
+  #  Money.new(100, "GBP").format(:symbol => true)  => "£1.00"
+  #  Money.new(100, "EUR").format(:symbol => true)  => "€1.00"
   #
   # You can specify a false expression or an empty string to disable prepending
   # a money symbol:
   #
-  #  Money.new(100, :currency => "USD").format(:symbol => false)  => "1.00"
-  #  Money.new(100, :currency => "GBP").format(:symbol => nil)    => "1.00"
-  #  Money.new(100, :currency => "EUR").format(:symbol => "")     => "1.00"
+  #  Money.new(100, "USD").format(:symbol => false)  => "1.00"
+  #  Money.new(100, "GBP").format(:symbol => nil)    => "1.00"
+  #  Money.new(100, "EUR").format(:symbol => "")     => "1.00"
   #
   #  
   # If the symbol for the given currency isn't known, then it will default
   # to "$" as symbol:
   #
-  #  Money.new(100, :currency => "AWG").format(:symbol => true)  => "$1.00"
+  #  Money.new(100, "AWG").format(:symbol => true)  => "$1.00"
   #
   # You can specify a string as value to enforce using a particular symbol:
   #
-  #  Money.new(100, :currency => "AWG").format(:symbol => "ƒ")   => "ƒ1.00"
+  #  Money.new(100, "AWG").format(:symbol => "ƒ")   => "ƒ1.00"
   #
   # === +:html+
   #
@@ -209,14 +219,14 @@ class Money
 
     if rules.has_key?(:symbol)
       if rules[:symbol] === true
-        symbol = SYMBOLS[currency[:currency]] || "$"
+        symbol = SYMBOLS[currency] || "$"
       elsif rules[:symbol]
         symbol = rules[:symbol]
       else
         symbol = ""
       end
     else
-      symbol = "$"
+      symbol = SYMBOLS[currency] || "$"
     end
     
     if rules[:no_cents]

data/lib/money/symbols.rb

@@ -12,7 +12,8 @@ Money::SYMBOLS = {
   "SCR" => "₨",
   "LKR" => "₨",
   "SEK" => "kr",
-  "GHC" => "¢"
+  "GHC" => "¢",
+  "BRL" => "R$"
   
   # Everything else defaults to $
 }

data/money.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = "money"
-  s.version = "2.1.4"
+  s.version = "2.1.5"
   s.summary = "Money and currency exchange support library"
   s.email = "hongli@phusion.nl"
   s.homepage = "http://money.rubyforge.org/"

data/test/money_spec.rb

@@ -73,6 +73,14 @@ describe Money do
     Money.euro(50).should == Money.new(50, "EUR")
   end
   
+  specify "Money.new accepts { :currency => 'foo' } as the value for the 'currency' argument" do
+    money = Money.new(20, :currency => "EUR")
+    money.currency.should == "EUR"
+    
+    money = Money.new(20, :currency => nil)
+    money.currency.should == Money.default_currency
+  end
+  
   specify "Money.add_rate works" do
     Money.add_rate("EUR", "USD", 10)
     Money.new(10_00, "EUR").exchange_to("USD").should == Money.new(100_00, "USD")
@@ -129,11 +137,13 @@ describe Money do
     end
     
     specify "#format(:symbol => a symbol string) uses the given value as the money symbol" do
-      Money.new(100, :currency => "GBP").format(:symbol => "£").should == "£1.00"
+      Money.new(100, "GBP").format(:symbol => "£").should == "£1.00"
     end
     
     specify "#format(:symbol => true) returns symbol based on the given currency code" do
-      one = Proc.new {|currency| Money.new(100, :currency => currency).format(:symbol => true) }
+      one = Proc.new do |currency|
+        Money.new(100, currency).format(:symbol => true)
+      end
 
       # Pounds
       one["GBP"].should == "£1.00"
@@ -158,28 +168,42 @@ describe Money do
       one["SCR"].should == "₨1.00"
       one["LKR"].should == "₨1.00"
       
+      # Brazilian Real
+      one["BRL"].should == "R$1.00"
+      
       # Other
       one["SEK"].should == "kr1.00"
       one["GHC"].should == "¢1.00"
     end
     
     specify "#format(:symbol => true) returns $ when currency code is not recognized" do
-      Money.new(100, :currency => "XYZ").format(:symbol => true).should == "$1.00"
+      Money.new(100, "XYZ").format(:symbol => true).should == "$1.00"
     end
     
     specify "#format(:symbol => some non-Boolean value that evaluates to true) returs symbol based on the given currency code" do
-      Money.new(100, :currency => "GBP").format(:symbol => true).should == "£1.00"
-      Money.new(100, :currency => "EUR").format(:symbol => true).should == "€1.00"
-      Money.new(100, :currency => "SEK").format(:symbol => true).should == "kr1.00"
+      Money.new(100, "GBP").format(:symbol => true).should == "£1.00"
+      Money.new(100, "EUR").format(:symbol => true).should == "€1.00"
+      Money.new(100, "SEK").format(:symbol => true).should == "kr1.00"
     end
     
     specify "#format with :symbol == "", nil or false returns the amount without a symbol" do
-      money = Money.new(100, :currency => "GBP")
+      money = Money.new(100, "GBP")
       money.format(:symbol => "").should == "1.00"
       money.format(:symbol => nil).should == "1.00"
       money.format(:symbol => false).should == "1.00"
     end
     
+    specify "#format without :symbol assumes that :symbol is set to true" do
+      money = Money.new(100)
+      money.format.should == "$1.00"
+      
+      money = Money.new(100, "GBP")
+      money.format.should == "£1.00"
+      
+      money = Money.new(100, "XYZ")
+      money.format.should == "$1.00"
+    end
+    
     specify "#format(:html => true) works as documented" do
       string = Money.ca_dollar(570).format(:html => true, :with_currency => true)
       string.should == "$5.70 <span class=\"currency\">CAD</span>"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: money
 version: !ruby/object:Gem::Version 
-  version: 2.1.4
+  version: 2.1.5
 platform: ruby
 authors: 
 - Tobias Luetke
@@ -11,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-08-02 00:00:00 +02:00
+date: 2009-11-05 00:00:00 +01:00
 default_executable: 
 dependencies: []
 
@@ -39,6 +39,8 @@ files:
 - test/money_spec.rb
 has_rdoc: true
 homepage: http://money.rubyforge.org/
+licenses: []
+
 post_install_message: 
 rdoc_options: []
 
@@ -59,9 +61,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: money
-rubygems_version: 1.3.1
+rubygems_version: 1.3.5
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: Money and currency exchange support library
 test_files: []