blend_spreadsheet_loan_generator 0.1.24 → 0.1.28

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0473a465aaf8c05516fd8ed8eeff3009996f4afe3c9dbc5578df88fb4985a03a
-  data.tar.gz: a73d70c1cbfd2d2241dd2bc875750358bf6893914739b0b5efaf65271e8800f1
+  metadata.gz: bf94149d6402855a08bf289dbbe244a061ff53b2b9c985ec6ad986990c80bc07
+  data.tar.gz: e4b12c44ab4f2cfaa75214532bcb172cc753be7e1e8971e68314e133b2ec5748
 SHA512:
-  metadata.gz: 55e0989827c375bc5f13d58c7bef7d7bf0024126f838997b7a5c669e5a4bb378020c4dff1d616b78f6686f3b3050bbba7a5132fd18385cf0aaa668d1e8fd09a6
-  data.tar.gz: 76cbd06e23b5250740ad087e08f4f61f22c6ae828e2ea1dec23559a2d55ae4bfbd5e1f7d72f81f0efa823ca3de7dd7dd86c2ca3c864fb68e7a7d7e4ee41a6bf8
+  metadata.gz: d029eec619738f060c7d202960b2ef0531fea597e6d4687658e5bf23f0f5bcd84482783b880b16b418103b3c20da5b7b5a78057809621dd29441d685c134dc1c
+  data.tar.gz: 7b92eadb27db35a729117b2b3b89d72217e4281d72606e78a8c44cd715c772da0a2d42a2a3783a5949dd329336b8ca59450696270f707b67b7be4bfdb2f6d8d1

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/concerns/spreadsheet_concern.rb

@@ -33,6 +33,7 @@ module BlendSpreadsheetLoanGenerator
           period_reimbursed_capitalized_fees
           period_fees_rate
           period_reimbursed_guaranteed_interests
+          period_reimbursed_guaranteed_fees
         ]
       end
 
@@ -54,6 +55,7 @@ module BlendSpreadsheetLoanGenerator
           capitalized_fees_end
           period_reimbursed_capitalized_fees
           period_reimbursed_guaranteed_interests
+          period_reimbursed_guaranteed_fees
         ]
       end
 

data/lib/blend_spreadsheet_loan_generator/early_repay.rb

@@ -46,13 +46,14 @@ module BlendSpreadsheetLoanGenerator
 
       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] }
-        else
-          0
-        end
-      )
+
+      if guaranteed_line.present? && guaranteed_line >= (last_paid_line + 2)
+        total_guaranteed_interests = values[(last_paid_line + 2)..guaranteed_line].sum { |value| value[:period_calculated_interests] }
+        total_guaranteed_fees = values[(last_paid_line + 2)..guaranteed_line].sum { |value| value[:period_calculated_fees] }
+      else
+        total_guaranteed_interests = 0
+        total_guaranteed_fees = 0
+      end
 
       total_to_be_paid = (
         values[last_paid_line + 1][:remaining_capital_start] +
@@ -80,27 +81,27 @@ 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]
       )
-      actual_capital_paid = (
-        capital_paid -
-        values[last_paid_line + 1][:period_calculated_interests] -
+      capital_paid_for_ratio = amount_paid.to_f - (
+        values[last_paid_line + 1][:capitalized_fees_start] +
         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 = (
-        ratio * total_guaranteed_interests
-      )
-      capital_paid -= guaranteed_interests_paid
+      ratio = options.fetch(:ratio, (capital_paid_for_ratio.to_f / values[last_paid_line + 1][:remaining_capital_start])).to_f
+      guaranteed_interests_paid = ratio * total_guaranteed_interests
+      guaranteed_fees_paid = ratio * total_guaranteed_fees
 
       amount = (
         if last_paid_line == -1
-          values[0][:remaining_capital_end]
+          values[0][:remaining_capital_start]
         else
           values[last_paid_line][:remaining_capital_end]
         end
       )
+
       @loan = Loan.new(
         amount: amount,
         duration: duration,
@@ -124,10 +125,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)"
@@ -138,8 +139,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])
@@ -160,6 +160,9 @@ module BlendSpreadsheetLoanGenerator
       worksheet[2, columns.index('period_reimbursed_guaranteed_interests') + 1] =
         excel_float(guaranteed_interests_paid)
 
+      worksheet[2, columns.index('period_reimbursed_guaranteed_fees') + 1] =
+        excel_float(guaranteed_fees_paid)
+
       apply_formats(worksheet: worksheet)
 
       worksheet.save
@@ -200,6 +203,7 @@ module BlendSpreadsheetLoanGenerator
       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[:period_reimbursed_guaranteed_fees] = h[:period_reimbursed_guaranteed_fees].to_f
 
       h
     end

data/lib/blend_spreadsheet_loan_generator/formula.rb

@@ -213,5 +213,9 @@ module BlendSpreadsheetLoanGenerator
     def period_reimbursed_guaranteed_interests_formula(line:)
       excel_float(0.0)
     end
+
+    def period_reimbursed_guaranteed_fees_formula(line:)
+      excel_float(0.0)
+    end
   end
 end

data/lib/blend_spreadsheet_loan_generator/generate.rb

@@ -24,12 +24,6 @@ module BlendSpreadsheetLoanGenerator
 
     def call(amount:, duration:, rate:, **options)
       begin
-        # session = GoogleDrive::Session.from_service_account_key(
-        #   File.join(
-        #     ENV['SPREADSHEET_LOAN_GENERATOR_DIR'],
-        #     'loan-spreadsheet-generator-6c27a42bdda7.json'
-        #   )
-        # )
         session = GoogleDrive::Session.from_config(
           File.join(ENV['SPREADSHEET_LOAN_GENERATOR_DIR'], 'config.json')
         )
@@ -71,9 +65,6 @@ module BlendSpreadsheetLoanGenerator
       generate_csv(worksheet: worksheet, target_path: options.fetch(:target_path))
 
       puts worksheet.human_url
-    rescue => e
-      require 'pry'
-      binding.pry
     end
   end
 end

data/lib/blend_spreadsheet_loan_generator/version.rb

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