blend_spreadsheet_loan_generator 0.1.99 → 0.1.103

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 565ddfb9ab9868bd0bc47ca82c3322b7a8a6fa2a5d1a519782bc3f985fa8e668
-  data.tar.gz: 1877ad34ba609c03c59f2fabc81d9d91940df5e1194a3455d52d697bbb8d7c83
+  metadata.gz: a53645750943fd847c6d787a9bbc73f23982daa5793ecb37f92100167d905b9e
+  data.tar.gz: 895e30e96a23336012ca31e8f772f354efb8feb0670d612fa2ca068b5979444b
 SHA512:
-  metadata.gz: 6db635662441108f44574b6b6f9eec16fe94e7394b324ab83213051b84e693391effb880db74e259c46fef54b7b74802adbcee34f95e648d23a20f37a0561f8a
-  data.tar.gz: f79d314308aac20dd01f22e5a03f1eb6a47aa1dc87542c4b93ae903d3a5e2c1dad3183acf59c0b6826e0f4dbc4d3559909c3d7222d6373c96fc55793f55871cb
+  metadata.gz: bf34f63e6d2bcfe7c983f4a191fa12de929dc56cf859f54f3676a0a981b3a7d735e9499b89d3599094ff7294f0a7fd07ddc523ec32343b9c4dd08fef4b72f644
+  data.tar.gz: 741777ca11694b3330609ce0aefd11df91234af988091d23605b75a895387466f3a5bb48bae43acdd4da2648e30193a142962871570402a59e63f635221a066c

data/lib/blend_spreadsheet_loan_generator/concerns/spreadsheet_concern.rb

@@ -100,7 +100,7 @@ module BlendSpreadsheetLoanGenerator
         end
         loan.duration.times do |line|
           columns.each.with_index do |title, column|
-            if first_term_skip && title.in?(custom_early_repayment)
+            if first_term_skip && title.in?(first_term_skip_columns)
               worksheet[line + 2, column + 1] = @formula.send("#{title}_formula", line: line + 2, first_term_skip: true)
             else
               worksheet[line + 2, column + 1] = @formula.send("#{title}_formula", line: line + 2)

data/lib/blend_spreadsheet_loan_generator/formula.rb

@@ -170,22 +170,20 @@ module BlendSpreadsheetLoanGenerator
 
     def period_calculated_fees_formula(line:, first_term_skip: false)
       term = line - 1
+      return excel_float(0.0) if first_term_skip
       if loan.bullet_term?(term)
-        index = (
-          if first_term_skip
-            index(line - 1)
-          else
-            index(line)
-          end
-        )
+        index = first_term_skip ? index(line - 1) : index(line)
+
         with_fees = "#{remaining_capital_start(line)} * (1 + #{period_fees_rate(line)} + #{period_rate(line)})^#{index}"
         without_fees = "#{remaining_capital_start(line)} * (1 + #{period_rate(line)})^#{index}"
         current = "#{with_fees} - #{without_fees}"
 
         "=#{current} - #{capitalized_fees_start(line)}"
       elsif loan.deferred_and_capitalized > 0 && term > loan.deferred_and_capitalized
-        with_fees = "#{remaining_capital_start(line)} * (1 + #{period_rate(line)} + #{period_fees_rate(line)})^#{loan.deferred_and_capitalized} * (#{period_rate(line)} + #{period_fees_rate(line)})"
-        without_fees = "#{remaining_capital_start(line)} * (1 + #{period_rate(line)})^#{loan.deferred_and_capitalized} * #{period_rate(line)}"
+        index = first_term_skip ? loan.deferred_and_capitalized : loan.deferred_and_capitalized - 1
+
+        with_fees = "#{remaining_capital_start(line)} * (1 + #{period_rate(line)} + #{period_fees_rate(line)})^#{index} * (#{period_rate(line)} + #{period_fees_rate(line)})"
+        without_fees = "#{remaining_capital_start(line)} * (1 + #{period_rate(line)})^#{index} * #{period_rate(line)}"
 
         "=#{with_fees} - #{without_fees}"
       else
@@ -209,6 +207,7 @@ module BlendSpreadsheetLoanGenerator
 
     def capitalized_fees_end_formula(line:, first_term_skip: false)
       term = line - 1
+      return excel_float(0.0) if first_term_skip
       if term <= loan.deferred_and_capitalized
         index = first_term_skip ? index(line - 1) : index(line)
         with_fees = "#{remaining_capital_start(line)} * (1 + #{period_fees_rate(line)} + #{period_rate(line)})^#{index}"

data/lib/blend_spreadsheet_loan_generator/restructure.rb

@@ -72,9 +72,9 @@ module BlendSpreadsheetLoanGenerator
       spreadsheet = session.create_spreadsheet(loan.name)
       worksheet = spreadsheet.add_worksheet(loan.type, loan.duration + 2, columns.count + 1, index: 0)
 
-      @formula = Formula.new(loan: loan, first_term_skip: true)
+      @formula = Formula.new(loan: loan)
 
-      apply_formulas(worksheet: worksheet)
+      apply_formulas(worksheet: worksheet, first_term_skip: true)
       apply_formats(worksheet: worksheet)
 
       worksheet.save

data/lib/blend_spreadsheet_loan_generator/version.rb

@@ -1,7 +1,7 @@
 require 'dry/cli'
 
 module BlendSpreadsheetLoanGenerator
-  VERSION = '0.1.99'.freeze
+  VERSION = '0.1.103'.freeze
 
   class Version < Dry::CLI::Command
     desc 'Print version'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: blend_spreadsheet_loan_generator
 version: !ruby/object:Gem::Version
-  version: 0.1.99
+  version: 0.1.103
 platform: ruby
 authors:
 - MZiserman