shopify-money 0.13.1 → 0.14.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cc70e7001416dec80b01e52ccae94bffd95d19c017bb55f96d7e568a56744bfc
-  data.tar.gz: 28b867f14908d4def0d7c349416deb83937aa3ea9bcb4781bcc9325b309c0602
+  metadata.gz: b02e24a104e1494877174e804e31e40e09b65a274def627d659990efc1aee7de
+  data.tar.gz: e7938ab991812e180b648b0d300da322f4b231168242e645ea665481f5975d31
 SHA512:
-  metadata.gz: 77d1625cc5c76642ea49a4859e963b3f411f2d9dbe16faed7419ee58038812beb32cf350e05f4bb4dec8ca8240fd2c1a14121b3ac34f3e33ad1e0067cbebf9aa
-  data.tar.gz: 7f40317635b9a4e415535093d3e14716e83e4c5617c9c8a439750dd23c7de9486a283e89d39285101a343941b3c35c5385f0c2cbe82048f097f843630c487045
+  metadata.gz: e327e9a9a15df9319a137763fea1e959c029a8f41d7791509798b3fbdce1d105ce2eeabbfff97aee2e798df55dff55de7d2800e57f83f649efb9580c15db5a8a
+  data.tar.gz: 41ad146ac22f2803728c66547caddc3a108d997c1a010c35d748b264b8f9c90d9130a5e921ab9ac3fff489fb85d830c75a05b020b87a55a0fb8ac7587b40a8a1

data/.travis.yml

@@ -5,6 +5,7 @@ branches:
   only:
   - master
 rvm:
+  - 2.6
   - 2.5
   - 2.4
   - 2.3

data/lib/money/allocator.rb

@@ -37,11 +37,8 @@ class Money
     #   Money.new(10.01, "USD").allocate([0.5, 0.5], :roundrobin_reverse)
     #     #=> [#<Money value:5.00 currency:USD>, #<Money value:5.01 currency:USD>]
     def allocate(splits, strategy = :roundrobin)
-      if all_rational?(splits)
-        allocations = splits.inject(0) { |sum, n| sum + n }
-      else
-        allocations = splits.inject(0) { |sum, n| sum + Helpers.value_to_decimal(n) }
-      end
+      splits.map!(&:to_r)
+      allocations = splits.inject(0, :+)
 
       if (allocations - BigDecimal("1")) > Float::EPSILON
         raise ArgumentError, "splits add to more than 100%"
@@ -81,14 +78,11 @@ class Money
       maximums_total = maximums.reduce(Money.new(0, allocation_currency), :+)
 
       splits = maximums.map do |max_amount|
-        next(0) if maximums_total.zero?
+        next(Rational(0)) if maximums_total.zero?
         Money.rational(max_amount, maximums_total)
       end
 
-      total_allocatable = [
-        value * allocation_currency.subunit_to_unit,
-        maximums_total.value * allocation_currency.subunit_to_unit
-      ].min
+      total_allocatable = [maximums_total.subunits, self.subunits].min
 
       subunits_amounts, left_over = amounts_from_splits(1, splits, total_allocatable)
 
@@ -116,10 +110,12 @@ class Money
     end
 
     def amounts_from_splits(allocations, splits, subunits_to_split = subunits)
+      raise ArgumentError, "All splits values must be of type Rational." unless all_rational?(splits)
+
       left_over = subunits_to_split
 
       amounts = splits.collect do |ratio|
-        frac = (Helpers.value_to_decimal(subunits_to_split * ratio) / allocations).floor
+        frac = (subunits_to_split * ratio / allocations.to_r).floor
         left_over -= frac
         frac
       end

data/lib/money/version.rb

@@ -1,3 +1,3 @@
 class Money
-  VERSION = "0.13.1"
+  VERSION = "0.14.0"
 end

data/money.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency("rspec", "~> 3.2")
   s.add_development_dependency("database_cleaner", "~> 1.6")
   s.add_development_dependency("sqlite3", "~> 1.3.6")
-  s.add_development_dependency("bigdecimal", "~> 1.3.2")
+  s.add_development_dependency("bigdecimal", "~> 1.4.4")
 
   s.files = `git ls-files`.split($/)
   s.executables   = s.files.grep(%r{^bin/}) { |f| File.basename(f) }

data/spec/allocator_spec.rb

@@ -67,6 +67,12 @@ RSpec.describe "Allocator" do
     specify "#allocate raise ArgumentError when invalid strategy is provided" do
       expect { new_allocator(0.03).allocate([0.5, 0.5], :bad_strategy_name) }.to raise_error(ArgumentError, "Invalid strategy. Valid options: :roundrobin, :roundrobin_reverse")
     end
+
+    specify "#allocate does not raise ArgumentError when invalid splits types are provided" do
+      moneys = new_allocator(0.03).allocate([0.5, 0.5], :roundrobin)
+      expect(moneys[0]).to eq(Money.new(0.02))
+      expect(moneys[1]).to eq(Money.new(0.01))
+    end
   end
 
   describe 'allocate_max_amounts' do
@@ -127,6 +133,12 @@ RSpec.describe "Allocator" do
         new_allocator(3).allocate_max_amounts([Money.empty, Money.empty, Money.empty]),
       ).to eq([Money.empty, Money.empty, Money.empty])
     end
+
+    specify "#allocate_max_amounts allocates the right amount without rounding error" do
+      expect(
+        new_allocator(24.2).allocate_max_amounts([Money.new(46), Money.new(46), Money.new(50), Money.new(50),Money.new(50)]),
+        ).to eq([Money.new(4.6), Money.new(4.6), Money.new(5), Money.new(5), Money.new(5)])
+    end
   end
 
   def new_allocator(amount, currency = nil)

data/spec/core_extensions_spec.rb

@@ -56,6 +56,6 @@ RSpec.describe BigDecimal do
   it_should_behave_like "an object supporting to_money"
 
   it "parses a zero BigDecimal to Money.zero" do
-    expect(BigDecimal.new("-0.000").to_money).to eq(Money.zero)
+    expect(BigDecimal("-0.000").to_money).to eq(Money.zero)
   end
 end

data/spec/helpers_spec.rb

@@ -51,8 +51,8 @@ RSpec.describe Money::Helpers do
 
     it 'returns the bigdecimal representation of numbers while they are deprecated' do
       expect(Money).to receive(:deprecate).exactly(2).times
-      expect(subject.value_to_decimal('1.23abc')).to eq(amount)
-      expect(subject.value_to_decimal("1.23\n23")).to eq(amount)
+      expect(subject.value_to_decimal('0.00123e3')).to eq(amount)
+      expect(subject.value_to_decimal("0.123e1")).to eq(amount)
     end
 
     it 'raises on invalid object' do

data/spec/money_spec.rb

@@ -744,8 +744,8 @@ RSpec.describe "Money" do
     end
 
     it "accepts Rational number" do
-      expect(Money.from_amount(Rational("999999999999999999.999")).value).to eql(BigDecimal.new("1000000000000000000", Money::Helpers::MAX_DECIMAL))
-      expect(Money.from_amount(Rational("999999999999999999.99")).value).to eql(BigDecimal.new("999999999999999999.99", Money::Helpers::MAX_DECIMAL))
+      expect(Money.from_amount(Rational("999999999999999999.999")).value).to eql(BigDecimal("1000000000000000000", Money::Helpers::MAX_DECIMAL))
+      expect(Money.from_amount(Rational("999999999999999999.99")).value).to eql(BigDecimal("999999999999999999.99", Money::Helpers::MAX_DECIMAL))
     end
 
     it "raises ArgumentError with unsupported argument" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: shopify-money
 version: !ruby/object:Gem::Version
-  version: 0.13.1
+  version: 0.14.0
 platform: ruby
 authors:
 - Shopify Inc
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-29 00:00:00.000000000 Z
+date: 2019-11-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -100,14 +100,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.2
+        version: 1.4.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.2
+        version: 1.4.4
 description: Manage money in Shopify with a class that wont lose pennies during division!
 email: gems@shopify.com
 executables: