money 6.6.0 → 6.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c65fe09cbae38c4022a53cdc0c6b5cba47e72930
-  data.tar.gz: 5de5a0732f90ab4af46ef801378a7a6161b5324d
+  metadata.gz: f3285f9f76aec95f56d6f73d260330c3bc0f6984
+  data.tar.gz: 956b5acb84b6b2100d31e49b4a4c79bfbc71e612
 SHA512:
-  metadata.gz: bba3d4bc1dfc26c28ed9e4720a815c0bf36c6dd0376c17a664cb70d066d5c436c29da795abade5bd61c0797808f5969f52fa696d7bfeb874333ad11411745583
-  data.tar.gz: 1a38008c4890e953e1002485fd1098c935ed370cf4e05648846327302d2202fed8adf96df22b37cb98abf7de5b36a8cc87bc7d168d7ab606f2d87a28d87e4f32
+  metadata.gz: 2892ac7ef0eb825da0e0d2d37c1c794703f781d3667bf265f72f032d2de0f132fe061965561dbbbf5d70f6de57a6658c4a11608e83462bee46a263a27c49b320
+  data.tar.gz: ee6ac428822ff9c7783b684d50374fb6bb2e9b41722c4e20d57f57328c972dcb0055d62efb0684c4fc29dace6bc6340b5e36bbcfa2c58a75e19f63179b6ae49a

data/.travis.yml

@@ -3,12 +3,12 @@ sudo: false
 rvm:
   - 1.9.3
   - 2.0.0
-  - 2.1.2
-  - 2.2.0
+  - 2.1.6
+  - 2.2.2
   - rbx-2
 script: bundle exec rspec spec
 notifications:
-  recipients:
+  email:
     - semmons99@gmail.com
     - andreas@aloop.org
     - weppos@weppos.net

data/CHANGELOG.md

@@ -2,6 +2,9 @@
 
 ## Next release
 
+TBD
+
+## 6.6.0
  - Fixed VariableExchange#exchange_with for big numbers.
  - Add Currency symbol translation support
  - `Currency.all` raises a more helpful error message

data/README.md

@@ -1,12 +1,12 @@
 # RubyMoney - Money
 
