money_extensions 1.1.0 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e61a63193ba97a1d8ea9a0a8249290e9dfabf131311ad85da009c38306bc150d
-  data.tar.gz: 0c54c7ec6e4e502c7ebe23d5345cea093be0e1f947692098ffe6fc5218b27d6f
+  metadata.gz: 06650b1771418b5d1bdc6d6391949813b5068ac49a69c8ab05e8d2c25a00be01
+  data.tar.gz: 134f2a5024b53e835adf631ea62d39e7005c0f2823ed3339a651197165fef6a0
 SHA512:
-  metadata.gz: 91590442812a5733b601511b7074aa08eddcddb77c389010e882b62b75520720021c19a259dce15245a295df32778a8096f87d3d4eddc7d75fc181aac4e8f120
-  data.tar.gz: a1510bc019b28af3c4612bff28f922dcabd8d299a80007332166dbb47ad1246525b697a466391ef944aa130772eae81724d2bb757f7b97af10e484a99709bc37
+  metadata.gz: e67f7a24cf172adbf7b8c155e47385daddfc86bc15270df25555aa4b1edac30082ea8e79fc12d9f40f0f2f644cee002d817a144a3777a85acda3caf470b15bc4
+  data.tar.gz: c971b6a50588c06dc507737fdba9ff27bfd800f4d64438538f4f15e62fb6b3b25eb23d6db45a9b4be9effe2b6e27dbfa03ebe14de38eb063fb06796c55471503

data/.github/workflows/ruby.yml

@@ -5,8 +5,8 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        gemfile: [rails60, rails61]
-        ruby: ["2.6", "2.7", "3.0"]
+        gemfile: [rails60, rails61, rails70]
+        ruby: ["2.7", "3.0", "3.1"]
     runs-on: ubuntu-latest
     env:
       BUNDLE_GEMFILE: gemfiles/${{ matrix.gemfile }}.gemfile
@@ -17,3 +17,8 @@ jobs:
           ruby-version: ${{ matrix.ruby }}
           bundler-cache: true
       - run: bundle exec rake
+      - name: Coveralls
+        uses: coverallsapp/github-action@master
+        with:
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          path-to-lcov: coverage/lcov.info

data/.ruby-version

@@ -1 +1 @@
-3.0.0
+3.1.0

data/CHANGELOG.md

@@ -1,5 +1,17 @@
 # Changelog
 
+## 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
+
+## 1.2.0
+
+- [PLAT-183] Build with Ruby 3.1 / Rails 7 and publish coverage with github action
+
 ## 1.1.0
 
 - [TT-8625] Update to build with github actions / ruby 3.0 / rails 6.1

data/gemfiles/rails70.gemfile

@@ -0,0 +1,7 @@
+source 'https://rubygems.org'
+gemspec :path => '../'
+
+group :development, :test do
+  gem 'activerecord', '~> 7.0'
+  gem 'activesupport', '~> 7.0'
+end

data/lib/money_extensions/active_record/extensions.rb

@@ -2,9 +2,7 @@
 
 module ActiveRecord
   module Extensions
-    def self.included(base)
-      base.extend(ClassMethods)
-    end
+    extend ActiveSupport::Concern
 
     module ClassMethods
       # Assign a :currency (Money::Currency object) reader/writer for the given
@@ -44,5 +42,7 @@ module ActiveRecord
   end
 end
 
-::ActiveRecord::Base.send(:include, MoneyField)
-::ActiveRecord::Base.send(:include, ActiveRecord::Extensions)
+ActiveSupport.on_load(:active_record) do
+  ::ActiveRecord::Base.send(:include, MoneyField)
+  ::ActiveRecord::Base.send(:include, ActiveRecord::Extensions)
+end

data/lib/money_extensions/{money_field.rb → active_record/money_field.rb}

@@ -1,9 +1,7 @@
 # frozen_string_literal: true
 
 module MoneyField
-  def self.included(base)
-    base.extend(ClassMethods)
-  end
+  extend ActiveSupport::Concern
 
   module ClassMethods
     # Add a money field attribute

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.1.0'
+  VERSION = '1.4.0'
 end

data/lib/money_extensions.rb

@@ -4,12 +4,12 @@ module MoneyExtensions
   require 'money_extensions/integer'
   require 'money_extensions/split_between'
   require 'money_extensions/html_format'
-  require 'money_extensions/money_field'
   require 'money_extensions/numeric'
   require 'money_extensions/string'
 
   # TODO: Defer requiring the active record extension to who needs it
   if Module.const_defined?('ActiveRecord')
+    require 'money_extensions/active_record/money_field'
     require 'money_extensions/active_record/extensions'
   end
 

data/money_extensions.gemspec

@@ -26,8 +26,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rubocop'
   spec.add_development_dependency 'rspec'
   spec.add_development_dependency 'coverage-kit'
-  spec.add_development_dependency 'simplecov-rcov'
-  spec.add_development_dependency 'coveralls'
   spec.add_development_dependency 'sqlite3'
   spec.add_development_dependency 'activerecord'
   spec.add_development_dependency 'pry-byebug'

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,4 +1,3 @@
-require 'simplecov-rcov'
-require 'coveralls'
 require 'coverage/kit'
-Coverage::Kit.setup(minimum_coverage: 86.6)
+
+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.1.0
+  version: 1.4.0
 platform: ruby
 authors:
 - Michael Noack
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-01-06 00:00:00.000000000 Z
+date: 2022-07-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: money
@@ -95,34 +95,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: simplecov-rcov
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: coveralls
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -184,12 +156,13 @@ files:
 - Rakefile
 - gemfiles/rails60.gemfile
 - gemfiles/rails61.gemfile
+- gemfiles/rails70.gemfile
 - lib/money_extensions.rb
 - lib/money_extensions/active_record/extensions.rb
+- lib/money_extensions/active_record/money_field.rb
 - lib/money_extensions/array.rb
 - lib/money_extensions/html_format.rb
 - lib/money_extensions/integer.rb
-- lib/money_extensions/money_field.rb
 - lib/money_extensions/numeric.rb
 - lib/money_extensions/split_between.rb
 - lib/money_extensions/string.rb
@@ -222,7 +195,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.3
+rubygems_version: 3.3.3
 signing_key: 
 specification_version: 4
 summary: Set of extensions to the money gem used by TravelLink Technology.