double_double 0.0.2 → 0.1.0

data/.travis.yml

@@ -2,9 +2,6 @@ language: ruby
 rvm:
   - 1.9.2
   - 1.9.3
-  - jruby-19mode
   - rbx-19mode
   - ruby-head
-env:
-  - JRUBY_OPTS="--1.9"
 script: rake

data/README.md

@@ -1,5 +1,7 @@
 # double_double
 [![Build Status](https://travis-ci.org/crftr/double_double.png)](https://travis-ci.org/crftr/double_double)
+[![Dependency Status](https://gemnasium.com/crftr/double_double.png)](https://gemnasium.com/crftr/double_double)
+[![Code Climate](https://codeclimate.com/badge.png)](https://codeclimate.com/github/crftr/double_double)
 
 A double-entry accounting system.  Likely to change heavily in the coming days.
 

data/lib/double_double/account.rb

@@ -13,7 +13,7 @@ module DoubleDouble
   # normal balance swapped. For example, to remove equity, a "Drawing" account may be created
   # as a contra equity account as follows:
   #
-  #   DoubleDouble::Equity.create(:name => "Drawing", contra => true)
+  #   DoubleDouble::Equity.create(name: "Drawing", number: 2002, contra: true)
   #
   # At all times the balance of all accounts should conform to the "accounting equation"
   #   DoubleDouble::Assets = Liabilties + Owner's Equity
@@ -35,18 +35,19 @@ module DoubleDouble
     
     has_many :credit_amounts
     has_many :debit_amounts
-    has_many :credit_transactions, :through => :credit_amounts, :source => :transaction
-    has_many :debit_transactions, :through => :debit_amounts, :source => :transaction
+    has_many :credit_transactions, through: :credit_amounts, source: :transaction
+    has_many :debit_transactions,  through: :debit_amounts,  source: :transaction
 
     validates_presence_of :type, :name, :number
     validates_uniqueness_of :name, :number
 
     def side_balance(is_debit, hash)
+      hash_keys = hash.keys
       a = is_debit ? DoubleDouble::DebitAmount.scoped : DoubleDouble::CreditAmount.scoped
       a = a.where(account_id: self.id)
-      a = a.by_project_id( hash[:project_id] )               if hash.has_key?(:project_id)
-      a = a.by_approving_user_id( hash[:approving_user_id] ) if hash.has_key?(:approving_user_id)
-      a = a.by_targeted_user_id( hash[:targeted_user_id] )   if hash.has_key?(:targeted_user_id)
+      a = a.by_context(hash[:context_id], hash[:context_type])       if (hash_keys & [:context_id, :context_type]).count == 2
+      a = a.by_initiator(hash[:initiator_id], hash[:initiator_type]) if (hash_keys & [:initiator_id, :initiator_type]).count == 2
+      a = a.by_accountee(hash[:accountee_id], hash[:accountee_type]) if (hash_keys & [:accountee_id, :accountee_type]).count == 2
       Money.new(a.sum(:amount_cents))
     end
     
@@ -80,6 +81,30 @@ module DoubleDouble
       end
       accounts_balance
     end
-    
+
+    protected
+      # Left Side Accounts:
+      # if contra { credits_balance(hash) - debits_balance(hash)  }
+      # else      { debits_balance(hash)  - credits_balance(hash) }
+      #
+      # Right Side Accounts:
+      # if contra { debits_balance(hash)  - credits_balance(hash) }
+      # else      { credits_balance(hash) - debits_balance(hash)  }
+      #
+      # @return [Money] The balance of the account instance
+      def child_account_balance(is_left_side_account, hash = {})
+        if (is_left_side_account && contra) || !(is_left_side_account || contra)
+          credits_balance(hash) - debits_balance(hash)
+        else
+          debits_balance(hash) - credits_balance(hash)
+        end
+      end
   end
 end
+
+
+
+
+
+
+

data/lib/double_double/amount.rb

@@ -7,27 +7,26 @@ module DoubleDouble
   class Amount < ActiveRecord::Base
     self.table_name = 'double_double_amounts'
 
-    attr_accessible :account, :amount, :transaction, :project_id, :approving_user_id, :targeted_user_id
+    attr_accessible :account, :amount, :transaction, :context, :initiator, :accountee
     
     belongs_to :transaction
     belongs_to :account
-    belongs_to :project
-    belongs_to :approving_user, :class_name => "User"
-    belongs_to :targeted_user,  :class_name => "User"
+    belongs_to :context,    polymorphic: true
+    belongs_to :initiator,  polymorphic: true
+    belongs_to :accountee,  polymorphic: true
     
-    scope :by_project_id,        lambda{|p_id| where(:project_id => p_id)}
-    scope :by_approving_user_id, lambda{|au_id| where(:approving_user_id => au_id)}
-    scope :by_targeted_user_id,  lambda{|tu_id| where(:targeted_user_id => tu_id)}
+    scope :by_context,   ->(c_id, c_base_class) { where(context_id:   c_id, context_type:   c_base_class) }
+    scope :by_initiator, ->(i_id, i_base_class) { where(initiator_id: i_id, initiator_type: i_base_class) }
+    scope :by_accountee, ->(a_id, a_base_class) { where(accountee_id: a_id, accountee_type: a_base_class) }
 
-    scope :by_transaction_type_number, lambda{|tt_num| where( transaction: {transaction_type: {number: tt_num}})}
+    # scope :by_transaction_type_number, -> {|tt_num| where( transaction: {transaction_type: {number: tt_num}})}
 
     validates_presence_of :type, :amount_cents, :transaction, :account
     
     composed_of :amount,
-      :class_name => "Money",
-      :mapping => [%w(amount_cents cents), %w(currency currency_as_string)],
-      :constructor => Proc.new { |cents, currency| Money.new(cents || 0, currency || Money.default_currency) },
-      :converter => Proc.new { |value| value.respond_to?(:to_money) ? value.to_money : raise(ArgumentError, "Can't convert #{value.class} to Money") }
-    
+      class_name: "Money",
+      mapping: [%w(amount_cents cents), %w(currency currency_as_string)],
+      constructor: Proc.new { |cents, currency| Money.new(cents || 0, currency || Money.default_currency) },
+      converter: Proc.new { |value| value.respond_to?(:to_money) ? value.to_money : raise(ArgumentError, "Can't convert #{value.class} to Money") }
   end
 end

data/lib/double_double/asset.rb

@@ -6,20 +6,6 @@ module DoubleDouble
   #
   # @see http://en.wikipedia.org/wiki/Asset Assets
   #
-  class Asset < Account
-
-    # The balance of the account.
-    #
-    # Assets have normal debit balances, so the credits are subtracted from the debits
-    # unless this is a contra account, in which debits are subtracted from credits
-    #
-    # @return [Money] The value balance
-    def balance(hash = {})
-      if contra
-        credits_balance(hash) - debits_balance(hash)
-      else
-        debits_balance(hash) - credits_balance(hash)
-      end
-    end
+  class Asset < LeftSideAccount
   end
 end

data/lib/double_double/credit_amount.rb

@@ -2,7 +2,7 @@ module DoubleDouble
   # The CreditAmount class represents credit entries in the transaction journal.
   #
   # @example
-  #     credit_amount = DoubleDouble::CreditAmount.new(:account => revenue, :amount => 1000)
+  #     credit_amount = DoubleDouble::CreditAmount.new(account: "revenue", amount: 1000)
   #
   class CreditAmount < Amount
   end

data/lib/double_double/debit_amount.rb

@@ -2,7 +2,7 @@ module DoubleDouble
   # The DebitAmount class represents debit entries in the transaction journal.
   #
   # @example
-  #     debit_amount = DoubleDouble::DebitAmount.new(:account => cash, :amount => 1000)
+  #     debit_amount = DoubleDouble::DebitAmount.new(account: "cash", amount: 1000)
   #
   class DebitAmount < Amount
   end

data/lib/double_double/equity.rb

@@ -6,21 +6,6 @@ module DoubleDouble
   #
   # @see http://en.wikipedia.org/wiki/Equity_(finance) Equity
   #
-  # @author Michael Bulat
-  class Equity < Account
-
-    # The balance of the account.
-    #
-    # Equity accounts have normal credit balances, so the debits are subtracted from the credits
-    # unless this is a contra account, in which credits are subtracted from debits
-    #
-    # @return [Money] The value balance
-    def balance(hash = {})
-      if contra
-        debits_balance(hash) - credits_balance(hash)
-      else
-        credits_balance(hash) - debits_balance(hash)
-      end
-    end
+  class Equity < RightSideAccount
   end
 end

data/lib/double_double/expense.rb

@@ -6,21 +6,6 @@ module DoubleDouble
   #
   # @see http://en.wikipedia.org/wiki/Expense Expenses
   #
-  # @author Michael Bulat
-  class Expense < Account
-
-    # The balance of the account.
-    #
-    # Expenses have normal debit balances, so the credits are subtracted from the debits
-    # unless this is a contra account, in which debits are subtracted from credits
-    #
-    # @return [Money] The value balance
-    def balance(hash = {})
-      if contra
-        credits_balance(hash) - debits_balance(hash)
-      else
-        debits_balance(hash) - credits_balance(hash)
-      end
-    end
+  class Expense < LeftSideAccount
   end
 end

data/lib/double_double/left_side_account.rb

@@ -0,0 +1,7 @@
+module DoubleDouble
+  class LeftSideAccount < Account
+    def balance(hash = {})
+      child_account_balance(true, hash)
+    end
+  end
+end

data/lib/double_double/liability.rb

@@ -6,20 +6,6 @@ module DoubleDouble
   #
   # @see http://en.wikipedia.org/wiki/Liability_(financial_accounting) Liability
   #
-  class Liability < Account
-
-    # The balance of the account.
-    #
-    # Liability accounts have normal credit balances, so the debits are subtracted from the credits
-    # unless this is a contra account, in which credits are subtracted from debits
-    #
-    # @return [Money] The value balance
-    def balance(hash = {})
-      if contra
-        debits_balance(hash) - credits_balance(hash)
-      else
-        credits_balance(hash) - debits_balance(hash)
-      end
-    end
+  class Liability < RightSideAccount
   end
 end

data/lib/double_double/revenue.rb

@@ -6,21 +6,6 @@ module DoubleDouble
   #
   # @see http://en.wikipedia.org/wiki/Revenue Revenue
   #
-  # @author Michael Bulat
-  class Revenue < Account
-
-    # The balance of the account.
-    #
-    # Revenue accounts have normal credit balances, so the debits are subtracted from the credits
-    # unless this is a contra account, in which credits are subtracted from debits
-    #
-    # @return [Money] The value balance
-    def balance(hash = {})
-      if contra
-        debits_balance(hash) - credits_balance(hash)
-      else
-        credits_balance(hash) - debits_balance(hash)
-      end
-    end
+  class Revenue < RightSideAccount
   end
 end

data/lib/double_double/right_side_account.rb

@@ -0,0 +1,7 @@
+module DoubleDouble
+  class RightSideAccount < Account
+    def balance(hash = {})
+      child_account_balance(false, hash)
+    end
+  end
+end

data/lib/double_double/transaction.rb

@@ -10,10 +10,10 @@ module DoubleDouble
   #   cash = DoubleDouble::Asset.find_by_name('Cash')
   #   accounts_receivable = DoubleDouble::Asset.find_by_name('Accounts Receivable')
   #
-  #   debit_amount = DoubleDouble::DebitAmount.new(:account => cash, :amount => 1000)
-  #   credit_amount = DoubleDouble::CreditAmount.new(:account => accounts_receivable, :amount => 1000)
+  #   debit_amount = DoubleDouble::DebitAmount.new(account: 'cash', amount: 1000)
+  #   credit_amount = DoubleDouble::CreditAmount.new(account: 'accounts_receivable', amount: 1000)
   #
-  #   transaction = DoubleDouble::Transaction.new(:description => "Receiving payment on an invoice")
+  #   transaction = DoubleDouble::Transaction.new(description: "Receiving payment on an invoice")
   #   transaction.debit_amounts << debit_amount
   #   transaction.credit_amounts << credit_amount
   #   transaction.save
@@ -23,22 +23,21 @@ module DoubleDouble
   class Transaction < ActiveRecord::Base
     self.table_name = 'double_double_transactions'
 
-    attr_accessible :description, :commercial_document
+    attr_accessible :description
 
     belongs_to :transaction_type
-    belongs_to :commercial_document, :polymorphic => true
 
     has_many :credit_amounts
     has_many :debit_amounts
     has_many :credit_accounts, :through => :credit_amounts, :source => :account
-    has_many :debit_accounts, :through => :debit_amounts, :source => :account
+    has_many :debit_accounts,  :through => :debit_amounts,  :source => :account
 
     validates_presence_of :description
     validate :has_credit_amounts?
     validate :has_debit_amounts?
     validate :amounts_cancel?
 
-    scope :by_transaction_type_number, lambda{|tt_num| where(transaction_type: {number: tt_num})}
+    scope :by_transaction_type_number, ->(tt_num) { where(transaction_type: {number: tt_num})}
 
     # Simple API for building a transaction and associated debit and credit amounts
     #
@@ -53,17 +52,17 @@ module DoubleDouble
     #
     # @return [DoubleDouble::Transaction] A Transaction with built credit and debit objects ready for saving
     def self.build(hash)
-      transaction = Transaction.new(description: hash[:description], commercial_document: hash[:commercial_document])
+      t = Transaction.new(description: hash[:description])
       hash[:debits].each do |debit|
-        a = Account.find_by_name(debit[:account])
-        transaction.debit_amounts << DebitAmount.new(account: a, amount: debit[:amount], transaction: transaction, project_id: debit[:project_id], approving_user_id: debit[:approving_user_id], targeted_user_id: debit[:targeted_user_id])
+        new_debit_amount = prepare_amount_parameters debit.merge!({transaction: t})
+        t.debit_amounts << DebitAmount.new(new_debit_amount)
       end
       hash[:credits].each do |credit|
-        a = Account.find_by_name(credit[:account])
-        transaction.credit_amounts << CreditAmount.new(account: a, amount: credit[:amount], transaction: transaction, project_id: credit[:project_id], approving_user_id: credit[:approving_user_id], targeted_user_id: credit[:targeted_user_id])
+        new_credit_amount = prepare_amount_parameters credit.merge!({transaction: t})
+        t.credit_amounts << CreditAmount.new(new_credit_amount)
       end
-      transaction.transaction_type = hash[:transaction_type] if hash.has_key?(:transaction_type)
-      transaction
+      t.transaction_type = hash[:transaction_type] if hash.has_key?(:transaction_type)
+      t
     end
 
     private
@@ -81,8 +80,26 @@ module DoubleDouble
 
       def difference_of_amounts
         credit_amount_total = credit_amounts.inject(Money.new(0)) {|sum, credit_amount| sum + credit_amount.amount}
-        debit_amount_total  = debit_amounts.inject(Money.new(0))  {|sum, debit_amount|  sum + debit_amount.amount}
+        debit_amount_total  = debit_amounts.inject(Money.new(0))  {|sum,  debit_amount| sum +  debit_amount.amount}
         credit_amount_total - debit_amount_total
       end
+
+      def self.prepare_amount_parameters args
+        prepared_params = { account: Account.find_by_name(args[:account]), transaction: args[:transaction], amount: args[:amount]}
+        
+        args_keys = args.keys
+        if (args_keys & [:context_id, :context_type]).count == 2
+          prepared_params.merge!({context_id: args[:context_id], context_type: args[:context_type]})
+        end
+        
+        if (args_keys & [:initiator_id, :initiator_type]).count == 2
+          prepared_params.merge!({initiator_id: args[:initiator_id], initiator_type: args[:initiator_type]})
+        end
+
+        if (args_keys & [:accountee_id, :accountee_type]).count == 2
+          prepared_params.merge!({accountee_id: args[:accountee_id], accountee_type: args[:accountee_type]})
+        end
+        prepared_params
+      end
   end
 end

data/lib/double_double/transaction_type.rb

@@ -1,5 +1,4 @@
 module DoubleDouble
-
   class TransactionType < ActiveRecord::Base
     self.table_name = 'double_double_transaction_types'
     
@@ -9,5 +8,4 @@ module DoubleDouble
     validates_numericality_of :number,      greater_than: 0
     validates_length_of       :description, minimum: 6
   end
-  
 end

data/lib/double_double/version.rb

@@ -1,3 +1,3 @@
 module DoubleDouble
-  VERSION = "0.0.2"
+  VERSION = "0.1.0"
 end

data/lib/double_double.rb

@@ -5,6 +5,8 @@ require 'double_double/version'
 
 # Accounts
 require 'double_double/account'
+require 'double_double/left_side_account'
+require 'double_double/right_side_account'
 require 'double_double/asset'
 require 'double_double/equity'
 require 'double_double/expense'

data/spec/factories/account_factory.rb

@@ -1,20 +1,20 @@
 FactoryGirl.define do
-  factory :account, :class => DoubleDouble::Account do |account|
+  factory :account, class: DoubleDouble::Account do |account|
     account.name   { FactoryGirl.generate(:account_name)  }
     account.number { FactoryGirl.generate(:account_number)}
     account.contra false
 
-    factory :asset,     :class => DoubleDouble::Asset
-    factory :equity,    :class => DoubleDouble::Equity
-    factory :expense,   :class => DoubleDouble::Expense
-    factory :liability, :class => DoubleDouble::Liability
-    factory :revenue,   :class => DoubleDouble::Revenue
+    factory :asset,     class: DoubleDouble::Asset
+    factory :equity,    class: DoubleDouble::Equity
+    factory :expense,   class: DoubleDouble::Expense
+    factory :liability, class: DoubleDouble::Liability
+    factory :revenue,   class: DoubleDouble::Revenue
 
-    factory :not_asset,     :class => DoubleDouble::Liability
-    factory :not_equity,    :class => DoubleDouble::Asset
-    factory :not_expense,   :class => DoubleDouble::Liability
-    factory :not_liability, :class => DoubleDouble::Asset
-    factory :not_revenue,   :class => DoubleDouble::Asset
+    factory :not_asset,     class: DoubleDouble::Liability
+    factory :not_equity,    class: DoubleDouble::Asset
+    factory :not_expense,   class: DoubleDouble::Liability
+    factory :not_liability, class: DoubleDouble::Asset
+    factory :not_revenue,   class: DoubleDouble::Asset
   end
   
   sequence :account_name do |n|

data/spec/factories/amount_factory.rb

@@ -1,10 +1,10 @@
 FactoryGirl.define do
-  factory :amount, :class => DoubleDouble::Amount do |amount|
+  factory :amount, class: DoubleDouble::Amount do |amount|
   end
 
-  factory :credit_amt, :class => DoubleDouble::CreditAmount  do
+  factory :credit_amt, class: DoubleDouble::CreditAmount  do
   end
 
-  factory :debit_amt, :class => DoubleDouble::DebitAmount  do
+  factory :debit_amt, class: DoubleDouble::DebitAmount  do
   end
 end

data/spec/factories/transaction_factory.rb

@@ -1,5 +1,5 @@
 FactoryGirl.define do
-  factory :transaction, :class => DoubleDouble::Transaction do
+  factory :transaction, class: DoubleDouble::Transaction do
     description { FactoryGirl.generate(:transaction_type_description) }
   end
 

data/spec/factories/transaction_type_factory.rb

@@ -1,5 +1,5 @@
 FactoryGirl.define do
-  factory :transaction_type, :class => DoubleDouble::TransactionType do |type|
+  factory :transaction_type, class: DoubleDouble::TransactionType do |type|
     type.description  { FactoryGirl.generate(:transaction_type_description) }
     type.number       { FactoryGirl.generate(:transaction_type_number)      }
   end

data/spec/models/credit_amount_spec.rb

@@ -19,28 +19,28 @@ module DoubleDouble
       credit_amount.should_not be_valid
     end
     
-    it "should be sensitive to project_id when calculating balances, if supplied" do
+    it "should be sensitive to 'context' when calculating balances, if supplied" do
       acct_1     = FactoryGirl.create(:asset)
       other_acct = FactoryGirl.create(:not_asset)
       t = FactoryGirl.build(:transaction)
-      t.credit_amounts << FactoryGirl.create(:credit_amt, transaction: t, amount: Money.new(123), account: acct_1, project_id: 77)
+      t.credit_amounts << FactoryGirl.create(:credit_amt, transaction: t, amount: Money.new(123), account: acct_1, context_id: 77, context_type: 'Job')
       t.debit_amounts  << FactoryGirl.create(:debit_amt,  transaction: t, amount: Money.new(123), account: other_acct)
       t.save
       t = FactoryGirl.build(:transaction)
-      t.credit_amounts << FactoryGirl.create(:credit_amt, transaction: t, amount: Money.new(321), account: acct_1, project_id: 77)
+      t.credit_amounts << FactoryGirl.create(:credit_amt, transaction: t, amount: Money.new(321), account: acct_1, context_id: 77, context_type: 'Job')
       t.debit_amounts  << FactoryGirl.create(:debit_amt,  transaction: t, amount: Money.new(321), account: other_acct)
       t.save
       t = FactoryGirl.build(:transaction)
-      t.credit_amounts << FactoryGirl.create(:credit_amt, transaction: t, amount: Money.new(275), account: acct_1, project_id: 82)
+      t.credit_amounts << FactoryGirl.create(:credit_amt, transaction: t, amount: Money.new(275), account: acct_1, context_id: 82, context_type: 'Job')
       t.debit_amounts  << FactoryGirl.create(:debit_amt,  transaction: t, amount: Money.new(275), account: other_acct)
       t.save
       t = FactoryGirl.build(:transaction)
       t.credit_amounts << FactoryGirl.create(:credit_amt, transaction: t, amount: Money.new(999), account: acct_1)
       t.debit_amounts  << FactoryGirl.create(:debit_amt,  transaction: t, amount: Money.new(999), account: other_acct)
       t.save
-      acct_1.credits_balance({project_id: 77}).should == Money.new(123 + 321)
-      acct_1.credits_balance({project_id: 82}).should == Money.new(275)
-      acct_1.credits_balance.should                   == Money.new(123 + 321 + 275 + 999)
+      acct_1.credits_balance({context_id: 77, context_type: 'Job'}).should == Money.new(123 + 321)
+      acct_1.credits_balance({context_id: 82, context_type: 'Job'}).should == Money.new(275)
+      acct_1.credits_balance.should == Money.new(123 + 321 + 275 + 999)
     end
   end
 end

data/spec/models/debit_amount_spec.rb

@@ -19,28 +19,28 @@ module DoubleDouble
       debit_amount.should_not be_valid
     end
     
-    it "should be sensitive to project_id when calculating balances, if supplied" do
+    it "should be sensitive to context_id when calculating balances, if supplied" do
       acct_1     = FactoryGirl.create(:asset)
       other_acct = FactoryGirl.create(:not_asset)
       t = FactoryGirl.build(:transaction)
-      t.debit_amounts  << FactoryGirl.create(:debit_amt,  transaction: t, amount: Money.new(123), account: acct_1, project_id: 77)
+      t.debit_amounts  << FactoryGirl.create(:debit_amt,  transaction: t, amount: Money.new(123), account: acct_1, context_id: 77, context_type: 'Job')
       t.credit_amounts << FactoryGirl.create(:credit_amt, transaction: t, amount: Money.new(123), account: other_acct)
       t.save
       t = FactoryGirl.build(:transaction)
-      t.debit_amounts  << FactoryGirl.create(:debit_amt,  transaction: t, amount: Money.new(321), account: acct_1, project_id: 77)
+      t.debit_amounts  << FactoryGirl.create(:debit_amt,  transaction: t, amount: Money.new(321), account: acct_1, context_id: 77, context_type: 'Job')
       t.credit_amounts << FactoryGirl.create(:credit_amt, transaction: t, amount: Money.new(321), account: other_acct)
       t.save
       t = FactoryGirl.build(:transaction)
-      t.debit_amounts  << FactoryGirl.create(:debit_amt,  transaction: t, amount: Money.new(275), account: acct_1, project_id: 82)
+      t.debit_amounts  << FactoryGirl.create(:debit_amt,  transaction: t, amount: Money.new(275), account: acct_1, context_id: 82, context_type: 'Job')
       t.credit_amounts << FactoryGirl.create(:credit_amt, transaction: t, amount: Money.new(275), account: other_acct)
       t.save
       t = FactoryGirl.build(:transaction)
       t.debit_amounts  << FactoryGirl.create(:debit_amt,  transaction: t, amount: Money.new(999), account: acct_1)
       t.credit_amounts << FactoryGirl.create(:credit_amt, transaction: t, amount: Money.new(999), account: other_acct)
       t.save
-      acct_1.debits_balance({project_id: 77}).should == Money.new(123 + 321)
-      acct_1.debits_balance({project_id: 82}).should == Money.new(275)
-      acct_1.debits_balance.should                   == Money.new(123 + 321 + 275 + 999)
+      acct_1.debits_balance({context_id: 77, context_type: 'Job'}).should == Money.new(123 + 321)
+      acct_1.debits_balance({context_id: 82, context_type: 'Job'}).should == Money.new(275)
+      acct_1.debits_balance.should == Money.new(123 + 321 + 275 + 999)
     end
   end
 end

data/spec/models/transaction_spec.rb

@@ -65,36 +65,21 @@ module DoubleDouble
       t.errors['base'].should == ["The credit and debit amounts are not equal"]
     end
 
-    it "should have a polymorphic commercial document associations" do
-      mock_document = FactoryGirl.create(:asset) # one would never do this, but it allows us to not require a migration for the test
-
-      t = FactoryGirl.build(:transaction)
-      t.credit_amounts << FactoryGirl.create(:credit_amt, transaction: t, amount: Money.new(123), account: @acct)
-      t.debit_amounts  << FactoryGirl.create(:debit_amt,  transaction: t, amount: Money.new(123), account: @other_acct)
-      t.commercial_document = mock_document
-      t.save
-
-      saved_transaction = Transaction.find(t.id)
-      saved_transaction.commercial_document.should == mock_document
-    end
-
     it "should allow building a transaction and credit and debits with a hash" do
       FactoryGirl.create(:asset, :name => "Accounts Receivable")
       FactoryGirl.create(:revenue, :name => "Sales Revenue")
       FactoryGirl.create(:liability, :name =>  "Sales Tax Payable")
-      mock_document = FactoryGirl.create(:asset)
       transaction = Transaction.build(
         description: "Sold some widgets",
-        commercial_document: mock_document,
         debits: [
           {account: "Accounts Receivable", amount: 50}], 
         credits: [
           {account: "Sales Revenue", amount: 45},
           {account: "Sales Tax Payable", amount: 5}])
+
       transaction.should be_valid
       transaction.save
       saved_transaction = DoubleDouble::Transaction.find(transaction.id)
-      saved_transaction.commercial_document.should == mock_document
     end
 
   end

data/spec/spec_helper.rb

@@ -10,23 +10,18 @@ ActiveRecord::Migration.verbose = false
 @migration  = Class.new(ActiveRecord::Migration) do
   def change
     create_table :double_double_accounts do |t|
-      t.integer :number,       null: false
-      t.string :name
-      t.string :type
-      t.boolean :contra
-
-      t.timestamps
+      t.integer :number,        null: false
+      t.string  :name,          null: false
+      t.string  :type,          null: false
+      t.boolean :contra,        default: false
     end
     add_index :double_double_accounts, [:name, :type]
 
     create_table :double_double_transactions do |t|
       t.string :description
-      t.integer :commercial_document_id
-      t.string :commercial_document_type
       t.references :transaction_type
       t.timestamps
     end
-    add_index :double_double_transactions, [:commercial_document_id, :commercial_document_type], :name => "index_transactions_on_commercial_doc"
     add_index :double_double_transactions, :transaction_type_id
 
     create_table :double_double_transaction_types do |t|
@@ -39,15 +34,19 @@ ActiveRecord::Migration.verbose = false
       t.string :type
       t.references :account
       t.references :transaction
-      t.references :project
-      t.references :approving_user
-      t.references :targeted_user
-      t.integer :amount_cents, :limit => 8, :default => 0, :null => false
+      t.references :context,    polymorphic: true
+      t.references :initiator,  polymorphic: true
+      t.references :accountee,  polymorphic: true
+      
+      t.integer :amount_cents, limit: 8, default: 0, null: false
       t.string  :currency
-    end 
-    add_index :double_double_amounts, :project_id
-    add_index :double_double_amounts, :approving_user_id
-    add_index :double_double_amounts, :targeted_user_id
+    end
+    add_index :double_double_amounts, :context_id
+    add_index :double_double_amounts, :context_type
+    add_index :double_double_amounts, :initiator_id
+    add_index :double_double_amounts, :initiator_type
+    add_index :double_double_amounts, :accountee_id
+    add_index :double_double_amounts, :accountee_type
     add_index :double_double_amounts, :type
     add_index :double_double_amounts, [:account_id, :transaction_id]
     add_index :double_double_amounts, [:transaction_id, :account_id]

data/spec/support/left_side_account_types.rb

@@ -59,19 +59,19 @@ shared_examples "a left side account type" do
       a2 = rand(1_000_000_000)
       a3 = rand(1_000_000_000)
       a4 = rand(1_000_000_000)
-      pid1 = 100
-      pid2 = 200
+      context_id_1 = 100
+      context_id_2 = 200
 
       t = FactoryGirl.build(:transaction)
-      t.credit_amounts << FactoryGirl.create(:credit_amt, transaction: t, amount: Money.new(a1), account: acct1, project_id: pid1)
+      t.credit_amounts << FactoryGirl.create(:credit_amt, transaction: t, amount: Money.new(a1), account: acct1, context_id: context_id_1, context_type: 'Job')
       t.debit_amounts  << FactoryGirl.create(:debit_amt,  transaction: t, amount: Money.new(a1), account: other_account)
       t.save
       t = FactoryGirl.build(:transaction)
-      t.credit_amounts << FactoryGirl.create(:credit_amt, transaction: t, amount: Money.new(a2), account: acct1, project_id: pid1)
+      t.credit_amounts << FactoryGirl.create(:credit_amt, transaction: t, amount: Money.new(a2), account: acct1, context_id: context_id_1, context_type: 'Job')
       t.debit_amounts  << FactoryGirl.create(:debit_amt,  transaction: t, amount: Money.new(a2), account: other_account)
       t.save
       t = FactoryGirl.build(:transaction)
-      t.credit_amounts << FactoryGirl.create(:credit_amt, transaction: t, amount: Money.new(a3), account: acct1, project_id: pid2)
+      t.credit_amounts << FactoryGirl.create(:credit_amt, transaction: t, amount: Money.new(a3), account: acct1, context_id: context_id_2, context_type: 'Job')
       t.debit_amounts  << FactoryGirl.create(:debit_amt,  transaction: t, amount: Money.new(a3), account: other_account)
       t.save
       t = FactoryGirl.build(:transaction)
@@ -81,15 +81,15 @@ shared_examples "a left side account type" do
 
       t = FactoryGirl.build(:transaction)
       t.credit_amounts << FactoryGirl.create(:credit_amt, transaction: t, amount: Money.new(a4), account: other_account)
-      t.debit_amounts  << FactoryGirl.create(:debit_amt,  transaction: t, amount: Money.new(a4), account: acct1, project_id: pid1)
+      t.debit_amounts  << FactoryGirl.create(:debit_amt,  transaction: t, amount: Money.new(a4), account: acct1, context_id: context_id_1, context_type: 'Job')
       t.save
       t = FactoryGirl.build(:transaction)
       t.credit_amounts << FactoryGirl.create(:credit_amt, transaction: t, amount: Money.new(a2), account: other_account)
-      t.debit_amounts  << FactoryGirl.create(:debit_amt,  transaction: t, amount: Money.new(a2), account: acct1, project_id: pid1)
+      t.debit_amounts  << FactoryGirl.create(:debit_amt,  transaction: t, amount: Money.new(a2), account: acct1, context_id: context_id_1, context_type: 'Job')
       t.save
       t = FactoryGirl.build(:transaction)
       t.credit_amounts << FactoryGirl.create(:credit_amt, transaction: t, amount: Money.new(a3), account: other_account)
-      t.debit_amounts  << FactoryGirl.create(:debit_amt,  transaction: t, amount: Money.new(a3), account: acct1, project_id: pid2)
+      t.debit_amounts  << FactoryGirl.create(:debit_amt,  transaction: t, amount: Money.new(a3), account: acct1, context_id: context_id_2, context_type: 'Job')
       t.save
       t = FactoryGirl.build(:transaction)
       t.credit_amounts << FactoryGirl.create(:credit_amt, transaction: t, amount: Money.new(a3), account: other_account)
@@ -98,27 +98,27 @@ shared_examples "a left side account type" do
 
       t = FactoryGirl.build(:transaction)
       t.credit_amounts << FactoryGirl.create(:credit_amt, transaction: t, amount: Money.new(a4), account: other_account)
-      t.debit_amounts  << FactoryGirl.create(:debit_amt,  transaction: t, amount: Money.new(a4), account: acct2, project_id: pid1)
+      t.debit_amounts  << FactoryGirl.create(:debit_amt,  transaction: t, amount: Money.new(a4), account: acct2, context_id: context_id_1, context_type: 'Job')
       t.save
       t = FactoryGirl.build(:transaction)
       t.credit_amounts << FactoryGirl.create(:credit_amt, transaction: t, amount: Money.new(a2), account: other_account)
-      t.debit_amounts  << FactoryGirl.create(:debit_amt,  transaction: t, amount: Money.new(a2), account: acct2, project_id: pid1)
+      t.debit_amounts  << FactoryGirl.create(:debit_amt,  transaction: t, amount: Money.new(a2), account: acct2, context_id: context_id_1, context_type: 'Job')
       t.save
       t = FactoryGirl.build(:transaction)
       t.credit_amounts << FactoryGirl.create(:credit_amt, transaction: t, amount: Money.new(a3), account: other_account)
-      t.debit_amounts  << FactoryGirl.create(:debit_amt,  transaction: t, amount: Money.new(a3), account: acct2, project_id: pid2)
+      t.debit_amounts  << FactoryGirl.create(:debit_amt,  transaction: t, amount: Money.new(a3), account: acct2, context_id: context_id_2, context_type: 'Job')
       t.save
       t = FactoryGirl.build(:transaction)
       t.credit_amounts << FactoryGirl.create(:credit_amt, transaction: t, amount: Money.new(a3), account: other_account)
       t.debit_amounts  << FactoryGirl.create(:debit_amt,  transaction: t, amount: Money.new(a3), account: acct2)
       t.save
 
-      acct1.balance({project_id: pid1}).should == Money.new((a4 + a2) - (a1 + a2))
-      acct1.balance({project_id: pid2}).should == Money.new(a3 - a3)
+      acct1.balance({context_id: context_id_1, context_type: 'Job'}).should == Money.new((a4 + a2) - (a1 + a2))
+      acct1.balance({context_id: context_id_2, context_type: 'Job'}).should == Money.new(a3 - a3)
       acct1.balance.should                     == Money.new((a4 + a2 + a3 + a3) - (a1 + a2 + a3 + a3))
       
-      acct2.balance({project_id: pid1}).should == Money.new((a4 + a2))
-      acct2.balance({project_id: pid2}).should == Money.new(a3)
+      acct2.balance({context_id: context_id_1, context_type: 'Job'}).should == Money.new((a4 + a2))
+      acct2.balance({context_id: context_id_2, context_type: 'Job'}).should == Money.new(a3)
       acct2.balance.should                     == Money.new((a4 + a2 + a3 + a3))
     end
   end

data/spec/support/right_side_account_types.rb

@@ -59,19 +59,19 @@ shared_examples "a right side account type" do
       a2 = rand(1_000_000_000)
       a3 = rand(1_000_000_000)
       a4 = rand(1_000_000_000)
-      pid1 = 100
-      pid2 = 200
+      context_id_1 = 100
+      context_id_2 = 200
 
       t = FactoryGirl.build(:transaction)
-      t.credit_amounts << FactoryGirl.create(:credit_amt, transaction: t, amount: Money.new(a1), account: acct1, project_id: pid1)
+      t.credit_amounts << FactoryGirl.create(:credit_amt, transaction: t, amount: Money.new(a1), account: acct1, context_id: context_id_1, context_type: 'Job')
       t.debit_amounts  << FactoryGirl.create(:debit_amt,  transaction: t, amount: Money.new(a1), account: other_account)
       t.save
       t = FactoryGirl.build(:transaction)
-      t.credit_amounts << FactoryGirl.create(:credit_amt, transaction: t, amount: Money.new(a2), account: acct1, project_id: pid1)
+      t.credit_amounts << FactoryGirl.create(:credit_amt, transaction: t, amount: Money.new(a2), account: acct1, context_id: context_id_1, context_type: 'Job')
       t.debit_amounts  << FactoryGirl.create(:debit_amt,  transaction: t, amount: Money.new(a2), account: other_account)
       t.save
       t = FactoryGirl.build(:transaction)
-      t.credit_amounts << FactoryGirl.create(:credit_amt, transaction: t, amount: Money.new(a3), account: acct1, project_id: pid2)
+      t.credit_amounts << FactoryGirl.create(:credit_amt, transaction: t, amount: Money.new(a3), account: acct1, context_id: context_id_2, context_type: 'Job')
       t.debit_amounts  << FactoryGirl.create(:debit_amt,  transaction: t, amount: Money.new(a3), account: other_account)
       t.save
       t = FactoryGirl.build(:transaction)
@@ -81,15 +81,15 @@ shared_examples "a right side account type" do
 
       t = FactoryGirl.build(:transaction)
       t.credit_amounts << FactoryGirl.create(:credit_amt, transaction: t, amount: Money.new(a4), account: other_account)
-      t.debit_amounts  << FactoryGirl.create(:debit_amt,  transaction: t, amount: Money.new(a4), account: acct1, project_id: pid1)
+      t.debit_amounts  << FactoryGirl.create(:debit_amt,  transaction: t, amount: Money.new(a4), account: acct1, context_id: context_id_1, context_type: 'Job')
       t.save
       t = FactoryGirl.build(:transaction)
       t.credit_amounts << FactoryGirl.create(:credit_amt, transaction: t, amount: Money.new(a2), account: other_account)
-      t.debit_amounts  << FactoryGirl.create(:debit_amt,  transaction: t, amount: Money.new(a2), account: acct1, project_id: pid1)
+      t.debit_amounts  << FactoryGirl.create(:debit_amt,  transaction: t, amount: Money.new(a2), account: acct1, context_id: context_id_1, context_type: 'Job')
       t.save
       t = FactoryGirl.build(:transaction)
       t.credit_amounts << FactoryGirl.create(:credit_amt, transaction: t, amount: Money.new(a3), account: other_account)
-      t.debit_amounts  << FactoryGirl.create(:debit_amt,  transaction: t, amount: Money.new(a3), account: acct1, project_id: pid2)
+      t.debit_amounts  << FactoryGirl.create(:debit_amt,  transaction: t, amount: Money.new(a3), account: acct1, context_id: context_id_2, context_type: 'Job')
       t.save
       t = FactoryGirl.build(:transaction)
       t.credit_amounts << FactoryGirl.create(:credit_amt, transaction: t, amount: Money.new(a3), account: other_account)
@@ -98,27 +98,27 @@ shared_examples "a right side account type" do
 
       t = FactoryGirl.build(:transaction)
       t.credit_amounts << FactoryGirl.create(:credit_amt, transaction: t, amount: Money.new(a4), account: other_account)
-      t.debit_amounts  << FactoryGirl.create(:debit_amt,  transaction: t, amount: Money.new(a4), account: acct2, project_id: pid1)
+      t.debit_amounts  << FactoryGirl.create(:debit_amt,  transaction: t, amount: Money.new(a4), account: acct2, context_id: context_id_1, context_type: 'Job')
       t.save
       t = FactoryGirl.build(:transaction)
       t.credit_amounts << FactoryGirl.create(:credit_amt, transaction: t, amount: Money.new(a2), account: other_account)
-      t.debit_amounts  << FactoryGirl.create(:debit_amt,  transaction: t, amount: Money.new(a2), account: acct2, project_id: pid1)
+      t.debit_amounts  << FactoryGirl.create(:debit_amt,  transaction: t, amount: Money.new(a2), account: acct2, context_id: context_id_1, context_type: 'Job')
       t.save
       t = FactoryGirl.build(:transaction)
       t.credit_amounts << FactoryGirl.create(:credit_amt, transaction: t, amount: Money.new(a3), account: other_account)
-      t.debit_amounts  << FactoryGirl.create(:debit_amt,  transaction: t, amount: Money.new(a3), account: acct2, project_id: pid2)
+      t.debit_amounts  << FactoryGirl.create(:debit_amt,  transaction: t, amount: Money.new(a3), account: acct2, context_id: context_id_2, context_type: 'Job')
       t.save
       t = FactoryGirl.build(:transaction)
       t.credit_amounts << FactoryGirl.create(:credit_amt, transaction: t, amount: Money.new(a3), account: other_account)
       t.debit_amounts  << FactoryGirl.create(:debit_amt,  transaction: t, amount: Money.new(a3), account: acct2)
       t.save
 
-      acct1.balance({project_id: pid1}).should == Money.new((a1 + a2) - (a4 + a2))
-      acct1.balance({project_id: pid2}).should == Money.new(a3 - a3)
+      acct1.balance({context_id: context_id_1, context_type: 'Job'}).should == Money.new((a1 + a2) - (a4 + a2))
+      acct1.balance({context_id: context_id_2, context_type: 'Job'}).should == Money.new(a3 - a3)
       acct1.balance.should                     == Money.new((a1 + a2 + a3 + a3) - (a4 + a2 + a3 + a3))
       
-      acct2.balance({project_id: pid1}).should == Money.new(- (a4 + a2))
-      acct2.balance({project_id: pid2}).should == Money.new(- a3)
+      acct2.balance({context_id: context_id_1, context_type: 'Job'}).should == Money.new(- (a4 + a2))
+      acct2.balance({context_id: context_id_2, context_type: 'Job'}).should == Money.new(- a3)
       acct2.balance.should                     == Money.new(- (a4 + a2 + a3 + a3))
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: double_double
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-26 00:00:00.000000000 Z
+date: 2013-01-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: money
@@ -146,8 +146,10 @@ files:
 - lib/double_double/debit_amount.rb
 - lib/double_double/equity.rb
 - lib/double_double/expense.rb
+- lib/double_double/left_side_account.rb
 - lib/double_double/liability.rb
 - lib/double_double/revenue.rb
+- lib/double_double/right_side_account.rb
 - lib/double_double/transaction.rb
 - lib/double_double/transaction_type.rb
 - lib/double_double/version.rb