money 6.5.1 → 6.6.0

data/spec/money/arithmetic_spec.rb

@@ -12,13 +12,20 @@ describe Money do
   end
 
   describe "#==" do
-    it "returns true if and only if their amount and currency are equal" do
+    it "returns true if both the amounts and currencies are equal" do
       expect(Money.new(1_00, "USD")).to     eq Money.new(1_00, "USD")
       expect(Money.new(1_00, "USD")).not_to eq Money.new(1_00, "EUR")
       expect(Money.new(1_00, "USD")).not_to eq Money.new(2_00, "USD")
       expect(Money.new(1_00, "USD")).not_to eq Money.new(99_00, "EUR")
     end
 
+    it "returns true if both amounts are zero, even if currency differs" do
+      expect(Money.new(0, "USD")).to eq Money.new(0, "USD")
+      expect(Money.new(0, "USD")).to eq Money.new(0, "EUR")
+      expect(Money.new(0, "USD")).to eq Money.new(0, "AUD")
+      expect(Money.new(0, "USD")).to eq Money.new(0, "JPY")
+    end
+
     it "returns false if used to compare with an object that doesn't respond to #to_money" do
       expect(Money.new(1_00, "USD")).not_to eq Object.new
       expect(Money.new(1_00, "USD")).not_to eq Class
@@ -116,12 +123,11 @@ describe Money do
       expect(Money.new(1_00) <=> klass.new(Money.new(2_00))).to be < 0
     end
 
-    it "raises ArgumentError when used to compare with an object that doesn't respond to #to_money" do
-      expected_message = /Comparison .+ failed/
-      expect{ Money.new(1_00) <=> Object.new  }.to raise_error(ArgumentError, expected_message)
-      expect{ Money.new(1_00) <=> Class       }.to raise_error(ArgumentError, expected_message)
-      expect{ Money.new(1_00) <=> Kernel      }.to raise_error(ArgumentError, expected_message)
-      expect{ Money.new(1_00) <=> /foo/       }.to raise_error(ArgumentError, expected_message)
+    it "returns nil when used to compare with an object that doesn't respond to #to_money" do
+      expect(Money.new(1_00) <=> Object.new).to be_nil
+      expect(Money.new(1_00) <=> Class).to be_nil
+      expect(Money.new(1_00) <=> Kernel).to be_nil
+      expect(Money.new(1_00) <=> /foo/).to be_nil
     end
   end
 
@@ -287,15 +293,7 @@ describe Money do
       end
     end
 
-    context "infinite_precision = true" do
-      before do
-        Money.infinite_precision = true
-      end
-
-      after do
-        Money.infinite_precision = false
-      end
-
+    context "with infinite_precision", :infinite_precision do
       it "uses BigDecimal division" do
         ts = [
           {:a => Money.new( 13, :USD), :b =>  4, :c => Money.new( 3.25, :USD)},
@@ -348,15 +346,7 @@ describe Money do
       end
     end
 
-    context "infinite_precision = true" do
-      before do
-        Money.infinite_precision = true
-      end
-
-      after do
-        Money.infinite_precision = false
-      end
-
+    context "with infinite_precision", :infinite_precision do
       it "uses BigDecimal division" do
         ts = [
           {:a => Money.new( 13, :USD), :b =>  4, :c => Money.new( 3.25, :USD)},
@@ -409,15 +399,7 @@ describe Money do
       end
     end
 
-    context "infinite_precision = true" do
-      before do
-        Money.infinite_precision = true
-      end
-
-      after do
-        Money.infinite_precision = false
-      end
-
+    context "with infinite_precision", :infinite_precision do
       it "uses BigDecimal division" do
         ts = [
             {:a => Money.new( 13, :USD), :b =>  4, :c => [Money.new( 3, :USD), Money.new( 1, :USD)]},

data/spec/money/formatting_spec.rb

@@ -95,6 +95,23 @@ describe Money, "formatting" do
         expect(money.decimal_mark).to eq ','
       end
     end
+
+    context "with number.currency.symbol.*" do
+      before :each do
+        reset_i18n
+        I18n.locale = :de
+        I18n.backend.store_translations(
+            :de,
+            :number => { :currency => { :symbol => { :CAD => "CAD$" } } }
+        )
+      end
+
+      subject(:money) { Money.empty("CAD") }
+
+      it "should use 'CAD$' as the currency symbol" do
+        expect(money.format(:translate => true)).to eq("CAD$0.00")
+      end
+    end
   end
 
   describe "#format" do
@@ -512,15 +529,7 @@ describe Money, "formatting" do
       end
     end
 
-    describe ":rounded_infinite_precision option" do
-      before do
-        Money.infinite_precision = true
-      end
-
-      after do
-        Money.infinite_precision = false
-      end
-
+    describe ":rounded_infinite_precision option", :infinite_precision do
       it "does round fractional when set to true" do
         expect(Money.new(BigDecimal.new('12.1'), "USD").format(:rounded_infinite_precision => true)).to eq "$0.12"
         expect(Money.new(BigDecimal.new('12.5'), "USD").format(:rounded_infinite_precision => true)).to eq "$0.13"
@@ -541,15 +550,13 @@ describe Money, "formatting" do
         expect(Money.new(BigDecimal.new('1'), "MGA").format(:rounded_infinite_precision => false)).to eq "Ar0.1"
       end
 
-      describe ":rounded_infinite_precision option with i18n = false" do
+      describe "with i18n = false" do
         before do
           Money.use_i18n = false
-          Money.infinite_precision = true
         end
 
         after do
           Money.use_i18n = true
-          Money.infinite_precision = false
         end
 
         it 'does round fractional when set to true' do

data/spec/money_spec.rb

@@ -78,8 +78,7 @@ describe Money do
       end
     end
 
-    context "infinite_precision = true" do
-      before { expect(Money).to receive(:infinite_precision).and_return(true) }
+    context "with infinite_precision", :infinite_precision do
       context 'given the initializing value is 1.50' do
         let(:initializing_value) { 1.50 }
 
@@ -121,6 +120,59 @@ describe Money do
     end
   end
 
+  describe ".from_amount" do
+    it "accepts numeric values" do
+      expect(Money.from_amount(1, "USD")).to eq Money.new(1_00, "USD")
+      expect(Money.from_amount(1.0, "USD")).to eq Money.new(1_00, "USD")
+      expect(Money.from_amount("1".to_d, "USD")).to eq Money.new(1_00, "USD")
+    end
+
+    it "raises ArgumentError with unsupported argument" do
+      expect { Money.from_amount("1") }.to raise_error(ArgumentError)
+      expect { Money.from_amount(Object.new) }.to raise_error(ArgumentError)
+    end
+
+    it "converts given amount to subunits according to currency" do
+      expect(Money.from_amount(1, "USD")).to eq Money.new(1_00, "USD")
+      expect(Money.from_amount(1, "TND")).to eq Money.new(1_000, "TND")
+      expect(Money.from_amount(1, "JPY")).to eq Money.new(1, "JPY")
+    end
+
+    it "rounds the given amount to subunits" do
+      expect(Money.from_amount(4.444, "USD").amount).to eq "4.44".to_d
+      expect(Money.from_amount(5.555, "USD").amount).to eq "5.56".to_d
+      expect(Money.from_amount(444.4, "JPY").amount).to eq "444".to_d
+      expect(Money.from_amount(555.5, "JPY").amount).to eq "556".to_d
+    end
+
+    it "does not round the given amount when infinite_precision is set", :infinite_precision do
+      expect(Money.from_amount(4.444, "USD").amount).to eq "4.444".to_d
+      expect(Money.from_amount(5.555, "USD").amount).to eq "5.555".to_d
+      expect(Money.from_amount(444.4, "JPY").amount).to eq "444.4".to_d
+      expect(Money.from_amount(555.5, "JPY").amount).to eq "555.5".to_d
+    end
+
+    it "accepts an optional currency" do
+      expect(Money.from_amount(1).currency).to eq Money.default_currency
+      jpy = Money::Currency.wrap("JPY")
+      expect(Money.from_amount(1, jpy).currency).to eq jpy
+      expect(Money.from_amount(1, "JPY").currency).to eq jpy
+    end
+
+    it "accepts an optional bank" do
+      expect(Money.from_amount(1).bank).to eq Money.default_bank
+      bank = double "bank"
+      expect(Money.from_amount(1, "USD", bank).bank).to eq bank
+    end
+
+    it 'rounds using rounding_mode' do
+      expect(Money.from_amount(1.999).to_d).to eq 2
+      expect(Money.rounding_mode(BigDecimal::ROUND_DOWN) do
+        Money.from_amount(1.999).to_d
+      end).to eq 1.99
+    end
+  end
+
   %w[cents pence].each do |units|
     describe "##{units}" do
       it "is a synonym of #fractional" do
@@ -176,19 +228,9 @@ YAML
         expect(m.fractional).to be_a(Integer)
       end
 
-      context "with infinite_precision" do
-        before do
-          Money.infinite_precision = true
-        end
-
-        after do
-          Money.infinite_precision = false
-        end
-
-        it "is a BigDecimal" do
-          money = YAML::load serialized
-          expect(money.fractional).to be_a BigDecimal
-        end
+      it "is a BigDecimal when using infinite_precision", :infinite_precision do
+        money = YAML::load serialized
+        expect(money.fractional).to be_a BigDecimal
       end
     end
 
@@ -234,15 +276,7 @@ YAML
       end
     end
 
-    context "infinite_precision = true" do
-      before do
-        Money.infinite_precision = true
-      end
-
-      after do
-        Money.infinite_precision = false
-      end
-
+    context "with infinite_precision", :infinite_precision do
       it "returns the amount in fractional unit" do
         expect(Money.new(1_00).fractional).to eq BigDecimal("100")
       end
@@ -254,87 +288,77 @@ YAML
       end
     end
   end
-  
+
   describe "#round_to_nearest_cash_value" do
     it "rounds to the nearest possible cash value" do
       money = Money.new(2350, "AED")
       expect(money.round_to_nearest_cash_value).to eq 2350
-      
+
       money = Money.new(-2350, "AED")
       expect(money.round_to_nearest_cash_value).to eq(-2350)
-      
+
       money = Money.new(2213, "AED")
       expect(money.round_to_nearest_cash_value).to eq 2225
-      
+
       money = Money.new(-2213, "AED")
       expect(money.round_to_nearest_cash_value).to eq(-2225)
-      
+
       money = Money.new(2212, "AED")
       expect(money.round_to_nearest_cash_value).to eq 2200
-      
+
       money = Money.new(-2212, "AED")
       expect(money.round_to_nearest_cash_value).to eq(-2200)
-    
+
       money = Money.new(178, "CHF")
       expect(money.round_to_nearest_cash_value).to eq 180
-      
+
       money = Money.new(-178, "CHF")
       expect(money.round_to_nearest_cash_value).to eq(-180)
-      
+
       money = Money.new(177, "CHF")
       expect(money.round_to_nearest_cash_value).to eq 175
-      
+
       money = Money.new(-177, "CHF")
       expect(money.round_to_nearest_cash_value).to eq(-175)
-      
+
       money = Money.new(175, "CHF")
       expect(money.round_to_nearest_cash_value).to eq 175
-      
+
       money = Money.new(-175, "CHF")
       expect(money.round_to_nearest_cash_value).to eq(-175)
-      
+
       money = Money.new(299, "USD")
       expect(money.round_to_nearest_cash_value).to eq 299
-      
+
       money = Money.new(-299, "USD")
       expect(money.round_to_nearest_cash_value).to eq(-299)
-      
+
       money = Money.new(300, "USD")
       expect(money.round_to_nearest_cash_value).to eq 300
-      
+
       money = Money.new(-300, "USD")
       expect(money.round_to_nearest_cash_value).to eq(-300)
-      
+
       money = Money.new(301, "USD")
       expect(money.round_to_nearest_cash_value).to eq 301
-      
+
       money = Money.new(-301, "USD")
       expect(money.round_to_nearest_cash_value).to eq(-301)
     end
-    
+
     it "raises an exception if smallest denomination is not defined" do
       money = Money.new(100, "XAG")
       expect {money.round_to_nearest_cash_value}.to raise_error(Money::UndefinedSmallestDenomination)
     end
-    
+
     it "returns a Fixnum when infinite_precision is not set" do
       money = Money.new(100, "USD")
       expect(money.round_to_nearest_cash_value).to be_a Fixnum
     end
-  
-    context "with infinite_precision" do
-      before do
-        Money.infinite_precision = true
-      end
 
-      after do
-        Money.infinite_precision = false
-      end
-
-      it "returns a BigDecimal" do
-        money = Money.new(100, "EUR")
-        expect(money.round_to_nearest_cash_value).to be_a BigDecimal
-      end
+    it "returns a BigDecimal when infinite_precision is set", :infinite_precision do
+      money = Money.new(100, "EUR")
+      expect(money.round_to_nearest_cash_value).to be_a BigDecimal
     end
   end
 
@@ -347,6 +371,7 @@ YAML
       expect(Money.new(1_00,  "USD").amount).to eq 1
       expect(Money.new(1_000, "TND").amount).to eq 1
       expect(Money.new(1,     "VUV").amount).to eq 1
+      expect(Money.new(1,     "CLP").amount).to eq 1
     end
 
     it "does not loose precision" do
@@ -445,15 +470,7 @@ YAML
       expect(Money.new(10_00, "BRL").to_s).to eq "10,00"
     end
 
-    context "infinite_precision = true" do
-      before do
-        Money.infinite_precision = true
-      end
-
-      after do
-        Money.infinite_precision = false
-      end
-
+    context "with infinite_precision", :infinite_precision do
       it "shows fractional cents" do
         expect(Money.new(1.05, "USD").to_s).to eq "0.0105"
       end
@@ -573,15 +590,7 @@ YAML
       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
-
+    context "with infinite_precision", :infinite_precision do
       it "allows for fractional cents allocation" do
         one_third = BigDecimal("1") / BigDecimal("3")
 
@@ -618,15 +627,7 @@ YAML
       expect(moneys[2].cents).to eq 33
     end
 
-    context "infinite_precision = true" do
-      before do
-        Money.infinite_precision = true
-      end
-
-      after do
-        Money.infinite_precision = false
-      end
-
+    context "with infinite_precision", :infinite_precision do
       it "allows for splitting by fractional cents" do
         thirty_three_and_one_third = BigDecimal("100") / BigDecimal("3")
 
@@ -644,10 +645,6 @@ YAML
     subject(:rounded) { money.round }
 
     context "without infinite_precision" do
-      before do
-        Money.infinite_precision = false
-      end
-
       it "returns self (as it is already rounded)" do
         rounded = money.round
         expect(rounded).to be money
@@ -655,15 +652,7 @@ YAML
       end
     end
 
-    context "with infinite_precision" do
-      before do
-        Money.infinite_precision = true
-      end
-
-      after do
-        Money.infinite_precision = false
-      end
-
+    context "with infinite_precision", :infinite_precision do
       it "returns a different money" do
         expect(rounded).not_to be money
       end

data/spec/rates_store/memory_spec.rb

@@ -0,0 +1,71 @@
+require 'spec_helper'
+
+describe Money::RatesStore::Memory do
+  let(:subject) { described_class.new }
+
+  describe '#add_rate and #get_rate' do
+    it 'stores rate in memory' do
+      expect(subject.add_rate('USD', 'CAD', 0.9)).to eql 0.9
+      expect(subject.get_rate('USD', 'CAD')).to eql 0.9
+    end
+  end
+
+  describe 'add_rate' do
+    it "uses a mutex by default" do
+      expect(subject.instance_variable_get(:@mutex)).to receive(:synchronize)
+      subject.add_rate('USD', 'EUR', 1.25)
+    end
+
+    context ':without_mutex' do
+      let(:subject) { Money::RatesStore::Memory.new(:without_mutex => true) }
+
+      it "doesn't use mutex if requested not to" do
+        expect(subject.instance_variable_get(:@mutex)).not_to receive(:synchronize)
+        subject.add_rate('USD', 'EUR', 1.25)
+      end
+    end
+  end
+
+  describe '#each_rate' do
+    before do
+      subject.add_rate('USD', 'CAD', 0.9)
+      subject.add_rate('CAD', 'USD', 1.1)
+    end
+
+    it 'iterates over rates' do
+      expect{|b| subject.each_rate(&b)}.to yield_successive_args(['USD', 'CAD', 0.9], ['CAD', 'USD', 1.1])
+    end
+
+    it 'is an Enumeator' do
+      expect(subject.each_rate).to be_kind_of(Enumerator)
+      result = subject.each_rate.each_with_object({}){|(from, to, rate),m| m[[from,to].join] = rate}
+      expect(result).to match({'USDCAD' => 0.9, 'CADUSD' => 1.1})
+    end
+  end
+
+  describe '#transaction' do
+    context 'mutex' do
+      it 'uses mutex' do
+        expect(subject.instance_variable_get('@mutex')).to receive(:synchronize)
+        subject.transaction{ a = 1}
+      end
+
+      it 'wraps block in mutex transaction only once' do
+        expect{
+          subject.transaction do
+            subject.add_rate('USD', 'CAD', 1)
+          end
+        }.not_to raise_error
+      end
+    end
+
+    context 'no mutex' do
+      let(:subject) { Money::RatesStore::Memory.new(:without_mutex => true) }
+
+      it 'does not use mutex' do
+        expect(subject.instance_variable_get('@mutex')).not_to receive(:synchronize)
+        subject.transaction{ a = 1}
+      end
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -21,3 +21,13 @@ end
 def reset_i18n
   I18n.backend = I18n::Backend::Simple.new
 end
+
+RSpec.shared_context "with infinite precision", :infinite_precision do
+  before do
+    Money.infinite_precision = true
+  end
+
+  after do
+    Money.infinite_precision = false
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: money
 version: !ruby/object:Gem::Version
-  version: 6.5.1
+  version: 6.6.0
 platform: ruby
 authors:
 - Shane Emmons
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-03 00:00:00.000000000 Z
+date: 2015-07-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n
@@ -64,14 +64,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 3.2.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 3.2.0
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
@@ -131,17 +131,20 @@ files:
 - lib/money/money/arithmetic.rb
 - lib/money/money/constructors.rb
 - lib/money/money/formatting.rb
+- lib/money/rates_store/memory.rb
 - lib/money/version.rb
 - money.gemspec
 - spec/bank/base_spec.rb
 - spec/bank/single_currency_spec.rb
 - spec/bank/variable_exchange_spec.rb
 - spec/currency/heuristics_spec.rb
+- spec/currency/loader_spec.rb
 - spec/currency_spec.rb
 - spec/money/arithmetic_spec.rb
 - spec/money/constructors_spec.rb
 - spec/money/formatting_spec.rb
 - spec/money_spec.rb
+- spec/rates_store/memory_spec.rb
 - spec/spec_helper.rb
 homepage: http://rubymoney.github.io/money
 licenses:
@@ -171,7 +174,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: A Ruby Library for dealing with money and currency conversion.
@@ -180,10 +183,12 @@ test_files:
 - spec/bank/single_currency_spec.rb
 - spec/bank/variable_exchange_spec.rb
 - spec/currency/heuristics_spec.rb
+- spec/currency/loader_spec.rb
 - spec/currency_spec.rb
 - spec/money/arithmetic_spec.rb
 - spec/money/constructors_spec.rb
 - spec/money/formatting_spec.rb
 - spec/money_spec.rb
+- spec/rates_store/memory_spec.rb
 - spec/spec_helper.rb
 has_rdoc: