blend_spreadsheet_loan_generator 0.1.41 → 0.1.45

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1357474c60cfb9e4c2856a80890d3d009fc78a66d38848e1b280ba3e1326dbd1
-  data.tar.gz: 6c7c524d35b0877d3d8a446142fc7c3e7bb5291af9fa9c07fc8343334e7dba6f
+  metadata.gz: cca84a8a3514638dbbdf412c9c3847f2e5ec299c6a057fe31bf64bed84214d5b
+  data.tar.gz: bbcea0582d8d49b4deeb03fd18e7485d2c721c74c63625fc0b7b5319d5ff870f
 SHA512:
-  metadata.gz: 774098b91a0e32d71bfa251adf70f888e5a2447172da89fe6f8310d2e6dc460910c3c9e60cf05589e41fd03a95ad466b3ee1fc3a1f2c2e98d3713ef49a96736e
-  data.tar.gz: 269d14778cc7c31d65a900e6542cc2a0dfe101d07aa2670b11bf8ed22b9556cf13d97df81b2d64a3f615d7c03d5b50a52baf56927b7904c6b04d72c5e46bf009
+  metadata.gz: 1040a0c2b2c5e7a2fbfc4bbb2b277ffa136ce4b57b849a1e96a5f7710aa84125940c779be295ae1cee150427d9c5d4c56b301497d3afcd2cedf079f73177e537
+  data.tar.gz: 4736c7b12ec0202759f72a953f81da8001c317d6183dfb8846ed0b3695c56a6a55bb58566e7ebdfd1bc85ff1965ee0c9c2bd141bf6dc9e6e6e86e236a13b3aa5

data/lib/blend_spreadsheet_loan_generator/concerns/spreadsheet_concern.rb

@@ -87,13 +87,20 @@ module BlendSpreadsheetLoanGenerator
         end
       end
 
-      def apply_formulas(worksheet:, early_repayment: true)
+      def custom_early_repayment
+        %w[
+          period_calculated_fees
+          capitalized_fees_end
+        ]
+      end
+
+      def apply_formulas(worksheet:, early_repayment: false)
         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|
-            if early_repayment && title == 'period_calculated_fees'
+            if early_repayment && title.in?(custom_early_repayment)
               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)

data/lib/blend_spreadsheet_loan_generator/early_repay.rb

@@ -168,6 +168,10 @@ module BlendSpreadsheetLoanGenerator
       worksheet[2, columns.index('period_reimbursed_guaranteed_fees') + 1] =
         excel_float(guaranteed_fees_paid)
 
+      worksheet[2, columns.index('period_calculated_fees') + 1] =
+        excel_float(0.0)
+
+
       apply_formats(worksheet: worksheet)
 
       worksheet.save

data/lib/blend_spreadsheet_loan_generator/formula.rb

@@ -170,12 +170,7 @@ module BlendSpreadsheetLoanGenerator
 
     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?(term)
+      if loan.bullet_term?(term)
         index = (
           if early_repayment
             index(line - 1)
@@ -188,6 +183,11 @@ module BlendSpreadsheetLoanGenerator
         current = "#{with_fees} - #{without_fees}"
 
         "=#{current} - #{capitalized_fees_start(line)}"
+      elsif 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}"
       else
         amount_to_capitalize = [
           '(',
@@ -207,11 +207,12 @@ module BlendSpreadsheetLoanGenerator
       "=ARRONDI(#{capitalized_fees_end(line - 1)}; 2)"
     end
 
-    def capitalized_fees_end_formula(line:)
+    def capitalized_fees_end_formula(line:, early_repayment: false)
       term = line - 1
       if term <= loan.deferred_and_capitalized
-        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)}"
+        index = early_repayment ? index(line - 1) : index(line)
+        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}"
         "=ARRONDI(#{with_fees} - #{without_fees}; 2)"
       else
         "=ARRONDI(#{capitalized_fees_start(line)} - #{period_reimbursed_capitalized_fees(line)}; 2)"

data/lib/blend_spreadsheet_loan_generator/loan.rb

@@ -113,7 +113,7 @@ module BlendSpreadsheetLoanGenerator
     end
 
     def bullet_term?(term)
-      deferred_and_capitalized <= term || bullet? # for last term
+      deferred_and_capitalized >= term || bullet? # for last term
     end
 
     def in_fine?

data/lib/blend_spreadsheet_loan_generator/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: blend_spreadsheet_loan_generator
 version: !ruby/object:Gem::Version
-  version: 0.1.41
+  version: 0.1.45
 platform: ruby
 authors:
 - MZiserman