double_double 0.2.6 → 0.2.7

data/README.md

@@ -60,6 +60,7 @@ class CreateDoubleDouble < ActiveRecord::Migration
       t.references :account
       t.references :transaction
       t.references :context,    polymorphic: true
+      t.references :subcontext, polymorphic: true
       t.references :accountee,  polymorphic: true
       
       t.integer :amount_cents, limit: 8, default: 0, null: false
@@ -67,6 +68,8 @@ class CreateDoubleDouble < ActiveRecord::Migration
     end
     add_index :double_double_amounts, :context_id
     add_index :double_double_amounts, :context_type
+    add_index :double_double_amounts, :subcontext_id
+    add_index :double_double_amounts, :subcontext_type
     add_index :double_double_amounts, :accountee_id
     add_index :double_double_amounts, :accountee_type
     add_index :double_double_amounts, :type

data/lib/double_double/account.rb

@@ -80,6 +80,7 @@ module DoubleDouble
         a = is_debit ? DoubleDouble::DebitAmount.scoped : DoubleDouble::CreditAmount.scoped
         a = a.where(account_id: self.id)
         a = a.by_context(hash[:context])                   if hash.has_key? :context
+        a = a.by_subcontext(hash[:subcontext])             if hash.has_key? :subcontext
         a = a.by_accountee(hash[:accountee])               if hash.has_key? :accountee
         a = a.by_transaction_type(hash[:transaction_type]) if hash.has_key? :transaction_type
         Money.new(a.sum(:amount_cents))

data/lib/double_double/amount.rb

@@ -7,15 +7,17 @@ module DoubleDouble
   class Amount < ActiveRecord::Base
     self.table_name = 'double_double_amounts'
 
-    attr_accessible :account, :amount, :transaction, :context, :accountee, as: :transation_builder
+    attr_accessible :account, :amount, :transaction, :context, :subcontext, :accountee, as: :transation_builder
     
     belongs_to :transaction
     belongs_to :account
     belongs_to :accountee,  polymorphic: true
     belongs_to :context,    polymorphic: true
+    belongs_to :subcontext, polymorphic: true
     
-    scope :by_accountee,        ->(a) { where(accountee_id: a.id, accountee_type: a.class.base_class) }
-    scope :by_context,          ->(c) { where(context_id:   c.id, context_type:   c.class.base_class) }
+    scope :by_accountee,        ->(a) { where(accountee_id:  a.id, accountee_type:  a.class.base_class) }
+    scope :by_context,          ->(c) { where(context_id:    c.id, context_type:    c.class.base_class) }
+    scope :by_subcontext,       ->(s) { where(subcontext_id: s.id, subcontext_type: s.class.base_class) }
     scope :by_transaction_type, ->(t) { joins(:transaction).where(double_double_transactions: {transaction_type_id: t}) }
 
     validates_presence_of :type, :transaction, :account

data/lib/double_double/transaction.rb

@@ -110,8 +110,9 @@ module DoubleDouble
 
       def self.prepare_amount_parameters args
         prepared_params = { account: Account.named(args[:account]), transaction: args[:transaction], amount: args[:amount]}
-        prepared_params.merge!({accountee: args[:accountee]}) if args.has_key? :accountee
-        prepared_params.merge!({context:   args[:context]})   if args.has_key? :context
+        prepared_params.merge!({accountee:  args[:accountee]})  if args.has_key? :accountee
+        prepared_params.merge!({context:    args[:context]})    if args.has_key? :context
+        prepared_params.merge!({subcontext: args[:subcontext]}) if args.has_key? :subcontext
         prepared_params
       end
   end

data/lib/double_double/version.rb

@@ -1,3 +1,3 @@
 module DoubleDouble
-  VERSION = "0.2.6"
+  VERSION = "0.2.7"
 end

data/spec/models/credit_amount_spec.rb

@@ -7,6 +7,8 @@ module DoubleDouble
       @dummy_transaction = DoubleDouble::Transaction.new
       @job = DoubleDouble::Expense.create!(name: 'stand-in job', number: 999)
       @po  = DoubleDouble::Expense.create!(name: 'stand-in purchase order', number: 333)
+      @item_foo = DoubleDouble::Expense.create!(name: 'stand-in item_foo', number: 1000)
+      @item_bar = DoubleDouble::Expense.create!(name: 'stand-in item_bar', number: 1001)
     end
 
     it "should not be valid without an amount" do
@@ -46,23 +48,42 @@ module DoubleDouble
     it "should be sensitive to 'context' when calculating balances, if supplied" do
       Transaction.create!(
           description: 'Foobar1',
-          debits:  [{account: 'Cash', amount: Money.new(123)}], 
-          credits: [{account: 'Loan', amount: Money.new(123), context: @job}])
+          debits:  [{account: 'Cash', amount: 123}], 
+          credits: [{account: 'Loan', amount: 123, context: @job}])
       Transaction.create!(
           description: 'Foobar2',
-          debits:  [{account: 'Cash', amount: Money.new(321)}], 
-          credits: [{account: 'Loan', amount: Money.new(321), context: @job}])
+          debits:  [{account: 'Cash', amount: 321}], 
+          credits: [{account: 'Loan', amount: 321, context: @job}])
       Transaction.create!(
           description: 'Foobar3',
-          debits:  [{account: 'Cash', amount: Money.new(275)}], 
-          credits: [{account: 'Loan', amount: Money.new(275), context: @po}])
+          debits:  [{account: 'Cash', amount: 275}], 
+          credits: [{account: 'Loan', amount: 275, context: @po}])
       Transaction.create!(
           description: 'Foobar4',
-          debits:  [{account: 'Cash', amount: Money.new(999)}], 
-          credits: [{account: 'Loan', amount: Money.new(999)}])
-      @loan.credits_balance({context: @job}).should == Money.new(123 + 321)
-      @loan.credits_balance({context: @po}).should == Money.new(275)
-      @loan.credits_balance.should == Money.new(123 + 321 + 275 + 999)
+          debits:  [{account: 'Cash', amount: 999}], 
+          credits: [{account: 'Loan', amount: 999}])
+      @loan.credits_balance({context: @job}).should == 123 + 321
+      @loan.credits_balance({context: @po}).should == 275
+      @loan.credits_balance.should == 123 + 321 + 275 + 999
+      Transaction.create!(
+          description: 'Foobar5',
+          debits:  [{account: 'Cash', amount: 9_999}], 
+          credits: [{account: 'Loan', amount: 9_999, context: @job, subcontext: @item_foo}])
+      Transaction.create!(
+          description: 'Foobar5',
+          debits:  [{account: 'Cash', amount: 123}], 
+          credits: [{account: 'Loan', amount: 123, context: @po, subcontext: @item_foo}])
+      Transaction.create!(
+          description: 'Foobar6',
+          debits:  [{account: 'Cash', amount: 222}], 
+          credits: [{account: 'Loan', amount: 222, context: @po, subcontext: @item_foo}])
+      Transaction.create!(
+          description: 'Foobar7',
+          debits:  [{account: 'Cash', amount: 1}], 
+          credits: [{account: 'Loan', amount: 1, context: @po, subcontext: @item_bar}])
+      @loan.credits_balance({context: @po, subcontext: @item_foo}).should == 123 + 222
+      @loan.credits_balance({context: @po, subcontext: @item_bar}).should == 1
+
       Account.trial_balance.should eq(0)
     end
   end

data/spec/models/debit_amount_spec.rb

@@ -7,6 +7,8 @@ module DoubleDouble
       @dummy_transaction = DoubleDouble::Transaction.new
       @job = DoubleDouble::Expense.create!(name: 'stand-in job', number: 999)
       @po  = DoubleDouble::Expense.create!(name: 'stand-in purchase order', number: 333)
+      @item_foo = DoubleDouble::Expense.create!(name: 'stand-in item_foo', number: 1000)
+      @item_bar = DoubleDouble::Expense.create!(name: 'stand-in item_bar', number: 1001)
     end
 
     it "should not be valid without an amount" do
@@ -46,23 +48,41 @@ module DoubleDouble
     it "should be sensitive to 'context' when calculating balances, if supplied" do
       Transaction.create!(
           description: 'Foobar1',
-          debits:  [{account: 'Cash', amount: Money.new(123), context: @job}], 
-          credits: [{account: 'Loan', amount: Money.new(123)}])
+          debits:  [{account: 'Cash', amount: 123, context: @job}], 
+          credits: [{account: 'Loan', amount: 123}])
       Transaction.create!(
           description: 'Foobar2',
-          debits:  [{account: 'Cash', amount: Money.new(321), context: @job}], 
-          credits: [{account: 'Loan', amount: Money.new(321)}])
+          debits:  [{account: 'Cash', amount: 321, context: @job}], 
+          credits: [{account: 'Loan', amount: 321}])
       Transaction.create!(
           description: 'Foobar3',
-          debits:  [{account: 'Cash', amount: Money.new(275), context: @po}], 
-          credits: [{account: 'Loan', amount: Money.new(275)}])
+          debits:  [{account: 'Cash', amount: 275, context: @po}], 
+          credits: [{account: 'Loan', amount: 275}])
       Transaction.create!(
           description: 'Foobar4',
-          debits:  [{account: 'Cash', amount: Money.new(999)}], 
-          credits: [{account: 'Loan', amount: Money.new(999)}])
-      @cash.debits_balance({context: @job}).should == Money.new(123 + 321)
-      @cash.debits_balance({context: @po}).should == Money.new(275)
-      @cash.debits_balance.should == Money.new(123 + 321 + 275 + 999)
+          debits:  [{account: 'Cash', amount: 999}], 
+          credits: [{account: 'Loan', amount: 999}])
+      @cash.debits_balance({context: @job}).should == 123 + 321
+      @cash.debits_balance({context: @po}).should == 275
+      @cash.debits_balance.should == 123 + 321 + 275 + 999
+      Transaction.create!(
+          description: 'Foobar5',
+          debits:  [{account: 'Cash', amount: 9_999, context: @job, subcontext: @item_foo}], 
+          credits: [{account: 'Loan', amount: 9_999}])
+      Transaction.create!(
+          description: 'Foobar5',
+          debits:  [{account: 'Cash', amount: 123, context: @po, subcontext: @item_foo}], 
+          credits: [{account: 'Loan', amount: 123}])
+      Transaction.create!(
+          description: 'Foobar6',
+          debits:  [{account: 'Cash', amount: 222, context: @po, subcontext: @item_foo}], 
+          credits: [{account: 'Loan', amount: 222}])
+      Transaction.create!(
+          description: 'Foobar7',
+          debits:  [{account: 'Cash', amount: 1, context: @po, subcontext: @item_bar}], 
+          credits: [{account: 'Loan', amount: 1}])
+      @cash.debits_balance({context: @po, subcontext: @item_foo}).should == 123 + 222
+      @cash.debits_balance({context: @po, subcontext: @item_bar}).should == 1
       Account.trial_balance.should eq(0)
     end
   end

data/spec/spec_helper.rb

@@ -37,6 +37,7 @@ ActiveRecord::Migration.verbose = false
       t.references :account
       t.references :transaction
       t.references :context,    polymorphic: true
+      t.references :subcontext, polymorphic: true
       t.references :accountee,  polymorphic: true
       
       t.integer :amount_cents, limit: 8, default: 0, null: false
@@ -44,6 +45,8 @@ ActiveRecord::Migration.verbose = false
     end
     add_index :double_double_amounts, :context_id
     add_index :double_double_amounts, :context_type
+    add_index :double_double_amounts, :subcontext_id
+    add_index :double_double_amounts, :subcontext_type
     add_index :double_double_amounts, :accountee_id
     add_index :double_double_amounts, :accountee_type
     add_index :double_double_amounts, :type

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: double_double
 version: !ruby/object:Gem::Version
-  version: 0.2.6
+  version: 0.2.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-12 00:00:00.000000000 Z
+date: 2013-02-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: money