monetize 1.9.4 → 1.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6268692fea7908fbc268790bf98cca9795df28eed380b07d2683eed6f5dad4d1
-  data.tar.gz: 8d795add425b915dc88ecf910505af69b7c1f340ae412083e4c230f0622c2e27
+  metadata.gz: 10b41ae5e40bb51d6d3fae9eb49cdd73c7be8542dd80c43467a12483f1c8e63b
+  data.tar.gz: 86ccb9489502a681cc271cca544eb2f1dbf9268034f1a7b83e2d1ddaa97d4f9a
 SHA512:
-  metadata.gz: e4291ebf0a43a4bea5a2973186b1dca2d9d9fa08729acb956073efb2628d6898620f5eb1110ade3bba5dbac313894babd4ab59c0d1db92b8cb8e041974a0d402
-  data.tar.gz: 06d080183a460c5777b9f7443655bcb00d214ee18a6294f0838a3ac4bfec95715ab1ad5704001d286a6bc1ed0966a4a031942bd946ef9d249372ea527a120785
+  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,11 @@
 # 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
 

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/parser.rb

@@ -50,7 +50,7 @@ module Monetize
 
       major, minor = extract_major_minor(num, currency)
 
-      amount = BigDecimal([major, minor].join(DEFAULT_DECIMAL_MARK))
+      amount = to_big_decimal([major, minor].join(DEFAULT_DECIMAL_MARK))
       amount = apply_multiplier(multiplier_exp, amount)
       amount = apply_sign(negative, amount)
 
@@ -59,12 +59,19 @@ module Monetize
 
     private
 
+    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
@@ -119,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']

data/lib/monetize/version.rb

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

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

data/spec/monetize_spec.rb

@@ -118,6 +118,10 @@ 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')
@@ -316,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
 
@@ -329,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

data/spec/spec_helper.rb

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

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: monetize
 version: !ruby/object:Gem::Version
-  version: 1.9.4
+  version: 1.11.0
 platform: ruby
 authors:
 - Shane Emmons
 - Anthony Dmitriyev
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-01-07 00:00:00.000000000 Z
+date: 2021-03-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: money
@@ -75,14 +75,13 @@ 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
@@ -107,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
@@ -122,8 +121,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-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,21 +0,0 @@
-sudo: false
-language:
-  - ruby
-  - java
-rvm:
-  - 1.9.3
-  - 2.0.0
-  - 2.1.10
-  - 2.2.10
-  - 2.3.8
-  - 2.4.6
-  - 2.5.5
-  - 2.6.3
-  - jruby-9.0.5.0
-jdk: openjdk8
-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.