ShadowBelmolve-money 2.3.5 → 2.3.7

data/README.rdoc

@@ -28,7 +28,7 @@ Install stable releases with the following command:
 The development version (hosted on Github) can be installed with:
 
   gem sources -a http://gems.github.com
-  gem install nofxx-money
+  gem install ShadowBelmolve-money
 
 
 == Usage
@@ -96,7 +96,7 @@ fields on the database.
 
 config/enviroment.rb
 
-  require.gem 'nofxx-money', :lib => 'money'
+  require.gem 'ShadowBelmolve-money', :lib => 'money'
 
 app/models/product.rb
 

data/VERSION

@@ -1 +1 @@
-2.3.5
+2.3.7

data/lib/money/core_extensions.rb

@@ -10,10 +10,10 @@ class Numeric
       if self.is_a? Integer
         Money.new(self)
       else
-        Money.new(self.to_s.gsub(/\./,'').to_i)
+        Money.new(self.to_s.gsub(/\./,'').round)
       end
     else
-      Money.new(self * 100)
+      Money.new((self * 100).round)
     end
   end
 end
@@ -22,35 +22,35 @@ 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">
-  def to_money(with_cents = false)
+  #   '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
     # Get the currency.
     matches = scan /([A-Z]{2,3})/
     currency = matches[0] ? matches[0][0] : Money.default_currency
-    cents = calculate_cents(self, with_cents)
+    cents = calculate_cents(self)
     Money.new(cents, currency)
   end
-
+  
   private
-
-  def calculate_cents(number, with_cents = true)
+  
+  def calculate_cents(number)
     # 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.
@@ -61,8 +61,8 @@ class String
     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
+    
+    # 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
@@ -78,10 +78,10 @@ class String
       # 1,000,000 - comma is a separator
       # 10000,00 - comma is a delimiter
       # 1000,000 - comma is a delimiter
-
+      
       # 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
@@ -89,23 +89,25 @@ 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
           # minor length is three
           # let's try to figure out intent of the delimiter
-
-          # the major length is greater than three, which means
+          
+          # 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
@@ -122,18 +124,25 @@ class String
     else
       raise ArgumentError, "Invalid currency amount"
     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
-    else
-      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
   end
-
+  
 end
+

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.5"
+  s.version = "2.3.7"
 
   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-01}
   s.description = %q{This library aids one in handling money and different currencies.}
   s.email = %q{see@reame}
   s.extra_rdoc_files = [
@@ -44,12 +44,12 @@ Gem::Specification.new do |s|
   s.rubygems_version = %q{1.3.3}
   s.summary = %q{This library aids one in handling money and different currencies.}
   s.test_files = [
-    "spec/money/exchange_bank_spec.rb",
+    "spec/spec_helper.rb",
+     "spec/money/exchange_bank_spec.rb",
+     "spec/money/core_extensions_spec.rb",
      "spec/money/acts_as_money_spec.rb",
      "spec/money/money_spec.rb",
-     "spec/money/core_extensions_spec.rb",
-     "spec/db/schema.rb",
-     "spec/spec_helper.rb"
+     "spec/db/schema.rb"
   ]
 
   if s.respond_to? :specification_version then

data/spec/money/core_extensions_spec.rb

@@ -15,30 +15,47 @@ 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) }
-
-    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") }
-
-    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") }
+  describe "String#to_money" do
+    EXAMPLES = {
+      "20.15" => {:cents => Money.new(20_15), :no_cents => Money.new(20_15)},
+      "100" => {:cents => Money.new(100_00), :no_cents => Money.new(100)},
+      "100.37" => {:cents => Money.new(100_37), :no_cents => Money.new(100_37)},
+      "100,37" => {:cents => Money.new(100_37), :no_cents => Money.new(100_37)},
+      "100 000" => {:cents => Money.new(100_000_00), :no_cents => Money.new(100_000)},
+      "100.000,45" => {:cents => Money.new(100_000_45), :no_cents => Money.new(100_000_45)},
+      "-100.100,45" => {:cents => Money.new(-100_100_45), :no_cents => Money.new(-100_100_45)},
+
+      "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.37 EUR" => {:cents => Money.new(100_37, "EUR"), :no_cents => Money.new(100_37, "EUR")},
+      "100,37 EUR" => {:cents => Money.new(100_37, "EUR"), :no_cents => Money.new(100_37, "EUR")},
+
+      "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")},
+      "EUR 100.37" => {:cents => Money.new(100_37, "EUR"), :no_cents => Money.new(100_37, "EUR")},
+      "CAD -100.37" => {:cents => Money.new(-100_37, "CAD"), :no_cents => Money.new(-100_37, "CAD")},
+      "EUR 100,37" => {:cents => Money.new(100_37, "EUR"), :no_cents => Money.new(100_37, "EUR")},
+      "EUR -100,37" => {:cents => Money.new(-100_37, "EUR"), :no_cents => Money.new(-100_37, "EUR")},
+
+      "BRL 100,37" => {:cents => Money.new(100_37, "BRL"), :no_cents => Money.new(100_37, "BRL")},
+      "BRL -100,37" => {:cents => Money.new(-100_37, "BRL"), :no_cents => Money.new(-100_37, "BRL")},
+
+      "$100 USD" => {:cents => Money.new(100_00, "USD"), :no_cents => Money.new(100, "USD")}
+    }
+
+    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 "should convert '#{string}' without cents" do
+        string.to_money(true).should == expected_money[:no_cents]
+      end
+
+      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

@@ -100,7 +100,7 @@ describe Money::ExchangeBank do
     end
 
     it "should fetch data" do
-      Money.default_currency = "EUR"
+      Money.stub!(:default_currency).and_return("EUR")
       @bank.fetch_rates
       @bank.get_rate("DKK").should be_close(7.4453, 0.0001)
       @bank.get_rate("BRL").should be_close(2.832, 0.001)
@@ -108,7 +108,7 @@ describe Money::ExchangeBank do
     end
 
     it "should fetch diff than eur" do
-      Money.default_currency = "BRL"
+      Money.stub!(:default_currency).and_return("BRL")
       @bank.fetch_rates
       @bank.get_rate("DKK").should be_close(2.6289, 0.0001)
       @bank.get_rate("EEK").should be_close(5.5249, 0.0001)
@@ -116,13 +116,12 @@ describe Money::ExchangeBank do
     end
 
     it "should fetch for an unknown one" do
-      Money.default_currency = "XXX"
+      Money.stub!(:default_currency).and_return("XXX")
       @bank.fetch_rates
       @bank.get_rate("DKK").should be_nil
       @bank.get_rate("EUR", "USD").should be_close(1.4098, 0.001)
-      Money.default_currency = "USD"
-
     end
+
   end
 
   describe "Live Fetching" do

data/spec/money/money_spec.rb

@@ -158,9 +158,8 @@ describe Money do
     end
 
     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")
+      Money.add_rate("BGL", 10)
+      Money.new(10_00, "USD").exchange_to("BGL").should == Money.new(100_00, "BGL")
     end
 
     it "Money method missing exchange" do
@@ -217,6 +216,7 @@ describe Money do
     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(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") }
@@ -224,9 +224,8 @@ describe Money do
     it { Money.new(8800000000088, "EUR").format.should eql("€88,000,000,000.88") }
 
     it "should fail nicely if symbol can`t be found" do
-      Money.default_currency = "XXX"
+      Money.stub!(:default_currency).and_return("XXX")
       Money.new(800).format.should eql("$8.00")
-      Money.default_currency = "USD"
     end
 
     describe "Actions involving two Money objects" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: ShadowBelmolve-money
 version: !ruby/object:Gem::Version 
-  version: 2.3.5
+  version: 2.3.7
 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-01 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/spec_helper.rb
 - spec/money/exchange_bank_spec.rb
+- spec/money/core_extensions_spec.rb
 - spec/money/acts_as_money_spec.rb
 - spec/money/money_spec.rb
-- spec/money/core_extensions_spec.rb
 - spec/db/schema.rb
-- spec/spec_helper.rb