monetize 1.3.0 → 1.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 38e7e5f39705dfc454cf5e40d7ba07aab4d8b5c1
-  data.tar.gz: 58a057ce76a10410fd919e5b015c96eaccbb74a5
+  metadata.gz: bdb994a311b7519b56c417e4496a36bd6e41c377
+  data.tar.gz: f788b003d6412c6c3263b58736602f38be014c65
 SHA512:
-  metadata.gz: 1cdfffde0b0b27e4b1d5fe929644808abee53edecc67d76a56d8b98e1d1ce51a66397bbf21b272644c44c4644d741ce84d22029267aec1d991021a3636cddbfd
-  data.tar.gz: 2b68ae2631ddc16b55feec5a240870859e408d9e00e919b8b857bbf59af5fa632435c2c5f46892f88fab094dbb318064bdcad42d3fca196a2edf7e7eaa5d70fb
+  metadata.gz: 6c7435ede20d6b291da530a7c67876d347a2b484b46781ff5a7d040b4de6de6ce9c7f0378ef2179473e541c6b70223d6a793eb4c11911da0e38cc1e92a32e61a
+  data.tar.gz: 12d53e41df08426527aceb44dd598bcf4dcdd926e6cf8d279ad8ce81e16f00b68a9b0503079df141dec6aa62de58e1f0ad7d3b4dee292a1b366f43df9c489571

data/CHANGELOG.md

@@ -1,10 +1,14 @@
 # Changelog
 
 ## Master
-- ???
+- Required Forwardable on Collection to resolve NameError [\#44](https://github.com/RubyMoney/monetize/issues/44)
+- Add capability to parse currency amounts given with suffixes (K, M, B, and T)
 
 ## 1.3.0
 - Add NilClass extension
 - Added correct parsing of Brazilian Real $R symbol
 - Add testing task for  Brazilian Real parsing 
 - Add Lira Sign (₤) as a symbol for GBP
+
+## 1.3.1
+- Updated Money version dependency to 6.6

data/lib/collection.rb

@@ -1,6 +1,7 @@
 # encoding: utf-8
 
 require 'monetize'
+require 'forwardable'
 
 module Monetize
   class Collection

data/lib/monetize.rb

@@ -18,6 +18,15 @@ module Monetize
     "C$"   => "CAD"
   }
 
+  MULTIPLIER_SUFFIXES = {
+    "K"    => 3,
+    "M"    => 6,
+    "B"    => 9,
+    "T"    => 12
+  }
+  MULTIPLIER_SUFFIXES.default = 0
+  MULTIPLIER_REGEXP = Regexp.new('\d(%s)\b[^\d]*$' % MULTIPLIER_SUFFIXES.keys.join('|'), 'i')
+
   # Class methods
   class << self
     # @attr_accessor [true, false] assume_from_symbol Use this to enable the
@@ -81,6 +90,9 @@ module Monetize
   end
 
   def self.extract_cents(input, currency = Money.default_currency)
