blend_spreadsheet_loan_generator 0.1.19 → 0.1.24

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3a4482f5c0a0e93b8085f1bc9d064a15873d9da91d4a3c945febb087b9a233ff
-  data.tar.gz: a00f98340c0aa4109b950d59c132bbbeab5878992b474875db21078010762162
+  metadata.gz: 0473a465aaf8c05516fd8ed8eeff3009996f4afe3c9dbc5578df88fb4985a03a
+  data.tar.gz: a73d70c1cbfd2d2241dd2bc875750358bf6893914739b0b5efaf65271e8800f1
 SHA512:
-  metadata.gz: 3a7e731e49a56746d8a0b60e7a867efa6f10c65e59ad785fed1dd0529e3f1ca748582f1c6e54867b3c25cf54fb553d05f3b5d4a915194815960868c1c0fda226
-  data.tar.gz: 3337ca2d8d85a4eabb170869097eded13b92404f5ea402bb70ef6b943946479784f8e46d0fa868a58498f9b0c52184958671050d3a4944ce3a7099a7e1a2f1c3
+  metadata.gz: 55e0989827c375bc5f13d58c7bef7d7bf0024126f838997b7a5c669e5a4bb378020c4dff1d616b78f6686f3b3050bbba7a5132fd18385cf0aaa668d1e8fd09a6
+  data.tar.gz: 76cbd06e23b5250740ad087e08f4f61f22c6ae828e2ea1dec23559a2d55ae4bfbd5e1f7d72f81f0efa823ca3de7dd7dd86c2ca3c864fb68e7a7d7e4ee41a6bf8

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

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'
@@ -43,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
@@ -64,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
       )
 
@@ -74,14 +82,27 @@ 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
 
+      amount = (
+        if last_paid_line == -1
+          values[0][:remaining_capital_end]
+        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),

data/lib/blend_spreadsheet_loan_generator/version.rb

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