-[![Gem Version](https://badge.fury.io/rb/money.png)](http://badge.fury.io/rb/money)
-[![Build Status](https://travis-ci.org/RubyMoney/money.png?branch=master)](https://travis-ci.org/RubyMoney/money)
-[![Code Climate](https://codeclimate.com/github/RubyMoney/money.png)](https://codeclimate.com/github/RubyMoney/money)
-[![Coverage Status](https://coveralls.io/repos/RubyMoney/money/badge.png?branch=master)](https://coveralls.io/r/RubyMoney/money?branch=master)
-[![Inline docs](http://inch-ci.org/github/RubyMoney/money.png)](http://inch-ci.org/github/RubyMoney/money)
-[![Dependency Status](https://gemnasium.com/RubyMoney/money.png)](https://gemnasium.com/RubyMoney/money)
-[![License](http://img.shields.io/license/MIT.png?color=green)](http://opensource.org/licenses/MIT)
+[![Gem Version](https://badge.fury.io/rb/money.svg)](http://badge.fury.io/rb/money)
+[![Build Status](https://travis-ci.org/RubyMoney/money.svg?branch=master)](https://travis-ci.org/RubyMoney/money)
+[![Code Climate](https://codeclimate.com/github/RubyMoney/money.svg)](https://codeclimate.com/github/RubyMoney/money)
+[![Coverage Status](https://coveralls.io/repos/RubyMoney/money/badge.svg?branch=master)](https://coveralls.io/r/RubyMoney/money?branch=master)
+[![Inline docs](http://inch-ci.org/github/RubyMoney/money.svg)](http://inch-ci.org/github/RubyMoney/money)
+[![Dependency Status](https://gemnasium.com/RubyMoney/money.svg)](https://gemnasium.com/RubyMoney/money)
+[![License](https://img.shields.io/github/license/RubyMoney/money.svg)](http://opensource.org/licenses/MIT)
 
 :warning: Please read the [migration notes](#migration-notes) before upgrading to a new major version.
 

data/lib/money/bank/variable_exchange.rb

@@ -108,7 +108,7 @@ class Money
         else
           if rate = get_rate(from.currency, to_currency)
             fractional = calculate_fractional(from, to_currency)
-            Money.new(
+            from.class.new(
               exchange(fractional, rate, &block), to_currency
             )
           else

data/lib/money/currency.rb

@@ -18,6 +18,7 @@ class Money
 
     # Keeping cached instances in sync between threads
     @@mutex = Mutex.new
+    @@instances = {}
 
     # Thrown when a Currency has been registered without all the attributes
     # which are required for the current action.
@@ -34,18 +35,17 @@ class Money
     class UnknownCurrency < ArgumentError; end
 
     class << self
-      alias_method :original_new, :new
       def new(id)
         id = id.to_s.downcase
         unless stringified_keys.include?(id)
           raise UnknownCurrency, "Unknown currency '#{id}'"
         end
 
-        @@mutex.synchronize { instances[id] } || super
+        _instances[id] || @@mutex.synchronize { _instances[id] ||= super }
       end
 
-      def instances
-        @instances ||= Hash.new { |h, k| h[k] = original_new(k) }
+      def _instances
+        @@instances
       end
 
       # Lookup a currency with given +id+ an returns a +Currency+ instance on
@@ -168,7 +168,7 @@ class Money
       # @option delimiter [String] character between each thousands place
       def register(curr)
         key = curr.fetch(:iso_code).downcase.to_sym
-        @@mutex.synchronize { instances.delete(key.to_s) }
+        @@mutex.synchronize { _instances.delete(key.to_s) }
         @table[key] = curr
         @stringified_keys = stringify_keys
       end

data/lib/money/money.rb

@@ -340,7 +340,7 @@ class Money
   #
   # @return [String]
   def inspect
-    "#<Money fractional:#{fractional} currency:#{currency}>"
+    "#<#{self.class.name} fractional:#{fractional} currency:#{currency}>"
   end
 
   # Returns the amount of money as a string.
@@ -497,7 +497,7 @@ class Money
       left_over.to_i.times { |i| amounts[i % amounts.length] += 1 }
     end
 
-    amounts.collect { |fractional| Money.new(fractional, currency) }
+    amounts.collect { |fractional| self.class.new(fractional, currency) }
   end
 
   # Split money amongst parties evenly without losing pennies.
@@ -535,7 +535,7 @@ class Money
   #
   def round(rounding_mode = self.class.rounding_mode)
     if self.class.infinite_precision
-      Money.new(fractional.round(0, rounding_mode), self.currency)
+      self.class.new(fractional.round(0, rounding_mode), self.currency)
     else
       self
     end
@@ -605,8 +605,8 @@ class Money
   end
 
   def split_flat(num)
-    low = Money.new(fractional / num, currency)
-    high = Money.new(low.fractional + 1, currency)
+    low = self.class.new(fractional / num, currency)
+    high = self.class.new(low.fractional + 1, currency)
 
     remainder = fractional % num
 

data/lib/money/money/arithmetic.rb

@@ -8,7 +8,7 @@ class Money
     # @example
     #    - Money.new(100) #=> #<Money @fractional=-100>
     def -@
-      Money.new(-fractional, currency)
+      self.class.new(-fractional, currency)
     end
 
     # Checks whether two money objects have the same currency and the same
@@ -83,7 +83,7 @@ class Money
     def +(other_money)
       return self if other_money == 0
       other_money = other_money.exchange_to(currency)
-      Money.new(fractional + other_money.fractional, currency)
+      self.class.new(fractional + other_money.fractional, currency)
     end
 
     # Returns a new Money object containing the difference between the two
@@ -100,7 +100,7 @@ class Money
     def -(other_money)
       return self if other_money == 0
       other_money = other_money.exchange_to(currency)
-      Money.new(fractional - other_money.fractional, currency)
+      self.class.new(fractional - other_money.fractional, currency)
     end
 
     # Multiplies the monetary value with the given number and returns a new
@@ -119,9 +119,9 @@ class Money
     #
     def *(value)
       if value.is_a? Numeric
-        Money.new(fractional * value, currency)
+        self.class.new(fractional * value, currency)
       else
-        raise ArgumentError, "Can't multiply a Money by a #{value.class.name}'s value"
+        raise ArgumentError, "Can't multiply a #{self.class.name} by a #{value.class.name}'s value"
       end
     end
 
@@ -141,10 +141,10 @@ class Money
     #   Money.new(100) / Money.new(10) #=> 10.0
     #
     def /(value)
-      if value.is_a?(Money)
+      if value.is_a?(self.class)
         fractional / as_d(value.exchange_to(currency).fractional).to_f
       else
-        Money.new(fractional / as_d(value), currency)
+        self.class.new(fractional / as_d(value), currency)
       end
     end
 
@@ -182,16 +182,16 @@ class Money
     def divmod_money(val)
       cents = val.exchange_to(currency).cents
       quotient, remainder = fractional.divmod(cents)
-      [quotient, Money.new(remainder, currency)]
+      [quotient, self.class.new(remainder, currency)]
     end
     private :divmod_money
 
     def divmod_other(val)
       if self.class.infinite_precision
         quotient, remainder = fractional.divmod(as_d(val))
-        [Money.new(quotient, currency), Money.new(remainder, currency)]
+        [self.class.new(quotient, currency), self.class.new(remainder, currency)]
       else
-        [div(val), Money.new(fractional.modulo(val), currency)]
+        [div(val), self.class.new(fractional.modulo(val), currency)]
       end
     end
     private :divmod_other
@@ -236,7 +236,7 @@ class Money
       if (fractional < 0 && val < 0) || (fractional > 0 && val > 0)
         self.modulo(val)
       else
-        self.modulo(val) - (val.is_a?(Money) ? val : Money.new(val, currency))
+        self.modulo(val) - (val.is_a?(Money) ? val : self.class.new(val, currency))
       end
     end
 
@@ -247,7 +247,7 @@ class Money
     # @example
     #   Money.new(-100).abs #=> #<Money @fractional=100>
     def abs
-      Money.new(fractional.abs, currency)
+      self.class.new(fractional.abs, currency)
     end
 
     # Test if the money amount is zero.

data/lib/money/money/constructors.rb

@@ -11,7 +11,7 @@ class Money
     #   Money.empty #=> #<Money @fractional=0>
     def empty(currency = default_currency)
       @empty ||= {}
-      @empty[currency] ||= Money.new(0, currency).freeze
+      @empty[currency] ||= new(0, currency).freeze
     end
     alias_method :zero, :empty
 
@@ -28,7 +28,7 @@ class Money
     #   n.cents    #=> 100
     #   n.currency #=> #<Money::Currency id: cad>
     def ca_dollar(cents)
-      Money.new(cents, "CAD")
+      new(cents, "CAD")
     end
     alias_method :cad, :ca_dollar
 
@@ -45,7 +45,7 @@ class Money
     #   n.cents    #=> 100
     #   n.currency #=> #<Money::Currency id: usd>
     def us_dollar(cents)
-      Money.new(cents, "USD")
+      new(cents, "USD")
     end
     alias_method :usd, :us_dollar
 
@@ -61,7 +61,7 @@ class Money
     #   n.cents    #=> 100
     #   n.currency #=> #<Money::Currency id: eur>
     def euro(cents)
-      Money.new(cents, "EUR")
+      new(cents, "EUR")
     end
     alias_method :eur, :euro
 
@@ -77,7 +77,7 @@ class Money
     #   n.fractional    #=> 100
     #   n.currency #=> #<Money::Currency id: gbp>
     def pound_sterling(pence)
-      Money.new(pence, "GBP")
+      new(pence, "GBP")
     end
     alias_method :gbp, :pound_sterling
 

data/lib/money/version.rb

@@ -1,3 +1,3 @@
 class Money
-  VERSION = "6.6.0"
+  VERSION = "6.6.1"
 end

data/spec/bank/variable_exchange_spec.rb

@@ -71,6 +71,11 @@ class Money
               amount = 10**20
               expect(bank.exchange_with(Money.usd(amount), :EUR)).to eq Money.eur(1.33 * amount)
             end
+
+            it "preserves the class in the result when given a subclass of Money" do
+              special_money_class = Class.new(Money)
+              expect(bank.exchange_with(special_money_class.new(100, 'USD'), 'EUR')).to be_a special_money_class
+            end
           end
         end
 

data/spec/currency_spec.rb

@@ -170,7 +170,8 @@ class Money
 
 
     describe "#initialize" do
-      before { Currency.instances.clear }
+      before { Currency._instances.clear }
+
       it "lookups data from loaded config" do
         currency = Currency.new("USD")
         expect(currency.id).to                    eq :usd
@@ -185,6 +186,13 @@ class Money
         expect(currency.smallest_denomination).to eq 1
       end
 
+      it 'caches instances' do
+        currency = Currency.new("USD")
+
+        expect(Currency._instances.length).to           eq 1
+        expect(Currency._instances["usd"].object_id).to eq currency.object_id
+      end
+
       it "raises UnknownCurrency with unknown currency" do
         expect { Currency.new("xxx") }.to raise_error(Currency::UnknownCurrency, /xxx/)
       end

data/spec/money/arithmetic_spec.rb

@@ -9,6 +9,11 @@ describe Money do
       expect((- Money.new(1))).to  eq Money.new(-1)
       expect((- Money.new(-1))).to eq Money.new(1)
     end
+
+    it "preserves the class in the result when using a subclass of Money" do
+      special_money_class = Class.new(Money)
+      expect(- special_money_class.new(10_00)).to be_a special_money_class
+    end
   end
 
   describe "#==" do
@@ -173,6 +178,11 @@ describe Money do
     it "adds Fixnum 0 to money and returns the same ammount" do
       expect(Money.new(10_00) + 0).to eq Money.new(10_00)
     end
+
+    it "preserves the class in the result when using a subclass of Money" do
+      special_money_class = Class.new(Money)
+      expect(special_money_class.new(10_00, "USD") + Money.new(90, "USD")).to be_a special_money_class
+    end
   end
 
   describe "#-" do
@@ -189,6 +199,11 @@ describe Money do
     it "subtract Fixnum 0 to money and returns the same ammount" do
       expect(Money.new(10_00) - 0).to eq Money.new(10_00)
     end
+
+    it "preserves the class in the result when using a subclass of Money" do
+      special_money_class = Class.new(Money)
+      expect(special_money_class.new(10_00, "USD") - Money.new(90, "USD")).to be_a special_money_class
+    end
   end
 
   describe "#*" do
@@ -215,6 +230,11 @@ describe Money do
     it "does not multiply Money by an object which is NOT a number" do
       expect { Money.new( 10, :USD) *  'abc' }.to raise_error(ArgumentError)
     end
+
+    it "preserves the class in the result when using a subclass of Money" do
+      special_money_class = Class.new(Money)
+      expect(special_money_class.new(10_00, "USD") * 2).to be_a special_money_class
+    end
   end
 
   describe "#/" do
@@ -230,6 +250,11 @@ describe Money do
       end
     end
 
+    it "preserves the class in the result when using a subclass of Money" do
+      special_money_class = Class.new(Money)
+      expect(special_money_class.new(10_00, "USD") / 2).to be_a special_money_class
+    end
+
     context 'rounding preference' do
       before do
         allow(Money).to receive(:rounding_mode).and_return(rounding_mode)
@@ -412,6 +437,16 @@ describe Money do
         end
       end
     end
+
+    it "preserves the class in the result when dividing a subclass of Money by a fixnum" do
+      special_money_class = Class.new(Money)
+      expect(special_money_class.new(10_00, "USD").divmod(4).last).to be_a special_money_class
+    end
+
+    it "preserves the class in the result when using a subclass of Money by a subclass of Money" do
+      special_money_class = Class.new(Money)
+      expect(special_money_class.new(10_00, "USD").divmod(special_money_class.new(4_00)).last).to be_a special_money_class
+    end
   end
 
   describe "#modulo" do
@@ -512,6 +547,11 @@ describe Money do
       expect(n.abs).to eq Money.new( 1, :USD)
       expect(n).to     eq Money.new(-1, :USD)
     end
+
+    it "preserves the class in the result when using a subclass of Money" do
+      special_money_class = Class.new(Money)
+      expect(special_money_class.new(-1).abs).to be_a special_money_class
+    end
   end
 
   describe "#zero?" do

data/spec/money/constructors_spec.rb

@@ -20,12 +20,22 @@ describe Money::Constructors do
     it "doesn't allow money to be modified for a currency" do
       expect(Money.empty).to be_frozen
     end
+
+    it "instantiates a subclass when inheritance is used" do
+      special_money_class = Class.new(Money)
+      expect(special_money_class.empty).to be_a special_money_class
+    end
   end
 
 
   describe "::zero" do
     subject { Money.zero }
     it { is_expected.to eq Money.empty }
+
+    it "instantiates a subclass when inheritance is used" do
+      special_money_class = Class.new(Money)
+      expect(special_money_class.zero).to be_a special_money_class
+    end
   end
 
 
@@ -37,6 +47,11 @@ describe Money::Constructors do
     it "is aliased to ::cad" do
       expect(Money.cad(50)).to eq Money.ca_dollar(50)
     end
+
+    it "instantiates a subclass when inheritance is used" do
+      special_money_class = Class.new(Money)
+      expect(special_money_class.ca_dollar(0)).to be_a special_money_class
+    end
   end
 
 
@@ -48,6 +63,11 @@ describe Money::Constructors do
     it "is aliased to ::usd" do
       expect(Money.usd(50)).to eq Money.us_dollar(50)
     end
+
+    it "instantiates a subclass when inheritance is used" do
+      special_money_class = Class.new(Money)
+      expect(special_money_class.us_dollar(0)).to be_a special_money_class
+    end
   end
 
 
@@ -59,6 +79,11 @@ describe Money::Constructors do
     it "is aliased to ::eur" do
       expect(Money.eur(50)).to eq Money.euro(50)
     end
+
+    it "instantiates a subclass when inheritance is used" do
+      special_money_class = Class.new(Money)
+      expect(special_money_class.euro(0)).to be_a special_money_class
+    end
   end
 
 
@@ -70,6 +95,11 @@ describe Money::Constructors do
     it "is aliased to ::gbp" do
       expect(Money.gbp(50)).to eq Money.pound_sterling(50)
     end
+
+    it "instantiates a subclass when inheritance is used" do
+      special_money_class = Class.new(Money)
+      expect(special_money_class.pound_sterling(0)).to be_a special_money_class
+    end
   end
 
 end

data/spec/money_spec.rb

@@ -590,6 +590,11 @@ YAML
       expect { Money.us_dollar(0.05).allocate([0.5, 0.6]) }.to raise_error(ArgumentError)
     end
 
+    it "keeps subclasses intact" do
+      special_money_class = Class.new(Money)
+      expect(special_money_class.new(005).allocate([1]).first).to be_a special_money_class
+    end
+
     context "with infinite_precision", :infinite_precision do
       it "allows for fractional cents allocation" do
         one_third = BigDecimal("1") / BigDecimal("3")
@@ -627,6 +632,11 @@ YAML
       expect(moneys[2].cents).to eq 33
     end
 
+    it "preserves the class in the result when using a subclass of Money" do
+      special_money_class = Class.new(Money)
+      expect(special_money_class.new(10_00).split(1).first).to be_a special_money_class
+    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")
@@ -669,18 +679,23 @@ YAML
         rounded = money.round(BigDecimal::ROUND_DOWN)
         expect(rounded.cents).to eq 15
       end
+
+      context "when using a subclass of Money" do
+        let(:special_money_class) { Class.new(Money) }
+        let(:money) { special_money_class.new(15.75, 'NZD') }
+
+        it "preserves the class in the result" do
+          expect(rounded).to be_a special_money_class
+        end
+      end
     end
   end
 
-  describe "inheritance" do
-    it "allows inheritance" do
-      # TypeError:
-      #   wrong argument type nil (expected Fixnum)
-      # ./lib/money/money.rb:63:in `round'
-      # ./lib/money/money.rb:63:in `fractional'
-      # ./lib/money/money/arithmetic.rb:115:in `-'
-      MoneyChild = Class.new(Money)
-      expect(MoneyChild.new(1000) - Money.new(500)).to eq Money.new(500)
+  describe "#inspect" do
+    it "reports the class name properly when using inheritance" do
+      expect(Money.new(1).inspect).to start_with '#<Money'
+      Subclass = Class.new(Money)
+      expect(Subclass.new(1).inspect).to start_with '#<Subclass'
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: money
 version: !ruby/object:Gem::Version
-  version: 6.6.0
+  version: 6.6.1
 platform: ruby
 authors:
 - Shane Emmons
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-15 00:00:00.000000000 Z
+date: 2015-07-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n