mudrat_projector 0.9.7 → 0.9.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 22bbbd46167f4233cee6d7d66e0d27981fd2ec37
-  data.tar.gz: 6889680517e59605686eec56110fb17aa7dd0d7d
+  metadata.gz: 3cce3469b96fb8c1678dac9ea4eef337229ac064
+  data.tar.gz: 41ca2ea8737e746fe8d4836816191ba52d209d79
 SHA512:
-  metadata.gz: 319cae04c37547d85279b54af9bf1916946afefefe77ab10028eb6d96f1295a37fa8270c7e6f9c2846e054d86220232e84e2b4c0c5232001b27a7fa7df18ee77
-  data.tar.gz: 5ec7b8b16f5a393c924255bb0b922bfab91f69d80ca6bd5a9e21ac0be29848afbc4e7d3b2c82f113db5b33fa47c02c903f98c6c25c75e373ea68635e483c49ef
+  metadata.gz: a8144c435f0b81475f317f4dda0ffe7f5970a83a7f8fd14c2b6eb4308b5d2eacf136daea5e0ea77e1623dad57bf1accc5e7d8228f389f126dc671aa62fc1856b
+  data.tar.gz: cbe2e1250bad94129a09cd49e6ba3f8ae4e87f74f5eb811157790a578f134ebf72de2ba0513878927cb59a23ac0bbdd4b1e3fd30551be5b5809d01b0475ee9c8

data/lib/mudrat_projector/projector.rb

@@ -15,6 +15,7 @@ module MudratProjector
       @chart        = params.fetch :chart, ChartOfAccounts.new
       @from         = params.fetch :from, ABSOLUTE_START
       @transactions = []
+      @transaction_with_ids = {}
       @validator    = Validator.new projector: self, chart: @chart
     end
 
@@ -39,14 +40,46 @@ module MudratProjector
     def add_transaction params
       if params.is_a? Transaction
         transaction = params
+      elsif id = params.delete(:id)
+        return add_transaction_with_id(id, params)
       else
-        klass = params.has_key?(:schedule) ? ScheduledTransaction : Transaction
-        transaction = klass.new params
-        validate_transaction! transaction
+        transaction = build_transaction params
       end
       @transactions.push transaction
     end
 
+    def add_transaction_with_id(id, params)
+      @transaction_with_ids[id] = build_transaction params
+    end
+
+    def alter_transaction(id, effective_date: nil, scale: nil)
+      orig = remove_transaction id
+      old, new = orig.slice(effective_date - 1)
+      old.each do |t| add_transaction t; end
+      unless scale == 0
+        new_transaction = new.clone_transaction multiplier: scale
+        add_transaction_with_id id, new_transaction
+      end
+    end
+
+    def fetch_transaction(id)
+      @transaction_with_ids.fetch id
+    end
+
+    def remove_transaction(id)
+      @transaction_with_ids.fetch id # generate KeyError
+      @transaction_with_ids.delete id
+    end
+
+    def end_scheduled_transaction(id, effective_date: nil)
+      alter_transaction id, effective_date: (effective_date + 1), scale: 0
+    end
+
+    def each_transaction(&block)
+      @transactions.each &block
+      @transaction_with_ids.values.each(&block)
+    end
+
     def balanced?
       balance.zero?
     end
@@ -62,7 +95,7 @@ module MudratProjector
       if build_next
         handler.next_projector = self.class.new from: to + 1, chart: @chart
       end
-      @transactions.each do |transaction| handler << transaction; end
+      each_transaction do |transaction| handler << transaction; end
       projection.project! &block
       handler.next_projector
     end
@@ -71,5 +104,15 @@ module MudratProjector
       transactions.each do |transaction| add_transaction transaction; end
     end
 
+    private
+
+    def build_transaction params
+      return params if params.is_a? Transaction
+      klass = params.has_key?(:schedule) ? ScheduledTransaction : Transaction
+      klass.new(params).tap do |transaction|
+        validate_transaction! transaction
+      end
+    end
+
   end
 end

data/lib/mudrat_projector/scheduled_transaction.rb

@@ -9,11 +9,11 @@ module MudratProjector
 
     def build_transactions intervals
       intervals.map do |date, prorate|
-        clone_transaction new_date: date, multiplier: prorate
+        clone_transaction new_date: date, multiplier: prorate, new_schedule: nil
       end
     end
 
-    def clone_transaction new_date: date, new_schedule: nil, multiplier: 1
+    def clone_transaction new_date: date, new_schedule: schedule.serialize, multiplier: 1
       params = build_cloned_tranasction_params new_date, multiplier
       return Transaction.new(params) if new_schedule.nil?
       params[:schedule] = new_schedule

data/lib/mudrat_projector/version.rb

@@ -1,3 +1,3 @@
 module MudratProjector
-  VERSION = "0.9.7"
+  VERSION = "0.9.8"
 end

data/test/{models → lib}/projector_test.rb

@@ -151,6 +151,57 @@ class ProjectorTransactionTest < Minitest::Test
     assert_equal 1500000, @projector.net_worth
   end
 
+  def test_add_and_remove_transaction_with_id
+    @projector.add_transaction(
+      id: :foo,
+      date: jan_2_2000,
+      credit: { amount: 1000, account_id: :nustartup_inc },
+      debit:  { amount: 1000, account_id: :checking      },
+    )
+
+    refute_nil @projector.fetch_transaction(:foo)
+
+    @projector.remove_transaction(:foo)
+
+    assert_raises KeyError do
+      @projector.fetch_transaction(:foo)
+    end
+  end
+
+  def test_ending_scheduled_transaction
+    @projector.add_transaction(
+      id: :bar,
+      date: jan_1_2000,
+      credit: { amount: 1000, account_id: :nustartup_inc },
+      debit:  { amount: 1000, account_id: :checking      },
+      schedule: every_month,
+    )
+
+    @projector.end_scheduled_transaction :bar, effective_date: jun_30_2000
+    @projector.project to: dec_31_2000
+
+    assert_equal 6000, @projector.net_worth
+  end
+
+  def test_altering_scheduled_transaction
+    @projector.add_transaction(
+      id: :bar,
+      date: jan_1_2000,
+      credit: { amount: 1000, account_id: :nustartup_inc },
+      debit:  { amount: 1000, account_id: :checking      },
+      schedule: every_month,
+    )
+
+    @projector.alter_transaction(
+      :bar,
+      effective_date: jul_1_2000,
+      scale: 2.0,
+    )
+
+    @projector.project to: dec_31_2000
+    assert_equal (6000 + 12000), @projector.net_worth
+  end
+
   private
 
   def add_scheduled_transaction date = jan_1_2000

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mudrat_projector
 version: !ruby/object:Gem::Version
-  version: 0.9.7
+  version: 0.9.8
 platform: ruby
 authors:
 - ntl
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-23 00:00:00.000000000 Z
+date: 2014-01-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -145,18 +145,18 @@ files:
 - test/integrations/long_term_projection_test.rb
 - test/integrations/mortgage_test.rb
 - test/integrations/self_employed_tax_calculation_test.rb
-- test/models/accounts_test.rb
-- test/models/chart_of_accounts_test.rb
-- test/models/date_diff_test.rb
-- test/models/projection_test.rb
-- test/models/projector_test.rb
-- test/models/schedule_test.rb
-- test/models/scheduled_transaction_test.rb
-- test/models/tax_calculator_test.rb
-- test/models/transaction_entry_test.rb
-- test/models/transaction_handler_test.rb
-- test/models/transaction_test.rb
-- test/models/validator_test.rb
+- test/lib/accounts_test.rb
+- test/lib/chart_of_accounts_test.rb
+- test/lib/date_diff_test.rb
+- test/lib/projection_test.rb
+- test/lib/projector_test.rb
+- test/lib/schedule_test.rb
+- test/lib/scheduled_transaction_test.rb
+- test/lib/tax_calculator_test.rb
+- test/lib/transaction_entry_test.rb
+- test/lib/transaction_handler_test.rb
+- test/lib/transaction_test.rb
+- test/lib/validator_test.rb
 - test/test_helper.rb
 homepage: https://github.com/ntl/mudrat-projector
 licenses:
@@ -187,16 +187,16 @@ test_files:
 - test/integrations/long_term_projection_test.rb
 - test/integrations/mortgage_test.rb
 - test/integrations/self_employed_tax_calculation_test.rb
-- test/models/accounts_test.rb
-- test/models/chart_of_accounts_test.rb
-- test/models/date_diff_test.rb
-- test/models/projection_test.rb
-- test/models/projector_test.rb
-- test/models/schedule_test.rb
-- test/models/scheduled_transaction_test.rb
-- test/models/tax_calculator_test.rb
-- test/models/transaction_entry_test.rb
-- test/models/transaction_handler_test.rb
-- test/models/transaction_test.rb
-- test/models/validator_test.rb
+- test/lib/accounts_test.rb
+- test/lib/chart_of_accounts_test.rb
+- test/lib/date_diff_test.rb
+- test/lib/projection_test.rb
+- test/lib/projector_test.rb
+- test/lib/schedule_test.rb
+- test/lib/scheduled_transaction_test.rb
+- test/lib/tax_calculator_test.rb
+- test/lib/transaction_entry_test.rb
+- test/lib/transaction_handler_test.rb
+- test/lib/transaction_test.rb
+- test/lib/validator_test.rb
 - test/test_helper.rb