money 2.1.3 → 2.1.4

data/lib/money/core_extensions.rb

@@ -17,7 +17,8 @@ class String
   #   '100.37'.to_money    # => #<Money @cents=10037>
   #   '100 USD'.to_money   # => #<Money @cents=10000, @currency="USD">
   #   'USD 100'.to_money   # => #<Money @cents=10000, @currency="USD">
-  #   '$100 USD'.to_money   # => #<Money @cents=10000, @currency="USD">
+  #   '$100 USD'.to_money  # => #<Money @cents=10000, @currency="USD">
+  #   'hello 2000 world'.to_money   # => #<Money @cents=200000 @currency="USD")>
   def to_money
     # Get the currency.
     matches = scan /([A-Z]{2,3})/
@@ -79,6 +80,8 @@ class String
         # ex: 1,000 - 1.0000 - 10001.000
         # split number into possible major (dollars) and minor (cents) values
         possible_major, possible_minor = num.split(separator)
+        possible_major ||= "0"
+        possible_minor ||= "00"
         
         # if the minor (cents) length isn't 3, assign major/minor from the possibles
         # e.g.
@@ -114,8 +117,19 @@ class String
     end
     
     # build the string based on major/minor since separator/delimiters have been removed
-    # transform to a float, multiply by 100 to convert to cents
-    cents = "#{major}.#{minor}".to_f * 100
+    # avoiding floating point arithmetic here to ensure accuracy
+    cents = (major.to_i * 100)
+    # add the minor number as well. this may have any number of digits,
+    # so we treat minor as a string and truncate or right-fill it with zeroes
+    # until it becomes a two-digit number string, which we add to cents.
+    minor = minor.to_s
+    truncated_minor = minor[0..1]
+    truncated_minor << "0" * (2 - truncated_minor.size) if truncated_minor.size < 2
+    cents += truncated_minor.to_i
+    # respect rounding rules
+    if minor.size >= 3 && minor[2..2].to_i >= 5
+      cents += 1
+    end
     
     # if negative, multiply by -1; otherwise, return positive cents
     negative ? cents * -1 : cents

data/lib/money/money.rb

@@ -3,7 +3,7 @@ require 'money/variable_exchange_bank'
 # Represents an amount of money in a certain currency.
 class Money
   include Comparable
-  
+
   attr_reader :cents, :currency, :bank
   
   class << self
@@ -127,22 +127,30 @@ class Money
   end
 
 
-  # Format the price according to several rules. The following options are
-  # supported: :display_free, :with_currency, :no_cents, :symbol and :html
+  # Creates a formatted price string according to several rules. The following
+  # options are supported: :display_free, :with_currency, :no_cents, :symbol
+  # and :html.
   #
-  # display_free:
+  # === +:display_free+
   #
-  #  Money.us_dollar(0).format(:display_free => true) => "free"
-  #  Money.us_dollar(0).format(:display_free => "gratis") => "gratis"
+  # Whether a zero amount of money should be formatted of "free" or as the
+  # supplied string.
+  #
+  #  Money.us_dollar(0).format(:display_free => true)      => "free"
+  #  Money.us_dollar(0).format(:display_free => "gratis")  => "gratis"
   #  Money.us_dollar(0).format => "$0.00"
   #
-  # with_currency: 
+  # === +:with_currency+
+  #
+  # Whether the currency name should be appended to the result string.
   #
   #  Money.ca_dollar(100).format => "$1.00"
   #  Money.ca_dollar(100).format(:with_currency => true) => "$1.00 CAD"
-  #  Money.us_dollar(85).format(:with_currency => true) => "$0.85 USD"
+  #  Money.us_dollar(85).format(:with_currency => true)  => "$0.85 USD"
   #
-  # no_cents:  
+  # === +:no_cents+
+  #
+  # Whether cents should be omitted.
   #
   #  Money.ca_dollar(100).format(:no_cents => true) => "$1"
   #  Money.ca_dollar(599).format(:no_cents => true) => "$5"
@@ -150,13 +158,43 @@ class Money
   #  Money.ca_dollar(570).format(:no_cents => true, :with_currency => true) => "$5 CAD"
   #  Money.ca_dollar(39000).format(:no_cents => true) => "$390"
   #
-  # symbol:
+  # === +:symbol+
+  #
+  # 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"
+  #  
+  #  # 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"
+  #
+  # 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"
+  #
+  #  
+  # 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"
+  #
+  # You can specify a string as value to enforce using a particular symbol:
   #
-  #  Money.new(100, :currency => "GBP").format(:symbol => "£") => "£1.00"
+  #  Money.new(100, :currency => "AWG").format(:symbol => "ƒ")   => "ƒ1.00"
   #
-  # html:
+  # === +:html+
   #
-  #  Money.ca_dollar(570).format(:html => true, :with_currency => true) =>  "$5.70 <span class=\"currency\">CAD</span>"
+  # Whether the currency should be HTML-formatted. Only useful in combination with +:with_currency+.
+  #
+  #  Money.ca_dollar(570).format(:html => true, :with_currency => true)
+  #    =>  "$5.70 <span class=\"currency\">CAD</span>"
   def format(*rules)
     # support for old format parameters
     rules = normalize_formatting_rules(rules)
@@ -170,7 +208,9 @@ class Money
     end
 
     if rules.has_key?(:symbol)
-      if rules[:symbol]
+      if rules[:symbol] === true
+        symbol = SYMBOLS[currency[:currency]] || "$"
+      elsif rules[:symbol]
         symbol = rules[:symbol]
       else
         symbol = ""
@@ -197,7 +237,9 @@ class Money
     formatted
   end  
   
-  # Money.ca_dollar(100).to_s => "1.00"
+  # Returns the amount of money as a string.
+  #
+  #  Money.ca_dollar(100).to_s => "1.00"
   def to_s
     sprintf("%.2f", cents / 100.00)
   end

data/lib/money/symbols.rb

@@ -0,0 +1,18 @@
+# encoding: utf-8
+
+# Add more from http://www.xe.com/symbols.php
+Money::SYMBOLS = {
+  "GBP" => "£",
+  "JPY" => "¥",
+  "EUR" => "€",
+  "ZWD" => "Z$",
+  "CNY" => "¥",
+  "INR" => "₨",
+  "NPR" => "₨",
+  "SCR" => "₨",
+  "LKR" => "₨",
+  "SEK" => "kr",
+  "GHC" => "¢"
+  
+  # Everything else defaults to $
+}

data/lib/money.rb

@@ -22,4 +22,5 @@
 
 $LOAD_PATH << File.expand_path(File.dirname(__FILE__))
 require 'money/money'
+require 'money/symbols'
 require 'money/core_extensions'

data/money.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = "money"
-  s.version = "2.1.3"
+  s.version = "2.1.4"
   s.summary = "Money and currency exchange support library"
   s.email = "hongli@phusion.nl"
   s.homepage = "http://money.rubyforge.org/"
@@ -15,6 +15,7 @@ Gem::Specification.new do |s|
       "lib/money/core_extensions.rb",
       "lib/money/errors.rb",
       "lib/money/money.rb",
+      "lib/money/symbols.rb",
       "lib/money/variable_exchange_bank.rb",
       "test/core_extensions_spec.rb",
       "test/exchange_bank_spec.rb",

data/test/core_extensions_spec.rb

@@ -1,4 +1,4 @@
-$LOAD_PATH << File.expand_path(File.dirname(__FILE__) + "/../lib")
+$LOAD_PATH.unshift(File.expand_path(File.dirname(__FILE__) + "/../lib"))
 require 'money/core_extensions'
 
 describe "Money core extensions" do
@@ -13,6 +13,7 @@ describe "Money core extensions" do
   end
   
   specify "String#to_money works" do
+    "20.15".to_money.should == Money.new(20_15)
     "100".to_money.should == Money.new(100_00)
     "100.37".to_money.should == Money.new(100_37)
     "100,37".to_money.should == Money.new(100_37)
@@ -20,9 +21,16 @@ describe "Money core extensions" do
     "100,000.00".to_money.should == Money.new(100_000_00)
     "1,000".to_money.should == Money.new(1_000_00)
     "-1,000".to_money.should == Money.new(-1_000_00)
+    "1,000.5".to_money.should == Money.new(1_000_50)
+    "1,000.51".to_money.should == Money.new(1_000_51)
+    "1,000.505".to_money.should == Money.new(1_000_51)
+    "1,000.504".to_money.should == Money.new(1_000_50)
     "1,000.0000".to_money.should == Money.new(1_000_00)
     "1,000.5000".to_money.should == Money.new(1_000_50)
+    "1,000.5099".to_money.should == Money.new(1_000_51)
     "1.550".to_money.should == Money.new(1_55)
+    "25.".to_money.should == Money.new(25_00)
+    ".75".to_money.should == Money.new(75)
     
     "100 USD".to_money.should == Money.new(100_00, "USD")
     "-100 USD".to_money.should == Money.new(-100_00, "USD")
@@ -58,4 +66,8 @@ describe "Money core extensions" do
     "$-1,955.000 USD".to_money.should == Money.new(-1_955_00, "USD")
     "$1.99000 USD".to_money.should == Money.new(1_99, "USD")
   end
+  
+  specify "String#to_money ignores unrecognized data" do
+    "hello 2000 world".to_money.should == Money.new(2000_00)
+  end
 end

data/test/exchange_bank_spec.rb

@@ -1,4 +1,4 @@
-$LOAD_PATH << File.expand_path(File.dirname(__FILE__) + "/../lib")
+$LOAD_PATH.unshift(File.expand_path(File.dirname(__FILE__) + "/../lib"))
 require 'money/variable_exchange_bank'
 
 describe Money::VariableExchangeBank do

data/test/money_spec.rb

@@ -1,6 +1,7 @@
 # encoding: utf-8
-$LOAD_PATH << File.expand_path(File.dirname(__FILE__) + "/../lib")
+$LOAD_PATH.unshift(File.expand_path(File.dirname(__FILE__) + "/../lib"))
 require 'money/money'
+require 'money/symbols'
 
 describe Money do
   it "is associated to the singleton instance of VariableExchangeBank by default" do
@@ -127,10 +128,51 @@ describe Money do
       Money.ca_dollar(39000).format(:no_cents).should == "$390"
     end
     
-    specify "#format(:symbol => ...) works as documented" do
+    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"
     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) }
+
+      # Pounds
+      one["GBP"].should == "£1.00"
+      
+      # Dollars
+      one["USD"].should == "$1.00"
+      one["CAD"].should == "$1.00"
+      one["AUD"].should == "$1.00"
+      one["NZD"].should == "$1.00"
+      one["ZWD"].should == "Z$1.00"
+      
+      # Yen
+      one["JPY"].should == "¥1.00"      
+      one["CNY"].should == "¥1.00"      
+      
+      # Euro
+      one["EUR"].should == "€1.00"
+      
+      # Rupees
+      one["INR"].should == "₨1.00"
+      one["NPR"].should == "₨1.00"
+      one["SCR"].should == "₨1.00"
+      one["LKR"].should == "₨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"
+    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"
+    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"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: money
 version: !ruby/object:Gem::Version 
-  version: 2.1.3
+  version: 2.1.4
 platform: ruby
 authors: 
 - Tobias Luetke
@@ -11,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-02-21 00:00:00 +01:00
+date: 2009-08-02 00:00:00 +02:00
 default_executable: 
 dependencies: []
 
@@ -32,6 +32,7 @@ files:
 - lib/money/core_extensions.rb
 - lib/money/errors.rb
 - lib/money/money.rb
+- lib/money/symbols.rb
 - lib/money/variable_exchange_bank.rb
 - test/core_extensions_spec.rb
 - test/exchange_bank_spec.rb