blend_spreadsheet_loan_generator 0.1.37 → 0.1.41

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 27190e62c6f022886585a05178b48b3145887fc2299d32dd184572d034f8a22f
-  data.tar.gz: 4208f3be04bc68c700ad262fcd90e7e6130c3eb3414ef5ac8ae46035a6d7cb30
+  metadata.gz: 1357474c60cfb9e4c2856a80890d3d009fc78a66d38848e1b280ba3e1326dbd1
+  data.tar.gz: 6c7c524d35b0877d3d8a446142fc7c3e7bb5291af9fa9c07fc8343334e7dba6f
 SHA512:
-  metadata.gz: 075fae95ddf44ce9ce1b360debd2942c5cfbb94a623f9f37519f74109db3f43cab3624953c383a14dfc829819a1e3d363e569aada4305ea63755313ccc58df3b
-  data.tar.gz: 1c2721d5083b1e9e5bda9055dcc9ae3afe69744fb3b98036373a6b57f18e2d6dce2e0d34e0894cff7e21c8dd376b5fe9ea3e9790935e85cf721dc6456328327c
+  metadata.gz: 774098b91a0e32d71bfa251adf70f888e5a2447172da89fe6f8310d2e6dc460910c3c9e60cf05589e41fd03a95ad466b3ee1fc3a1f2c2e98d3713ef49a96736e
+  data.tar.gz: 269d14778cc7c31d65a900e6542cc2a0dfe101d07aa2670b11bf8ed22b9556cf13d97df81b2d64a3f615d7c03d5b50a52baf56927b7904c6b04d72c5e46bf009

data/lib/blend_spreadsheet_loan_generator/concerns/spreadsheet_concern.rb

@@ -87,13 +87,17 @@ module BlendSpreadsheetLoanGenerator
         end
       end
 
-      def apply_formulas(worksheet:)
+      def apply_formulas(worksheet:, early_repayment: true)
         columns.each.with_index do |title, column|
           worksheet[1, column + 1] = title
         end
         loan.duration.times do |line|
           columns.each.with_index do |title, column|
-            worksheet[line + 2, column + 1] = @formula.send("#{title}_formula", line: line + 2)
+            if early_repayment && title == 'period_calculated_fees'
+              worksheet[line + 2, column + 1] = @formula.send("#{title}_formula", line: line + 2, early_repayment: true)
+            else
+              worksheet[line + 2, column + 1] = @formula.send("#{title}_formula", line: line + 2)
+            end
           end
         end
       end

data/lib/blend_spreadsheet_loan_generator/early_repay.rb

@@ -127,7 +127,7 @@ module BlendSpreadsheetLoanGenerator
 
       @formula = Formula.new(loan: loan)
 
-      apply_formulas(worksheet: worksheet)
+      apply_formulas(worksheet: worksheet, early_repayment: true)
 
       worksheet[2, columns.index('remaining_capital_start') + 1] =
         excel_float(values[last_paid_line + 1][:remaining_capital_start])

data/lib/blend_spreadsheet_loan_generator/formula.rb

@@ -168,18 +168,26 @@ module BlendSpreadsheetLoanGenerator
       end
     end
 
-    def period_calculated_fees_formula(line:)
+    def period_calculated_fees_formula(line:, early_repayment: false)
       term = line - 1
       if loan.deferred_and_capitalized > 0 && term > loan.deferred_and_capitalized
         with_fees = "#{remaining_capital_start(line)} * (1 + #{period_rate(line)} + #{period_fees_rate(line)})^#{loan.deferred_and_capitalized} * (#{period_rate(line)} + #{period_fees_rate(line)})"
         without_fees = "#{remaining_capital_start(line)} * (1 + #{period_rate(line)})^#{loan.deferred_and_capitalized} * #{period_rate(line)}"
+
         "=#{with_fees} - #{without_fees}"
-      elsif loan.bullet? && term == loan.duration
-        with_fees = "#{remaining_capital_start(line)} * (1 + #{period_fees_rate(line)} + #{period_rate(line)})^#{index(line)}"
-        without_fees = "#{remaining_capital_start(line)} * (1 + #{period_rate(line)})^#{index(line)}"
+      elsif loan.bullet_term?(term)
+        index = (
+          if early_repayment
+            index(line - 1)
+          else
+            index(line)
+          end
+        )
+        with_fees = "#{remaining_capital_start(line)} * (1 + #{period_fees_rate(line)} + #{period_rate(line)})^#{index}"
+        without_fees = "#{remaining_capital_start(line)} * (1 + #{period_rate(line)})^#{index}"
         current = "#{with_fees} - #{without_fees}"
 
-        "=#{current} - #{capitalized_fees_end(line - 1)}"
+        "=#{current} - #{capitalized_fees_start(line)}"
       else
         amount_to_capitalize = [
           '(',

data/lib/blend_spreadsheet_loan_generator/loan.rb

@@ -112,6 +112,10 @@ module BlendSpreadsheetLoanGenerator
       fully_deferred? && deferred_and_capitalized == total_deferred_duration
     end
 
+    def bullet_term?(term)
+      deferred_and_capitalized <= term || bullet? # for last term
+    end
+
     def in_fine?
       fully_deferred? && deferred == total_deferred_duration
     end

data/lib/blend_spreadsheet_loan_generator/version.rb

@@ -1,7 +1,7 @@
 require 'dry/cli'
 
 module BlendSpreadsheetLoanGenerator
-  VERSION = '0.1.37'.freeze
+  VERSION = '0.1.41'.freeze
 
   class Version < Dry::CLI::Command
     desc 'Print version'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: blend_spreadsheet_loan_generator
 version: !ruby/object:Gem::Version
-  version: 0.1.37
+  version: 0.1.41
 platform: ruby
 authors:
 - MZiserman
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-09-27 00:00:00.000000000 Z
+date: 2021-09-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport