Merge pull request #147 from trushkevich/deduce-decimal-mark-when-major-zero

Make parser deduce decimal mark when there is only one delimiter in a string and major is 0

Author: semmons99

CHANGELOG.md

@@ -1,5 +1,8 @@
 # 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`.
 

lib/monetize/parser.rb

@@ -126,8 +126,13 @@ def extract_major_minor_with_tentative_delimiter(num, delimiter)
       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']

lib/monetize/version.rb

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

spec/monetize_spec.rb

@@ -320,6 +320,29 @@
         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