money_extensions 1.3.0 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b02ce974d0847bc55984f19c7b7052cac5178e8ca17ed4c17778b7cab20b918d
-  data.tar.gz: 888c92464c6ba7510c855ac6ee8670c802d41f6e408f2e3cbf21ae793e1fdd7d
+  metadata.gz: 44dd97a83c21781a83f266f6ee1249fc2849e6ae4867a02e6666c15afc9cc018
+  data.tar.gz: d3d928e7816db0241eb60314f411bfff47f76b4466b34aab9fb5f9493a18d8f4
 SHA512:
-  metadata.gz: fbef0196b7903684d86d191ea69dbc1f007949647f5135bbafcaea0ae6f9ee097fa46eee3892e4b9a799909345cabbb6f8b2fbe9681e994198d9e7220dd76991
-  data.tar.gz: 52f7c134ad23cc2db1d1d040be03abfbf7607bf48731f838004609cf114045c4efdf09f708f3ae8864ff242a38b20e5e79f1a4cfd6f8d4d73cbcd3299784b845
+  metadata.gz: 3f972a2dd5e9b4947e8c996bb920a5618c8058d795e10ccde6bddb28b1e7f82d9c5c82a9dd261cd6ea25bf61649cce5ab8043bda47522fceb59d8683810971ed
+  data.tar.gz: 7cb882d57518a6ce6f76df8aa7cc9127985ea081532c16e2eb6b5e7dc777908bd53ffecd705975bcd28bdd5ddc115aa35a2ff98a72b45fd824c7d38cfc71e55a

data/.git-blame-ignore-revs

@@ -0,0 +1,12 @@
+# The commits that did automated reformatting. You can ignore them
+# during git-blame with `--ignore-rev` or `--ignore-revs-file`.
+# You can also globally configure GIT with the following command
+#
+#   $ git config --add 'blame.ignoreRevsFile' '.git-blame-ignore-revs'
+#
+# Example entries:
+#
+# <full commit hash>  # initial black-format
+# <full commit hash>  # rename something internal
+
+0cdd3ad2866c4ebc989284f265bb968484547a08 # Pretty CHANGELOG.md

data/.github/workflows/ruby.yml

@@ -6,7 +6,7 @@ jobs:
       fail-fast: false
       matrix:
         gemfile: [rails60, rails61, rails70]
-        ruby: ["2.7", "3.0", "3.1"]
+        ruby: ["3.0", "3.1", "3.2"]
     runs-on: ubuntu-latest
     env:
       BUNDLE_GEMFILE: gemfiles/${{ matrix.gemfile }}.gemfile

data/.ruby-version

@@ -1 +1 @@
-3.1.0
+3.2.0

data/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Changelog
 
+## 1.5.0
+
+- [PLAT-1175] Update to Ruby 3.2
+
+## 1.4.0
+
+- [PLAT-401] Optimise split_between when we are doing so with numbers
+
 ## 1.3.0
 
 - [PLAT-377] Improve bundler require time for the Gem
@@ -14,10 +22,10 @@
 
 ## 1.0.0
 
-* [TT-5845] Update to support money gems >= 6
+- [TT-5845] Update to support money gems >= 6
 
 ## 0.1.0
 
-* Using Fixnum is deprecated
-* Drop rails 2 and old ruby support
-* Use coverage kit to enforce maximum coverage
+- Using Fixnum is deprecated
+- Drop rails 2 and old ruby support
+- Use coverage kit to enforce maximum coverage

data/lib/money_extensions/split_between.rb

@@ -1,11 +1,23 @@
 # frozen_string_literal: true
 
 module SplitBetween
+  extend ActiveSupport::Concern
+
   # Override division -- should not do it, but use split_between
   def /(*_params)
     raise "Division of money NOT allowed - use 'split_between' to avoid rounding errors"
   end
 
+  module ClassMethods
+    def split_evenly_between(cents, number)
+      Money::Allocation.generate(cents, number).map { |num| Money.from_cents(num) }
+    end
+  end
+
+  def split_evenly_between(number)
+    Money.split_evenly_between(cents, number)
+  end
+
   # Split the money between the specified number - and return an array of money
   # Remainder in splits are given to the highest value e.g.
   # $2.00 splits [40, 81, 40] into [49, 102, 49]
@@ -13,11 +25,7 @@ module SplitBetween
   def split_between(params)
     # if just a number is passed in, then money is split equally
     if params.is_a?(Integer)
-      divisor = params
-      raise ArgumentError, 'Can only split up over a positive number' if divisor < 1
-
-      rounded_split = lossy_divide(divisor)
-      results       = Array.new(divisor, rounded_split) # Create with 'divisor' num elements
+      results = split_evenly_between(params)
 
       # if an array of monies is passed in, then split in proportions
     elsif params.is_a?(Array)
@@ -36,14 +44,17 @@ module SplitBetween
       results.map! do |ratio|
         ::Money.new((cents * (ratio.to_f / total)).round)
       end
+
+      # Distribute rounding to max absolute to avoid a $0 amount getting the rounding
+      remainder = self - results.total_money
+      if !remainder.zero?
+        biggest_value_index = results.index(results.max_by(&:abs))
+        results[biggest_value_index] += remainder
+      end
     else
       raise 'Either a Integer or array has to be passed in for splitting money'
     end
 
-    # Distribute rounding to max absolute to avoid a $0 amount getting the rounding
-    biggest_value_index = results.index(results.max_by(&:abs))
-    results[biggest_value_index] += self - results.total_money
-
     results
   end
 end

data/lib/money_extensions/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module MoneyExtensions
-  VERSION = '1.3.0'
+  VERSION = '1.5.0'
 end

data/spec/money_spec.rb

@@ -5,6 +5,26 @@ describe Money do
     expect { Money.new(50)/10 }.to raise_error(RuntimeError)
   end
 
+  it 'should split evenly between' do
+    money = Money.new(100)
+
+    expect(money.split_evenly_between(3)).to eq [34,33,33].map{ |i| Money.new(i) }
+    expect(money.split_evenly_between(3).sum(Money.zero)).to eq money
+
+    expect(money.split_evenly_between(6)).to eq [17,17,17,17,16,16].map{ |i| Money.new(i) }
+    expect(money.split_evenly_between(6).sum(Money.zero)).to eq money
+  end
+
+  it 'should split evenly between negative numbers' do
+    money = Money.new(-100)
+
+    expect(money.split_evenly_between(3)).to eq [-33,-33,-34].map{ |i| Money.new(i) }
+    expect(money.split_evenly_between(3).sum(Money.zero)).to eq money
+
+    expect(money.split_evenly_between(6)).to eq [-16,-16,-17,-17,-17,-17].map{ |i| Money.new(i) }
+    expect(money.split_evenly_between(6).sum(Money.zero)).to eq money
+  end
+
   it "should split money correctly" do
     money = Money.new(100)
 
@@ -21,7 +41,7 @@ describe Money do
     expect(money.split_between([1,2])).to eq [33,67].map{ |i| Money.new(i)}
 
     money_negative = Money.new(-100)
-    expect(money_negative.split_between(3)).to eq [-34,-33,-33].map{ |i| Money.new(i)}
+    expect(money_negative.split_between(3)).to eq [-33,-33,-34].map{ |i| Money.new(i)}
     expect(money_negative.split_between([1,2,2,5])).to eq [-10,-20,-20,-50].map{ |i| Money.new(i)}
     expect(money_negative.split_between([1,2])).to eq [-33,-67].map{ |i| Money.new(i)}
 

data/spec/support/coverage_loader.rb

@@ -1,3 +1,3 @@
 require 'coverage/kit'
 
-Coverage::Kit.setup(minimum_coverage: 86.5)
+Coverage::Kit.setup(minimum_coverage: 87.0)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: money_extensions
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.5.0
 platform: ruby
 authors:
 - Michael Noack
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-07-02 00:00:00.000000000 Z
+date: 2023-01-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: money
@@ -143,6 +143,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".git-blame-ignore-revs"
 - ".github/dependabot.yml"
 - ".github/workflows/release.yml"
 - ".github/workflows/ruby.yml"
@@ -195,7 +196,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.3
+rubygems_version: 3.4.1
 signing_key: 
 specification_version: 4
 summary: Set of extensions to the money gem used by TravelLink Technology.