+    multiplier_suffix = (matches = MULTIPLIER_REGEXP.match(input)) ? matches[1].upcase : nil
+    multiplier_exp = MULTIPLIER_SUFFIXES[multiplier_suffix]
+
     num = input.gsub(/[^\d.,'-]/, '')
 
     negative = num =~ /^-|-$/ ? true : false
@@ -138,7 +150,13 @@ module Monetize
     end
 
     cents = major.to_i * currency.subunit_to_unit
-    minor = minor.to_s
+
+    cents *= (10 ** multiplier_exp)
+    minor = minor.to_s + ('0' * multiplier_exp)
+    shift = minor[0 ... multiplier_exp].to_i * 100
+    cents += shift
+    minor = (minor[multiplier_exp .. -1] || '')
+
     minor = if minor.size < currency.decimal_places
               (minor + ("0" * currency.decimal_places))[0,currency.decimal_places].to_i
             elsif minor.size > currency.decimal_places

data/lib/monetize/version.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
 
 module Monetize
-  VERSION = "1.3.0"
+  VERSION = "1.3.1"
 end

data/monetize.gemspec

@@ -18,7 +18,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.5.0"
+  spec.add_dependency "money", "~> 6.6"
 
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"

data/spec/core_extensions_spec.rb

@@ -58,58 +58,66 @@ describe Monetize, "core extensions" do
     describe "#to_money" do
 
       STRING_TO_MONEY = {
-        "20.15"           => Money.new(20_15)             ,
-        "100"             => Money.new(100_00)            ,
-        "100.37"          => Money.new(100_37)            ,
-        "100,37"          => Money.new(100_37)            ,
-        "100 000"         => Money.new(100_000_00)        ,
-        "100,000.00"      => Money.new(100_000_00)        ,
-        "1,000"           => Money.new(1_000_00)          ,
-        "-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.504"       => Money.new(1_000_50)          ,
-        "1,000.0000"      => Money.new(1_000_00)          ,
-        "1,000.5000"      => Money.new(1_000_50)          ,
-        "1,000.5099"      => Money.new(1_000_51)          ,
-        "1.550"           => Money.new(1_55)              ,
-        "25."             => Money.new(25_00)             ,
-        ".75"             => Money.new(75)                ,
-
-        "100 USD"         => Money.new(100_00, "USD")     ,
-        "-100 USD"        => Money.new(-100_00, "USD")    ,
-        "100 EUR"         => Money.new(100_00, "EUR")     ,
-        "100.37 EUR"      => Money.new(100_37, "EUR")     ,
-        "100,37 EUR"      => Money.new(100_37, "EUR")     ,
-        "100,000.00 USD"  => Money.new(100_000_00, "USD") ,
-        "100.000,00 EUR"  => Money.new(100_000_00, "EUR") ,
-        "1,000 USD"       => Money.new(1_000_00, "USD")   ,
-        "-1,000 USD"      => Money.new(-1_000_00, "USD")  ,
-        "1,000.5500 USD"  => Money.new(1_000_55, "USD")   ,
-        "-1,000.6500 USD" => Money.new(-1_000_65, "USD")  ,
-        "1.550 USD"       => Money.new(1_55, "USD")       ,
-
-        "USD 100"         => Money.new(100_00, "USD")     ,
-        "EUR 100"         => Money.new(100_00, "EUR")     ,
-        "EUR 100.37"      => Money.new(100_37, "EUR")     ,
-        "CAD -100.37"     => Money.new(-100_37, "CAD")    ,
-        "EUR 100,37"      => Money.new(100_37, "EUR")     ,
-        "EUR -100,37"     => Money.new(-100_37, "EUR")    ,
-        "USD 100,000.00"  => Money.new(100_000_00, "USD") ,
-        "EUR 100.000,00"  => Money.new(100_000_00, "EUR") ,
-        "USD 1,000"       => Money.new(1_000_00, "USD")   ,
-        "USD -1,000"      => Money.new(-1_000_00, "USD")  ,
-        "USD 1,000.9000"  => Money.new(1_000_90, "USD")   ,
-        "USD -1,000.090"  => Money.new(-1_000_09, "USD")  ,
-        "USD 1.5500"      => Money.new(1_55, "USD")       ,
-
-        "$100 USD"        => Money.new(100_00, "USD")     ,
-        "$1,194.59 USD"   => Money.new(1_194_59, "USD")   ,
-        "$-1,955 USD"     => Money.new(-1_955_00, "USD")  ,
-        "$1,194.5900 USD" => Money.new(1_194_59, "USD")   ,
-        "$-1,955.000 USD" => Money.new(-1_955_00, "USD")  ,
-        "$1.99000 USD"    => Money.new(1_99, "USD")       ,
+        "20.15"           => Money.new(20_15)                 ,
+        "100"             => Money.new(100_00)                ,
+        "100.37"          => Money.new(100_37)                ,
+        "100,37"          => Money.new(100_37)                ,
+        "100 000"         => Money.new(100_000_00)            ,
+        "100,000.00"      => Money.new(100_000_00)            ,
+        "1,000"           => Money.new(1_000_00)              ,
+        "-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.504"       => Money.new(1_000_50)              ,
+        "1,000.0000"      => Money.new(1_000_00)              ,
+        "1,000.5000"      => Money.new(1_000_50)              ,
+        "1,000.5099"      => Money.new(1_000_51)              ,
+        "1.550"           => Money.new(1_55)                  ,
+        "25."             => Money.new(25_00)                 ,
+        ".75"             => Money.new(75)                    ,
+
+        "7.21K"           => Money.new(7_210_00)              ,
+        "1M"              => Money.new(1_000_000_00)          ,
+        "1.2M"            => Money.new(1_200_000_00)          ,
+        "1.37M"           => Money.new(1_370_000_00)          ,
+        "3.1415927M"      => Money.new(3_141_592_70)          ,
+        ".42B"            => Money.new(420_000_000_00)        ,
+        "5T"              => Money.new(5_000_000_000_000_00)  ,
+
+        "100 USD"         => Money.new(100_00, "USD")         ,
+        "-100 USD"        => Money.new(-100_00, "USD")        ,
+        "100 EUR"         => Money.new(100_00, "EUR")         ,
+        "100.37 EUR"      => Money.new(100_37, "EUR")         ,
+        "100,37 EUR"      => Money.new(100_37, "EUR")         ,
+        "100,000.00 USD"  => Money.new(100_000_00, "USD")     ,
+        "100.000,00 EUR"  => Money.new(100_000_00, "EUR")     ,
+        "1,000 USD"       => Money.new(1_000_00, "USD")       ,
+        "-1,000 USD"      => Money.new(-1_000_00, "USD")      ,
+        "1,000.5500 USD"  => Money.new(1_000_55, "USD")       ,
+        "-1,000.6500 USD" => Money.new(-1_000_65, "USD")      ,
+        "1.550 USD"       => Money.new(1_55, "USD")           ,
+
+        "USD 100"         => Money.new(100_00, "USD")         ,
+        "EUR 100"         => Money.new(100_00, "EUR")         ,
+        "EUR 100.37"      => Money.new(100_37, "EUR")         ,
+        "CAD -100.37"     => Money.new(-100_37, "CAD")        ,
+        "EUR 100,37"      => Money.new(100_37, "EUR")         ,
+        "EUR -100,37"     => Money.new(-100_37, "EUR")        ,
+        "USD 100,000.00"  => Money.new(100_000_00, "USD")     ,
+        "EUR 100.000,00"  => Money.new(100_000_00, "EUR")     ,
+        "USD 1,000"       => Money.new(1_000_00, "USD")       ,
+        "USD -1,000"      => Money.new(-1_000_00, "USD")      ,
+        "USD 1,000.9000"  => Money.new(1_000_90, "USD")       ,
+        "USD -1,000.090"  => Money.new(-1_000_09, "USD")      ,
+        "USD 1.5500"      => Money.new(1_55, "USD")           ,
+
+        "$100 USD"        => Money.new(100_00, "USD")         ,
+        "$1,194.59 USD"   => Money.new(1_194_59, "USD")       ,
+        "$-1,955 USD"     => Money.new(-1_955_00, "USD")      ,
+        "$1,194.5900 USD" => Money.new(1_194_59, "USD")       ,
+        "$-1,955.000 USD" => Money.new(-1_955_00, "USD")      ,
+        "$1.99000 USD"    => Money.new(1_99, "USD")           ,
       }
 
       it "works as documented" do

data/spec/monetize_spec.rb

@@ -95,6 +95,13 @@ describe Monetize do
           expect(Monetize.parse("€9.99+")).to eq Money.new(999, 'EUR')
         end
 
+        it 'parses formatted inputs with amounts given with suffixes' do
+          expect(Monetize.parse('$1.26K')).to eq Money.new(1_260_00, 'USD')
+          expect(Monetize.parse('$126.36M')).to eq Money.new(126_360_000_00, 'USD')
+          expect(Monetize.parse('€.45B')).to eq Money.new(450_000_000_00, 'EUR')
+          expect(Monetize.parse('-$2.45B')).to eq Money.new(-2_450_000_000_00, 'USD')
+          expect(Monetize.parse('€1.65T')).to eq Money.new(1_650_000_000_000_00, 'EUR')
+        end
       end
 
       context 'opted out' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: monetize
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.3.1
 platform: ruby
 authors:
 - Shane Emmons
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-29 00:00:00.000000000 Z
+date: 2015-07-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: money
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 6.5.0
+        version: '6.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 6.5.0
+        version: '6.6'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -115,7 +115,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: A library for converting various objects into `Money` objects.