blend_spreadsheet_loan_generator 0.1.20 → 0.1.25

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e577c4867c3181945bf7cb960443c26aca398c1b2650cc41b23eecb2ba07740f
-  data.tar.gz: 7751b3676cd92659f849d265a1be7cc4b49ae251533b2b8a8aeb30198a82aac9
+  metadata.gz: 169f284925fdd8ff961eecf431c8fd62625cf9b5cc1006cf2c0d1fe2ff3d290d
+  data.tar.gz: af871dff6102cbb857cd7fbc65f75265b597cee10689adc820c1b7060cf72dbe
 SHA512:
-  metadata.gz: 10a1b186823531afe0ecdd159228b7ca9da495d9792c3f1900f611c560795642351475c68deb7f8b4ab9f262da9ef9ec086157cce1749d037f0c7702fca7cd85
-  data.tar.gz: c41aa92c96c91fc17f89dcc5b1772351705a995809365e06263019fbfc077f82a10b8d7406f26bad97d3503cc82ce4101b0c1afc04a5330be7b555e892ded191
+  metadata.gz: 483fbcafe2c4f763f2b1a53108d4d80f344471a730de69e2a938370ae5159581925f93b1efa33e29530afbc74897a0aaf4251a9885c46ac2f7926478a15c51cc
+  data.tar.gz: da813c5b56325a72db5023b2fad4be50008bb112c2198ac491a99d7d17c57131245eb2bc48750aef5c19addd9b2825a27e34a7e639a59ac125844c63e4aa4e11

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,7 +44,7 @@ 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
@@ -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]))
+
+      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.20'.freeze
+  VERSION = '0.1.25'.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.20
+  version: 0.1.25
 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