blend_spreadsheet_loan_generator 0.1.43 → 0.1.100

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 579b2d03b24b45a57e78c9c5ddf59b268e308bed4cc8430abe7d1c16ef0f1947
-  data.tar.gz: c0ba98674ce0c1d2a77571969e30fd4dbdb4da04a7c38dff8fbce8e66dc939d7
+  metadata.gz: '094d6041671fe31e1d4065b08a380527d0c823a14921d1e240fe27668de71062'
+  data.tar.gz: 445f25c29e92de5b36dcd6a687f4a94fbfe0a2d30705dd623fb1f03315f3991a
 SHA512:
-  metadata.gz: 839a032643e22e7445b1dfe06d3cc2bd97db8ee65c84bc2f4e18f157206a5a068b83825100595af093dde0925babfb3a119843ed321cb36a52f08974323e789a
-  data.tar.gz: f17f59099f9ab23e65cbef14230c76bd17ce90aad022d9e433a4b3b53bf2ec4cafefc82c988ca478e0ceac8b606acade5c89845f0edecb254dfc5876db6f1971
+  metadata.gz: 12f8be613825bbf69472ea9332e72d77ef85d4cf53072f1734ac3be632b0ddcfa2d7a3b9f53e7cb6dc2fb719de90a364e7c76dee05995215753233f7d10f5d9c
+  data.tar.gz: 9c0735c99dcf516f92b9458dedd69e42e2c303df500dfaf809d0164cc35054f26dd34e9c48d2f6ba558aeb12e1a702253e2f3e6aacdc74456f23afac837ef577

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?(custom_early_repayment)
+              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,26 +168,23 @@ 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.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)}"
+      if loan.bullet_term?(term)
+        index = first_term_skip ? index(line - 1) : index(line)
 
-        "=#{with_fees} - #{without_fees}"
-      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_start(line)}"
+      elsif loan.deferred_and_capitalized > 0 && term > loan.deferred_and_capitalized
+        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
         amount_to_capitalize = [
           '(',
@@ -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/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/restructure.rb

@@ -72,7 +72,7 @@ module BlendSpreadsheetLoanGenerator
       spreadsheet = session.create_spreadsheet(loan.name)
       worksheet = spreadsheet.add_worksheet(loan.type, loan.duration + 2, columns.count + 1, index: 0)
 
-      @formula = Formula.new(loan: loan)
+      @formula = Formula.new(loan: loan, first_term_skip: true)
 
       apply_formulas(worksheet: worksheet)
       apply_formats(worksheet: worksheet)

data/lib/blend_spreadsheet_loan_generator/version.rb

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