blend_spreadsheet_loan_generator 0.1.26 → 0.1.30

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 46ffd519aaf8bc1d7b8bb2bb84c376e107f04cf2c8af6ee23ad028a563e63d8b
-  data.tar.gz: da8b157b33839272a2647e201111a4349451a62c569195e95c293071c77800df
+  metadata.gz: c65bb8dcbc3561cd3fa134d4eac3153934937c0de336afd2f41054a87e87a1e0
+  data.tar.gz: d90db3f308d1b6580f70d3c898e9ff38c0dc2fdbb59cd5c688b08a12169b232d
 SHA512:
-  metadata.gz: 3ba10779043886b9870cd78fbbda175362c231a9afd824fa4d0a2107284d16ce493dd76469f542f8508359efd57041306e1727f645c409100e16e50712cf74a9
-  data.tar.gz: 6c497e6e9d39c7b537a5f07fb14306850b53cfe77b12653cb0ce6dd2b1e4329ce199fb73c007beb50c945e193146cddb7ad20cd1526f1beb15a5b3ee828f86b3
+  metadata.gz: 531b9805eb3433e1835010a33fda24014e7071b5a21692bf8e66c78aeebe6cd45a1d05048158d97ccb484c2e9b3b76315034aad73efd7923b6b511a5e695331d
+  data.tar.gz: 0c2e0a0d93fff9c3620abbf6cea28750f7375e1fb4becc799447e481ec655b02c94ca07907712aef2aed350bd5a798b03ffc22ce85a7f3d184294de0336ebaf8

data/lib/blend_spreadsheet_loan_generator/concerns/csv_concern.rb

@@ -27,24 +27,3 @@ module BlendSpreadsheetLoanGenerator
     end
   end
 end
-
-
-def generate_csv(data:, name:)
-  CSV.open(name, 'wb') do |csv|
-    data.each do |datum|
-      row = []
-      datum.each.with_index do |value, index|
-        row << (
-          if index == 0
-            value.to_i
-          elsif index == 1
-            Date.parse(value).strftime('%m/%d/%Y')
-          else
-            value.gsub(',', '.').to_f
-          end
-        )
-      end
-      csv << row
-    end
-  end
-end

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 + 2)
-          values[(last_paid_line + 2)..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] +
@@ -84,12 +85,20 @@ module BlendSpreadsheetLoanGenerator
         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])).to_f
-      guaranteed_interests_paid = (
-        ratio * total_guaranteed_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]
+      )
+      remaining_capital_for_ratio = (
+        values[last_paid_line + 1][:remaining_capital_start] +
+        values[last_paid_line + 1][:capitalized_interests_start] +
+        values[last_paid_line + 1][:period_calculated_interests]
       )
 
+      ratio = options.fetch(:ratio, capital_paid_for_ratio.to_f / remaining_capital_for_ratio).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_start]
@@ -156,6 +165,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
@@ -196,6 +208,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

@@ -191,7 +191,9 @@ module BlendSpreadsheetLoanGenerator
     def capitalized_fees_end_formula(line:)
       term = line - 1
       if term <= loan.deferred_and_capitalized
-        "=ARRONDI(#{capitalized_fees_start(line)} + #{period_calculated_fees(line)}; 2)"
+        with_fees = "#{remaining_capital_start_formula(line)} * (1 + #{period_fees_rate(line)} + #{period_rate(line)})^#{index(line)}"
+        without_fees = "#{remaining_capital_start_formula(line)} * (1 + #{period_rate(line)})^#{index(line)}"
+        "=ARRONDI(#{with_fees} - #{without_fees})"
       else
         "=ARRONDI(#{capitalized_fees_start(line)} - #{period_reimbursed_capitalized_fees(line)}; 2)"
       end
@@ -213,5 +215,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.26'.freeze
+  VERSION = '0.1.30'.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.26
+  version: 0.1.30
 platform: ruby
 authors:
 - MZiserman
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-07-15 00:00:00.000000000 Z
+date: 2021-09-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport