nofxx-money 2.2.2 → 2.3.1

data/Manifest.txt

@@ -14,11 +14,12 @@ rails/init.rb
 script/console
 script/destroy
 script/generate
-spec/db/acts_as_money.sqlite3
 spec/db/database.yml
 spec/db/schema.rb
 spec/money/acts_as_money_spec.rb
 spec/money/core_extensions_spec.rb
 spec/money/exchange_bank_spec.rb
 spec/money/money_spec.rb
+spec/spec.opts
 spec/spec_helper.rb
+tmp/acts_as_money.sqlite3

data/README.rdoc

@@ -17,6 +17,7 @@ Resources:
 - RDoc API: http://money.rubyforge.org
 - Git repository: http://github.com/FooBarWidget/money/tree/master
 
+
 == Download
 
 Install stable releases with the following command:
@@ -28,6 +29,7 @@ The development version (hosted on Github) can be installed with:
   gem sources -a http://gems.github.com
   gem install nofxx-money
 
+
 == Usage
 
 === Synopsis
@@ -38,6 +40,7 @@ The development version (hosted on Github) can be installed with:
   money = Money.new(1000, "USD")
   money.cents     # => 1000
   money.currency  # => "USD"
+  money.format    # => "$10.00"
 
   Money.new(1000, "USD") == Money.new(1000, "USD")   # => true
   Money.new(1000, "USD") == Money.new(100, "USD")    # => false
@@ -56,6 +59,11 @@ an example of how it works:
   Money.us_dollar(100).exchange_to("CAD")  # => Money.new(124, "CAD")
   Money.ca_dollar(100).exchange_to("USD")  # => Money.new(80, "USD")
 
+or
+
+  Money.us_dollar(100).to_cad              # => Money.new(124, "CAD")
+  Money.ca_dollar(100).to_usd              # => Money.new(80, "USD")
+
 Comparison and arithmetic operations work as expected:
 
   Money.new(1000, "USD") <=> Money.new(900, "USD")   # => 1; 9.00 USD is smaller
@@ -86,15 +94,7 @@ app/models/product.rb
     belongs_to :product
     has_money :price
 
-    private
-      validate :cents_not_zero
-
-      def cents_not_zero
-        errors.add("price_cents", "cannot be zero or less") unless cents > 0
-      end
-
-      validates_presence_of :sku, :currency
-      validates_uniqueness_of :sku
+    validates_numericality_of :price_cents, :greater_than => 0
   end
 
 migration:
@@ -116,6 +116,7 @@ If you use Rails, then environment.rb is a very good place to put this.
 
 == TODO
 
-* Better validation
+* Better validation (fix composed_of allow_nil)
 * Interest (almost there..)
+* Remote rate fetching
 

data/Rakefile

@@ -4,7 +4,7 @@ require File.dirname(__FILE__) + '/lib/money'
 # Generate all the Rake tasks
 # Run 'rake -T' to see list of generated tasks (from gem root directory)
 $hoe = Hoe.new('money', Money::VERSION) do |p|
-  p.developer('FIXME full name', 'FIXME email')
+  p.developer('Money Team', 'see@readme')
   p.changes              = p.paragraphs_of("History.txt", 0..1).join("\n\n")
   p.rubyforge_name       = p.name
   p.summary = "This library aids one in handling money and different currencies."
@@ -16,7 +16,7 @@ $hoe = Hoe.new('money', Money::VERSION) do |p|
     ['newgem', ">= #{::Newgem::VERSION}"]
   ]
 
-  p.clean_globs |= %w[**/.DS_Store tmp *.log]
+  p.clean_globs |= %w[**/.DS_Store *.log]
   path = (p.rubyforge_name == p.name) ? p.rubyforge_name : "\#{p.rubyforge_name}/\#{p.name}"
   p.remote_rdoc_dir = File.join(path.gsub(/^#{p.rubyforge_name}\/?/,''), 'rdoc')
   p.rsync_args = '-av --delete --ignore-errors'

data/lib/money.rb

@@ -25,5 +25,5 @@ require 'money/money'
 require 'money/core_extensions'
 
 class Money
-  VERSION = "2.2.2"
+  VERSION = "2.3.1"
 end

data/lib/money/acts_as_money.rb

@@ -12,25 +12,26 @@ module ActsAsMoney #:nodoc:
     # end
     #
     # @product.value.class      #=>  "Money"
-    # @product.value_in_cents   #=>  "1000"
+    # @product.value_cents      #=>  "1000"
     # @product.tax_currency     #=>  "USD"
     #
     # Opts:
     # :cents => "pennys"        #=>  @product.pennys
     # :currency => "currency"   #=>  @product.currency
     # :allow_nil => true
-    # :with_currency => true
+    # :with_currency => false
+    # :with_cents => true       #=>  1000.to_money #=> #<Money @cents=1000>
     #
     def has_money(*attributes)
-      config = {:with_currency => true, :converter => lambda { |m| m.to_money },
-                :allow_nil => false }.update(attributes.extract_options!)
+      config = {:with_currency => true, :with_cents => false,
+                :allow_nil => true }.update(attributes.extract_options!)
 
-      attributes.each do |attr|
-        mapping = [[config[:cents] || "#{attr}_cents", 'cents']]
-        mapping << [config[:currency] || "#{attr}_currency", 'currency'] if config[:with_currency]
+      for attribute in attributes do
+        mapping = [[config[:cents] || "#{attribute}_cents", 'cents']]
+        mapping << [config[:currency] || "#{attribute}_currency", 'currency'] if config[:with_currency]
 
-        composed_of attr, :class_name => 'Money',:allow_nil => config[:allow_nil],
-           :mapping => mapping, :converter => config[:converter]
+        composed_of attribute, :class_name => 'Money', :allow_nil => config[:allow_nil],
+           :mapping => mapping, :converter => lambda { |m| (m||0).to_money(config[:with_cents]) }
       end
 
     end

data/lib/money/core_extensions.rb

@@ -1,11 +1,20 @@
 class Numeric
   # Converts this numeric to a Money object in the default currency. It
-  # multiplies the numeric value by 100 and treats that as cents.
+  # multiplies the numeric value by 100 and treats that as cents if receive false.
   #
-  #   100.to_money => #<Money @cents=10000>
+  #   100.to_money => #<Money @cents=100>
   #   100.37.to_money => #<Money @cents=10037>
-  def to_money
-    Money.new(self * 100)
+  #   100.to_money(false) => #<Money @cents=10000>
+  def to_money(cents = false)
+    if cents
+      if self.is_a? Integer
+        Money.new(self)
+      else
+        Money.new(self.to_s.gsub(/\./,'').to_i)
+      end
+    else
+      Money.new(self * 100)
+    end
   end
 end
 
@@ -13,27 +22,118 @@ class String
   # Parses the current string and converts it to a Money object.
   # Excess characters will be discarded.
   #
-  #   '100'.to_money       # => #<Money @cents=10000>
+  #   '100'.to_money       # => #<Money @cents=100>
   #   '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">
-  def to_money
+  #   '100 USD'.to_money   # => #<Money @cents=100, @currency="USD">
+  #   'USD 100'.to_money   # => #<Money @cents=100, @currency="USD">
+  #   '$100 USD'.to_money   # => #<Money @cents=100, @currency="USD">
+  #   '$100 USD'.to_money(false) # => #<Money @cents=10000, @currency="USD">
+  def to_money(with_cents = false)
     # Get the currency.
     matches = scan /([A-Z]{2,3})/
     currency = matches[0] ? matches[0][0] : Money.default_currency
+    cents = calculate_cents(self, with_cents)
+    Money.new(cents, currency)
+  end
+
+  private
+
+  def calculate_cents(number, with_cents = true)
+    # remove anything that's not a number, potential delimiter, or minus sign
+    num = number.gsub(/[^\d|\.|,|\'|\s|\-]/, '').strip
+
+    # set a boolean flag for if the number is negative or not
+    negative = num.split(//).first == "-"
+
+    # if negative, remove the minus sign from the number
+    num = num.gsub(/^-/, '') if negative
+
+    # gather all separators within the result number
+    used_separators = num.scan /[^\d]/
+
+    # determine the number of unique separators within the number
+    #
+    # e.g.
+    # $1,234,567.89 would return 2 (, and .)
+    # $125,00 would return 1
+    # $199 would return 0
+    # $1 234,567.89 would raise an error (separators are space, comma, and period)
+    case used_separators.uniq.length
+    # no separator or delimiter; major (dollars) is the number, and minor (cents) is 0
+    when 0 then major, minor = num, 0
+
+    # two separators, so we know the last item in this array is the
+    # major/minor delimiter and the rest are separators
+    when 2
+      separator, delimiter = used_separators.uniq
+      # remove all separators, split on the delimiter
+      major, minor = num.gsub(separator, '').split(delimiter)
+      min = 0 unless min
+    when 1
+      # we can't determine if the comma or period is supposed to be a separator or a delimiter
+      # e.g.
+      # 1,00 - comma is a delimiter
+      # 1.000 - period is a delimiter
+      # 1,000 - comma is a separator
+      # 1,000,000 - comma is a separator
+      # 10000,00 - comma is a delimiter
+      # 1000,000 - comma is a delimiter
 
-    # Get the cents amount
-    sans_spaces = gsub(/\s+/, '')
-    matches = sans_spaces.scan /(\-?\d+(?:[\.,]\d+)?)/
-    cents = if matches[0]
-              value = matches[0][0].gsub(/,/, '.')
-              value.to_f * 100
+      # assign first separator for reusability
+      separator = used_separators.first
+
+      # separator is used as a separator when there are multiple instances, always
+      if num.scan(separator).length > 1 # multiple matches; treat as separator
+        major, minor = num.gsub(separator, ''), 0
+      else
+        # ex: 1,000 - 1.0000 - 10001.000
+        # split number into possible major (dollars) and minor (cents) values
+        possible_major, possible_minor = num.split(separator)
+
+        # if the minor (cents) length isn't 3, assign major/minor from the possibles
+        # e.g.
+        # 1,00 => 1.00
+        # 1.0000 => 1.00
+        # 1.2 => 1.20
+        if possible_minor.length != 3 # delimiter
+          major, minor = possible_major, possible_minor
+        else
+          # minor length is three
+          # let's try to figure out intent of the delimiter
+
+          # the major length is greater than three, which means
+          # the comma or period is used as a delimiter
+          # e.g.
+          # 1000,000
+          # 100000,000
+          if possible_major.length > 3
+            major, minor = possible_major, possible_minor
+          else
+            # number is in format ###{sep}### or ##{sep}### or #{sep}###
+            # handle as , is sep, . is delimiter
+            if separator == '.'
+              major, minor = possible_major, possible_minor
             else
-              0
+              major, minor = "#{possible_major}#{possible_minor}", 0
             end
+          end
+        end
+      end
+    else
+      raise ArgumentError, "Invalid currency amount"
+    end
 
-    Money.new(cents, currency)
+    # build the string based on major/minor since separator/delimiters have been removed
+    # transform to a float, multiply by 100 to convert to cents
+    if with_cents and minor == 0
+      cents = "#{major}.#{minor}".to_f
+    else
+      cents = "#{major}.#{minor}".to_f * 100
+    end
+
+
+    # if negative, multiply by -1; otherwise, return positive cents
+    negative ? cents * -1 : cents
   end
-end
 
+end

data/lib/money/money.rb

@@ -28,6 +28,16 @@ class Money
     attr_accessor :default_currency
   end
 
+  CURRENCIES = {
+    "USD" => { :delimiter => ",", :separator => ".", :symbol => "$" },
+    "CAD" => { :delimiter => ",", :separator => ".", :symbol => "$" },
+    "HKD" => { :delimiter => ",", :separator => ".", :symbol => "$" },
+    "SGD" => { :delimiter => ",", :separator => ".", :symbol => "$" },
+    "BRL" => { :delimiter => ".", :separator => ",", :symbol => "R$" },
+    "EUR" => { :delimiter => ",", :separator => ".", :symbol => '€', :html => '€' },
+    "GBP" => { :delimiter => ",", :separator => ".", :symbol => '£', :html => '£' },
+    "JPY" => { :delimiter => ".", :separator => ".", :symbol => '¥', :html => '¥' },
+  }
   self.default_bank = VariableExchangeBank.instance
   self.default_currency = "USD"
 
@@ -52,7 +62,7 @@ class Money
     Money.new(cents, "EUR")
   end
 
-  # Creates a new Money object of the given value, using the Euro currency.
+  # Creates a new Money object of the given value, using the Brazilian Real currency.
   def self.real(cents)
     Money.new(cents, "BRL")
   end
@@ -67,7 +77,7 @@ class Money
   # Alternativly you can use the convinience methods like
   # Money.ca_dollar and Money.us_dollar
   def initialize(cents, currency = Money.default_currency, bank = Money.default_bank)
-    @cents = cents.round # ? cents.round : 0
+    @cents = cents.round
     @currency = currency
     @bank = bank
   end
@@ -129,7 +139,6 @@ class Money
   # Calculates compound interest
   # Returns a money object with the sum of self + it
   def compound_interest(rate,count=1)
-
     Money.new(cents * ((1 + rate / 100.0 / 12) ** count - 1))
   end
 
@@ -138,11 +147,11 @@ class Money
     Money.new(rate/100/12*cents*count)
   end
 
-  def with_simple_interest(rate,count=1)
-  end
-
-  # Split money in installments
-  # So US$ 10.00 == [ 3.34, 3.33, 3.33 ]
+  # Split money in number of installments
+  #
+  # Money.new(10_00).split_in_installments(3)
+  # => [ 3.34, 3.33, 3.33 ]  (All Money instances)
+  #
   def split_in_installments(fixnum,extra=nil,*opts)
     wallet = Wallet.new(fixnum, Money.new(cents/fixnum,currency))
     to_add = cents % fixnum
@@ -151,13 +160,17 @@ class Money
   end
 
   # Split money in installments based on payment value
+  #
+  # Money.new(1000_00).split_in_installments(Money.new(300_00))
+  # => [ 334_00, 333_00, 333_00 ]  (All Money instances)
+  #
   def in_installments_of(other_money,first=false)
     split_in_installments(cents/other_money.cents,first)
   end
 
   # Just a helper if you got tax inputs in percentage.
-  # Ie. with_tax(20) =>  cents * 1.20
-  def with_tax(tax)
+  # Ie. add_tax(20) =>  cents * 1.20
+  def add_tax(tax)
     Money.new(cents + cents / 100 * tax)
   end
 
@@ -186,15 +199,35 @@ class Money
   # html:
   #
   #  Money.ca_dollar(570).format(:html => true, :with_currency => true) =>  "$5.70 <span class=\"currency\">CAD</span>"
-  def format(rules = {})
-    return "free" if cents == 0
+   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]
+      elsif rules[:display_free]
+        return "free"
+      end
+    end
 
-    rules = rules.flatten
+    if rules.has_key?(:symbol)
+      if rules[:symbol]
+        symbol = rules[:symbol]
+      else
+        symbol = ""
+      end
+    else
+      symbol = CURRENCIES[currency][:symbol]
+    end
 
-    if rules.include?(:no_cents)
-      formatted = sprintf("$%d", cents.to_f / 100  )
+    if rules[:no_cents]
+      formatted = sprintf("#{symbol}%d", cents.to_f / 100)
+      formatted.gsub!(/(\d)(?=(\d\d\d)+(?!\d))/, "\\1#{CURRENCIES[currency][:delimiter]}")
     else
-      formatted = sprintf("$%.2f", cents.to_f / 100  )
+      formatted = sprintf("#{symbol}%.2f", cents.to_f / 100).split('.')
+      formatted[0].gsub!(/(\d)(?=(\d\d\d)+(?!\d))/, "\\1#{CURRENCIES[currency][:delimiter]}")
+      formatted = formatted.join(CURRENCIES[currency][:separator])
     end
 
     if rules[:with_currency]
@@ -206,6 +239,20 @@ class Money
     formatted
   end
 
+   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
+
+
   # Money.ca_dollar(100).to_s => "1.00"
   def to_s
     sprintf("%.2f", cents / 100.0)
@@ -221,34 +268,18 @@ class Money
     Money.new(@bank.exchange(self.cents, currency, other_currency), other_currency)
   end
 
-  # Recieve a money object with the same amount as the current Money object
-  # in american dollar
-  def as_us_dollar
-    exchange_to("USD")
-  end
-
-  # Recieve a money object with the same amount as the current Money object
-  # in canadian dollar
-  def as_ca_dollar
-    exchange_to("CAD")
-  end
-
-  # Recieve a money object with the same amount as the current Money object
-  # in euro
-  def as_euro
-    exchange_to("EUR")
-  end
-
-  # Recieve a money object with the same amount as the current Money object
-  # in real
-  def as_real
-    exchange_to("BRL")
-  end
-
   # Conversation to self
   def to_money
     self
   end
+
+  def method_missing(m,*x)
+    if m.to_s =~ /^as/
+      exchange_to(m.to_s.split("_").last.upcase)
+    else
+      super
+    end
+  end
 end
 
 #

data/money.gemspec

@@ -2,15 +2,15 @@
 
 Gem::Specification.new do |s|
   s.name = %q{money}
-  s.version = "2.2.2"
+  s.version = "2.3.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["FIXME full name"]
-  s.date = %q{2009-02-12}
+  s.authors = ["Money Team"]
+  s.date = %q{2009-03-15}
   s.description = %q{This library aids one in handling money and different currencies.}
-  s.email = ["FIXME email"]
+  s.email = ["see@readme"]
   s.extra_rdoc_files = ["History.txt", "Manifest.txt", "README.rdoc"]
-  s.files = ["History.txt", "MIT-LICENSE", "Manifest.txt", "README.rdoc", "Rakefile", "lib/money.rb", "lib/money/acts_as_money.rb", "lib/money/core_extensions.rb", "lib/money/errors.rb", "lib/money/money.rb", "lib/money/variable_exchange_bank.rb", "money.gemspec", "rails/init.rb", "script/console", "script/destroy", "script/generate", "spec/db/acts_as_money.sqlite3", "spec/db/database.yml", "spec/db/schema.rb", "spec/money/acts_as_money_spec.rb", "spec/money/core_extensions_spec.rb", "spec/money/exchange_bank_spec.rb", "spec/money/money_spec.rb", "spec/spec_helper.rb"]
+  s.files = ["History.txt", "MIT-LICENSE", "Manifest.txt", "README.rdoc", "Rakefile", "lib/money.rb", "lib/money/acts_as_money.rb", "lib/money/core_extensions.rb", "lib/money/errors.rb", "lib/money/money.rb", "lib/money/variable_exchange_bank.rb", "money.gemspec", "rails/init.rb", "script/console", "script/destroy", "script/generate", "spec/db/database.yml", "spec/db/schema.rb", "spec/money/acts_as_money_spec.rb", "spec/money/core_extensions_spec.rb", "spec/money/exchange_bank_spec.rb", "spec/money/money_spec.rb", "spec/spec.opts", "spec/spec_helper.rb", "tmp/acts_as_money.sqlite3"]
   s.has_rdoc = true
   s.homepage = %q{http://github.com/nofxx/money}
   s.rdoc_options = ["--main", "README.rdoc"]

data/spec/db/database.yml

@@ -1,4 +1,4 @@
 adapter: sqlite3
-database: spec/db/acts_as_money.sqlite3
+database: tmp/acts_as_money.sqlite3
 pool: 5
 timeout: 5000

data/spec/db/schema.rb

@@ -1,14 +1,12 @@
-require File.dirname(__FILE__) + '/../spec_helper.rb'
-
 ActiveRecord::Schema.define() do
 
   create_table :accounts, :force => true do |t|
-    t.integer :value_in_cents, :total_in_cents
+    t.integer :value_cents, :total_cents
     t.string  :value_currency, :total_currency
   end
 
   create_table :products, :force => true do |t|
-    t.integer :value_in_cents, :tax_pennys
+    t.integer :value_cents, :tax_pennys
     t.string  :value_currency
   end
 

data/spec/money/acts_as_money_spec.rb

@@ -2,43 +2,63 @@ require File.dirname(__FILE__) + '/../spec_helper.rb'
 require File.dirname(__FILE__) + '/../../rails/init.rb'
 
 # Uncomment this once to create the db
-load_schema
+# load_schema
 
 class Account < ActiveRecord::Base
   has_money :value, :total, :allow_nil => true
 end
 
 class Product < ActiveRecord::Base
-  has_money :value
+  has_money :value, :allow_nil => false
   has_money :tax, :cents => "pennys", :with_currency => false
 
-  validates_presence_of :value
+  validates_numericality_of :value_cents, :greater_than => 0
 end
 
 describe "Acts as Money" do
 
-      it "should require money" do
-      @account = Account.create(:value => nil)
-      @account.value_in_cents.should eql(0)
-    end
+  it "should accept nil" do
+    @account = Account.create(:value => nil)
+    @account.should be_valid
+    @account.value.should be_nil
+  end
+
+  it "should require money" do
+    @product = Product.create(:value => nil)
+    @product.should have(1).errors
+    @product.value.should == Money.new(0)
+  end
+
+  it "should require money" do
+    @product_fake = Product.create(:value => nil)
+    @product_fake.value_cents.should eql(0)
+  end
+
+  it "should create" do
+    @account = Account.create!(:value => 10, :total => "20 BRL")
+    @account.should be_valid
+  end
+
+  it "should write to the db" do
+    lambda do
+      @account = Account.create!(:value => 10, :total => "20 BRL")
+    end.should change(Account, :count).by(1)
+    Account.last.total.format.should eql("R$20,00")
+  end
 
-      it "should require money" do
-      @product_fake = Product.create(:value => nil)
-      @product_fake.value_in_cents.should eql(0)
-    end
 
   describe "Account" do
 
     before(:each) do
-      @account = Account.create(:value => 10, :total => "20 BRL")
+      @account = Account.create!(:value => 10, :total => "20 BRL")
     end
 
     it "should return an instance of Money" do
       @account.value.should be_instance_of(Money)
     end
 
-    it "should write to the db" do
-      Account.first.value.to_s.should eql("10.00")
+    it "should format out nicely" do
+      @account.value.format.should eql("$10.00")
     end
 
     it "should include nicely" do
@@ -47,7 +67,7 @@ describe "Acts as Money" do
     end
 
     it "should map cents" do
-      @account.value_in_cents.to_s.should eql("1000")
+      @account.value_cents.to_s.should eql("1000")
     end
 
     it "should map currency" do
@@ -71,8 +91,6 @@ describe "Acts as Money" do
       @product.should_not respond_to(:tax_currency)
     end
 
-
-
   end
 
 end

data/spec/money/core_extensions_spec.rb

@@ -20,6 +20,8 @@ describe "Money core extensions" do
     it { "100.37".to_money.should == Money.new(100_37) }
     it { "100,37".to_money.should == Money.new(100_37) }
     it { "100 000".to_money.should == Money.new(100_000_00) }
+    it { "100.000,45".to_money.should == Money.new(100_000_45) }
+    it { "-100.100,45".to_money.should == Money.new(-100_100_45) }
 
     it { "100 USD".to_money.should == Money.new(100_00, "USD") }
     it { "-100 USD".to_money.should == Money.new(-100_00, "USD") }
@@ -34,6 +36,9 @@ describe "Money core extensions" do
     it { "EUR 100,37".to_money.should == Money.new(100_37, "EUR") }
     it { "EUR -100,37".to_money.should == Money.new(-100_37, "EUR") }
 
+    it { "BRL 100,37".to_money.should == Money.new(100_37, "BRL") }
+    it { "BRL -100,37".to_money.should == Money.new(-100_37, "BRL") }
+
     it {"$100 USD".to_money.should == Money.new(100_00, "USD") }
   end
 end

data/spec/money/money_spec.rb

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 require File.dirname(__FILE__) + '/../spec_helper.rb'
 
 describe Money do
@@ -75,8 +76,8 @@ describe Money do
   end
 
   it "should calculate tax" do
-    Money.new(100).with_tax(20).cents.should eql(120)
-    Money.new(100).with_tax(-20).cents.should eql(80)
+    Money.new(100).add_tax(20).cents.should eql(120)
+    Money.new(100).add_tax(-20).cents.should eql(80)
   end
 
   it "should calculate compound tax" do
@@ -95,17 +96,13 @@ describe Money do
   end
 
   it "shuld sum array" do
-    @money = Money.new(10_00).with_tax(10)
+    @money = Money.new(10_00).add_tax(10)
     @money.split_in_installments(3).sum.cents.should eql(1100)
   end
 
-  it "should output as float" do
-    Money.new(10_00).to_f.should eql(10.0)
-  end
+  it {  Money.new(10_00).to_f.should eql(10.0) }
+  it {  Money.new(10_00).to_s.should eql("10.00") }
 
-  it "should output as string" do
-    Money.new(10_00).to_s.should eql("10.00")
-  end
 
   it "should create a new Money object of 0 cents if empty" do
     Money.empty.should == Money.new(0)
@@ -131,50 +128,89 @@ describe Money do
     Money.add_rate("EUR", "USD", 10)
     Money.new(10_00, "EUR").exchange_to("USD").should == Money.new(100_00, "USD")
   end
-end
-
-describe "Actions involving two Money objects" do
-  describe "if the other Money object has the same currency" do
-    it "#<=> compares the two objects' amounts" do
-      (Money.new(1_00, "USD") <=> Money.new(1_00, "USD")).should == 0
-      (Money.new(1_00, "USD") <=> Money.new(99, "USD")).should > 0
-      (Money.new(1_00, "USD") <=> Money.new(2_00, "USD")).should < 0
-    end
-
-    it "#+ adds the other object's amount to the current object's amount while retaining the currency" do
-      (Money.new(10_00, "USD") + Money.new(90, "USD")).should == Money.new(10_90, "USD")
-    end
 
-    it "#- substracts the other object's amount from the current object's amount while retaining the currency" do
-      (Money.new(10_00, "USD") - Money.new(90, "USD")).should == Money.new(9_10, "USD")
-    end
+  it "Money method missing exchange" do
+     Money.add_rate("EUR", "BRL", 10)
+     Money.new(10_00, "EUR").as_brl.should == Money.new(100_00, "BRL")
   end
 
-  describe "if the other Money object has a different currency" do
-    it "#<=> compares the two objects' amount after converting the other object's amount to its own currency" do
-      target = Money.new(200_00, "EUR")
-      target.should_receive(:exchange_to).with("USD").and_return(Money.new(300_00, "USD"))
-      (Money.new(100_00, "USD") <=> target).should < 0
+  describe "Format out " do
 
-      target = Money.new(200_00, "EUR")
-      target.should_receive(:exchange_to).with("USD").and_return(Money.new(100_00, "USD"))
-      (Money.new(100_00, "USD") <=> target).should == 0
+    describe "Options" do
+      before(:each) do
+        @cash = Money.new(200)
+      end
 
-      target = Money.new(200_00, "EUR")
-      target.should_receive(:exchange_to).with("USD").and_return(Money.new(99_00, "USD"))
-      (Money.new(100_00, "USD") <=> target).should > 0
+      it { @cash.format.should eql("$2.00") }
+      it { @cash.format(:symbol => "R$ ").should eql("R$ 2.00") }
+      it { @cash.format(:no_cents => true).should eql("$2") }
+      it { @cash.format(:no_cents => true, :symbol => "R$ ").should eql("R$ 2") }
     end
 
-    it "#+ adds the other object's amount, converted to this object's currency, to this object's amount while retaining its currency" do
-      other = Money.new(90, "EUR")
-      other.should_receive(:exchange_to).with("USD").and_return(Money.new(9_00, "USD"))
-      (Money.new(10_00, "USD") + other).should == Money.new(19_00, "USD")
+    it { Money.new(0).format.should eql("$0.00") }
+    it { Money.new(0).format(:display_free => true).should eql("free") }
+    it { Money.new(0).format(:display_free => "GRATIS").should eql("GRATIS") }
+
+    it { Money.new(9).format.should eql("$0.09") }
+    it { Money.new(99).format.should eql("$0.99") }
+    it { Money.new(800).format.should eql("$8.00") }
+    it { Money.new(-8000).format(:no_cents => true).should eql("$-80") }
+    it { Money.new(80000).format.should eql("$800.00") }
+    it { Money.new(800000).format.should eql("$8,000.00") }
+    it { Money.new(-8000000, "JPY").format(:no_cents => true).should eql("¥-80.000") }
+    it { Money.new(87654321, "BRL").format.should eql("R$876.543,21") }
+    it { Money.new(800000000, "BRL").format.should eql("R$8.000.000,00") }
+    it { Money.new(8000000000, "BRL").format.should eql("R$80.000.000,00") }
+    it { Money.new(80000000000, "CAD").format.should eql("$800,000,000.00") }
+    it { Money.new(880000000000, "GBP").format(:no_cents => true).should eql("£8,800,000,000") }
+    it { Money.new(8800000000088, "EUR").format.should eql("€88,000,000,000.88") }
+
+  end
+
+
+  describe "Actions involving two Money objects" do
+    describe "if the other Money object has the same currency" do
+      it "#<=> compares the two objects' amounts" do
+        (Money.new(1_00, "USD") <=> Money.new(1_00, "USD")).should == 0
+        (Money.new(1_00, "USD") <=> Money.new(99, "USD")).should > 0
+        (Money.new(1_00, "USD") <=> Money.new(2_00, "USD")).should < 0
+      end
+
+      it "#+ adds the other object's amount to the current object's amount while retaining the currency" do
+        (Money.new(10_00, "USD") + Money.new(90, "USD")).should == Money.new(10_90, "USD")
+      end
+
+      it "#- substracts the other object's amount from the current object's amount while retaining the currency" do
+        (Money.new(10_00, "USD") - Money.new(90, "USD")).should == Money.new(9_10, "USD")
+      end
     end
 
-    it "#- substracts the other object's amount, converted to this object's currency, from this object's amount while retaining its currency" do
-      other = Money.new(90, "EUR")
-      other.should_receive(:exchange_to).with("USD").and_return(Money.new(9_00, "USD"))
-      (Money.new(10_00, "USD") - other).should == Money.new(1_00, "USD")
+    describe "if the other Money object has a different currency" do
+      it "#<=> compares the two objects' amount after converting the other object's amount to its own currency" do
+        target = Money.new(200_00, "EUR")
+        target.should_receive(:exchange_to).with("USD").and_return(Money.new(300_00, "USD"))
+        (Money.new(100_00, "USD") <=> target).should < 0
+
+        target = Money.new(200_00, "EUR")
+        target.should_receive(:exchange_to).with("USD").and_return(Money.new(100_00, "USD"))
+        (Money.new(100_00, "USD") <=> target).should == 0
+
+        target = Money.new(200_00, "EUR")
+        target.should_receive(:exchange_to).with("USD").and_return(Money.new(99_00, "USD"))
+        (Money.new(100_00, "USD") <=> target).should > 0
+      end
+
+      it "#+ adds the other object's amount, converted to this object's currency, to this object's amount while retaining its currency" do
+        other = Money.new(90, "EUR")
+        other.should_receive(:exchange_to).with("USD").and_return(Money.new(9_00, "USD"))
+        (Money.new(10_00, "USD") + other).should == Money.new(19_00, "USD")
+      end
+
+      it "#- substracts the other object's amount, converted to this object's currency, from this object's amount while retaining its currency" do
+        other = Money.new(90, "EUR")
+        other.should_receive(:exchange_to).with("USD").and_return(Money.new(9_00, "USD"))
+        (Money.new(10_00, "USD") - other).should == Money.new(1_00, "USD")
+      end
     end
   end
 end

data/spec/spec.opts

@@ -0,0 +1,4 @@
+--colour
+--format progress
+--loadby mtime
+--reverse

data/spec/spec_helper.rb

@@ -11,12 +11,10 @@ $:.unshift(File.dirname(__FILE__) + '/../lib')
 require 'money'
 
 config = YAML.load_file(File.dirname(__FILE__) + '/db/database.yml')
-ActiveRecord::Base.logger = Logger.new(File.dirname(__FILE__) + "/debug.log")
+ActiveRecord::Base.logger = Logger.new("/tmp/money-debug.log")
 ActiveRecord::Base.establish_connection(config)
 
 
 def load_schema
   load(File.dirname(__FILE__) + "/db/schema.rb")
 end
-
-

metadata

@@ -1,19 +1,20 @@
 --- !ruby/object:Gem::Specification 
 name: nofxx-money
 version: !ruby/object:Gem::Version 
-  version: 2.2.2
+  version: 2.3.1
 platform: ruby
 authors: 
-- FIXME full name
+- Money Team
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2009-02-12 00:00:00 -08:00
+date: 2009-03-15 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: newgem
+  type: :development
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
@@ -23,6 +24,7 @@ dependencies:
     version: 
 - !ruby/object:Gem::Dependency 
   name: hoe
+  type: :development
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
@@ -32,7 +34,7 @@ dependencies:
     version: 
 description: This library aids one in handling money and different currencies.
 email: 
-- FIXME email
+- see@readme
 executables: []
 
 extensions: []
@@ -58,14 +60,15 @@ files:
 - script/console
 - script/destroy
 - script/generate
-- spec/db/acts_as_money.sqlite3
 - spec/db/database.yml
 - spec/db/schema.rb
 - spec/money/acts_as_money_spec.rb
 - spec/money/core_extensions_spec.rb
 - spec/money/exchange_bank_spec.rb
 - spec/money/money_spec.rb
+- spec/spec.opts
 - spec/spec_helper.rb
+- tmp/acts_as_money.sqlite3
 has_rdoc: true
 homepage: http://github.com/nofxx/money
 post_install_message: