nofxx-money 2.3.6 → 2.3.8

data/Manifest.txt

@@ -22,4 +22,3 @@ 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

@@ -10,28 +10,14 @@ This library aids one in handling money and different currencies. Features:
 - Has the ability to parse a money string into a Money object.
 - Provides ActiveRecord "has_money" method.
 
-Resources:
-
-- Website: http://money.rubyforge.org
-- RDoc API: http://money.rubyforge.org
-- This fork: http://github.com/ShadowBelmolve/money
-- Forked from: http://github.com/nofxx/money
-- Git repository: http://github.com/FooBarWidget/money/tree/master
-
-
-== Download
-
-Install stable releases with the following command:
-
-  gem install money
 
-The development version (hosted on Github) can be installed with:
+== Install
 
   gem sources -a http://gems.github.com
-  gem install nofxx-money
+  gem install <this-fork>-money
 
 
-== Usage
+== Use
 
 === Synopsis
 
@@ -51,6 +37,14 @@ The development version (hosted on Github) can be installed with:
   Money.new(1000, "USD") == Money.new(1000, "EUR")   # => false
 
 
+=== Rounding
+
+You can use round_to_coin when you don't have currency with coins for cents.
+E.g. if the smallest coin is 0.50, then
+
+  Money.new(1448, 'CZK').round_to_coin(50).to_s  # => "14.50"
+
+
 === Currency Exchange
 
 Exchanging money is performed through an exchange bank object. The default
@@ -88,6 +82,17 @@ www.xe.com for the current rates or just returns <tt>rand(2)</tt>:
   Money.default_bank = ExchangeBankWhichScrapesXeDotCom.new
 
 
+=== Default Currency
+
+By default Money defaults to USD as its currency. This can be overwritten using:
+
+  Money.default_currency = "CAD"
+
+If you use Rails, then environment.rb is a very good place to put this.
+
+
+== Webapps
+
 === Ruby on Rails
 
 Use the +has_money+ method to embed the money object in your models.
@@ -96,7 +101,7 @@ fields on the database.
 
 config/enviroment.rb
 
-  require.gem 'nofxx-money', :lib => 'money'
+  require.gem 'bobek-money', :lib => 'money'
 
 app/models/product.rb
 
@@ -115,18 +120,25 @@ migration:
   end
 
 
-=== Default Currency
+=== jQuery
 
-By default Money defaults to USD as its currency. This can be overwritten using:
+Check out http://meiaduzia.com.br/cuducos2/priceformat for a nice
+mask for webapp's textfields.
 
-  Money.default_currency = "CAD"
 
-If you use Rails, then environment.rb is a very good place to put this.
+== About
+
+Resources:
 
+Orinally developed by:
+
+- Forked from: http://github.com/FooBarWidget/money
+- Website: http://money.rubyforge.org
+- RDoc API: http://money.rubyforge.org
 
-== TODO
 
-* Better validation (fix composed_of allow_nil)
-* Interest (almost there..)
-* Remote rate fetching
+This branch is part of:
 
+:: http://github.com/bobek/money
+:: http://github.com/nofxx/money
+:: http://github.com/ShadowBelmove/money

data/VERSION

@@ -1 +1 @@
-2.3.6
+2.3.8

data/lib/money/core_extensions.rb

@@ -13,7 +13,7 @@ class Numeric
         Money.new(self.to_s.gsub(/\./,'').to_i)
       end
     else
-      Money.new(self * 100)
+      Money.new((self * 100).round)
     end
   end
 end
@@ -22,12 +22,12 @@ class String
   # Parses the current string and converts it to a Money object.
   # Excess characters will be discarded.
   #
-  #   '100'.to_money       # => #<Money @cents=100>
+  #   '100'.to_money       # => #<Money @cents=10000>
   #   '100.37'.to_money    # => #<Money @cents=10037>
-  #   '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">
+  #   '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">
+  #   'hello 2000 world'.to_money   # => #<Money @cents=200000 @currency="USD")>
   def to_money(with_cents = false)
     # Get the currency.
     matches = scan /([A-Z]{2,3})/
@@ -38,7 +38,7 @@ class String
 
   private
 
-  def calculate_cents(number, with_cents = true)
+  def calculate_cents(number, with_cents)
     # remove anything that's not a number, potential delimiter, or minus sign
     num = number.gsub(/[^\d|\.|,|\'|\s|\-]/, '').strip
 
@@ -89,12 +89,14 @@ 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.
-        # 1,00 => 1.00
-        # 1.0000 => 1.00
-        # 1.2 => 1.20
+        #   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
@@ -104,8 +106,8 @@ class String
           # the major length is greater than three, which means
           # the comma or period is used as a delimiter
           # e.g.
-          # 1000,000
-          # 100000,000
+          #   1000,000
+          #   100000,000
           if possible_major.length > 3
             major, minor = possible_major, possible_minor
           else
@@ -124,16 +126,27 @@ 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
-    if with_cents and minor == 0
-      cents = "#{major}.#{minor}".to_f
+    # avoiding floating point arithmetic here to ensure accuracy
+    if with_cents #and minor == 0
+      cents = major.to_i
     else
-      cents = "#{major}.#{minor}".to_f * 100
+      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
     end
 
-
     # if negative, multiply by -1; otherwise, return positive cents
     negative ? cents * -1 : cents
   end
 
 end
+

data/lib/money/exchange_bank.rb

@@ -26,6 +26,10 @@ end
 #  bank.exchange(100_00, "USD", "CAD")  # => 6450
 class Money
   class ExchangeBank
+    #
+    # Rates to be autofetched
+    attr_accessor :default_rates
+
     # Returns the singleton instance of ExchangeBank.
     #
     # By default, <tt>Money.default_bank</tt> returns the same object.
@@ -51,6 +55,7 @@ class Money
       @mutex.synchronize do
         @rates["#{from}<>#{to}".upcase] = rate
         @rates["#{to}<>#{from}".upcase] = 1.0/rate
+        @rates["sync_at"] = Time.now.to_i
       end
     end
 
@@ -74,21 +79,27 @@ class Money
     # Returns the amount of cents in +to_currency+ as an integer, rounded down.
     #
     # 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
-        raise Money::UnknownRate, "No conversion rate known for '#{from_currency}' -> '#{to_currency}'"
-      end
+    def exchange(cents, from, to)
+      rate =  get_rate(from, to)
+      raise(Money::UnknownRate, "No conversion rate for #{from} -> #{to}") unless rate
       (cents * rate).floor
     end
 
+    def fetch_rate(from, to)
+
+    end
+
     # Fetch rates
     def fetch_rates
       xml = Parser::XML(Net::HTTP.get(URI.parse('http://www.ecb.int/stats/eurofxref/eurofxref-daily.xml')))
       curr = (xml/:Cube).select { |r| r["currency"] == Money.default_currency }.first
       diff = Money.default_currency == "EUR" || !curr ? 1 : curr["rate"].to_f
       (xml/:Cube).each do |x|
-        parse_rate x['rate'].to_f / diff, curr ? Money.default_currency : "EUR", x['currency'].upcase if x['currency']
+        r = x['rate'].to_f
+        c = x['currency'] || ""
+        unless default_rates && !default_rates.include?(c)
+          parse_rate r / diff, curr ? Money.default_currency : "EUR", c.upcase
+        end
       end
       parse_rate diff, Money.default_currency, "EUR" if curr
       self

data/lib/money/money.rb

@@ -99,6 +99,7 @@ class Money
   end
 
   def <=>(other_money)
+    other_money = Money.new(other_money) unless other_money.is_a? Money
     if bank.same_currency?(currency, other_money.currency)
       cents <=> other_money.cents
     else

data/money.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{money}
-  s.version = "2.3.6"
+  s.version = "2.3.8"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Money Team"]
-  s.date = %q{2009-05-29}
+  s.date = %q{2009-06-20}
   s.description = %q{This library aids one in handling money and different currencies.}
   s.email = %q{see@reame}
   s.extra_rdoc_files = [
@@ -41,14 +41,14 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/nofxx/money}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.3}
+  s.rubygems_version = %q{1.3.4}
   s.summary = %q{This library aids one in handling money and different currencies.}
   s.test_files = [
-    "spec/money/exchange_bank_spec.rb",
+    "spec/db/schema.rb",
      "spec/money/acts_as_money_spec.rb",
+     "spec/money/exchange_bank_spec.rb",
      "spec/money/money_spec.rb",
      "spec/money/core_extensions_spec.rb",
-     "spec/db/schema.rb",
      "spec/spec_helper.rb"
   ]
 

data/spec/money/core_extensions_spec.rb

@@ -15,30 +15,48 @@ describe "Money core extensions" do
     end
   end
 
-  describe "String#to_money works" do
-    it { "100".to_money.should == Money.new(100_00) }
-    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) }
+  describe "String#to_money" do
+    EXAMPLES = {
+      "20.15" => {:cents => Money.new(20_15), :no_cents => Money.new(20)},
+      "100"   => {:cents => Money.new(100_00), :no_cents => Money.new(100)},
+      "100.37"   => {:cents => Money.new(100_37), :no_cents => Money.new(100)},
+      "100,37"   => {:cents => Money.new(100_37), :no_cents => Money.new(100)},
+      "100 000"  => {:cents => Money.new(100_000_00), :no_cents => Money.new(100_000)},
+      "100 USD"  => {:cents => Money.new(100_00, "USD"), :no_cents => Money.new(100, "USD")},
+      "-100 USD" => {:cents => Money.new(-100_00, "USD"), :no_cents => Money.new(-100, "USD")},
+      "100 EUR"  => {:cents => Money.new(100_00, "EUR"), :no_cents => Money.new(100, "EUR")},
+      "$100 USD" => {:cents => Money.new(100_00, "USD"), :no_cents => Money.new(100, "USD")},
+      "USD 100"  => {:cents => Money.new(100_00, "USD"), :no_cents => Money.new(100, "USD")},
+      "EUR 100"  => {:cents => Money.new(100_00, "EUR"), :no_cents => Money.new(100, "EUR")},
+      "1,000.5"  => {:cents => Money.new(1_000_50), :no_cents => Money.new(1_000) },
+      "1,000.51" => {:cents => Money.new(1_000_51), :no_cents => Money.new(1_000) },
+      "100.000,45"  => {:cents => Money.new(100_000_45), :no_cents => Money.new(100_000)},
+      "-100.100,45" => {:cents => Money.new(-100_100_45), :no_cents => Money.new(-100_100)},
+      "1,000.505"   => {:cents => Money.new(1_000_51), :no_cents => Money.new(1_000) },
+      "1,000.504"   => {:cents => Money.new(1_000_50), :no_cents => Money.new(1_000) },
+      "100.37 EUR"  => {:cents => Money.new(100_37, "EUR"), :no_cents => Money.new(100, "EUR")},
+      "100,37 EUR"  => {:cents => Money.new(100_37, "EUR"), :no_cents => Money.new(100, "EUR")},
+      "EUR 100.37"  => {:cents => Money.new(100_37, "EUR"), :no_cents => Money.new(100, "EUR")},
+      "CAD -100.37" => {:cents => Money.new(-100_37, "CAD"), :no_cents => Money.new(-100, "CAD")},
+      "EUR 100,37"  => {:cents => Money.new(100_37, "EUR"), :no_cents => Money.new(100, "EUR")},
+      "EUR -100,37" => {:cents => Money.new(-100_37, "EUR"), :no_cents => Money.new(-100, "EUR")},
+      "BRL 100,37"  => {:cents => Money.new(100_37, "BRL"), :no_cents => Money.new(100, "BRL")},
+      "BRL -100,37" => {:cents => Money.new(-100_37, "BRL"), :no_cents => Money.new(-100, "BRL")}
 
-    it { "100 USD".to_money.should == Money.new(100_00, "USD") }
-    it { "-100 USD".to_money.should == Money.new(-100_00, "USD") }
-    it { "100 EUR".to_money.should == Money.new(100_00, "EUR") }
-    it { "100.37 EUR".to_money.should == Money.new(100_37, "EUR") }
-    it { "100,37 EUR".to_money.should == Money.new(100_37, "EUR") }
+    }
 
-    it { "USD 100".to_money.should == Money.new(100_00, "USD") }
-    it { "EUR 100".to_money.should == Money.new(100_00, "EUR") }
-    it { "EUR 100.37".to_money.should == Money.new(100_37, "EUR") }
-    it { "CAD -100.37".to_money.should == Money.new(-100_37, "CAD") }
-    it { "EUR 100,37".to_money.should == Money.new(100_37, "EUR") }
-    it { "EUR -100,37".to_money.should == Money.new(-100_37, "EUR") }
+    EXAMPLES.each_pair do |string, expected_money|
+      it "should convert '#{string}' with cents by default" do
+        string.to_money.should == expected_money[:cents]
+      end
 
-    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 "should convert '#{string}' without cents" do
+        string.to_money(true).should == expected_money[:no_cents]
+      end
 
-    it {"$100 USD".to_money.should == Money.new(100_00, "USD") }
+      it "should convert '#{string}' with cents" do
+        string.to_money(false).should == expected_money[:cents]
+      end
+    end
   end
 end

data/spec/money/exchange_bank_spec.rb

@@ -88,8 +88,7 @@ describe Money::ExchangeBank do
   end
 
   it "raises Money::UnknownRate upon conversion if the conversion rate is unknown" do
-    block = lambda { @bank.exchange(10, "USD", "ABC") }
-    block.should raise_error(Money::UnknownRate)
+    lambda { @bank.exchange(10, "USD", "ABC") }.should raise_error(Money::UnknownRate)
   end
 
   describe "Fetching Data" do
@@ -122,6 +121,23 @@ describe Money::ExchangeBank do
       @bank.get_rate("EUR", "USD").should be_close(1.4098, 0.001)
     end
 
+    it "should fetch only what I want" do
+      Money.stub!(:default_currency).and_return("BRL")
+      @bank.default_rates = ["BRL", "EUR"]
+      @bank.fetch_rates
+      @bank.get_rate("DKK").should be_nil
+      @bank.get_rate("USD").should be_nil
+      @bank.get_rate("EUR").should be_close(2.832, 0.001)
+    end
+
+    it "should be convert EUR to BRL with default USD" do
+      Money.stub!(:default_currency).and_return("USD")
+      @bank.default_rates = ["BRL", "EUR", "USD"]
+      @bank.fetch_rates
+      @bank.exchange(100, "BRL", "EUR").should be_close(2,2)
+      @bank.exchange(100, "EUR", "BRL")
+    end
+
   end
 
   describe "Live Fetching" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: nofxx-money
 version: !ruby/object:Gem::Version 
-  version: 2.3.6
+  version: 2.3.8
 platform: ruby
 authors: 
 - Money Team
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-05-29 00:00:00 -07:00
+date: 2009-06-20 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -73,9 +73,9 @@ signing_key:
 specification_version: 3
 summary: This library aids one in handling money and different currencies.
 test_files: 
-- spec/money/exchange_bank_spec.rb
+- spec/db/schema.rb
 - spec/money/acts_as_money_spec.rb
+- spec/money/exchange_bank_spec.rb
 - spec/money/money_spec.rb
 - spec/money/core_extensions_spec.rb
-- spec/db/schema.rb
 - spec/spec_helper.rb