blend_spreadsheet_loan_generator 0.1.45 → 0.1.102

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cca84a8a3514638dbbdf412c9c3847f2e5ec299c6a057fe31bf64bed84214d5b
-  data.tar.gz: bbcea0582d8d49b4deeb03fd18e7485d2c721c74c63625fc0b7b5319d5ff870f
+  metadata.gz: bfe713bbe1e4e57601559e592fc0a5fc621b5e72e151bb100ac341c6e29b8690
+  data.tar.gz: 409a0e1d8cc8a91926638577fb97d18794b25338c786547550f18dd849f525ef
 SHA512:
-  metadata.gz: 1040a0c2b2c5e7a2fbfc4bbb2b277ffa136ce4b57b849a1e96a5f7710aa84125940c779be295ae1cee150427d9c5d4c56b301497d3afcd2cedf079f73177e537
-  data.tar.gz: 4736c7b12ec0202759f72a953f81da8001c317d6183dfb8846ed0b3695c56a6a55bb58566e7ebdfd1bc85ff1965ee0c9c2bd141bf6dc9e6e6e86e236a13b3aa5
+  metadata.gz: 1b4e6474624e79661081ab0ef187b8518d22e8ba79a3840aa30d4b7ef111db9442a367902621358b70f4cd37579516e526551a4b7603a6100e158c1097baf668
+  data.tar.gz: 3cb5ee2b57bf520c54ac42e35f43a33da737c1df2a6a2ea3714a2a34cb2e97a224d74f402dc797880f49773abd046885177fbd79af4be44505904703ac5f2358

data/lib/blend_spreadsheet_loan_generator/concerns/spreadsheet_concern.rb

@@ -87,21 +87,21 @@ module BlendSpreadsheetLoanGenerator
         end
       end
 
-      def custom_early_repayment
+      def first_term_skip_columns
         %w[
           period_calculated_fees
           capitalized_fees_end
         ]
       end
 
-      def apply_formulas(worksheet:, early_repayment: false)
+      def apply_formulas(worksheet:, first_term_skip: 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.in?(custom_early_repayment)
-              worksheet[line + 2, column + 1] = @formula.send("#{title}_formula", line: line + 2, early_repayment: true)
+            if first_term_skip && title.in?(first_term_skip_columns)
+              worksheet[line + 2, column + 1] = @formula.send("#{title}_formula", line: line + 2, first_term_skip: true)
             else
               worksheet[line + 2, column + 1] = @formula.send("#{title}_formula", line: line + 2)
             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, early_repayment: true)
+      apply_formulas(worksheet: worksheet, first_term_skip: 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,24 +168,21 @@ module BlendSpreadsheetLoanGenerator
       end
     end
 
-    def period_calculated_fees_formula(line:, early_repayment: false)
+    def period_calculated_fees_formula(line:, first_term_skip: false)
       term = line - 1
       if loan.bullet_term?(term)
-        index = (
-          if early_repayment
-            index(line - 1)
-          else
-            index(line)
-          end
-        )
+        index = first_term_skip ? 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}"
         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)}"
+        index = first_term_skip ? loan.deferred_and_capitalized : loan.deferred_and_capitalized - 1
+
+        with_fees = "#{remaining_capital_start(line)} * (1 + #{period_rate(line)} + #{period_fees_rate(line)})^#{index} * (#{period_rate(line)} + #{period_fees_rate(line)})"
+        without_fees = "#{remaining_capital_start(line)} * (1 + #{period_rate(line)})^#{index} * #{period_rate(line)}"
 
         "=#{with_fees} - #{without_fees}"
       else
@@ -207,10 +204,10 @@ module BlendSpreadsheetLoanGenerator
       "=ARRONDI(#{capitalized_fees_end(line - 1)}; 2)"
     end
 
-    def capitalized_fees_end_formula(line:, early_repayment: false)
+    def capitalized_fees_end_formula(line:, first_term_skip: false)
       term = line - 1
       if term <= loan.deferred_and_capitalized
-        index = early_repayment ? index(line - 1) : index(line)
+        index = first_term_skip ? 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)"

data/lib/blend_spreadsheet_loan_generator/restructure.rb

@@ -74,7 +74,7 @@ module BlendSpreadsheetLoanGenerator
 
       @formula = Formula.new(loan: loan)
 
-      apply_formulas(worksheet: worksheet)
+      apply_formulas(worksheet: worksheet, first_term_skip: true)
       apply_formats(worksheet: worksheet)
 
       worksheet.save

data/lib/blend_spreadsheet_loan_generator/version.rb

@@ -1,7 +1,7 @@
 require 'dry/cli'
 
 module BlendSpreadsheetLoanGenerator
-  VERSION = '0.1.45'.freeze
+  VERSION = '0.1.102'.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.45
+  version: 0.1.102
 platform: ruby
 authors:
 - MZiserman