interest_calc 0.1.0 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7b9270952b4db924510e32a7767e8938c0087bfb2808f5f91083f469fdc2f0f9
-  data.tar.gz: 7f35803f477a96ce89afef7fe150c02e7b53de92c33dd2027521e67420d29206
+  metadata.gz: d8a106bfb77db774342387c9692d0db2ba9c0b3a39cd95c5157278d9af91a482
+  data.tar.gz: cc4dba477d4bed5803c1c3d22b1d95b4ee053469e45597f56993f53285e67a1f
 SHA512:
-  metadata.gz: 7b433d79cc59d0d6a6368205d92d54fff8c877511693b9ce6e51cd230f0c2a04d074c4526d3a82b112ba0836d17c9b6be64d1c8f068c6c72fbe70c3c9a4f4812
-  data.tar.gz: f09d1dc9b2b0290b281f43e707f42737fe364d57d2a979f428ad811f57324a2f9cf6c63e1c588877eec12f1bc5d77b08b321f05f8a17bfebf4dce297fbad616e
+  metadata.gz: ddc579bae548e775abddf463e29ed9c716d938c829e45563d67a5356718e2a04f95f5f430c11f4c89586fdcbe2dfc213623b55a3e246b72b242470ca9bb88054
+  data.tar.gz: 75d8cd4b256b5b45b43600ff589d6ddf7d6c741ffdaa12ebfe5095f7faec3d91496678cf978e660afc39ee70a4b07f5fef3007b944be865b1132a9a921f30adc

data/.gitignore

@@ -7,6 +7,7 @@ test/dummy/tmp/
 test/dummy/.sass-cache
 
 *.sh
+*.gem
 sample_data.rb
 gre.rb
 gpm.rb

data/Rakefile

@@ -0,0 +1,10 @@
+require "rake/testtask"
+
+Rake::TestTask.new do |t|
+  t.libs << "test"
+  t.test_files = FileList['test/**/*.rb']
+  #t.verbose = true
+end
+
+desc "Run tests"
+task default: :test

data/interest_calc.gemspec

@@ -17,9 +17,9 @@ Gem::Specification.new do |s|
   s.homepage    = 'https://rubygems.org/gems/interest_calc'
   s.license     = 'MIT'
 
-  s.add_dependency('ostruct')
-  s.add_dependency('active_support')
+  s.add_dependency('activesupport', '~> 7.0.0')
+  s.add_development_dependency('minitest', '~> 5.16')
 
-  s.add_dependency('interest_days')
+  #s.add_dependency('interest_days', '~> 0.4.1')
 
 end

data/lib/interest_calc/calculators/{open_line_calculator.rb → line_of_credit_calculator.rb}

@@ -1,3 +1,4 @@
+require 'logger'
 require 'ostruct'
 require 'active_support'
 require 'active_support/core_ext'
@@ -6,16 +7,74 @@ require 'date'
 
 
 module InterestCalc
-  class OpenLineCalculator
+  class LineOfCreditCalculator
 
     attr_accessor :interest_rate
+    attr_accessor :logger
 
     def initialize(interest_rate = 0.05)
       @interest_rate = interest_rate
+      @logger = Logger.new(STDOUT)
     end
 
-    # calculates the interest per month for an open line of credit
     def calculate(data)
+      return_values = []
+      nitem = nil
+      changes = data[:changes]
+      end_date = data[:end_date]
+
+      if changes.nil? || changes.count < 1
+        raise Exception.new "No changes to the line of credit provided. Please provide an array of changes data[:changes]"
+      end
+
+      changes.reverse!
+      citem = changes.pop
+      cdate = citem[:date]
+      camount = citem[:amount]
+
+      
+      interest = 0
+      nitem = changes.pop
+
+      logger.debug "#{self.class.name}##{__method__}:calculation starts: #{cdate.at_beginning_of_month}"
+
+      while(cdate <= cdate.at_end_of_month) do
+
+        # amount has changed
+        if(!nitem.nil? && nitem[:date] == cdate)
+          logger.debug "#{self.class.name}##{__method__}: amount changing. OLD:#{camount} -- change:#{nitem[:amount]} -- NEW:#{camount + nitem[:amount]}"
+          camount += nitem[:amount]
+          nitem = changes.pop # pops nil if changes.empty?
+        end
+
+        interest += camount * interest_rate / 365.0
+
+        if(cdate == cdate.at_end_of_month)
+          return_values << {
+            interest: interest,
+            year: cdate.year,
+            month: cdate.month
+          }
+
+          interest = 0
+          logger.debug "#{self.class.name}##{__method__}: stored:#{return_values.last}"
+
+          # if there are no further changes and this month is over, abort
+          break if nitem.nil? && (end_date.nil? || cdate >= end_date)
+        end
+
+        
+
+        cdate = cdate + 1.day
+      end
+      
+      return return_values
+
+    end
+
+
+    # calculates the interest per month for an open line of credit
+    def calculate_old(data)
 
       return_values = []
       nitem = nil
@@ -108,6 +167,8 @@ module InterestCalc
     def print(data)
       values = calculate data
 
+      total_interest = 0.0
+
       puts "--------------------------------------"
       puts "|    year-month  |     interest      |"
       puts "--------------------------------------"
@@ -115,7 +176,10 @@ module InterestCalc
         ym = "#{item[:year]}-#{item[:month]}".ljust(16)
         i = item[:interest].to_f.round(2).to_s.rjust(19)
         puts "|#{ym}|#{i}|"
+
+        total_interest += item[:interest].to_f
       end
+      puts "|#{"2022".ljust(16)}|#{total_interest.round(2).to_s.rjust(19)}|"
       puts "--------------------------------------"
       return values
     end
@@ -128,16 +192,16 @@ module InterestCalc
         raise "amount can't be nil"
       end
 
-      puts "#{self.class.name}##{__method__}: date:#{cdate} -- end_date:#{end_date}"
+      logger.debug "#{self.class.name}##{__method__}: date:#{cdate} -- end_date:#{end_date}"
       # calculate until end of month if no end_date given.
       # Add one day to include last day in calculations
       end_date = end_date || (cdate.at_end_of_month)
 
-      puts "#{self.class.name}##{__method__}: interest rate: #{@interest_rate}"
+      logger.debug "#{self.class.name}##{__method__}: interest rate: #{@interest_rate}"
 
       result = interest_days_counter_factor(cdate, end_date) * @interest_rate * camount
 
-      puts "#{self.class.name}##{__method__}: calculated interest: #{result}"
+      logger.debug "#{self.class.name}##{__method__}: calculated interest: #{result}"
       return result
     end
 
@@ -152,8 +216,8 @@ module InterestCalc
       # add 1 to count the first day as well
       days = ((end_date - date).to_i + 1)
       factor = days / 360.0
-      puts "#{self.class.name}##{__method__}: days #{days}-- factor:#{factor}"
+      logger.debug "#{self.class.name}##{__method__}: days #{days}-- factor:#{factor}"
       factor
     end
   end
-end
+end

data/lib/interest_calc/version.rb

@@ -1,3 +1,3 @@
 module InterestCalc
-  VERSION = "0.1.0"
+  VERSION = "0.2.2"
 end

data/lib/interest_calc.rb

@@ -1,2 +1,2 @@
 require_relative 'interest_calc/version'
-require_relative 'interest_calc/calculators/open_line_calculator'
+require_relative 'interest_calc/calculators/line_of_credit_calculator'

metadata

@@ -1,57 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: interest_calc
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.2
 platform: ruby
 authors:
 - Christoph Engelhardt
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-06-22 00:00:00.000000000 Z
+date: 2022-07-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: ostruct
+  name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 7.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 7.0.0
 - !ruby/object:Gem::Dependency
-  name: active_support
+  name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: interest_days
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
+        version: '5.16'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '5.16'
 description: Helps you calculate interest for open lines of credit
 email: christoph@christophengelhardt.com
 executables: []
@@ -61,9 +47,10 @@ files:
 - ".gitignore"
 - LICENSE
 - README.md
+- Rakefile
 - interest_calc.gemspec
 - lib/interest_calc.rb
-- lib/interest_calc/calculators/open_line_calculator.rb
+- lib/interest_calc/calculators/line_of_credit_calculator.rb
 - lib/interest_calc/version.rb
 homepage: https://rubygems.org/gems/interest_calc
 licenses: