money 2.1.2 → 2.1.3

data/lib/money/money.rb

@@ -169,7 +169,15 @@ class Money
       end
     end
 
-    symbol = rules[:symbol] ? rules[:symbol].empty? ? "$" : rules[:symbol] : "$"
+    if rules.has_key?(:symbol)
+      if rules[:symbol]
+        symbol = rules[:symbol]
+      else
+        symbol = ""
+      end
+    else
+      symbol = "$"
+    end
     
     if rules[:no_cents]
       formatted = sprintf("#{symbol}%d", cents.to_f / 100)

data/money.gemspec

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

data/test/money_spec.rb

@@ -131,6 +131,13 @@ describe Money do
       Money.new(100, :currency => "GBP").format(:symbol => "£").should == "£1.00"
     end
     
+    specify "#format with :symbol == "", nil or false returns the amount without a symbol" do
+      money = Money.new(100, :currency => "GBP")
+      money.format(:symbol => "").should == "1.00"
+      money.format(:symbol => nil).should == "1.00"
+      money.format(:symbol => false).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.2
+  version: 2.1.3
 platform: ruby
 authors: 
 - Tobias Luetke