monetize 1.9.1 → 1.9.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7c921047a6f291ae61ceb19db130de7b0288d8e2
-  data.tar.gz: f48eb20c8582b1453ef6114df30793f9367d934e
+  metadata.gz: e6d46a5e6d4c8b7e1dec430cfeb98a98536bb336
+  data.tar.gz: 523799519e83fca200b5d813a0ca010ab2ae090e
 SHA512:
-  metadata.gz: 9b4a49126c30cfd92968d6fed6cd43a806e5cda807f8dfd0c8956d434e0e3a3331191d9e228e5648c4d11157f01d3c3fcdb72f72f21e52f96002ab803b70265a
-  data.tar.gz: 571ec0ec170014d408f4ba0208a1b40f04cdf3436b2939e7d43b922cfe2ce3e981fb5a51a6dc79eab8d07ccad4ecfbc270548e15b4293428df87dbc0c912d277
+  metadata.gz: a88d6ce931f8c0d37653c3067a76caa4be8f5adbc10d78e2c1ee5d8b8089163b38926506c5e1a3524192b3d7e745a22f1d48d9773570239ce11f5a0fc122ee1d
+  data.tar.gz: d83465b93fdf95a3cb25ecfa805e694a775dab789766b046076948382cb01f64aeb78484b53e9afa60fd557a317fbfcd3ac51208559693c8196e9228a27c9ea6

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 1.9.2
+- Respect Money.rounding_mode when parsing strings
+- Deprecate Monetize.extract_cents
+
 ## 1.9.1
 - Ruby 2.6 support
 

data/lib/monetize.rb

@@ -31,9 +31,9 @@ module Monetize
       return from_numeric(input, currency) if input.is_a?(Numeric)
 
       parser = Monetize::Parser.new(input, currency, options)
-      currency_from_input = Money::Currency.wrap(parser.parse_currency)
+      amount, currency = parser.parse
 
-      Money.new(parser.parse_cents(currency_from_input), currency_from_input)
+      Money.from_amount(amount, currency)
     rescue Money::Currency::UnknownCurrency => e
       fail ParseError, e.message
     end
@@ -66,7 +66,10 @@ module Monetize
     end
 
     def extract_cents(input, currency = Money.default_currency)
-      Monetize::Parser.new(input).parse_cents(currency)
+      warn '[DEPRECATION] Monetize.extract_cents is deprecated. Use Monetize.parse().cents'
+
+      money = parse(input, currency)
+      money.cents if money
     end
   end
 end

data/lib/monetize/parser.rb

@@ -29,13 +29,17 @@ module Monetize
     MULTIPLIER_SUFFIXES.default = 0
     MULTIPLIER_REGEXP = Regexp.new(format('^(.*?\d)(%s)\b([^\d]*)$', MULTIPLIER_SUFFIXES.keys.join('|')), 'i')
 
+    DEFAULT_DECIMAL_MARK = '.'.freeze
+
     def initialize(input, fallback_currency = Money.default_currency, options = {})
       @input = input.to_s.strip
       @fallback_currency = fallback_currency
       @options = options
     end
 
-    def parse_cents(currency)
+    def parse
+      currency = Money::Currency.wrap(parse_currency)
+
       multiplier_exp, input = extract_multiplier
 
       num = input.gsub(/(?:^#{currency.symbol}|[^\d.,'-]+)/, '')
@@ -46,14 +50,16 @@ module Monetize
 
       major, minor = extract_major_minor(num, currency)
 
-      major, minor = apply_multiplier(multiplier_exp, major.to_i, minor)
+      amount = BigDecimal([major, minor].join(DEFAULT_DECIMAL_MARK))
+      amount = apply_multiplier(multiplier_exp, amount)
+      amount = apply_sign(negative, amount)
 
-      cents = major.to_i * currency.subunit_to_unit
+      [amount, currency]
+    end
 
-      cents += set_minor_precision(minor, currency)
+    private
 
-      apply_sign(negative, cents)
-    end
+    attr_reader :input, :fallback_currency, :options
 
     def parse_currency
       computed_currency = nil
@@ -63,25 +69,16 @@ module Monetize
       computed_currency || fallback_currency || Money.default_currency
     end
 
-    private
-
-    attr_reader :input, :fallback_currency, :options
-
     def assume_from_symbol?
       options.fetch(:assume_from_symbol) { Monetize.assume_from_symbol }
     end
 
-    def apply_multiplier(multiplier_exp, major, minor)
-      major *= 10**multiplier_exp
-      minor = minor.to_s + ('0' * multiplier_exp)
-      shift = minor[0...multiplier_exp].to_i
-      major += shift
-      minor = (minor[multiplier_exp..-1] || '')
-      [major, minor]
+    def apply_multiplier(multiplier_exp, amount)
+      amount * 10**multiplier_exp
     end
 
-    def apply_sign(negative, cents)
-      negative ? cents * -1 : cents
+    def apply_sign(negative, amount)
+      negative ? amount * -1 : amount
     end
 
     def compute_currency
@@ -150,22 +147,6 @@ module Monetize
       CURRENCY_SYMBOLS.keys.map { |key| Regexp.escape(key) }.join('|')
     end
 
-    def set_minor_precision(minor, currency)
-      if Money.infinite_precision
-        (BigDecimal(minor) / (10**minor.size)) * currency.subunit_to_unit
-      elsif minor.size < currency.decimal_places
-        (minor + ('0' * currency.decimal_places))[0, currency.decimal_places].to_i
-      elsif minor.size > currency.decimal_places
-        if minor[currency.decimal_places, 1].to_i >= 5
-          minor[0, currency.decimal_places].to_i + 1
-        else
-          minor[0, currency.decimal_places].to_i
-        end
-      else
-        minor.to_i
-      end
-    end
-
     def split_major_minor(num, delimiter)
       major, minor = num.split(delimiter)
       [major, minor || '00']

data/lib/monetize/version.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
 
 module Monetize
-  VERSION = '1.9.1'
+  VERSION = '1.9.2'
 end

data/monetize.gemspec

@@ -7,8 +7,8 @@ require 'English'
 Gem::Specification.new do |spec|
   spec.name          = 'monetize'
   spec.version       = Monetize::VERSION
-  spec.authors       = ['Shane Emmons']
-  spec.email         = ['shane@emmons.io']
+  spec.authors       = ['Shane Emmons', 'Anthony Dmitriyev']
+  spec.email         = ['shane@emmons.io', 'anthony.dmitriyev@gmail.com']
   spec.description   = 'A library for converting various objects into `Money` objects.'
   spec.summary       = 'A library for converting various objects into `Money` objects.'
   spec.homepage      = 'https://github.com/RubyMoney/monetize'

data/spec/core_extensions_spec.rb

@@ -67,7 +67,8 @@ describe Monetize, 'core extensions' do
         '-1,000'          => Money.new(-1_000_00),
         '1,000.5'         => Money.new(1_000_50),
         '1,000.51'        => Money.new(1_000_51),
-        '1,000.505'       => Money.new(1_000_51),
+        '1,000.505'       => Money.new(1_000_50), # ROUND_HALF_EVEN default bankers rounding
+        '1,000.515'       => Money.new(1_000_52), # ROUND_HALF_EVEN default bankers rounding
         '1,000.504'       => Money.new(1_000_50),
         '1,000.0000'      => Money.new(1_000_00),
         '1,000.5000'      => Money.new(1_000_50),
@@ -149,6 +150,28 @@ describe Monetize, 'core extensions' do
         expect('1'.to_money('JPY')).to eq Money.new(1,     'JPY')
         expect('1.5'.to_money('KWD').cents).to eq 1_500
       end
+
+      it 'respects Money.rounding_mode' do
+        expect('1.009'.to_money).to eq(Money.new(1_01))
+
+        Money.rounding_mode(BigDecimal::ROUND_DOWN) do
+          expect('1.009'.to_money).to eq(Money.new(1_00))
+        end
+
+        expect('1.001'.to_money).to eq(Money.new(1_00))
+
+        Money.rounding_mode(BigDecimal::ROUND_UP) do
+          expect('1.001'.to_money).to eq(Money.new(1_01))
+        end
+      end
+
+      it 'produces results similar to Money.from_amount for all the rounding edge cases' do
+        (1_000..1_010).each do |amount|
+          amount = amount.to_f / 1000
+
+          expect(amount.to_s.to_money).to eq(Money.from_amount(amount))
+        end
+      end
     end
 
     describe '#to_currency' do

data/spec/monetize_spec.rb

@@ -520,6 +520,20 @@ describe Monetize do
   end
 
   describe '.extract_cents' do
+    it 'is deprecated' do
+      allow(Monetize).to receive(:warn)
+
+      Monetize.extract_cents('100')
+
+      expect(Monetize)
+        .to have_received(:warn)
+        .with('[DEPRECATION] Monetize.extract_cents is deprecated. Use Monetize.parse().cents')
+    end
+
+    it 'extracts cents from a given string' do
+      expect(Monetize.extract_cents('10.99')).to eq(1099)
+    end
+
     it "correctly treats pipe marks '|' in input (regression test)" do
       expect(Monetize.extract_cents('100|0')).to eq Monetize.extract_cents('100!0')
     end

metadata

@@ -1,14 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: monetize
 version: !ruby/object:Gem::Version
-  version: 1.9.1
+  version: 1.9.2
 platform: ruby
 authors:
 - Shane Emmons
+- Anthony Dmitriyev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-16 00:00:00.000000000 Z
+date: 2019-07-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: money
@@ -69,6 +70,7 @@ dependencies:
 description: A library for converting various objects into `Money` objects.
 email:
 - shane@emmons.io
+- anthony.dmitriyev@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []