monetize 1.9.3 → 1.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9bf6700b6d319c454fcc18dc2ffd9414bd565d5797b456ffbe4db4bd16aa4d53
-  data.tar.gz: 11d999ec312805bed1f95b48f283d237785dffc6f64698a4b6c85f5a19f0d1d5
+  metadata.gz: fec107ece48dc97d0e602c4176dc4bee8e9dd7be4172c0a507df4efa941ddc12
+  data.tar.gz: d15c4dd9bfc270948d69e6ffb9483baa9cde97743111d0fb68b3f6f1db8d6c9d
 SHA512:
-  metadata.gz: 14414941fae908b1ef3e00c6c421f9572cafb159287d78816484dc7c1444078a294a058d9b718b82ecf8a0656db1ecb3f2304c807890d65575a19728c8df5159
-  data.tar.gz: fa4bfdf4d423f36b36918d41bdb2e695e8b684c75e195445f01391a94c7d9610777241511a90b8a6165d03fb0fd1a32860e422b644825a80267187eeaa1390fc
+  metadata.gz: 2bae292db1e6349b333248bab902017130ee85741e0321e8429216c83ca17c79003f36355eaced3e21fa8e9969df5a29f8fe538fe79ecef7f951b882f8cafe10
+  data.tar.gz: f5cc392537c1d8487c3117c680f9e49d0d38ec0db67fcda73594a4a7ce0dfddd8224338eaf5e97da880a86a5e31b4181fb287b9dd8b079f47ec104fd0edbfd49

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,17 @@
 # Changelog
 
+## 1.12.0
+- Update `to_money` to match money-rails to_hash.
+
+## 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
 

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/core_extensions/hash.rb

@@ -2,7 +2,16 @@
 
 class Hash
   def to_money(currency = nil)
-    hash_currency = self[:currency].is_a?(Hash) ? self[:currency][:iso_code] : self[:currency]
-    Money.new(self[:cents] || self[:fractional], hash_currency || currency || Money.default_currency)
+    money_hash = self.respond_to?(:with_indifferent_access) ? self.with_indifferent_access : self
+
+    hash_currency = if money_hash[:currency].is_a?(Hash)
+                      money_hash[:currency][:iso_code]
+                    elsif money_hash[:currency_iso] && !money_hash[:currency_iso].empty?
+                      money_hash[:currency_iso]
+                    else
+                      money_hash[:currency]
+                    end
+
+    Money.new(money_hash[:cents] || money_hash[:fractional], hash_currency || currency || Money.default_currency)
   end
 end

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
@@ -82,8 +89,8 @@ module Monetize
     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)
@@ -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']
@@ -153,7 +165,7 @@ module Monetize
     end
 
     def currency_symbol_regex
-      /(?<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.3'
+  VERSION = '1.12.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
@@ -230,6 +230,14 @@ describe Monetize, 'core extensions' do
           expect(hash.to_money).to eq(Money.new(100, 'USD'))
         end
       end
+        
+      context 'when Money to_hash is used' do
+        subject(:hash) { { cents: 100, currency_iso: 'SGD' } }
+
+        it 'converts Hash to Money, interpreting fractional as cents' do
+          expect(hash.to_money).to eq(Money.new(100, 'SGD'))
+        end
+      end
     end
   end
 

data/spec/monetize_spec.rb

@@ -118,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
@@ -311,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
 
@@ -324,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.3
+  version: 1.12.0
 platform: ruby
 authors:
 - Shane Emmons
 - Anthony Dmitriyev
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-01-01 00:00:00.000000000 Z
+date: 2022-01-07 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.22
+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.