money 2.1.0 → 2.1.1

data/lib/money/money.rb

@@ -157,7 +157,10 @@ class Money
   # html:
   #
   #  Money.ca_dollar(570).format(:html => true, :with_currency => true) =>  "$5.70 <span class=\"currency\">CAD</span>"
-  def format(rules = {})
+  def format(*rules)
+    # support for old format parameters
+    rules = normalize_formatting_rules(rules)
+    
     if cents == 0
       if rules[:display_free].respond_to?(:to_str)
         return rules[:display_free]
@@ -218,4 +221,19 @@ class Money
   def to_money
     self
   end  
+  
+  private
+  
+  def normalize_formatting_rules(rules)
+    if rules.size == 1
+      rules = rules.pop
+      rules = { rules => true } if rules.is_a?(Symbol)
+    else
+      rules = rules.inject({}) do |h,s|
+        h[s] = true
+        h
+      end
+    end
+    rules
+  end
 end

data/money.gemspec

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

data/test/money_spec.rb

@@ -105,6 +105,12 @@ describe Money do
     specify "#format(:with_currency => true) works as documented" do
       Money.ca_dollar(100).format(:with_currency => true).should == "$1.00 CAD"
       Money.us_dollar(85).format(:with_currency => true).should == "$0.85 USD"
+      Money.us_dollar(85).format(:with_currency).should == "$0.85 USD"
+    end
+    
+    specify "#format(:with_currency) works as documented" do
+      Money.ca_dollar(100).format(:with_currency).should == "$1.00 CAD"
+      Money.us_dollar(85).format(:with_currency).should == "$0.85 USD"
     end
     
     specify "#format(:no_cents => true) works as documented" do
@@ -113,6 +119,13 @@ describe Money do
       Money.ca_dollar(570).format(:no_cents => true, :with_currency => true).should == "$5 CAD"
       Money.ca_dollar(39000).format(:no_cents => true).should == "$390"
     end
+
+    specify "#format(:no_cents) works as documented" do
+      Money.ca_dollar(100).format(:no_cents).should == "$1"
+      Money.ca_dollar(599).format(:no_cents).should == "$5"
+      Money.ca_dollar(570).format(:no_cents, :with_currency).should == "$5 CAD"
+      Money.ca_dollar(39000).format(:no_cents).should == "$390"
+    end
     
     specify "#format(:symbol => ...) works as documented" do
       Money.new(100, :currency => "GBP").format(:symbol => "£").should == "£1.00"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: money
 version: !ruby/object:Gem::Version 
-  version: 2.1.0
+  version: 2.1.1
 platform: ruby
 authors: 
 - Tobias Luetke
@@ -11,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-02-15 00:00:00 +01:00
+date: 2009-02-19 00:00:00 +01:00
 default_executable: 
 dependencies: []