blend_spreadsheet_loan_generator 0.1.27 → 0.1.31

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b500ee01fce00eb5d3a71404f720ae470dd141bf187bef1634f3ad57588ba9f5
-  data.tar.gz: 46b53438bd6c349e3c5b52fc6fe333c081c1fd24bf5c098b28c4437abadb0ae4
+  metadata.gz: 398e368c7cf8e095e275942ec8d8f5375a3452f947bd97bba30cb06520a4437b
+  data.tar.gz: d9d40882295305ad46b49d5b76abeaa2ca89a89c5f0ffac453bc0fc095592873
 SHA512:
-  metadata.gz: c2ff7ffde2072fda5f29fb4fcaf61f6e3bccb663855c3527bba5d6f416d2949b2bc6a45bf92be0cc548f0976406dc115e54d225b01716b0072f8092a936b125e
-  data.tar.gz: 673dd3c59ce84d779cced52348043ce32e216faa5dc54bc332a8653206618f63ef5348b3a36b342e63ecfb26b3e795d99946c569c609314771300f0e47e00a66
+  metadata.gz: c790e70c21a56c50463428a037b3dfb472e086ff8c739fd36f0a9342914091e54253e2c415139c94c3559ee89e8a65f7ee2b0f2df0467b0ca43bcd2a1f1bc790
+  data.tar.gz: 03243acbdc2824c7102c59858a8bdd206376a0941a727ad3328877aed9d7a0b675f68e4e748c53a17ae55d19ed1cf0b72ade2f6e047562a2a1692b7c6e9072f6

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/early_repay.rb

@@ -85,8 +85,17 @@ module BlendSpreadsheetLoanGenerator
         values[last_paid_line + 1][:period_calculated_interests] +
         values[last_paid_line + 1][:period_calculated_fees]
       )
+      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.to_f / values[last_paid_line + 1][:remaining_capital_start])).to_f
+      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
 

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(line)} * (1 + #{period_fees_rate(line)} + #{period_rate(line)})^#{index(line)}"
+        without_fees = "#{remaining_capital_start(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

data/lib/blend_spreadsheet_loan_generator/version.rb

@@ -1,7 +1,7 @@
 require 'dry/cli'
 
 module BlendSpreadsheetLoanGenerator
-  VERSION = '0.1.27'.freeze
+  VERSION = '0.1.31'.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.27
+  version: 0.1.31
 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