blend_spreadsheet_loan_generator 0.1.21 → 0.1.26

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2f28ea47a7ea85e82f8bb7e6235025a727c4ed68e48ca775b8504a55e0ae104c
-  data.tar.gz: 933c6ad4f65149b569d0ac66e695b1896e6cd80d7e4b259cbd95920af99d811a
+  metadata.gz: 46ffd519aaf8bc1d7b8bb2bb84c376e107f04cf2c8af6ee23ad028a563e63d8b
+  data.tar.gz: da8b157b33839272a2647e201111a4349451a62c569195e95c293071c77800df
 SHA512:
-  metadata.gz: acf4406ebca9f8ec7bee91d47d8ab9f187b7e5da5253d64ddf58d2e66f451c1f54522ae43eaee1a9002f490101c7b4323bf0591ad0765d49befffdd4134e1c6b
-  data.tar.gz: 39c9ce533a34f54a95ee4147759fddfb5ebcc0c985c0b32b9ea0cdbe75865752aba7c4add64c0a60c51f7acae4585342c73a08a1c165c2eb8ed0b0852d116f37
+  metadata.gz: 3ba10779043886b9870cd78fbbda175362c231a9afd824fa4d0a2107284d16ce493dd76469f542f8508359efd57041306e1727f645c409100e16e50712cf74a9
+  data.tar.gz: 6c497e6e9d39c7b537a5f07fb14306850b53cfe77b12653cb0ce6dd2b1e4329ce199fb73c007beb50c945e193146cddb7ad20cd1526f1beb15a5b3ee828f86b3

data/exe/bslg

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
 
 require_relative '../lib/blend_spreadsheet_loan_generator'
+
 Dry::CLI.new(BlendSpreadsheetLoanGenerator).call

data/lib/blend_spreadsheet_loan_generator/early_repay.rb

@@ -44,11 +44,11 @@ module BlendSpreadsheetLoanGenerator
       values = f.to_a
       values.map! { |r| set_types([columns, r].transpose.to_h.with_indifferent_access) }
 
-      last_paid_line = values.index { |term| term[:index] == last_paid_term.to_i }
+      last_paid_line = values.index { |term| term[:index] == last_paid_term.to_i } || -1
       guaranteed_line = values.index { |term| term[:index] == options.fetch(:guaranteed_terms, -1).to_i } || nil
       total_guaranteed_interests = (
-        if guaranteed_line.present? && guaranteed_line > last_paid_line
-          values[(last_paid_line + 1)..guaranteed_line].sum { |value| value[:period_calculated_interests] }
+        if guaranteed_line.present? && guaranteed_line >= (last_paid_line + 2)
+          values[(last_paid_line + 2)..guaranteed_line].sum { |value| value[:period_calculated_interests] }
         else
           0
         end
@@ -65,7 +65,14 @@ module BlendSpreadsheetLoanGenerator
         if total_to_be_paid == amount_paid
           1
         else
-          options.fetch(:duration, values.last[:index] - values[last_paid_line][:index])
+          options.fetch(
+            :duration,
+            if last_paid_line == -1
+              values.last[:index]
+            else
+              values.last[:index] - values[last_paid_line][:index]
+            end
+          )
         end
       )
 
@@ -73,16 +80,26 @@ module BlendSpreadsheetLoanGenerator
 
       capital_paid = amount_paid.to_f - (
         values[last_paid_line + 1][:capitalized_interests_start] +
-        values[last_paid_line + 1][:capitalized_fees_start]
+        values[last_paid_line + 1][:capitalized_fees_start] +
+        values[last_paid_line + 1][:period_calculated_interests] +
+        values[last_paid_line + 1][:period_calculated_fees]
       )
+
       ratio = options.fetch(:ratio, (capital_paid.to_f / values[last_paid_line + 1][:remaining_capital_start])).to_f
       guaranteed_interests_paid = (
         ratio * total_guaranteed_interests
       )
-      capital_paid -= guaranteed_interests_paid
+
+      amount = (
+        if last_paid_line == -1
+          values[0][:remaining_capital_start]
+        else
+          values[last_paid_line][:remaining_capital_end]
+        end
+      )
 
       @loan = Loan.new(
-        amount: values[last_paid_line][:remaining_capital_end],
+        amount: amount,
         duration: duration,
         rate: rate,
         fees_rate: options.fetch(:fees_rate),
@@ -104,10 +121,10 @@ module BlendSpreadsheetLoanGenerator
       apply_formulas(worksheet: worksheet)
 
       worksheet[2, columns.index('remaining_capital_start') + 1] =
-        excel_float(values[last_paid_line][:remaining_capital_end])
+        excel_float(values[last_paid_line + 1][:remaining_capital_start])
 
       worksheet[2, columns.index('remaining_capital_end') + 1] =
-        "=#{excel_float(values[last_paid_line][:remaining_capital_end])} - #{period_capital(2)}"
+        "=#{excel_float(values[last_paid_line + 1][:remaining_capital_start])} - #{period_capital(2)}"
 
       worksheet[2, columns.index('period_interests') + 1] =
         "=ARRONDI(#{period_theoric_interests(2)}; 2)"
@@ -118,8 +135,7 @@ module BlendSpreadsheetLoanGenerator
       worksheet[2, columns.index('period_fees') + 1] =
         "=#{excel_float(values[last_paid_line + 1][:period_calculated_fees])}"
 
-      worksheet[2, columns.index('period_capital') + 1] =
-        "=#{excel_float(capital_paid)} - #{period_interests(2)} - #{period_fees(2)}"
+      worksheet[2, columns.index('period_capital') + 1] = "=#{excel_float(capital_paid)}"
 
       worksheet[2, columns.index('capitalized_interests_start') + 1] =
         excel_float(values[last_paid_line + 1][:capitalized_interests_start])

data/lib/blend_spreadsheet_loan_generator/version.rb

@@ -1,7 +1,7 @@
 require 'dry/cli'
 
 module BlendSpreadsheetLoanGenerator
-  VERSION = '0.1.21'.freeze
+  VERSION = '0.1.26'.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.21
+  version: 0.1.26
 platform: ruby
 authors:
 - MZiserman
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-07-13 00:00:00.000000000 Z
+date: 2021-07-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport