ShadowBelmolve-money 2.3.1 → 2.3.3

data/README.rdoc

@@ -12,7 +12,7 @@ This library aids one in handling money and different currencies. Features:
 
 Resources:
 
-- This fork: http://github.com/nofxx/money
+- This fork: http://github.com/ShadowBelmolve/money
 - Website: http://money.rubyforge.org
 - RDoc API: http://money.rubyforge.org
 - Git repository: http://github.com/FooBarWidget/money/tree/master
@@ -42,8 +42,11 @@ The development version (hosted on Github) can be installed with:
   money.currency  # => "USD"
   money.format    # => "$10.00"
 
+  Money.new(880088, "EUR").format # => €8,800.88
+  Money.new(-8000).format(:no_cents => true)  # => $-80
+
   Money.new(1000, "USD") == Money.new(1000, "USD")   # => true
-  Money.new(1000, "USD") == Money.new(100, "USD")    # => false
+  Money.new(1000, "USD") == Money.new( 100, "USD")   # => false
   Money.new(1000, "USD") == Money.new(1000, "EUR")   # => false
 
 
@@ -53,25 +56,31 @@ Exchanging money is performed through an exchange bank object. The default
 exchange bank object requires one to manually specify the exchange rate. Here's
 an example of how it works:
 
-  Money.add_rate("USD", "CAD", 1.24515)
-  Money.add_rate("CAD", "USD", 0.803115)
+  Money.add_rate("CAD", 0.803115)
+  Money.add_rate("USD", 1.24515)
 
-  Money.us_dollar(100).exchange_to("CAD")  # => Money.new(124, "CAD")
-  Money.ca_dollar(100).exchange_to("USD")  # => Money.new(80, "USD")
+  Money.us_dollar(100_00).exchange_to("CAD")  # => Money.new(15504, "CAD")
+  Money.ca_dollar(100_00).exchange_to("USD")  # => Money.new(6450, "USD")
 
 or
 
-  Money.us_dollar(100).to_cad              # => Money.new(124, "CAD")
-  Money.ca_dollar(100).to_usd              # => Money.new(80, "USD")
+  Money.us_dollar(100).as_cad              # => Money.new(155, "CAD")
+  Money.ca_dollar(100).as_usd              # => Money.new(64, "USD")
 
 Comparison and arithmetic operations work as expected:
 
   Money.new(1000, "USD") <=> Money.new(900, "USD")   # => 1; 9.00 USD is smaller
   Money.new(1000, "EUR") + Money.new(10, "EUR") == Money.new(1010, "EUR")
 
-  Money.add_rate("USD", "EUR", 0.5)
+  Money.add_rate("EUR", 0.5)
   Money.new(1000, "EUR") + Money.new(1000, "USD") == Money.new(1500, "EUR")
 
+Fetch the exchange rates published by the European Bank
+
+  Money.default_bank.fetch_rates          # Fetch the rates
+  Money.default_bank.auto_fetch 3600      # Fetch the rates every hour
+  Money.default_bank.stop_fetch           # Stop auto-fetch
+
 There is nothing stopping you from creating bank objects which scrapes
 www.xe.com for the current rates or just returns <tt>rand(2)</tt>:
 
@@ -80,9 +89,9 @@ www.xe.com for the current rates or just returns <tt>rand(2)</tt>:
 
 === Ruby on Rails
 
-Use the +has_many+ helper to embed the money object in your models.
-The following example requires a +price_in_cents+ and a +price_currency+
-fields.
+Use the +has_money+ method to embed the money object in your models.
+The following example requires a +price_cents+ and a +price_currency+
+fields on the database.
 
 config/enviroment.rb
 
@@ -107,7 +116,7 @@ migration:
 
 === Default Currency
 
-By default Money defaults to USD as its currency. This can be overwritten using
+By default Money defaults to USD as its currency. This can be overwritten using:
 
   Money.default_currency = "CAD"
 

data/lib/money.rb

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

data/lib/money/acts_as_money.rb

@@ -24,7 +24,7 @@ module ActsAsMoney #:nodoc:
     #
     def has_money(*attributes)
       config = {:with_currency => true, :with_cents => false,
-                :allow_nil => true }.update(attributes.extract_options!)
+                :allow_nil => false }.update(attributes.extract_options!)
 
       for attribute in attributes do
         mapping = [[config[:cents] || "#{attribute}_cents", 'cents']]

data/lib/money/money.rb

@@ -28,6 +28,9 @@ class Money
     attr_accessor :default_currency
   end
 
+  self.default_bank = VariableExchangeBank.instance
+  self.default_currency = "USD"
+
   CURRENCIES = {
     "USD" => { :delimiter => ",", :separator => ".", :symbol => "$" },
     "CAD" => { :delimiter => ",", :separator => ".", :symbol => "$" },
@@ -38,9 +41,6 @@ class Money
     "GBP" => { :delimiter => ",", :separator => ".", :symbol => '£', :html => '£' },
     "JPY" => { :delimiter => ".", :separator => ".", :symbol => '¥', :html => '¥' },
   }
-  self.default_bank = VariableExchangeBank.instance
-  self.default_currency = "USD"
-
 
   # Create a new money object with value 0.
   def self.empty(currency = default_currency)
@@ -67,8 +67,8 @@ class Money
     Money.new(cents, "BRL")
   end
 
-  def self.add_rate(from_currency, to_currency, rate)
-    Money.default_bank.add_rate(from_currency, to_currency, rate)
+  def self.add_rate(currency, rate)
+    Money.default_bank.add_rate(currency, rate)
   end
 
   # Creates a new money object.
@@ -76,10 +76,10 @@ 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
-    @currency = currency
-    @bank = bank
+  def initialize(cents, currency = nil, bank = nil)
+    @cents = cents.to_i
+    @currency = currency || Money.default_currency
+    @bank = bank || Money.default_bank
   end
 
   # Do two money objects equal? Only works if both objects are of the same currency
@@ -96,6 +96,7 @@ class Money
   end
 
   def +(other_money)
+    other_money = Money.new(other_money) unless other_money.is_a? Money
     if currency == other_money.currency
       Money.new(cents + other_money.cents, other_money.currency)
     else
@@ -104,6 +105,7 @@ class Money
   end
 
   def -(other_money)
+    other_money = Money.new(other_money) unless other_money.is_a? Money
     if currency == other_money.currency
       Money.new(cents - other_money.cents, other_money.currency)
     else
@@ -138,13 +140,13 @@ 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))
+  def compound_interest(rate, count = 1, period = 12)
+    Money.new(cents * ((1 + rate / 100.0 / period) ** count - 1))
   end
 
   # Calculate self + simple interest
-  def simple_interest(rate,count=1)
-    Money.new(rate/100/12*cents*count)
+  def simple_interest(rate, count = 1, period = 12)
+    Money.new(rate / 100 / period * cents * count)
   end
 
   # Split money in number of installments
@@ -152,10 +154,11 @@ class Money
   # 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)
+  def split_in_installments(fixnum, order=false)
     wallet = Wallet.new(fixnum, Money.new(cents/fixnum,currency))
     to_add = cents % fixnum
     to_add.times { |m| wallet[m] += Money.new(1) }
+    wallet.reverse! if order
     wallet
   end
 
@@ -164,8 +167,8 @@ class Money
   # 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)
+  def in_installments_of(other_money, order=false)
+    split_in_installments(cents/other_money.cents, order)
   end
 
   # Just a helper if you got tax inputs in percentage.
@@ -220,6 +223,7 @@ class Money
     else
       symbol = CURRENCIES[currency][:symbol]
     end
+    self.currency
 
     if rules[:no_cents]
       formatted = sprintf("#{symbol}%d", cents.to_f / 100)
@@ -239,8 +243,9 @@ class Money
       formatted << currency
       formatted << '</span>' if rules[:html]
     end
+    formatted.gsub!(CURRENCIES[currency][:symbol],CURRENCIES[currency][:html]) if rules[:html]
     formatted
-  end
+   end
 
    def normalize_formatting_rules(rules)
     if rules.size == 1
@@ -261,6 +266,11 @@ class Money
     sprintf("%.2f", cents / 100.0)
   end
 
+  # Money.new(123).to_i => "100"
+  def to_i
+    cents
+  end
+
   # Money.ca_dollar(100).to_f => "1.0"
   def to_f
     cents / 100.0

data/lib/money/variable_exchange_bank.rb

@@ -1,5 +1,7 @@
-require 'thread'
 require 'money/errors'
+require 'net/http'
+require 'rubygems'
+require 'hpricot'
 
 # Class for aiding in exchanging money between different currencies.
 # By default, the Money class uses an object of this class (accessible through
@@ -10,13 +12,13 @@ require 'money/errors'
 # exchanges with +exchange+. For example:
 #
 #  bank = Money::VariableExchangeBank.new
-#  bank.add_rate("USD", "CAD", 1.24515)
-#  bank.add_rate("CAD", "USD", 0.803115)
+#  bank.add_rate("CAD", 0.803115)
+#  bank.add_rate("USD", 1.24515)
 #  
 #  # Exchange 100 CAD to USD:
-#  bank.exchange(100_00, "CAD", "USD")  # => 124
+#  bank.exchange(100_00, "CAD", "USD")  # => 15504
 #  # Exchange 100 USD to CAD:
-#  bank.exchange(100_00, "USD", "CAD")  # => 80
+#  bank.exchange(100_00, "USD", "CAD")  # => 6450
 class Money
   class VariableExchangeBank
     # Returns the singleton instance of VariableExchangeBank.
@@ -28,22 +30,16 @@ class Money
     
     def initialize
       @rates = {}
-      @mutex = Mutex.new
+      @rates["USD"] = 1.0
     end
-    
-    # Registers a conversion rate. +from+ and +to+ are both currency names.
-    def add_rate(from, to, rate)
-      @mutex.synchronize do
-        @rates["#{from}_TO_#{to}".upcase] = rate
-      end
+
+    def add_rate(currency, rate)
+      @rates[currency.upcase] = (currency.upcase != Money.default_currency) ? (rate * @rates[Money.default_currency]) : rate
     end
-    
-    # Gets the rate for exchanging the currency named +from+ to the currency
-    # named +to+. Returns nil if the rate is unknown.
-    def get_rate(from, to)
-      @mutex.synchronize do
-        @rates["#{from}_TO_#{to}".upcase] 
-      end
+
+    def get_rate(currency = nil)
+      return nil unless @rates[currency]
+      (currency != Money.default_currency) ? @rates[currency.upcase] / @rates[Money.default_currency] : @rates[currency.upcase]
     end
     
     # Given two currency names, checks whether they're both the same currency.
@@ -60,11 +56,44 @@ class Money
     #
     # If the conversion rate is unknown, then Money::UnknownRate will be raised.
     def exchange(cents, from_currency, to_currency)
-      rate = get_rate(from_currency, to_currency)
-      if !rate
+      from_currency.upcase!
+      to_currency.upcase!
+      if !@rates[from_currency] or !@rates[to_currency]        
         raise Money::UnknownRate, "No conversion rate known for '#{from_currency}' -> '#{to_currency}'"
       end
-      (cents * rate).floor
+      ((cents / @rates[from_currency]) * @rates[to_currency]).round
+    end
+
+    # Fetch rates
+    def fetch_rates
+      xml = Hpricot.XML(
+        Net::HTTP.get(
+          URI.parse('http://www.ecb.int/stats/eurofxref/eurofxref-daily.xml')
+                     )
+             )
+
+      @rates["EUR"] = 1.0
+      (xml/:Cube).each do |ele|
+        @rates[ele['currency'].upcase] = ele['rate'].to_f if ele['currency']
+      end
+    end
+
+
+    # Auto fetch the currencies every X seconds
+    # if no time is give, will fetch every hour
+    def auto_fetch(time = 60*60)
+      @auto_fetch.kill if (@auto_fetch && @auto_fetch.alive?)
+      @auto_fetch = Thread.new {
+        loop do
+          self.fetch_rates
+          sleep time
+        end
+      }
+    end
+
+    # stop auto fetch
+    def stop_fetch
+      @auto_fetch.kill if (@auto_fetch && @auto_fetch.alive?)
     end
     
     @@singleton = VariableExchangeBank.new

data/money.gemspec

@@ -2,15 +2,15 @@
 
 Gem::Specification.new do |s|
   s.name = %q{money}
-  s.version = "2.3.1"
+  s.version = "2.3.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Money Team"]
-  s.date = %q{2009-03-15}
+  s.date = %q{2009-03-24}
   s.description = %q{This library aids one in handling money and different currencies.}
   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/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.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" ]
   s.has_rdoc = true
   s.homepage = %q{http://github.com/ShadowBelmolve/money}
   s.rdoc_options = ["--main", "README.rdoc"]
@@ -24,14 +24,14 @@ Gem::Specification.new do |s|
     s.specification_version = 2
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<newgem>, [">= 1.2.3"])
+      s.add_development_dependency(%q<newgem>, [">= 1.3.0"])
       s.add_development_dependency(%q<hoe>, [">= 1.8.0"])
     else
-      s.add_dependency(%q<newgem>, [">= 1.2.3"])
+      s.add_dependency(%q<newgem>, [">= 1.3.0"])
       s.add_dependency(%q<hoe>, [">= 1.8.0"])
     end
   else
-    s.add_dependency(%q<newgem>, [">= 1.2.3"])
+    s.add_dependency(%q<newgem>, [">= 1.3.0"])
     s.add_dependency(%q<hoe>, [">= 1.8.0"])
   end
 end

data/spec/money/acts_as_money_spec.rb

@@ -1,9 +1,6 @@
 require File.dirname(__FILE__) + '/../spec_helper.rb'
 require File.dirname(__FILE__) + '/../../rails/init.rb'
 
-# Uncomment this once to create the db
- load_schema
-
 class Account < ActiveRecord::Base
   has_money :value, :total, :allow_nil => true
 end

data/spec/money/exchange_bank_spec.rb

@@ -6,39 +6,41 @@ describe Money::VariableExchangeBank do
   end
 
   it "returns the previously specified conversion rate" do
-    @bank.add_rate("USD", "EUR", 0.788332676)
-    @bank.add_rate("EUR", "YEN", 122.631477)
-    @bank.get_rate("USD", "EUR").should == 0.788332676
-    @bank.get_rate("EUR", "YEN").should == 122.631477
+    @bank.add_rate("USD", 0.788332676)
+    @bank.add_rate("EUR", 122.631477)
+    @bank.get_rate("USD").should == 0.788332676
+    @bank.get_rate("EUR").should == 122.631477
   end
 
   it "treats currency names case-insensitively" do
-    @bank.add_rate("usd", "eur", 1)
-    @bank.get_rate("USD", "EUR").should == 1
+    @bank.add_rate("usd", 1)
+    @bank.get_rate("USD").should == 1
     @bank.same_currency?("USD", "usd").should be_true
     @bank.same_currency?("EUR", "usd").should be_false
   end
 
   it "returns nil if the conversion rate is unknown" do
-    @bank.get_rate("American Pesos", "EUR").should be_nil
+    @bank.get_rate("American Pesos").should be_nil
   end
 
   it "exchanges money from one currency to another according to the specified conversion rates" do
-    @bank.add_rate("USD", "EUR", 0.5)
-    @bank.add_rate("EUR", "YEN", 10)
+    @bank.add_rate("USD", 1.0)
+    @bank.add_rate("EUR", 0.5)
+    @bank.add_rate("YEN", 5)
     @bank.exchange(10_00, "USD", "EUR").should == 5_00
     @bank.exchange(500_00, "EUR", "YEN").should == 5000_00
   end
 
   it "rounds the exchanged result down" do
-    @bank.add_rate("USD", "EUR", 0.788332676)
-    @bank.add_rate("EUR", "YEN", 122.631477)
+    @bank.add_rate("USD", 1.0)
+    @bank.add_rate("EUR", 0.788332676)
+    @bank.add_rate("YEN", 122.631477)
     @bank.exchange(10_00, "USD", "EUR").should == 788
-    @bank.exchange(500_00, "EUR", "YEN").should == 6131573
+    @bank.exchange(500_00, "EUR", "YEN").should == 7777901
   end
 
   it "raises Money::UnknownRate upon conversion if the conversion rate is unknown" do
-    block = lambda { @bank.exchange(10, "USD", "EUR") }
+    block = lambda { @bank.exchange(10, "USD", "ABC") }
     block.should raise_error(Money::UnknownRate)
   end
 end

data/spec/money/money_spec.rb

@@ -2,6 +2,10 @@
 require File.dirname(__FILE__) + '/../spec_helper.rb'
 
 describe Money do
+
+  it {  Money.new(10_00).to_f.should eql(10.0) }
+  it {  Money.new(10_00).to_s.should eql("10.00") }
+
   it "is associated to the singleton instance of VariableExchangeBank by default" do
     Money.new(0).bank.object_id.should == Money::VariableExchangeBank.instance.object_id
   end
@@ -11,9 +15,13 @@ describe Money do
   end
 
   it "should rounds the given cents to an integer" do
-    Money.new(1.00, "USD").cents.should == 1
+    Money.new(1.0, "USD").cents.should == 1
     Money.new(1.01, "USD").cents.should == 1
-    Money.new(1.50, "USD").cents.should == 2
+  end
+
+  it "should use the floor method" do
+    Money.new(1.50, "USD").cents.should == 1
+    Money.new(1.99, "USD").cents.should == 1
   end
 
   it "#currency returns the currency passed to the constructor" do
@@ -34,76 +42,32 @@ describe Money do
     money.exchange_to("EUR")
   end
 
-  it "#exchange_to exchanges the amount properly" do
+  it "should exchange_to exchanges the amount properly" do
     money = Money.new(100_00, "USD")
     money.bank.should_receive(:exchange).with(100_00, "USD", "EUR").and_return(200_00)
     money.exchange_to("EUR").should == Money.new(200_00, "EUR")
   end
 
-  it "#== returns true if and only if their amount and currency are equal" do
+  it "should returns true if and only if their amount and currency are equal" do
     Money.new(1_00, "USD").should == Money.new(1_00, "USD")
   end
 
-  it "#* multiplies the money's amount by the multiplier while retaining the currency" do
-    (Money.new(1_00, "USD") * 10).should == Money.new(10_00, "USD")
+  it "should add retaining the currency" do
+    (Money.new(1_00, "USD") + 10).should == Money.new(1_10, "USD")
   end
 
-  it "#* divides the money's amount by the divisor while retaining the currency" do
-    (Money.new(10_00, "USD") / 10).should == Money.new(1_00, "USD")
+  it "should substract retaining the currency" do
+    (Money.new(1_00, "USD") - 10).should == Money.new(90, "USD")
   end
 
-  it "# divides the money ammout in installments add last" do
-    @money = Money.new(10_00).split_in_installments(3)
-    @money[0].cents.should eql(334)
-    @money[1].cents.should eql(333)
-    @money[2].cents.should eql(333)
-  end
-
-  it "# divides the money ammout in installments add first" do
-    @money = Money.new(10_00).split_in_installments(3,true)
-    @money.to_s.should eql(["3.34", "3.33", "3.33"])
-  end
-
-  it "# divides the money ammout in installments base on payment" do
-    money = Money.new(3_00)
-    Money.new(10_00).in_installments_of(money)[0].cents.should eql(334)
-    Money.new(10_00).in_installments_of(money)[1].cents.should eql(333)
-    Money.new(10_00).in_installments_of(money)[2].cents.should eql(333)
-  end
-
-  it "shuld sum array" do
-    Money.new(10_00).split_in_installments(3).sum.cents.should eql(1000)
-  end
-
-  it "should calculate tax" do
-    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
-    @ma = Money.new(1000_00)
-    @ma.compound_interest(12.99,12).to_s.should eql("137.92")
-  end
-
-  it "should calculate compound tax" do
-    @ma = Money.new(1000_00)
-    @ma.simple_interest(12.99,12).to_s.should eql("129.90")
-  end
-
-  it "should calculate compound tax" do
-    @ma = Money.new(2500_00)
-    @ma.compound_interest(12.99,3).to_s.should eql("82.07")
+  it "should multiply while retaining the currency" do
+    (Money.new(1_00, "USD") * 10).should == Money.new(10_00, "USD")
   end
 
-  it "shuld sum array" do
-    @money = Money.new(10_00).add_tax(10)
-    @money.split_in_installments(3).sum.cents.should eql(1100)
+  it "should divides while retaining the currency" do
+    (Money.new(10_00, "USD") / 10).should == Money.new(1_00, "USD")
   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 create a new Money object of 0 cents if empty" do
     Money.empty.should == Money.new(0)
   end
@@ -124,27 +88,97 @@ describe Money do
     Money.real(50).should == Money.new(50, "BRL")
   end
 
-  it "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")
+  describe "Installments" do
+
+    it "# divides the money ammout in installments add first" do
+      @money = Money.new(10_00).split_in_installments(3)
+      @money[0].cents.should eql(334)
+      @money[1].cents.should eql(333)
+      @money[2].cents.should eql(333)
+    end
+
+    it "# divides the money ammout in installments add last" do
+      @money = Money.new(10_00).split_in_installments(3,true)
+      @money.to_s.should eql(["3.33", "3.33", "3.34"])
+    end
+
+    it "# divides the money ammout in installments base on payment" do
+      money = Money.new(3_00)
+      Money.new(10_00).in_installments_of(money)[0].cents.should eql(334)
+      Money.new(10_00).in_installments_of(money)[1].cents.should eql(333)
+      Money.new(10_00).in_installments_of(money)[2].cents.should eql(333)
+    end
+
+    it "shuld sum array" do
+      Money.new(10_00).split_in_installments(3).sum.cents.should eql(1000)
+    end
+
+    it "should calculate tax" do
+      Money.new(100).add_tax(20).cents.should eql(120)
+      Money.new(100).add_tax(-20).cents.should eql(80)
+    end
+
+    it "shuld to_s wallet" do
+      @money = Money.new(10_00)
+      @money.split_in_installments(3).to_s.should eql(["3.34", "3.33", "3.33"])
+    end
+
+    it "shuld sum array" do
+      @money = Money.new(10_00).add_tax(10)
+      @money.split_in_installments(3).sum.cents.should eql(1100)
+    end
+
   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")
+  describe "Taxes and Interest" do
+
+    it "Money.add_rate works" do
+      Money.add_rate("USD", 1.0)
+      Money.add_rate("EUR", 10)
+      Money.new(10_00, "EUR").exchange_to("USD").should == Money.new(1_00, "USD")
+    end
+
+    it "Money method missing exchange" do
+      Money.add_rate("EUR", 1.0)
+      Money.add_rate("BRL", 10)
+      Money.new(10_00, "EUR").as_brl.should == Money.new(100_00, "BRL")
+    end
+
+    it "should calculate compound tax" do
+      m = Money.new(1000_00)
+      m.compound_interest(12.99,12).to_s.should eql("137.91")
+    end
+
+    it "should simple interest" do
+      m = Money.new(1000_00)
+      m.simple_interest(12.99,12).to_s.should eql("129.90")
+    end
+
+    it "should calculate compound interest" do
+      m = Money.new(2500_00)
+      m.compound_interest(12.99,3).to_s.should eql("82.06")
+    end
+
+    it "should calculate compound interest" do
+      m = Money.new(2500_00)
+      m.compound_interest(12.99,3,6).to_s.should eql("165.91")
+    end
+
   end
 
   describe "Format out " do
 
     describe "Options" do
       before(:each) do
-        @cash = Money.new(200)
+        @cash =  Money.new(2_00, "JPY")
       end
 
-      it { @cash.format.should eql("$2.00") }
+      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).should eql("¥2") }
       it { @cash.format(:no_cents => true, :symbol => "R$ ").should eql("R$ 2") }
+      it { @cash.format(:html => true).should eql("¥2.00") }
+
     end
 
     it { Money.new(0).format.should eql("$0.00") }

data/spec/spec_helper.rb

@@ -14,7 +14,6 @@ config = YAML.load_file(File.dirname(__FILE__) + '/db/database.yml')
 ActiveRecord::Base.logger = Logger.new("/tmp/money-debug.log")
 ActiveRecord::Base.establish_connection(config)
 
+db_file = File.exists?(File.dirname(__FILE__) + '/../tmp/acts_as_money.sqlite3')
+load(File.dirname(__FILE__) + "/db/schema.rb") unless db_file
 
-def load_schema
-  load(File.dirname(__FILE__) + "/db/schema.rb")
-end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: ShadowBelmolve-money
 version: !ruby/object:Gem::Version 
-  version: 2.3.1
+  version: 2.3.3
 platform: ruby
 authors: 
 - Money Team
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-03-15 00:00:00 -07:00
+date: 2009-03-24 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -20,7 +20,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.2.3
+        version: 1.3.0
     version: 
 - !ruby/object:Gem::Dependency 
   name: hoe
@@ -68,7 +68,6 @@ files:
 - spec/money/money_spec.rb
 - spec/spec.opts
 - spec/spec_helper.rb
-- tmp/acts_as_money.sqlite3
 has_rdoc: true
 homepage: http://github.com/ShadowBelmolve/money
 post_install_message: