money 5.0.0 → 5.1.0.beta1

data/money.gemspec

@@ -1,7 +1,7 @@
 # -*- encoding: utf-8 -*-
 Gem::Specification.new do |s|
   s.name        = "money"
-  s.version     = "5.0.0"
+  s.version     = "5.1.0.beta1"
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Tobias Luetke", "Hongli Lai", "Jeremy McNevin",
                    "Shane Emmons", "Simone Carletti"]
@@ -10,20 +10,18 @@ Gem::Specification.new do |s|
   s.summary     = "Money and currency exchange support library."
   s.description = "This library aids one in handling money and different currencies."
 
+  s.required_ruby_version     = ">= 1.9.2"
   s.required_rubygems_version = ">= 1.3.6"
 
-  s.add_dependency "i18n", "~> 0.4"
-  s.add_dependency "json"
+  s.add_dependency "i18n",       "~> 0.6.0"
 
-  s.add_development_dependency "rspec",     "~> 2.9.0"
-  s.add_development_dependency "yard",      "~> 0.7.5"
-  s.add_development_dependency "redcarpet", "~> 2.1.1"
-
-  s.requirements << "json"
+  s.add_development_dependency "rspec",       "~> 2.10.0"
+  s.add_development_dependency "yard",        "~> 0.8.1"
+  s.add_development_dependency "kramdown",    "~> 0.13.7"
 
   s.files =  Dir.glob("{config,lib,spec}/**/*")
   s.files += %w(CHANGELOG.md LICENSE README.md)
-  s.files += %w(Rakefile .gemtest money.gemspec)
+  s.files += %w(Rakefile money.gemspec)
 
   s.require_path = "lib"
 end

data/spec/bank/base_spec.rb

@@ -2,6 +2,14 @@ require 'spec_helper'
 
 describe Money::Bank::Base do
 
+  describe ".instance" do
+    it "is local to one class" do
+      klass = Money::Bank::Base
+      subclass = Class.new(Money::Bank::Base)
+      klass.instance.should_not == subclass.instance
+    end
+  end
+
   describe "#initialize" do
     it "accepts a block and stores @rounding_method" do
       proc = Proc.new { |n| n.ceil }

data/spec/bank/variable_exchange_spec.rb

@@ -147,7 +147,7 @@ describe Money::Bank::VariableExchange do
       it "writes rates to file" do
         f = mock('IO')
         File.should_receive(:open).with('null', 'w').and_yield(f)
-        f.should_receive(:write).with(@rates.to_json)
+        f.should_receive(:write).with(JSON.dump(@rates))
 
         subject.export_rates(:json, 'null')
       end

data/spec/currency_spec.rb

@@ -109,9 +109,8 @@ describe Money::Currency do
     end
 
     it "doesn't create new symbols indefinitely" do
-      expect {
-        expect { Money::Currency.new("bogus") }.to raise_exception(Money::Currency::UnknownCurrency)
-      }.to_not change{ Symbol.all_symbols.size }
+      expect { Money::Currency.new("bogus") }.to raise_exception(Money::Currency::UnknownCurrency)
+      Symbol.all_symbols.map{|s| s.to_s}.should_not include("bogus")
     end
   end
 

data/spec/money/arithmetic_spec.rb

@@ -3,7 +3,6 @@
 require "spec_helper"
 
 describe Money do
-
   describe "-@" do
     it "changes the sign of a number" do
       (- Money.new(0)).should == Money.new(0)
@@ -275,6 +274,28 @@ describe Money do
         (t[:a] / t[:b]).should == t[:c]
       end
     end
+
+    context "infinite_precision = true" do
+      before do
+        Money.infinite_precision = true
+      end
+
+      after do
+        Money.infinite_precision = false
+      end
+
+      it "uses BigDecimal division" do
+        ts = [
+          {:a => Money.new( 13, :USD), :b =>  4, :c => Money.new( 3.25, :USD)},
+          {:a => Money.new( 13, :USD), :b => -4, :c => Money.new(-3.25, :USD)},
+          {:a => Money.new(-13, :USD), :b =>  4, :c => Money.new(-3.25, :USD)},
+          {:a => Money.new(-13, :USD), :b => -4, :c => Money.new( 3.25, :USD)},
+        ]
+        ts.each do |t|
+          (t[:a] / t[:b]).should == t[:c]
+        end
+      end
+    end
   end
 
   describe "#div" do
@@ -314,6 +335,28 @@ describe Money do
         t[:a].div(t[:b]).should == t[:c]
       end
     end
+
+    context "infinite_precision = true" do
+      before do
+        Money.infinite_precision = true
+      end
+
+      after do
+        Money.infinite_precision = false
+      end
+
+      it "uses BigDecimal division" do
+        ts = [
+          {:a => Money.new( 13, :USD), :b =>  4, :c => Money.new( 3.25, :USD)},
+          {:a => Money.new( 13, :USD), :b => -4, :c => Money.new(-3.25, :USD)},
+          {:a => Money.new(-13, :USD), :b =>  4, :c => Money.new(-3.25, :USD)},
+          {:a => Money.new(-13, :USD), :b => -4, :c => Money.new( 3.25, :USD)},
+        ]
+        ts.each do |t|
+          t[:a].div(t[:b]).should == t[:c]
+        end
+      end
+    end
   end
 
   describe "#divmod" do
@@ -353,6 +396,28 @@ describe Money do
         t[:a].divmod(t[:b]).should == t[:c]
       end
     end
+
+    context "infinite_precision = true" do
+      before do
+        Money.infinite_precision = true
+      end
+
+      after do
+        Money.infinite_precision = false
+      end
+
+      it "uses BigDecimal division" do
+        ts = [
+            {:a => Money.new( 13, :USD), :b =>  4, :c => [Money.new( 3, :USD), Money.new( 1, :USD)]},
+            {:a => Money.new( 13, :USD), :b => -4, :c => [Money.new(-4, :USD), Money.new(-3, :USD)]},
+            {:a => Money.new(-13, :USD), :b =>  4, :c => [Money.new(-4, :USD), Money.new( 3, :USD)]},
+            {:a => Money.new(-13, :USD), :b => -4, :c => [Money.new( 3, :USD), Money.new(-1, :USD)]},
+        ]
+        ts.each do |t|
+          t[:a].divmod(t[:b]).should == t[:c]
+        end
+      end
+    end
   end
 
   describe "#modulo" do
@@ -506,5 +571,4 @@ describe Money do
       money.nonzero?.should be_equal(money)
     end
   end
-
 end

data/spec/money/formatting_spec.rb

@@ -5,6 +5,7 @@ require "spec_helper"
 describe Money, "formatting" do
 
   BAR = '{ "priority": 1, "iso_code": "BAR", "iso_numeric": "840", "name": "Dollar with 4 decimal places", "symbol": "$", "subunit": "Cent", "subunit_to_unit": 10000, "symbol_first": true, "html_entity": "$", "decimal_mark": ".", "thousands_separator": "," }'
+  INDIAN_BAR = '{ "priority": 1, "iso_code": "INDIAN_BAR", "iso_numeric": "840", "name": "Dollar with 4 decimal places", "symbol": "$", "subunit": "Cent", "subunit_to_unit": 10000, "symbol_first": true, "html_entity": "$", "decimal_mark": ".", "thousands_separator": ",", "south_asian_number_formatting": true}'
   EU4 = '{ "priority": 1, "iso_code": "EU4", "iso_numeric": "841", "name": "Euro with 4 decimal places", "symbol": "€", "subunit": "Cent", "subunit_to_unit": 10000, "symbol_first": true, "html_entity": "€", "decimal_mark": ",", "thousands_separator": "." }'
 
   context "without i18n" do
@@ -132,7 +133,7 @@ describe Money, "formatting" do
       one_thousand["BRL"].should == "R$ 1.000,00"
 
       # Other
-      one_thousand["SEK"].should == "kr1,000.00"
+      one_thousand["SEK"].should == "1.000,00 kr"
       one_thousand["GHC"].should == "₵1,000.00"
     end
 
@@ -231,7 +232,7 @@ describe Money, "formatting" do
         one["BRL"].should == "R$ 1,00"
 
         # Other
-        one["SEK"].should == "kr1.00"
+        one["SEK"].should == "1,00 kr"
         one["GHC"].should == "₵1.00"
       end
 
@@ -244,7 +245,7 @@ describe Money, "formatting" do
       specify "(:symbol => some non-Boolean value that evaluates to true) returns symbol based on the given currency code" do
         Money.new(100, "GBP").format(:symbol => true).should == "£1.00"
         Money.new(100, "EUR").format(:symbol => true).should == "€1,00"
-        Money.new(100, "SEK").format(:symbol => true).should == "kr1.00"
+        Money.new(100, "SEK").format(:symbol => true).should == "1,00 kr"
       end
 
       specify "(:symbol => "", nil or false) returns the amount without a symbol" do
@@ -282,6 +283,18 @@ describe Money, "formatting" do
       end
     end
 
+    describe ":south_asian_number_formatting delimiter" do
+      before(:each) do
+        Money::Currency.register(JSON.parse(INDIAN_BAR, :symbolize_names => true))
+      end
+
+      specify "(:south_asian_number_formatting => true) works as documented" do
+        Money.new(10000000, 'INR').format(:south_asian_number_formatting => true, :symbol => false).should == "1,00,000.00"
+        Money.new(1000000000, 'INDIAN_BAR').format(:south_asian_number_formatting => true, :symbol => false).should == "1,00,000.0000"
+        Money.new(10000000).format(:south_asian_number_formatting => true).should == "$1,00,000.00"
+      end
+    end
+
     describe ":thousands_separator option" do
       specify "(:thousands_separator => a thousands_separator string) works as documented" do
         Money.us_dollar(100000).format(:thousands_separator => ".").should == "$1.000.00"
@@ -384,10 +397,10 @@ describe Money, "formatting" do
     end
 
     it "brute forces :subunit_to_unit = 100" do
-      ("0.00".."9.99").each do |amt|
+      %w{0.00 0.01 1.00 1.01 5.67 9.99}.each do |amt|
         amt.to_money("USD").format(:symbol => false).should == amt
       end
-      ("-0.01".."-9.99").each do |amt|
+      %w{-0.01 -1.00 -1.01 -5.67 -9.99}.each do |amt|
         amt.to_money("USD").format(:symbol => false).should == amt
       end
       "1000.00".to_money("USD").format(:symbol => false).should == "1,000.00"
@@ -395,12 +408,14 @@ describe Money, "formatting" do
     end
 
     it "brute forces :subunit_to_unit = 1000" do
-      ("0.000".."9.999").each do |amt|
+      %w{0.000 0.001 1.000 1.001 5.678 9.999}.each do |amt|
         amt.to_money("IQD").format(:symbol => false).should == amt
       end
-      ("-0.001".."-9.999").each do |amt|
+
+      %w{-0.001 -1.000 -1.001 -5.678 -9.999}.each do |amt|
         amt.to_money("IQD").format(:symbol => false).should == amt
       end
+
       "1000.000".to_money("IQD").format(:symbol => false).should == "1,000.000"
       "-1000.000".to_money("IQD").format(:symbol => false).should == "-1,000.000"
     end

data/spec/money_spec.rb

@@ -3,7 +3,6 @@
 require "spec_helper"
 
 describe Money do
-
   describe ".new" do
     it "rounds the given cents to an integer" do
       Money.new(1.00, "USD").cents.should == 1
@@ -14,48 +13,83 @@ describe Money do
     it "is associated to the singleton instance of Bank::VariableExchange by default" do
       Money.new(0).bank.should be(Money::Bank::VariableExchange.instance)
     end
+
+    it "handles Rationals" do
+      n = Rational(1)
+      Money.new(n).cents.should == 1
+    end
+
+    it "handles Floats" do
+      n = Float("1")
+      Money.new(n).cents.should == 1
+    end
+
+    context "infinite_precision = true" do
+      before do
+        Money.infinite_precision = true
+      end
+
+      after do
+        Money.infinite_precision = false
+      end
+
+      it "doesn't round cents" do
+        Money.new(1.01, "USD").cents.should == BigDecimal("1.01")
+        Money.new(1.50, "USD").cents.should == BigDecimal("1.50")
+      end
+    end
   end
 
   describe ".new_with_dollars" do
+    it "is synonym of #new_with_amount" do
+      MoneyExpectation = Class.new(Money)
+      def MoneyExpectation.new_with_amount *args
+        args
+      end
+      MoneyExpectation.new_with_dollars("expectation").should == ["expectation"]
+    end
+  end
+
+  describe ".new_with_amount" do
     it "converts given amount to cents" do
-      Money.new_with_dollars(1).should == Money.new(100)
-      Money.new_with_dollars(1, "USD").should == Money.new(100, "USD")
-      Money.new_with_dollars(1, "EUR").should == Money.new(100, "EUR")
+      Money.new_with_amount(1).should == Money.new(100)
+      Money.new_with_amount(1, "USD").should == Money.new(100, "USD")
+      Money.new_with_amount(1, "EUR").should == Money.new(100, "EUR")
     end
 
     it "respects :subunit_to_unit currency property" do
-      Money.new_with_dollars(1, "USD").should == Money.new(1_00,  "USD")
-      Money.new_with_dollars(1, "TND").should == Money.new(1_000, "TND")
-      Money.new_with_dollars(1, "CLP").should == Money.new(1,     "CLP")
+      Money.new_with_amount(1, "USD").should == Money.new(1_00,  "USD")
+      Money.new_with_amount(1, "TND").should == Money.new(1_000, "TND")
+      Money.new_with_amount(1, "CLP").should == Money.new(1,     "CLP")
     end
 
     it "does not loose precision" do
-      Money.new_with_dollars(1234).cents.should == 1234_00
-      Money.new_with_dollars(100.37).cents.should == 100_37
-      Money.new_with_dollars(BigDecimal.new('1234')).cents.should == 1234_00
+      Money.new_with_amount(1234).cents.should == 1234_00
+      Money.new_with_amount(100.37).cents.should == 100_37
+      Money.new_with_amount(BigDecimal.new('1234')).cents.should == 1234_00
     end
 
     it "accepts optional currency" do
-      m = Money.new_with_dollars(1)
+      m = Money.new_with_amount(1)
       m.currency.should == Money.default_currency
 
-      m = Money.new_with_dollars(1, Money::Currency.wrap("EUR"))
+      m = Money.new_with_amount(1, Money::Currency.wrap("EUR"))
       m.currency.should == Money::Currency.wrap("EUR")
 
-      m = Money.new_with_dollars(1, "EUR")
+      m = Money.new_with_amount(1, "EUR")
       m.currency.should == Money::Currency.wrap("EUR")
     end
 
     it "accepts optional bank" do
-      m = Money.new_with_dollars(1)
+      m = Money.new_with_amount(1)
       m.bank.should == Money.default_bank
 
-      m = Money.new_with_dollars(1, "EUR", bank = Object.new)
+      m = Money.new_with_amount(1, "EUR", bank = Object.new)
       m.bank.should == bank
     end
 
     it "is associated to the singleton instance of Bank::VariableExchange by default" do
-      Money.new_with_dollars(0).bank.should be(Money::Bank::VariableExchange.instance)
+      Money.new_with_amount(0).bank.should be(Money::Bank::VariableExchange.instance)
     end
   end
 
@@ -90,36 +124,94 @@ describe Money do
     end
   end
 
-
   describe "#cents" do
-    it "returns the amount of cents" do
-      Money.new(1_00).cents.should == 1_00
-      Money.new_with_dollars(1).cents.should == 1_00
+    it "is a synonym of #fractional" do
+      expectation = Money.new(0)
+      def expectation.fractional
+        "expectation"
+      end
+      expectation.cents.should == "expectation"
+    end
+  end
+
+  describe "#fractional" do
+    it "returns the amount in fractional unit" do
+      Money.new(1_00).fractional.should == 1_00
+      Money.new_with_amount(1).fractional.should == 1_00
     end
 
-    it "stores cents as an integer regardless of what is passed into the constructor" do
+    it "stores fractional as an integer regardless of what is passed into the constructor" do
       [ Money.new(100), 1.to_money, 1.00.to_money, BigDecimal('1.00').to_money ].each do |m|
-        m.cents.should == 100
-        m.cents.should be_a(Fixnum)
+        m.fractional.should == 100
+        m.fractional.should be_a(Fixnum)
+      end
+    end
+
+    context "user changes rounding_mode" do
+      after do
+        Money.rounding_mode = BigDecimal::ROUND_HALF_EVEN
+      end
+
+      it "respects the rounding_mode" do
+        Money.rounding_mode = BigDecimal::ROUND_DOWN
+        Money.new(1.9).fractional.should == 1
+
+        Money.rounding_mode = BigDecimal::ROUND_UP
+        Money.new(1.1).fractional.should == 2
+      end
+    end
+
+    context "infinite_precision = true" do
+      before do
+        Money.infinite_precision = true
+      end
+
+      after do
+        Money.infinite_precision = false
+      end
+
+      it "returns the amount in fractional unit" do
+        Money.new(1_00).fractional.should == BigDecimal("100")
+        Money.new_with_amount(1).fractional.should == BigDecimal("100")
+      end
+
+      it "stores in fractional unit as an integer regardless of what is passed into the constructor" do
+        [ Money.new(100), 1.to_money, 1.00.to_money, BigDecimal('1.00').to_money ].each do |m|
+          m.fractional.should == BigDecimal("100")
+          m.fractional.should be_a(BigDecimal)
+        end
       end
     end
   end
 
-  describe "#dollars" do
+  describe "#amount" do
     it "returns the amount of cents as dollars" do
-      Money.new(1_00).dollars.should == 1
-      Money.new_with_dollars(1).dollars.should == 1
+      Money.new(1_00).amount.should == 1
+      Money.new_with_amount(1).amount.should == 1
     end
 
     it "respects :subunit_to_unit currency property" do
-      Money.new(1_00,  "USD").dollars.should == 1
-      Money.new(1_000, "TND").dollars.should == 1
-      Money.new(1,     "CLP").dollars.should == 1
+      Money.new(1_00,  "USD").amount.should == 1
+      Money.new(1_000, "TND").amount.should == 1
+      Money.new(1,     "CLP").amount.should == 1
     end
 
     it "does not loose precision" do
-      Money.new(100_37).dollars.should == 100.37
-      Money.new_with_dollars(100.37).dollars.should == 100.37
+      Money.new(100_37).amount.should == 100.37
+      Money.new_with_amount(100.37).amount.should == 100.37
+    end
+  end
+
+  describe "#dollars" do
+    it "is synonym of #amount" do
+      m = Money.new(0)
+
+      # Make a small expectation
+      def m.amount
+        5
+      end
+      
+      m.dollars.should == 5
     end
   end
 
@@ -196,6 +288,24 @@ describe Money do
     it "respects :decimal_mark" do
       Money.new(10_00, "BRL").to_s.should == "10,00"
     end
+
+    context "infinite_precision = true" do
+      before do
+        Money.infinite_precision = true
+      end
+
+      after do
+        Money.infinite_precision = false
+      end
+
+      it "shows fractional cents" do
+        Money.new(1.05, "USD").to_s.should == "0.0105"
+      end
+
+      it "suppresses fractional cents when there is none" do
+        Money.new(1.0, "USD").to_s.should == "0.01"
+      end
+    end
   end
 
   describe "#to_d" do
@@ -280,6 +390,25 @@ describe Money do
     it "requires total to be less then 1" do
       expect { Money.us_dollar(0.05).allocate([0.5, 0.6]) }.to raise_error(ArgumentError)
     end
+
+    context "infinite_precision = true" do
+      before do
+        Money.infinite_precision = true
+      end
+
+      after do
+        Money.infinite_precision = false
+      end
+
+      it "allows for fractional cents allocation" do
+        one_third = BigDecimal("1") / BigDecimal("3")
+
+        moneys = Money.new(100).allocate([one_third, one_third, one_third])
+        moneys[0].cents.should == one_third * BigDecimal("100")
+        moneys[1].cents.should == one_third * BigDecimal("100")
+        moneys[2].cents.should == one_third * BigDecimal("100")
+      end
+    end
   end
 
   describe "#split" do
@@ -306,7 +435,24 @@ describe Money do
       moneys[1].cents.should == 33
       moneys[2].cents.should == 33
     end
-  end
 
-end
+    context "infinite_precision = true" do
+      before do
+        Money.infinite_precision = true
+      end
+
+      after do
+        Money.infinite_precision = false
+      end
+
+      it "allows for splitting by fractional cents" do
+        thirty_three_and_one_third = BigDecimal("100") / BigDecimal("3")
 
+        moneys = Money.new(100).split(3)
+        moneys[0].cents.should == thirty_three_and_one_third
+        moneys[1].cents.should == thirty_three_and_one_third
+        moneys[2].cents.should == thirty_three_and_one_third
+      end
+    end
+  end
+end