blend_spreadsheet_loan_generator 0.1.29 → 0.1.33

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c2feb14eec33c86a032e711df82ad3b93bf8fd5b3f97c3746a5a24bef7814398
-  data.tar.gz: e526d50983256ede22d4d54d3e5f0486c36ca88509d254d57b8ad77f5e86a8a4
+  metadata.gz: caf298e238200e25827511da7dac19fb3632a4e4a85b1ea86f16323dd2e28b58
+  data.tar.gz: 52fc113243acc66cc02c65016871ba435cbeb70762b28d9240e07afb0a27dbd9
 SHA512:
-  metadata.gz: 59c7cf8b548249e27dd0c945598ab2d9a8287c32372b370d6bbbec2f7ffaf960ed978e9fd6e747564541152659dc841f57410769c3fd2571721898f2b389163a
-  data.tar.gz: 3a83c45004a61448074532f5d7ee1d0541b54734657821d965ab8de33649b056108470d9ac26c1056c3f78d8dd1630ce3b3fad32e01b1795679e2ed492bddd2f
+  metadata.gz: a41171c8bda9961b3b483fdc911a2eca6c0e7cd7d7fa47824e14d306f8d65316c6a9a8ec8e00fe16d25e0d9927d990664f69d75c0728d2c8608586dfde06fe72
+  data.tar.gz: 9bf8c3e0e21dc5f5419d90db5fd3be45032bf6f485c9cf4c077d441acfa443f73a7e16102fd4c2bba751ac21351fa50530debd677ef240a82ec446977caa7a66

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

@@ -174,8 +174,6 @@ module BlendSpreadsheetLoanGenerator
         remaining_capital_start(line),
         '+',
         capitalized_interests_start(line),
-        '+',
-        capitalized_fees_start(line),
         ')'
       ].join(' ')
 
@@ -191,7 +189,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}; 2)"
       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.29'.freeze
+  VERSION = '0.1.33'.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.29
+  version: 0.1.33
 platform: ruby
 authors:
 - MZiserman
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-07-30 00:00:00.000000000 Z
+date: 2021-09-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport