mudrat_projector 0.9.3 → 0.9.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 99cf860a7f16e297d956e8b018652994a216552c
-  data.tar.gz: 51de6ef4a9280d86339c5e045cd3514f6475259c
+  metadata.gz: d2181d2b58ff6ff66fc876cb0a69b95c40a73cb8
+  data.tar.gz: 506905ae2d682c9c3dd13712ad381fc2ba71b418
 SHA512:
-  metadata.gz: 25820eacfe06c533db174462a6cc9ae66a826751ddbeda829250ae2970fb92ed8a15ffdc3366d92b9a76b478a3996206ec074ea7f965609d24b1904435b00834
-  data.tar.gz: 89671345c7a2ebd2ef4513a20312d676bd1d0a023df1a066def36a6fa3c855eb6ec3400745431f375800ac7cc35240d795b84b0dff917d3f9b4d56c0c20ca0e4
+  metadata.gz: efafce27f94ec1a5c2a96535cd09fe6a3db785fe5581804cf0e7bd040b1d7adbf39e723d3c0bd55bec33325d4371aa59ac1dc6c19e73b8db7666cf037ab6ae1d
+  data.tar.gz: e3cd5fc24943b3ba408d68fb4ae2c5cefc484f4f1d425b39ed58fb8530791bb1323928daf3a3f6813d4e53d97a9a9805b6eb22c57a91d454403443eaf7dfbc88

data/lib/mudrat_projector/date_diff.rb

@@ -28,9 +28,17 @@ module MudratProjector
       end
 
       def days_between
-        (to - from).to_f + 1
+        to_big_decimal(to - from) + 1
       end
       private :days_between
+
+      def to_big_decimal(number)
+        if number.is_a? Rational
+          number.to_d(20)
+        else
+          number.to_d
+        end
+      end
     end
 
     class DayCalculator < Calculator
@@ -88,7 +96,7 @@ module MudratProjector
       end
 
       def days_in_unit unit
-        ((unit.end + 1) - unit.begin).to_f
+        to_big_decimal((unit.end + 1) - unit.begin)
       end
 
       def units_between

data/lib/mudrat_projector/projector.rb

@@ -18,7 +18,7 @@ module MudratProjector
       @validator    = Validator.new projector: self, chart: @chart
     end
 
-    def_delegators :@chart, *%i(accounts account_balance apply_transaction balance fetch net_worth split_account)
+    def_delegators :@chart, *%i(accounts account_balance apply_transaction balance fetch split_account)
     def_delegators :@validator, *%i(must_be_balanced! validate_account! validate_transaction!)
 
     def accounts= accounts
@@ -51,6 +51,10 @@ module MudratProjector
       balance.zero?
     end
 
+    def net_worth
+      @chart.net_worth.round(2).to_f
+    end
+
     def project to: end_of_projection, build_next: false, &block
       must_be_balanced!
       projection = Projection.new range: (from..to), chart: @chart

data/lib/mudrat_projector/schedule.rb

@@ -12,7 +12,9 @@ module MudratProjector
       split_count_over(range).reduce range.begin do |date, factor|
         @count -= factor if @count
         yield [date, factor]
-        DateDiff.advance intervals: factor, unit: unit, from: date
+        scalar.times.reduce date do |date, _|
+          DateDiff.advance intervals: factor, unit: unit, from: date
+        end
       end
     end
 
@@ -22,7 +24,8 @@ module MudratProjector
 
     def split_count_over range
       diff = DateDiff.date_diff unit: unit, from: range.begin, to: range.end
-      full_units, final_prorate = [@count, diff].compact.min.divmod 1
+      full_units, final_prorate = [@count, diff].compact.min.divmod scalar
+      final_prorate /= scalar
       ([1] * full_units).tap do |list|
         list.push final_prorate unless final_prorate.zero?
       end

data/lib/mudrat_projector/transaction_entry.rb

@@ -99,7 +99,7 @@ module MudratProjector
     private
 
     def fmt number
-      number.respond_to?(:round) ? number.round(2).to_f : number
+      number.respond_to?(:round) ? number.round(2).to_d : number
     end
   end
 

data/lib/mudrat_projector/version.rb

@@ -1,3 +1,3 @@
 module MudratProjector
-  VERSION = "0.9.3"
+  VERSION = "0.9.4"
 end

data/test/models/date_diff_test.rb

@@ -16,47 +16,46 @@ class DateDiffTest < Minitest::Test
   end
 
   def test_years_between_a_few_days
-    assert_equal (1.0   / 366.0), date_diff(:year, jan_1_2000, jan_1_2000)
-    assert_equal (31.0  / 366.0), date_diff(:year, jan_1_2000, jan_31_2000)
-    assert_equal (32.0  / 366.0), date_diff(:year, jan_1_2000, feb_1_2000)
-    assert_equal (2/366.0 + 2/365.0), date_diff(:year, dec_30_2000, jan_2_2001)
+    assert_equal (1  / 366.to_d), date_diff(:year, jan_1_2000, jan_1_2000)
+    assert_equal (31 / 366.to_d), date_diff(:year, jan_1_2000, jan_31_2000)
+    assert_equal (32 / 366.to_d), date_diff(:year, jan_1_2000, feb_1_2000)
+    assert_equal (2/366.to_d + 2/365.to_d), date_diff(:year, dec_30_2000, jan_2_2001)
   end
 
   def test_quarters_between_a_few_days
-    q1_2000 = (31 + 29 + 31).to_f
-    q4_2000 = (31 + 30 + 31).to_f
-    q1_2001 = (31 + 28 + 31).to_f
-    assert_equal (1.0  / q1_2000), date_diff(:quarter, jan_1_2000, jan_1_2000)
-    assert_equal (31.0 / q1_2000), date_diff(:quarter, jan_1_2000, jan_31_2000)
-    assert_equal (32.0 / q1_2000), date_diff(:quarter, jan_1_2000, feb_1_2000)
+    q1_2000 = (31 + 29 + 31).to_d
+    q4_2000 = (31 + 30 + 31).to_d
+    q1_2001 = (31 + 28 + 31).to_d
+    assert_equal (1  / q1_2000), date_diff(:quarter, jan_1_2000, jan_1_2000)
+    assert_equal (31 / q1_2000), date_diff(:quarter, jan_1_2000, jan_31_2000)
+    assert_equal (32 / q1_2000), date_diff(:quarter, jan_1_2000, feb_1_2000)
     assert_equal (2/q4_2000 + 2/q1_2001), date_diff(:quarter, dec_30_2000, jan_2_2001)
   end
 
   def test_months_between_a_few_days
-    assert_equal (1.0   / 31.0), date_diff(:month, jan_1_2000, jan_1_2000)
-    assert_equal (31.0  / 31.0), date_diff(:month, jan_1_2000, jan_31_2000)
-    assert_equal (1.0 + 1/29.0), date_diff(:month, jan_1_2000, feb_1_2000)
-    assert_equal (2.0/31.0 + 2.0/31.0), date_diff(:month, dec_30_2000, jan_2_2001)
+    assert_equal (1   / 31.to_d), date_diff(:month, jan_1_2000, jan_1_2000)
+    assert_equal (31  / 31.to_d), date_diff(:month, jan_1_2000, jan_31_2000)
+    assert_equal (1 + 1/29.to_d), date_diff(:month, jan_1_2000, feb_1_2000)
+    assert_equal (2/31.to_d + 2/31.to_d), date_diff(:month, dec_30_2000, jan_2_2001)
   end
 
   def test_weeks_between_a_few_days
-    assert_equal (1.0   / 7.0), date_diff(:week, jan_1_2000, jan_1_2000)
-    assert_equal (31.0  / 7.0), date_diff(:week, jan_1_2000, jan_31_2000)
-    assert_equal (32.0  / 7.0), date_diff(:week, jan_1_2000, feb_1_2000)
-    assert_equal (2/7.0 + 2/7.0), date_diff(:week, dec_30_2000, jan_2_2001)
+    assert_equal (1   / 7.to_d), date_diff(:week, jan_1_2000, jan_1_2000)
+    assert_equal (31  / 7.to_d), date_diff(:week, jan_1_2000, jan_31_2000)
+    assert_equal (Rational(32, 7).to_d(19)), date_diff(:week, jan_1_2000, feb_1_2000)
   end
 
   def test_days_between_a_few_days
-    assert_equal 1.0, date_diff(:day, jan_1_2000, jan_1_2000)
-    assert_equal 31.0, date_diff(:day, jan_1_2000, jan_31_2000)
-    assert_equal 32.0, date_diff(:day, jan_1_2000, feb_1_2000)
-    assert_equal 4.0, date_diff(:day, dec_30_2000, jan_2_2001)
+    assert_equal 1,  date_diff(:day, jan_1_2000, jan_1_2000)
+    assert_equal 31, date_diff(:day, jan_1_2000, jan_31_2000)
+    assert_equal 32, date_diff(:day, jan_1_2000, feb_1_2000)
+    assert_equal 4,  date_diff(:day, dec_30_2000, jan_2_2001)
   end
 
   def test_six_months
-    assert_equal ((1 + 29 + 31 + 30 + 31 + 2) / 366.0), date_diff(:year, jan_31_2000, jun_2_2000)
-    assert_equal (1.0/31.0 + 4.0 + 2.0/30.0), date_diff(:month, jan_31_2000, jun_2_2000)
-    assert_equal ((1 + 29 + 31 + 30 + 31 + 2) / 7.0), date_diff(:week, jan_31_2000, jun_2_2000)
+    assert_equal ((1 + 29 + 31 + 30 + 31 + 2) / 366.to_d), date_diff(:year, jan_31_2000, jun_2_2000)
+    assert_equal (1/31.to_d + 4 + 2/30.to_d), date_diff(:month, jan_31_2000, jun_2_2000)
+    assert_equal ((1 + 29 + 31 + 30 + 31 + 2) / 7.to_d), date_diff(:week, jan_31_2000, jun_2_2000)
     assert_equal (1 + 29 + 31 + 30 + 31 + 2), date_diff(:day, jan_31_2000, jun_2_2000)
   end
 
@@ -74,8 +73,8 @@ class DateDiffTest < Minitest::Test
   end
 
   def test_a_year_and_four_days_across_a_leap_year
-    assert_equal (2/366.0 + 1.0 + 2/365.0), date_diff(:year, dec_30_2000, Date.new(2002, 1, 2))
-    assert_equal (2/31.0 + 12.0 + 2/31.0), date_diff(:month, dec_30_2000, Date.new(2002, 1, 2))
+    assert_equal (2/366.to_d + 1 + 2/365.to_d), date_diff(:year, dec_30_2000, Date.new(2002, 1, 2))
+    assert_equal (2/31.to_d + 12 + 2/31.to_d), date_diff(:month, dec_30_2000, Date.new(2002, 1, 2))
   end
 
   def test_advancing_days

data/test/models/projector_test.rb

@@ -147,6 +147,32 @@ class ProjectorTransactionTest < Minitest::Test
     assert_equal 0, @projector.net_worth
   end
 
+  def test_annual_transactions_by_12_months
+    @projector.add_transaction(
+      date: apr_1_2012,
+      credit: { amount: 50000, account_id: :nustartup_inc },
+      debit:  { amount: 50000, account_id: :checking      },
+      schedule: { scalar: 12, unit: :month },
+    )
+
+    @projector.project to: mar_31_2042
+
+    assert_equal 1500000, @projector.net_worth
+  end
+
+  def test_annual_transactions
+    @projector.add_transaction(
+      date: apr_1_2012,
+      credit: { amount: 50000, account_id: :nustartup_inc },
+      debit:  { amount: 50000, account_id: :checking      },
+      schedule: { scalar: 12, unit: :month },
+    )
+
+    @projector.project to: mar_31_2042
+
+    assert_equal 1500000, @projector.net_worth
+  end
+
   private
 
   def add_scheduled_transaction date = jan_1_2000

data/test/models/schedule_test.rb

@@ -43,6 +43,28 @@ class ScheduledTransactionTest < Minitest::Test
     assert_equal expected_prorates, actual_prorates
   end
 
+  def test_slice_handles_scalar_greater_than_1
+    @schedule = Schedule.new scalar: 2, unit: :month
+
+    expected_dates = [jan_1_2000, mar_1_2000]
+    actual_dates, _ = @schedule.slice(jan_1_2000..mar_31_2000)
+    actual_dates.map! &:first
+
+    assert_equal expected_dates, actual_dates
+
+    expected_prorates = [1.0, 0.5]
+    actual_prorates, _ = @schedule.slice(jan_1_2000..mar_31_2000)
+    actual_prorates.map! &:last
+
+    assert_equal expected_prorates, actual_prorates
+
+    expected_prorates = [1.0, 0.75]
+    actual_prorates, _ = @schedule.slice(jan_1_2000..apr_15_2000)
+    actual_prorates.map! &:last
+
+    assert_equal expected_prorates, actual_prorates
+  end
+
   def test_handles_start_after_projection
     @schedule = Schedule.new every_month(from: apr_1_2000, until: jun_15_2000)
 

data/test/test_helper.rb

@@ -31,7 +31,7 @@ end
 # BigDecimal needs friendlier output
 class BigDecimal < Numeric
   def inspect
-    "#<BigDecmial:#{round(10).to_f.inspect}>"
+    "#<BigDecmial:#{round(20).to_f.inspect}>"
   end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mudrat_projector
 version: !ruby/object:Gem::Version
-  version: 0.9.3
+  version: 0.9.4
 platform: ruby
 authors:
 - ntl