monetize 1.9.1 → 1.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 7c921047a6f291ae61ceb19db130de7b0288d8e2
-  data.tar.gz: f48eb20c8582b1453ef6114df30793f9367d934e
+SHA256:
+  metadata.gz: 10b41ae5e40bb51d6d3fae9eb49cdd73c7be8542dd80c43467a12483f1c8e63b
+  data.tar.gz: 86ccb9489502a681cc271cca544eb2f1dbf9268034f1a7b83e2d1ddaa97d4f9a
 SHA512:
-  metadata.gz: 9b4a49126c30cfd92968d6fed6cd43a806e5cda807f8dfd0c8956d434e0e3a3331191d9e228e5648c4d11157f01d3c3fcdb72f72f21e52f96002ab803b70265a
-  data.tar.gz: 571ec0ec170014d408f4ba0208a1b40f04cdf3436b2939e7d43b922cfe2ce3e981fb5a51a6dc79eab8d07ccad4ecfbc270548e15b4293428df87dbc0c912d277
+  metadata.gz: c25475d1877bc00dceb06e01cb6863e4e805e87128320b6f77f2a7847930d22e1930ec9ee7cbe0f7efc462428348c05937121b2c45830cbf8f2003fd89dcd64c
+  data.tar.gz: fe0a09adc661a2d4afbbc7ee7ee7327d55fef5be9045f8c54d487121e6cc7057d9b53e1fa3890abad382fb8a71e178c69da04a2d95c069cd07880ae22f5f6818

data/.github/workflows/ruby.yml

@@ -0,0 +1,34 @@
+# This workflow uses actions that are not certified by GitHub.
+# They are provided by a third-party and are governed by
+# separate terms of service, privacy policy, and support
+# documentation.
+# This workflow will download a prebuilt Ruby version, install dependencies and run tests with Rake
+# For more information see: https://github.com/marketplace/actions/setup-ruby-jruby-and-truffleruby
+
+name: Ruby
+
+on:
+  push:
+    branches: [ main ]
+  pull_request:
+    branches: [ main ]
+
+jobs:
+  test:
+
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        ruby-version: ['2.6', '2.7', '3.0']
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up Ruby
+    # To automatically get bug fixes and new Ruby versions for ruby/setup-ruby,
+    # change this to (see https://github.com/ruby/setup-ruby#versioning):
+      uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: ${{ matrix.ruby-version }}
+        bundler-cache: true # runs 'bundle install' and caches installed gems automatically
+    - name: Run tests
+      run: bundle exec rspec spec

data/.gitignore

@@ -15,3 +15,4 @@ spec/reports
 test/tmp
 test/version_tmp
 tmp
+.ruby-version

data/CHANGELOG.md

@@ -1,5 +1,21 @@
 # Changelog
 
+## 1.11.0
+- When parsing a string assume a single separator to be a decimal mark when number starts with 0
+
+## 1.10.0
+- When using the `assume_from_symbol` option, the currency in the input string will be used over the assumed currency based on symbol. For example, `$1.05 CAD` will use `CAD` instead of `USD`.
+
+## 1.9.4
+- Fix symbol parsing that are surrounded by other characters
+
+## 1.9.3
+- Fix input parsing when currency symbol after the amount
+
+## 1.9.2
+- Respect Money.rounding_mode when parsing strings
+- Deprecate Monetize.extract_cents
+
 ## 1.9.1
 - Ruby 2.6 support
 

data/Gemfile

@@ -1,7 +1,5 @@
 source 'https://rubygems.org'
 
-gem 'coveralls', '>= 0.8.20', require: false
-
 # JSON and I18n gem no longer supports ruby < 2.0.0
 if defined?(JRUBY_VERSION)
   gem 'json'

data/LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2021 Shane Emmons
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

data/README.md

@@ -3,7 +3,6 @@
 [![Gem Version](https://badge.fury.io/rb/monetize.svg)](http://badge.fury.io/rb/monetize)
 [![Build Status](https://travis-ci.org/RubyMoney/monetize.svg?branch=master)](https://travis-ci.org/RubyMoney/monetize)
 [![Code Climate](https://codeclimate.com/github/RubyMoney/monetize.svg)](https://codeclimate.com/github/RubyMoney/monetize)
-[![Coverage Status](https://coveralls.io/repos/RubyMoney/monetize/badge.svg)](https://coveralls.io/r/RubyMoney/monetize)
 [![Dependency Status](https://gemnasium.com/RubyMoney/monetize.svg)](https://gemnasium.com/RubyMoney/monetize)
 [![License](https://img.shields.io/badge/license-MIT-green.svg)](http://opensource.org/licenses/MIT)
 

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,47 +50,47 @@ module Monetize
 
       major, minor = extract_major_minor(num, currency)
 
-      major, minor = apply_multiplier(multiplier_exp, major.to_i, minor)
+      amount = to_big_decimal([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)
+    def to_big_decimal(value)
+      BigDecimal(value)
+    rescue ::ArgumentError => err
+      fail ParseError, err.message
     end
 
+    attr_reader :input, :fallback_currency, :options
+
     def parse_currency
       computed_currency = nil
-      computed_currency = compute_currency if assume_from_symbol?
-      computed_currency ||= input[/[A-Z]{2,3}/]
+      computed_currency = input[/[A-Z]{2,3}/]
+      computed_currency ||= compute_currency if assume_from_symbol?
+
 
       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
-      matches = input.match(currency_symbol_regex)
-      CURRENCY_SYMBOLS[matches[:symbol]] if matches
+      match = input.match(currency_symbol_regex)
+      CURRENCY_SYMBOLS[match.to_s] if match
     end
 
     def extract_major_minor(num, currency)
@@ -122,8 +126,13 @@ module Monetize
       else
         possible_major, possible_minor = split_major_minor(num, delimiter)
 
-        if possible_minor.length != 3 || possible_major.length > 3 || delimiter == '.'
-          # Doesn't look like thousands separator
+        # Doesn't look like thousands separator
+        is_decimal_mark = possible_minor.length != 3 ||
+                          possible_major.length > 3 ||
+                          possible_major.to_i == 0 ||
+                          delimiter == '.'
+
+        if is_decimal_mark
           [possible_major, possible_minor]
         else
           ["#{possible_major}#{possible_minor}", '00']
@@ -150,29 +159,13 @@ 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']
     end
 
     def currency_symbol_regex
-      /\A[\+|\-]?(?<symbol>#{regex_safe_symbols})/
+      /(?<![A-Z])(#{regex_safe_symbols})(?![A-Z])/i
     end
   end
 end

data/lib/monetize/version.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
 
 module Monetize
-  VERSION = '1.9.1'
+  VERSION = '1.11.0'
 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

@@ -7,7 +7,7 @@ require 'monetize/core_extensions'
 describe Monetize, 'core extensions' do
   describe NilClass do
     describe '#to_money' do
-      it 'work as documented' do
+      it 'works as documented' do
         money = nil.to_money
         expect(money.cents).to eq 0
         expect(money.currency).to eq Money.default_currency
@@ -22,7 +22,7 @@ describe Monetize, 'core extensions' do
 
   describe Numeric do
     describe '#to_money' do
-      it 'work as documented' do
+      it 'works as documented' do
         money = 1234.to_money
         expect(money.cents).to eq 1_234_00
         expect(money.currency).to eq Money.default_currency
@@ -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

@@ -70,6 +70,10 @@ describe Monetize do
               expect(Monetize.parse("#{symbol}#{amount_in_units}")).to eq Money.new(amount, iso_code)
             end
 
+            it "parses formatted inputs with #{iso_code} symbol is after the amount" do
+              expect(Monetize.parse("#{amount_in_units}#{symbol}")).to eq Money.new(amount, iso_code)
+            end
+
             context 'prefix' do
               it 'parses formatted inputs with plus sign and currency as a symbol' do
                 expect(Monetize.parse("+#{symbol}#{amount_in_units}")).to eq Money.new(amount, iso_code)
@@ -114,6 +118,15 @@ describe Monetize do
           expect(Monetize.parse('L9.99')).to eq Money.new(999, 'USD')
         end
 
+        it 'should use provided currency over symbol' do
+          expect(Monetize.parse('$1.05 CAD')).to eq Money.new(105, 'CAD')
+        end
+
+        it 'ignores ZAR symbols that is part of a text' do
+          expect(Monetize.parse('EUR 9.99')).to eq Money.new(999, 'EUR')
+          expect(Monetize.parse('9.99 EUR')).to eq Money.new(999, 'EUR')
+        end
+
         context 'negatives' do
           it 'ignores the ambiguous kr symbol' do
             # Could mean either of DKK, EEK, ISK, NOK, SEK
@@ -307,6 +320,29 @@ describe Monetize do
         expect('€8.883.331,0034'.to_money('EU4')).to eq Money.new(8_883_331_0034, 'EU4')
         # rubocop:enable Style/NumericLiterals
       end
+
+      it 'parses strings deducing a decimal mark when a single delimiter is used and major is 0' do
+        expect('$0,4'.to_money('BAR')).to eq Money.new(4000, 'BAR')
+        expect('€0.4'.to_money('EU4')).to eq Money.new(4000, 'EU4')
+
+        expect('$0,04'.to_money('BAR')).to eq Money.new(400, 'BAR')
+        expect('€0.04'.to_money('EU4')).to eq Money.new(400, 'EU4')
+
+        expect('$0,004'.to_money('BAR')).to eq Money.new(40, 'BAR')
+        expect('€0.004'.to_money('EU4')).to eq Money.new(40, 'EU4')
+
+        expect('$0,0004'.to_money('BAR')).to eq Money.new(4, 'BAR')
+        expect('€0.0004'.to_money('EU4')).to eq Money.new(4, 'EU4')
+
+        expect('$0,0024'.to_money('BAR')).to eq Money.new(24, 'BAR')
+        expect('€0.0024'.to_money('EU4')).to eq Money.new(24, 'EU4')
+
+        expect('$0,0324'.to_money('BAR')).to eq Money.new(324, 'BAR')
+        expect('€0.0324'.to_money('EU4')).to eq Money.new(324, 'EU4')
+
+        expect('$0,5324'.to_money('BAR')).to eq Money.new(5324, 'BAR')
+        expect('€0.5324'.to_money('EU4')).to eq Money.new(5324, 'EU4')
+      end
     end
   end
 
@@ -320,6 +356,10 @@ describe Monetize do
     it 'raises ArgumentError when unable to detect polarity' do
       expect { Monetize.parse!('-$5.95-') }.to raise_error Monetize::ParseError
     end
+
+    it 'raises ArgumentError with invalid format' do
+      expect { Monetize.parse!('11..0') }.to raise_error Monetize::ParseError
+    end
   end
 
   describe '.parse_collection' do
@@ -520,6 +560,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

data/spec/spec_helper.rb

@@ -1,6 +1,4 @@
 # encoding: utf-8
-require 'coveralls'
-Coveralls.wear!
 
 require 'money'
 

metadata

@@ -1,14 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: monetize
 version: !ruby/object:Gem::Version
-  version: 1.9.1
+  version: 1.11.0
 platform: ruby
 authors:
 - Shane Emmons
-autorequire: 
+- Anthony Dmitriyev
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-02-16 00:00:00.000000000 Z
+date: 2021-03-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: money
@@ -69,18 +70,18 @@ dependencies:
 description: A library for converting various objects into `Money` objects.
 email:
 - shane@emmons.io
+- anthony.dmitriyev@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".coveralls.yml"
+- ".github/workflows/ruby.yml"
 - ".gitignore"
 - ".rubocop.yml"
-- ".travis.yml"
 - CHANGELOG.md
 - CONTRIBUTING.md
 - Gemfile
-- LICENSE.txt
+- LICENSE
 - README.md
 - Rakefile
 - lib/monetize.rb
@@ -105,7 +106,7 @@ metadata:
   changelog_uri: https://github.com/RubyMoney/monetize/blob/master/CHANGELOG.md
   source_code_uri: https://github.com/RubyMoney/monetize/
   bug_tracker_uri: https://github.com/RubyMoney/monetize/issues
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -120,9 +121,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.8
-signing_key: 
+rubygems_version: 3.2.3
+signing_key:
 specification_version: 4
 summary: A library for converting various objects into `Money` objects.
 test_files:

data/.coveralls.yml

@@ -1 +0,0 @@
-repo_token: pbKErt5rAW1iRYGMIAGGAAHfVRmiBzxfd

data/.travis.yml

@@ -1,18 +0,0 @@
-sudo: false
-language: ruby
-rvm:
-  - 1.9.3
-  - 2.0.0
-  - 2.1.10
-  - 2.2.10
-  - 2.3.7
-  - 2.4.4
-  - 2.5.1
-  - 2.6.0
-  - jruby-9.0.5.0
-before_install:
-  - gem install bundler --version '~> 1.17'
-script: bundle exec rspec spec
-notifications:
-  recipients:
-    - shane@emmons.io

data/LICENSE.txt

@@ -1,22 +0,0 @@
-Copyright (c) 2013 Shane Emmons
-
-MIT License
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.