blend_spreadsheet_loan_generator 0.1.16 → 0.1.21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bbb638c6b9da3b44d76b3c6bdcd25ff0c72c859e1f972e5f032b58e202bbb411
-  data.tar.gz: b104a0c811a1cc485a9914831db47e613af2a7f873aeffa0cb5dfc45859ba8b7
+  metadata.gz: 2f28ea47a7ea85e82f8bb7e6235025a727c4ed68e48ca775b8504a55e0ae104c
+  data.tar.gz: 933c6ad4f65149b569d0ac66e695b1896e6cd80d7e4b259cbd95920af99d811a
 SHA512:
-  metadata.gz: af51b53a9b4073e41d898ee41d8ca6725b04ce50c16300d00f25a0867af0c3ce874290343ac66d3edb5e2096d7210b287b91b77640ce2cd1304557125146dc08
-  data.tar.gz: 22b8948a0826f7f184672a3a0741514f17a7f133f61c46f7699f73dcd78b27dccf31b0cd24cd531a946b6addc404b6e1ee4b72d24cd555cf2d00bcac6ab17238
+  metadata.gz: acf4406ebca9f8ec7bee91d47d8ab9f187b7e5da5253d64ddf58d2e66f451c1f54522ae43eaee1a9002f490101c7b4323bf0591ad0765d49befffdd4134e1c6b
+  data.tar.gz: 39c9ce533a34f54a95ee4147759fddfb5ebcc0c985c0b32b9ea0cdbe75865752aba7c4add64c0a60c51f7acae4585342c73a08a1c165c2eb8ed0b0852d116f37

data/exe/bslg

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

data/lib/blend_spreadsheet_loan_generator/concerns/spreadsheet_concern.rb

@@ -3,7 +3,6 @@ module BlendSpreadsheetLoanGenerator
     extend ActiveSupport::Concern
 
     included do
-
       def columns
         %w[
           index
@@ -33,6 +32,7 @@ module BlendSpreadsheetLoanGenerator
           capitalized_fees_end
           period_reimbursed_capitalized_fees
           period_fees_rate
+          period_reimbursed_guaranteed_interests
         ]
       end
 
@@ -53,6 +53,7 @@ module BlendSpreadsheetLoanGenerator
           capitalized_fees_start
           capitalized_fees_end
           period_reimbursed_capitalized_fees
+          period_reimbursed_guaranteed_interests
         ]
       end
 

data/lib/blend_spreadsheet_loan_generator/early_repay.rb

@@ -13,6 +13,7 @@ module BlendSpreadsheetLoanGenerator
     argument :rate, type: :float, required: true, desc: 'year rate post restructuration'
 
     option :guaranteed_terms, type: :integer, default: 0
+    option :ratio, type: :float
     option :duration, type: :integer, desc: 'duration'
     option :period_duration, type: :integer, default: 1, desc: 'duration of a period in months'
     option :due_on, type: :date, default: Date.today, desc: 'date of the pay day of the first period DD/MM/YYYY'
@@ -44,10 +45,10 @@ module BlendSpreadsheetLoanGenerator
       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 }
-      guaranteed_line = values.index { |term| term[:index] == options.fetch(:guaranteed_terms, nil) } || nil
+      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..guaranteed_line].sum(:period_calculated_interests)
+          values[(last_paid_line + 1)..guaranteed_line].sum { |value| value[:period_calculated_interests] }
         else
           0
         end
@@ -74,9 +75,9 @@ module BlendSpreadsheetLoanGenerator
         values[last_paid_line + 1][:capitalized_interests_start] +
         values[last_paid_line + 1][:capitalized_fees_start]
       )
+      ratio = options.fetch(:ratio, (capital_paid.to_f / values[last_paid_line + 1][:remaining_capital_start])).to_f
       guaranteed_interests_paid = (
-        (capital_paid.to_f / values[last_paid_line + 1][:remaining_capital_start]) *
-        total_guaranteed_interests
+        ratio * total_guaranteed_interests
       )
       capital_paid -= guaranteed_interests_paid
 
@@ -109,7 +110,7 @@ module BlendSpreadsheetLoanGenerator
         "=#{excel_float(values[last_paid_line][:remaining_capital_end])} - #{period_capital(2)}"
 
       worksheet[2, columns.index('period_interests') + 1] =
-        "=ARRONDI(#{period_theoric_interests(2)} + #{guaranteed_interests_paid}; 2)"
+        "=ARRONDI(#{period_theoric_interests(2)}; 2)"
 
       worksheet[2, columns.index('period_theoric_interests') + 1] =
         "=#{excel_float(values[last_paid_line + 1][:period_calculated_interests])}"
@@ -136,6 +137,9 @@ module BlendSpreadsheetLoanGenerator
       worksheet[2, columns.index('period_reimbursed_capitalized_fees') + 1] =
         excel_float(values[last_paid_line + 1][:capitalized_fees_start])
 
+      worksheet[2, columns.index('period_reimbursed_guaranteed_interests') + 1] =
+        excel_float(guaranteed_interests_paid)
+
       apply_formats(worksheet: worksheet)
 
       worksheet.save
@@ -175,6 +179,7 @@ module BlendSpreadsheetLoanGenerator
       h[:capitalized_fees_end] = h[:capitalized_fees_end].to_f
       h[:period_reimbursed_capitalized_fees] = h[:period_reimbursed_capitalized_fees].to_f
       h[:period_fees_rate] = h[:period_fees_rate].to_f
+      h[:period_reimbursed_guaranteed_interests] = h[:period_reimbursed_guaranteed_interests].to_f
 
       h
     end

data/lib/blend_spreadsheet_loan_generator/formula.rb

@@ -42,7 +42,9 @@ module BlendSpreadsheetLoanGenerator
         '+',
         period_interests(line),
         '+',
-        period_reimbursed_capitalized_interests(line)
+        period_reimbursed_capitalized_interests(line),
+        '+',
+        period_reimbursed_guaranteed_interests(line)
       ].join(' ')
       "=ARRONDI(#{total}; 2)"
     end
@@ -207,5 +209,9 @@ module BlendSpreadsheetLoanGenerator
     def period_fees_rate_formula(line:)
       @interests_formula.period_fees_rate_formula(line: line)
     end
+
+    def period_reimbursed_guaranteed_interests_formula(line:)
+      excel_float(0.0)
+    end
   end
 end

data/lib/blend_spreadsheet_loan_generator/version.rb

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