allow date ranges on balance calculations and calculation with DB sum

app/models/plutus/account.rb

@@ -59,14 +59,14 @@ class Account < ActiveRecord::Base
     #   => #<BigDecimal:103259bb8,'0.2E4',4(12)>
     #
     # @return [BigDecimal] The decimal value balance
-    def balance
+    def balance(options={})
       if self.class == Plutus::Account
         raise(NoMethodError, "undefined method 'balance'")
       else
         if self.normal_credit_balance ^ contra
-          credits_balance - debits_balance
+          credits_balance(options) - debits_balance(options)
         else
-          debits_balance - credits_balance
+          debits_balance(options) - credits_balance(options)
         end
       end
     end
@@ -78,8 +78,8 @@ def balance
     #   => #<BigDecimal:103259bb8,'0.1E4',4(12)>
     #
     # @return [BigDecimal] The decimal value credit balance
-    def credits_balance
-      credit_amounts.balance
+    def credits_balance(options={})
+      credit_amounts.balance(options)
     end
 
     # The debit balance for the account.
@@ -89,8 +89,8 @@ def credits_balance
     #   => #<BigDecimal:103259bb8,'0.3E4',4(12)>
     #
     # @return [BigDecimal] The decimal value credit balance
-    def debits_balance
-      debit_amounts.balance
+    def debits_balance(options={})
+      debit_amounts.balance(options)
     end
 
     # This class method is used to return the balance of all accounts
@@ -103,17 +103,17 @@ def debits_balance
     #   => #<BigDecimal:1030fcc98,'0.82875E5',8(20)>
     #
     # @return [BigDecimal] The decimal value balance
-    def self.balance
+    def self.balance(options={})
       if self.new.class == Plutus::Account
         raise(NoMethodError, "undefined method 'balance'")
       else
         accounts_balance = BigDecimal.new('0')
         accounts = self.all
         accounts.each do |account|
           if account.contra
-            accounts_balance -= account.balance
+            accounts_balance -= account.balance(options)
           else
-            accounts_balance += account.balance
+            accounts_balance += account.balance(options)
           end
         end
         accounts_balance

app/models/plutus/amounts_extension.rb

@@ -2,7 +2,17 @@ module Plutus
   # Association extension for has_many :amounts relations. Internal.
   module AmountsExtension
     # Returns a sum of the referenced Amount objects.
-    def balance
+    def balance(hash)
+      if hash[:from_date] && hash[:to_date]
+        from_date = hash[:from_date].kind_of?(Date) ? hash[:from_date] : Date.parse(hash[:from_date])
+        to_date = hash[:to_date].kind_of?(Date) ? hash[:to_date] : Date.parse(hash[:to_date])
+        includes(:entry).where('plutus_entries.date' => from_date..to_date).sum(:amount)
+      else
+        sum(:amount)
+      end
+    end
+
+    def balance_for_new_record
       balance = BigDecimal.new('0')
       each do |amount_record|
         if amount_record.amount

app/models/plutus/asset.rb

@@ -21,8 +21,8 @@ class Asset < Account
     #   => #<BigDecimal:103259bb8,'0.2E4',4(12)>
     #
     # @return [BigDecimal] The decimal value balance
-    def balance
-      super
+    def balance(options={})
+      super(options)
     end
 
     # This class method is used to return
@@ -35,8 +35,8 @@ def balance
     #   => #<BigDecimal:1030fcc98,'0.82875E5',8(20)>
     #
     # @return [BigDecimal] The decimal value balance
-    def self.balance
-      super
+    def self.balance(options={})
+      super(options)
     end
   end
 end

app/models/plutus/entry.rb

@@ -64,7 +64,7 @@ def has_debit_amounts?
       end
 
       def amounts_cancel?
-        errors[:base] << "The credit and debit amounts are not equal" if credit_amounts.balance != debit_amounts.balance
+        errors[:base] << "The credit and debit amounts are not equal" if credit_amounts.balance_for_new_record != debit_amounts.balance_for_new_record
       end
   end
 end

app/models/plutus/equity.rb

@@ -21,7 +21,7 @@ class Equity < Account
     #   => #<BigDecimal:103259bb8,'0.2E4',4(12)>
     #
     # @return [BigDecimal] The decimal value balance
-    def balance
+    def balance(options={})
       super
     end
 
@@ -35,7 +35,7 @@ def balance
     #   => #<BigDecimal:1030fcc98,'0.82875E5',8(20)>
     #
     # @return [BigDecimal] The decimal value balance
-    def self.balance
+    def self.balance(options={})
       super
     end
   end

app/models/plutus/expense.rb

@@ -21,7 +21,7 @@ class Expense < Account
     #   => #<BigDecimal:103259bb8,'0.2E4',4(12)>
     #
     # @return [BigDecimal] The decimal value balance
-    def balance
+    def balance(options={})
       super
     end
 
@@ -35,7 +35,7 @@ def balance
     #   => #<BigDecimal:1030fcc98,'0.82875E5',8(20)>
     #
     # @return [BigDecimal] The decimal value balance
-    def self.balance
+    def self.balance(options={})
       super
     end
   end

app/models/plutus/liability.rb

@@ -21,7 +21,7 @@ class Liability < Account
     #   => #<BigDecimal:103259bb8,'0.2E4',4(12)>
     #
     # @return [BigDecimal] The decimal value balance
-    def balance
+    def balance(options={})
       super
     end
 
@@ -35,7 +35,7 @@ def balance
     #   => #<BigDecimal:1030fcc98,'0.82875E5',8(20)>
     #
     # @return [BigDecimal] The decimal value balance
-    def self.balance
+    def self.balance(options={})
       super
     end
   end

app/models/plutus/revenue.rb

@@ -21,7 +21,7 @@ class Revenue < Account
     #   => #<BigDecimal:103259bb8,'0.2E4',4(12)>
     #
     # @return [BigDecimal] The decimal value balance
-    def balance
+    def balance(options={})
       super
     end
 
@@ -35,7 +35,7 @@ def balance
     #   => #<BigDecimal:1030fcc98,'0.82875E5',8(20)>
     #
     # @return [BigDecimal] The decimal value balance
-    def self.balance
+    def self.balance(options={})
       super
     end
   end

spec/support/account_shared_examples.rb

@@ -16,6 +16,10 @@
   describe "instance methods" do
     its(:balance) { should be_kind_of(BigDecimal) }
 
+    it "reports a balance with date range" do
+      account.balance(:from_date => Date.today - 1.year, :to_date => Date.today).should be_kind_of(BigDecimal)
+    end
+
     it { should respond_to(:credit_entries) }
     it { should respond_to(:debit_entries) }
   end