money 6.13.1 → 6.13.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4981b9f6d6c9b7162e5df6692e81cac6440edcca
-  data.tar.gz: 96d7be00c3f275c0b8731807f4fa8955fade71bb
+  metadata.gz: 7913c2be69c77f43c10cb0a6262dadeccbbc9a9f
+  data.tar.gz: bb7de5d50d2a8e7185ebb4a87e5a60a637602e62
 SHA512:
-  metadata.gz: 4943cebf00d5abf48ca73b52ffd18cc2324287ffada6513357a1d4146b52fc7f4742dd95937efe499f96989c853939543ba857e8af32346f65852cbb71e0c3dd
-  data.tar.gz: 7b87dfa829e29eb266083e1b8d7df418c519273fb5fcab0095d6426b54cee22319303aa122825aa6f23ff635d32a28eb1644efa4f608c697c869c7b37405af0f
+  metadata.gz: f92d1aef2013a80abb618b49ce72d07406a93678b0ce183ce2c6051c397ccc24dd121d21eda707fab2dae042b369e83cf1deb6e45db15770b1a417b989014fe6
+  data.tar.gz: eeb2491fca41a8a3c858bad2314c4c8d3a29384f7f0da9e836b871071110f321c76ea697222f6b47903839f344bfbdcf85e0636b59a80dca1381bfa29aaa1b59

data/.travis.yml

@@ -23,7 +23,7 @@ matrix:
     - rvm: rbx-3
   fast_finish: true
 before_install:
-  - gem update bundler
+  - gem install bundler --version '~> 1.17'
 script: bundle exec rspec spec
 notifications:
   email:

data/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Changelog
 
+## 6.13.2
+- Prevent Money initialization with non-finite amounts
+- Convert the fractional value of a Money object to BigDecimal when initializing
+- Offer replacements for currency position deprecations
+- Fix Peruvian Sol symbol
+- Lock i18n to <= 1.2.0 for older (< 2.3) rubies
+- Prevent Divide By Zero in `Money#allocate`
+
 ## 6.13.1
 - Add bolívar soberano (VES)
 - Deprecate bolívar fuerte (VEF)

data/Gemfile

@@ -12,5 +12,6 @@ elsif RUBY_VERSION =~ /^1/
   gem 'tins',           '~> 1.6.0'
   gem 'term-ansicolor', '< 1.4'
 end
+gem 'i18n', '<= 1.2.0' if RUBY_VERSION < '2.3'
 
 gemspec

data/README.md

@@ -392,6 +392,35 @@ m = Money.new('123', :gbp) # => #<Money fractional:123 currency:GBP>
 m.format(symbol: m.currency.to_s + ' ') # => "GBP 1.23"
 ```
 
+## Rounding
+
+By default, `Money` objects are rounded to the nearest cent and the additional precision is not preserved:
+
+```ruby
+Money.from_amount(2.34567).format #=> "$2.35"
+```
+
+To retain the additional precision, you will also need to set `infinite_precision` to `true`.
+
+```ruby
+Money.infinite_precision = true
+Money.from_amount(2.34567).format #=> "$2.34567"
+```
+
+To round to the nearest cent (or anything more precise), you can use the `round` method. However, note that the `round` method on a `Money` object does not work the same way as a normal Ruby `Float` object. Money's `round` method accepts different arguments. The first argument to the round method is the rounding mode, while the second argument is the level of precision relative to the cent.
+
+```
+# Float
+2.34567.round     #=> 2
+2.34567.round(2)  #=> 2.35
+
+# Money
+Money.infinite_precision = true
+Money.new(2.34567).format       #=> "$0.0234567"
+Money.new(2.34567).round.format #=> "$0.02"
+Money.new(2.34567).round(BigDecimal::ROUND_HALF_UP, 2).format #=> "$0.0235"
+```
+
 ## Ruby on Rails
 
 To integrate money in a Rails application use [money-rails](https://github.com/RubyMoney/money-rails).

data/config/currency_iso.json

@@ -1647,12 +1647,12 @@
     "priority": 100,
     "iso_code": "PEN",
     "name": "Peruvian Sol",
-    "symbol": "S/.",
+    "symbol": "S/",
     "alternate_symbols": [],
     "subunit": "Céntimo",
     "subunit_to_unit": 100,
     "symbol_first": true,
-    "html_entity": "S/.",
+    "html_entity": "S/",
     "decimal_mark": ".",
     "thousands_separator": ",",
     "iso_numeric": "604",

data/lib/money/locale_backend/i18n.rb

@@ -5,7 +5,8 @@ class Money
     class I18n < Base
       KEY_MAP = {
         thousands_separator: :delimiter,
-        decimal_mark: :separator
+        decimal_mark: :separator,
+        symbol: :unit
       }.freeze
 
       def initialize

data/lib/money/money.rb

@@ -276,10 +276,13 @@ class Money
   #   Money.new(100, "EUR") #=> #<Money @fractional=100 @currency="EUR">
   #
   def initialize(obj, currency = Money.default_currency, bank = Money.default_bank)
-    @fractional = obj.respond_to?(:fractional) ? obj.fractional : as_d(obj)
+    @fractional = as_d(obj.respond_to?(:fractional) ? obj.fractional : obj)
     @currency   = obj.respond_to?(:currency) ? obj.currency : Currency.wrap(currency)
     @currency ||= Money.default_currency
     @bank       = obj.respond_to?(:bank) ? obj.bank : bank
+
+    # BigDecimal can be Infinity and NaN, money of that amount does not make sense
+    raise ArgumentError, 'must be initialized with a finite value' unless @fractional.finite?
   end
 
   # Assuming using a currency using dollars:

data/lib/money/money/allocation.rb

@@ -24,8 +24,11 @@ class Money
         parts_sum = parts.inject(0, :+)
         part = parts.pop
 
-        current_split = remaining_amount * part / parts_sum
-        current_split = current_split.truncate if whole_amounts
+        current_split = 0
+        if parts_sum > 0
+          current_split = remaining_amount * part / parts_sum
+          current_split = current_split.truncate if whole_amounts
+        end
 
         result.unshift current_split
         remaining_amount -= current_split

data/lib/money/money/formatting_rules.rb

@@ -103,15 +103,18 @@ class Money
 
     def warn_about_deprecated_rules(rules)
       if rules.has_key?(:symbol_position)
-        warn '[DEPRECATION] `symbol_position:` option is deprecated - use `format` to specify the formatting template.'
+        position = rules[:symbol_position]
+        template = position == :before ? '%u %n' : '%n %u'
+
+        warn "[DEPRECATION] `symbol_position: :#{position}` is deprecated - you can replace it with `format: #{template}`"
       end
 
       if rules.has_key?(:symbol_before_without_space)
-        warn '[DEPRECATION] `symbol_before_without_space:` option is deprecated - use `format` to specify the formatting template.'
+        warn "[DEPRECATION] `symbol_before_without_space:` option is deprecated - you can replace it with `format: '%u%n'`"
       end
 
       if rules.has_key?(:symbol_after_without_space)
-        warn '[DEPRECATION] `symbol_after_without_space:` option is deprecated - use `format` to specify the formatting template.'
+        warn "[DEPRECATION] `symbol_after_without_space:` option is deprecated - you can replace it with `format: '%n%u'`"
       end
 
       if rules.has_key?(:html)
@@ -121,7 +124,6 @@ class Money
       if rules.has_key?(:html_wrap_symbol)
         warn "[DEPRECATION] `html_wrap_symbol` is deprecated - use `html_wrap` instead. Please note that `html_wrap` will wrap all parts of currency."
       end
-
     end
   end
 end

data/lib/money/version.rb

@@ -1,3 +1,3 @@
 class Money
-  VERSION = '6.13.1'
+  VERSION = '6.13.2'
 end

data/money.gemspec

@@ -16,7 +16,7 @@ Gem::Specification.new do |s|
 
   s.add_dependency 'i18n', [">= 0.6.4", '<= 2']
 
-  s.add_development_dependency "bundler", "~> 1.3"
+  s.add_development_dependency "bundler"
   s.add_development_dependency "rake"
   s.add_development_dependency "rspec", "~> 3.4"
   s.add_development_dependency "yard", "~> 0.9.11"

data/spec/locale_backend/i18n_spec.rb

@@ -21,7 +21,7 @@ describe Money::LocaleBackend::I18n do
       before do
         I18n.locale = :de
         I18n.backend.store_translations(:de, number: {
-          currency: { format: { delimiter: '.', separator: ',' } }
+          currency: { format: { delimiter: '.', separator: ',', unit: '$' } }
         })
       end
 
@@ -32,6 +32,10 @@ describe Money::LocaleBackend::I18n do
       it 'returns decimal_mark based on the current locale' do
         expect(subject.lookup(:decimal_mark, nil)).to eq(',')
       end
+
+      it 'returns symbol based on the current locale' do
+        expect(subject.lookup(:symbol, nil)).to eq('$')
+      end
     end
 
     context 'with number.format defined' do
@@ -57,6 +61,10 @@ describe Money::LocaleBackend::I18n do
       it 'returns decimal_mark based on the current locale' do
         expect(subject.lookup(:decimal_mark, nil)).to eq(nil)
       end
+
+      it 'returns symbol based on the current locale' do
+        expect(subject.lookup(:symbol, nil)).to eq(nil)
+      end
     end
   end
 end

data/spec/money/allocation_spec.rb

@@ -87,6 +87,11 @@ describe Money::Allocation do
         expect(described_class.generate(10, [1, 1, 2])).to eq([3, 2, 5])
         expect(described_class.generate(100, [1, 1, 1])).to eq([34, 33, 33])
       end
+
+      it 'handles zero arguments' do
+        expect(described_class.generate(100, [1, 1, 0])).to eq([50, 50, 0])
+        expect(described_class.generate(100, [0, 1, 1])).to eq([0, 50, 50])
+      end
     end
 
     context 'fractional amounts' do

data/spec/money_spec.rb

@@ -92,6 +92,20 @@ describe Money do
       end
     end
 
+    context 'non-finite value is given' do
+      let(:error) { 'must be initialized with a finite value' }
+
+      it 'raises an error when trying to initialize with Infinity' do
+        expect { Money.new('Infinity') }.to raise_error(ArgumentError, error)
+        expect { Money.new(BigDecimal('Infinity')) }.to raise_error(ArgumentError, error)
+      end
+
+      it 'raises an error when trying to initialize with NaN' do
+        expect { Money.new('NaN') }.to raise_error(ArgumentError, error)
+        expect { Money.new(BigDecimal('NaN')) }.to raise_error(ArgumentError, error)
+      end
+    end
+
     context "with infinite_precision", :infinite_precision do
       context 'given the initializing value is 1.50' do
         let(:initializing_value) { 1.50 }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: money
 version: !ruby/object:Gem::Version
-  version: 6.13.1
+  version: 6.13.2
 platform: ruby
 authors:
 - Shane Emmons
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-27 00:00:00.000000000 Z
+date: 2019-01-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n
@@ -34,16 +34,16 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement