monetize 1.8.0 → 1.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2a6b1289754e6b83edb823b89e503d483cef3702
-  data.tar.gz: 7a8101c6719d5fb91f79ec85be449520ada30225
+  metadata.gz: e26348a04058d672c804c80a19beb2c4615f9a33
+  data.tar.gz: 68697cc2d144f4e6ce17e7784e0dcb5188a482fb
 SHA512:
-  metadata.gz: bd40b6b99cc913a0e8f65bad08f7d1ab0ad06a0117f5b1038e4fb43a559b04a0812bdd28e0826005f979f565ba9e6a404fa73e617457c7d5ea0c0d43b8480f93
-  data.tar.gz: e356b03bf3a1c5ad46ab0725e1c99e1bd52723e451f28e1c68f3b6dbfe3529d21a5750046a595f0c7c2b7f6de10c71f1abfa02d10caa3ef71d056ec04a4e0085
+  metadata.gz: 452be2be436b0ea57611a2a32b3230486f8f3de40cb74e4286931528a6db05fd2cddc114ca5373be7a92f4680a0f50a3992af373920b09f65c233fd0f9cb0007
+  data.tar.gz: db4134e4c44bb2b58fd12d6c7ff2d5e3259b76ba6971215cbdd61759d715cf98b014066f165dfea5cf79ac5c7997937ca1fc3ff0ceae8ce604424c41370def1f

data/.travis.yml

@@ -4,9 +4,10 @@ rvm:
   - 1.9.3
   - 2.0.0
   - 2.1.10
-  - 2.2.7
-  - 2.3.4
-  - 2.4.1
+  - 2.2.10
+  - 2.3.7
+  - 2.4.4
+  - 2.5.1
   - jruby-9.0.5.0
 script: bundle exec rspec spec
 notifications:

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## 1.9.0
+- Relax Money gem dependency to ~> 6.12
+- Refactor `Monetize::Parser`
+- Ruby 2.5 support
+
 ## 1.8.0
 - Money version updated to 6.11.2
 - Fix rounding problem in `.from_bigdecimal`

data/lib/monetize.rb

@@ -19,64 +19,54 @@ module Monetize
     # though, it will try to determine the correct separator by itself. Set this
     # to true to enforce the delimiters set in the currency all the time.
     attr_accessor :enforce_currency_delimiters
-  end
 
-  def self.parse(input, currency = Money.default_currency, options = {})
-    parse! input, currency, options
-  rescue Error
-    nil
-  end
+    def parse(input, currency = Money.default_currency, options = {})
+      parse! input, currency, options
+    rescue Error
+      nil
+    end
 
-  def self.parse!(input, currency = Money.default_currency, options = {})
-    return input if input.is_a?(Money)
-    return from_numeric(input, currency) if input.is_a?(Numeric)
+    def parse!(input, currency = Money.default_currency, options = {})
+      return input if input.is_a?(Money)
+      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)
+      parser = Monetize::Parser.new(input, currency, options)
+      currency_from_input = Money::Currency.wrap(parser.parse_currency)
 
-    Money.new(parser.parse_cents(currency_from_input), currency_from_input)
-  rescue Money::Currency::UnknownCurrency => e
-    fail ParseError, e.message
-  end
+      Money.new(parser.parse_cents(currency_from_input), currency_from_input)
+    rescue Money::Currency::UnknownCurrency => e
+      fail ParseError, e.message
+    end
 
-  def self.parse_collection(input, currency = Money.default_currency, options = {})
-    Collection.parse(input, currency, options)
-  end
+    def parse_collection(input, currency = Money.default_currency, options = {})
+      Collection.parse(input, currency, options)
+    end
 
-  def self.from_string(value, currency = Money.default_currency)
-    value = BigDecimal.new(value.to_s)
-    from_bigdecimal(value, currency)
-  end
+    def from_string(value, currency = Money.default_currency)
+      value = BigDecimal.new(value.to_s)
+      Money.from_amount(value, currency)
+    end
 
-  def self.from_fixnum(value, currency = Money.default_currency)
-    currency = Money::Currency.wrap(currency)
-    value *= currency.subunit_to_unit
-    Money.new(value, currency)
-  end
-  singleton_class.send(:alias_method, :from_integer, :from_fixnum)
+    def from_fixnum(value, currency = Money.default_currency)
+      Money.from_amount(value, currency)
+    end
+    alias_method :from_integer, :from_fixnum
 
-  def self.from_float(value, currency = Money.default_currency)
-    value = BigDecimal.new(value.to_s)
-    from_bigdecimal(value, currency)
-  end
+    def from_float(value, currency = Money.default_currency)
+      Money.from_amount(value, currency)
+    end
 
-  def self.from_bigdecimal(value, currency = Money.default_currency)
-    Money.from_amount(value, currency)
-  end
+    def from_bigdecimal(value, currency = Money.default_currency)
+      Money.from_amount(value, currency)
+    end
 
-  def self.from_numeric(value, currency = Money.default_currency)
-    case value
-    when Integer
-      from_fixnum(value, currency)
-    when Numeric
-      value = BigDecimal.new(value.to_s)
-      from_bigdecimal(value, currency)
-    else
-      fail ArgumentError, "'value' should be a type of Numeric"
+    def from_numeric(value, currency = Money.default_currency)
+      fail ArgumentError, "'value' should be a type of Numeric" unless value.is_a?(Numeric)
+      Money.from_amount(value, currency)
     end
-  end
 
-  def self.extract_cents(input, currency = Money.default_currency)
-    Monetize::Parser.new(input).parse_cents(currency)
+    def extract_cents(input, currency = Money.default_currency)
+      Monetize::Parser.new(input).parse_cents(currency)
+    end
   end
 end

data/lib/monetize/parser.rb

@@ -42,7 +42,7 @@ module Monetize
 
       negative, num = extract_sign(num)
 
-      num.chop! if num.match(/[\.|,]$/)
+      num.chop! if num =~ /[\.|,]$/
 
       major, minor = extract_major_minor(num, currency)
 
@@ -56,11 +56,9 @@ module Monetize
     end
 
     def parse_currency
-      computed_currency = if options.fetch(:assume_from_symbol) { Monetize.assume_from_symbol }
-                            compute_currency
-                          else
-                            input[/[A-Z]{2,3}/]
-                          end
+      computed_currency = nil
+      computed_currency = compute_currency if assume_from_symbol?
+      computed_currency ||= input[/[A-Z]{2,3}/]
 
       computed_currency || fallback_currency || Money.default_currency
     end
@@ -69,6 +67,10 @@ module Monetize
 
     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)
@@ -82,17 +84,9 @@ module Monetize
       negative ? cents * -1 : cents
     end
 
-    def contains_currency_symbol?
-      input =~ currency_symbol_regex
-    end
-
     def compute_currency
-      if contains_currency_symbol?
-        matches = input.match(currency_symbol_regex)
-        CURRENCY_SYMBOLS[matches[:symbol]]
-      else
-        input[/[A-Z]{2,3}/]
-      end
+      matches = input.match(currency_symbol_regex)
+      CURRENCY_SYMBOLS[matches[:symbol]] if matches
     end
 
     def extract_major_minor(num, currency)
@@ -114,7 +108,7 @@ module Monetize
     def extract_major_minor_with_single_delimiter(num, currency, delimiter)
       if delimiter == currency.decimal_mark
         split_major_minor(num, delimiter)
-      elsif Monetize.enforce_currency_delimiters and delimiter == currency.thousands_separator
+      elsif Monetize.enforce_currency_delimiters && delimiter == currency.thousands_separator
         [num.gsub(delimiter, ''), 0]
       else
         extract_major_minor_with_tentative_delimiter(num, delimiter)
@@ -128,7 +122,7 @@ module Monetize
       else
         possible_major, possible_minor = split_major_minor(num, delimiter)
 
-        if possible_minor.length != 3 or possible_major.length > 3 or delimiter == '.'
+        if possible_minor.length != 3 || possible_major.length > 3 || delimiter == '.'
           # Doesn't look like thousands separator
           [possible_major, possible_minor]
         else
@@ -147,7 +141,7 @@ module Monetize
     end
 
     def extract_sign(input)
-      result = (input =~ /^-+(.*)$/ or input =~ /^(.*)-+$/) ? [true, $1] : [false, input]
+      result = (input =~ /^-+(.*)$/ || input =~ /^(.*)-+$/) ? [true, $1] : [false, input]
       fail ParseError, 'Invalid amount (hyphen)' if result[1].include?('-')
       result
     end
@@ -174,8 +168,7 @@ module Monetize
 
     def split_major_minor(num, delimiter)
       major, minor = num.split(delimiter)
-      minor = '00' unless minor
-      [major, minor]
+      [major, minor || '00']
     end
 
     def currency_symbol_regex

data/lib/monetize/version.rb

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

data/monetize.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'money', '~> 6.11.2'
+  spec.add_dependency 'money', '~> 6.12'
 
   spec.add_development_dependency 'bundler', '~> 1.3'
   spec.add_development_dependency 'rake'

data/spec/monetize_spec.rb

@@ -483,14 +483,6 @@ describe Monetize do
       expect { Monetize.from_numeric('100') }.to raise_error(Monetize::ArgumentError)
     end
 
-    it 'optimizes workload' do
-      expect(Monetize).to receive(:from_fixnum).with(1, 'USD').and_return(Money.new(1_00, 'USD'))
-      expect(Monetize.from_numeric(1, 'USD')).to eq Money.new(1_00, 'USD')
-      expect(Monetize).to receive(:from_bigdecimal).with(BigDecimal.new('1.0'), 'USD').
-        and_return(Money.new(1_00, 'USD'))
-      expect(Monetize.from_numeric(1.0, 'USD')).to eq Money.new(1_00, 'USD')
-    end
-
     it 'respects :subunit_to_unit currency property' do
       expect(Monetize.from_numeric(1, 'USD')).to eq Money.new(1_00, 'USD')
       expect(Monetize.from_numeric(1, 'TND')).to eq Money.new(1_000, 'TND')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: monetize
 version: !ruby/object:Gem::Version
-  version: 1.8.0
+  version: 1.9.0
 platform: ruby
 authors:
 - Shane Emmons
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-03 00:00:00.000000000 Z
+date: 2018-08-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: money
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 6.11.2
+        version: '6.12'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 6.11.2
+        version: '6.12'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement