debitcredit 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f5c9ca7c15a9a0033ccdf7dc8ba48be7c2235f09
-  data.tar.gz: 639c675e7fa7448a3dae30abd464249af7dffafc
+  metadata.gz: 15bf18b62ec5961c9bc1c4fef7717b386b5e9c4c
+  data.tar.gz: bd563f7e9ced320e24ec88182013e30159584796
 SHA512:
-  metadata.gz: 9eabc70957e8da1b80fd373f3b9626af95a56b35f4c9245695c7558ea18d2b9318a1a8a7eb9c4c488573124d83cf32e6d3c4635be4354615a384128d2a98c818
-  data.tar.gz: 1fbde6b1603f9e3768d316636c249d78aa5795e39131164007a71270c32434d03a588c2216a0559321479cee70c5244ff459a0c686cfca2e4414f5facaa5e337
+  metadata.gz: 15eaadb79408a7768a7ce639d300dfb6eb4a811a7b6e367e77facc8d5053ea829c3e3409ce32143e19e93afa447c01b264d7c991295757753bb96439ab78434b
+  data.tar.gz: e2c2685de2c3cd0b7aa92415fb5195fc3783bea859b3f1dd1991c0ad679658cfb99391f7e4fe4de61e49b42c684a9f2f4e8934ab25e9996d22503cf46ac7f5d9

data/app/models/debitcredit/account.rb

@@ -4,8 +4,7 @@ module Debitcredit
     has_many :items, dependent: :destroy
 
     validates :name, :balance, presence: true
-
-    validates :balance, numericality: {greater_than_or_equal_to: 0}, unless: :overdraft_enabled?
+    validate :prevent_overdraft, unless: :overdraft_enabled?
 
     scope :asset,     ->{where(type: AssetAccount.name)}
     scope :equity,    ->{where(type: EquityAccount.name)}
@@ -36,9 +35,26 @@ module Debitcredit
       end
     end
 
-    def update_balance!(item)
+    attr_accessor :check_overdraft
+    def update_balance!(item, check_overdraft = true)
       item.balance = send(item.kind, item.amount)
+      self.check_overdraft = check_overdraft
       save!
     end
+
+    def overdraft?
+      balance < 0
+    end
+
+    protected
+
+    def prevent_overdraft
+      return unless balance_changed?
+      return unless check_overdraft
+      return unless balance < 0
+      return unless balance_was > balance
+
+      errors.add(:balance, :overdraft)
+    end
   end
 end

data/app/models/debitcredit/item.rb

@@ -20,5 +20,9 @@ module Debitcredit
     def kind
       debit?? :debit : :credit
     end
+
+    def inverse
+      self.class.new account: account, transaction: transaction, amount: amount, debit: credit?
+    end
   end
 end

data/app/models/debitcredit/transaction.rb

@@ -10,32 +10,36 @@ module Debitcredit
 
     before_create :lock_and_update_balances
 
-    # XXX
-    # prevent items and balance changes on update
-    # prevent update at all?
-
     def self.prepare(opts = {}, &block)
       new(opts).tap do |t|
         Docile.dsl_eval(DSL.new(t), &block)
       end
     end
 
+    attr_accessor :ignore_overdraft
+    def inverse(opts = {})
+      self.class.new({ignore_overdraft: true}.merge(opts)) do |res|
+        res.items = items.map(&:inverse)
+      end
+    end
+
     def items_balance
       items.map(&:value_for_balance).sum
     end
 
     def balanced?
-      0 == items_balance
+      items_balance.zero?
     end
 
     protected
+
     def ensure_balanced
       errors.add(:base, :unbalanced) unless balanced?
     end
 
     def lock_and_update_balances
       items.sort_by(&:account_id).each do |item|
-        item.account.lock!.update_balance!(item)
+        item.account.lock!.update_balance!(item, !ignore_overdraft)
       end
     end
   end

data/config/locales/en.yml

@@ -5,4 +5,6 @@ en:
       models:
         debitcredit/transaction:
           unbalanced: item amounts must balance to 0
+        debitcredit/account:
+          overdraft: overdraft is not allowed
 

data/db/migrate/20140130095257_no_overdraft_by_default.rb

@@ -0,0 +1,9 @@
+class NoOverdraftByDefault < ActiveRecord::Migration
+  def up
+    change_column_default :debitcredit_accounts, :overdraft_enabled, false
+  end
+
+  def down
+    change_column_default :debitcredit_accounts, :overdraft_enabled, true
+  end
+end

data/lib/debitcredit/version.rb

@@ -1,3 +1,3 @@
 module Debitcredit
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: debitcredit
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Vitaly Kushner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-28 00:00:00.000000000 Z
+date: 2014-01-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -203,6 +203,7 @@ files:
 - db/migrate/20140128131859_add_transaction_parent.rb
 - db/migrate/20140128134203_longer_account_name.rb
 - db/migrate/20140128153104_add_account_overdraft.rb
+- db/migrate/20140130095257_no_overdraft_by_default.rb
 - lib/debitcredit/engine.rb
 - lib/debitcredit/version.rb
 - lib/debitcredit.rb