blend_spreadsheet_loan_generator 0.1.18 → 0.1.23

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6f1bd528dfab34e5a542c71fb717a135514bcd836c514459aa3cd48370d8c6ce
-  data.tar.gz: 158fd28b4211df4ba3bc97b9fb79aa585267e2fb430974454f81780e3582c0aa
+  metadata.gz: 97656de6803defd1af54366733c9f096f2a571fba89576b0a96ced269bfdebae
+  data.tar.gz: 9b0036e1d46ae2835d7d1add57af17e18b29107a9b29e1f8e00dde54d86fef48
 SHA512:
-  metadata.gz: 26472f95146cb98da47c04b28cb1fd1fc03e318cdcf1f960cce59b8faca80e4a007b8bcfd85a24ee259babdce978acae868b0fe20d0132694d45dcc0d8ba5853
-  data.tar.gz: e88f0c3853586ecbc59cdbc0c255543dc19816e1873f35b3242bb6701f4aeef5b9a9a0dce4335efbfb6f5af0bdd3861c68931fcc10c54a66e56500a7db8cb212
+  metadata.gz: 5ae85edc2da12b6d1689f33e7564486fad79968c51c5cbb8d3ffb998b2c563d544f5267dd3b3df5a869ac98bd28742d9ccd0e1908e0f8b186b0b7b04835edfc2
+  data.tar.gz: 5896188fffc2c776cf8f9a8ba847c35f4848830ac8f1a893bc59a216e24a5f11b994d1e41dd4304fa15c38e1513ecd543721e22ba93e19ece033ed8021221744

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,7 +45,7 @@ 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 + 1)..guaranteed_line].sum { |value| value[:period_calculated_interests] }
@@ -74,9 +75,15 @@ module BlendSpreadsheetLoanGenerator
         values[last_paid_line + 1][:capitalized_interests_start] +
         values[last_paid_line + 1][:capitalized_fees_start]
       )
+      actual_capital_paid = (
+        capital_paid -
+        values[last_paid_line + 1][:period_calculated_interests] -
+        values[last_paid_line + 1][:period_calculated_fees]
+      )
+
+      ratio = options.fetch(:ratio, (actual_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 +116,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)} + #{excel_float(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 +143,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 +185,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.18'.freeze
+  VERSION = '0.1.23'.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.18
+  version: 0.1.23
 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