bookkeeping 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1546ea85dd27e3e962ce4f11e58a6e7e92c8c4e6
-  data.tar.gz: 315ead36edba9216723a54a4ab01411cabe74aac
+  metadata.gz: c80eee7c8cc61dde2184ffefa1c5c9cc241f82df
+  data.tar.gz: 37d0fede0812a012084e4b1fd30599f68360e009
 SHA512:
-  metadata.gz: 749270c9df89e09b0b2673c914c80a39e28a9a192e85a6b497ad9d3344a03fbaf93201230e313568d4a9f1f8a8809bc37167926d67c3d605ac21fed042018703
-  data.tar.gz: 5bd73eb78b84fd877a9cfada0a2467814abf0daf35cb442b99497302db2427c2b4658315ee170fbf596029b6eb0bd9d58cf7801379aa98fb2bf171abef054c12
+  metadata.gz: 58748ee0ad0b0411f736d4747ae0ee6f9bb9be2b1b8037ab43f7e31d0e547d9e1ecaf2407d30b3565d4c5bb5c50edbad8ea411432ae0fa5d57b24e17a1eb943d
+  data.tar.gz: f9c8cca3d4cb2fca1065dfe91a5bacd3a64b4a5f6a534898fb54a1f41e10fbd3978b996456d9034b9425d1b9c0ebe8976d45af2e7db7491e20803f9b2e870947

data/app/models/bookkeeping/account.rb

@@ -22,7 +22,6 @@ module Bookkeeping
 
     # Validations
     validates :name, presence: true
-    validate :prevent_overdraft, unless: :overdraft_enabled?
 
     class NotFound < StandardError; end
     class BadKind < StandardError; end
@@ -80,11 +79,5 @@ module Bookkeeping
     def overdraft?
       balance < 0
     end
-
-    private
-
-      def prevent_overdraft
-        errors.add(:balance, :overdraft) if balance < 0
-      end
   end
 end

data/app/models/bookkeeping/credit_amount.rb

@@ -12,5 +12,11 @@
 
 module Bookkeeping
   class CreditAmount < Amount
+
+    after_initialize :init
+
+    def init
+      self.is_debit = false
+    end
   end
 end

data/app/models/bookkeeping/entry.rb

@@ -15,6 +15,7 @@ module Bookkeeping
   class Entry < ActiveRecord::Base
 
     belongs_to :transactionable, polymorphic: true
+    belongs_to :rollback_entry, class_name: 'Bookkeeping::Entry'
     has_many :amounts, dependent: :destroy
     has_many :debit_amounts, class_name: "Bookkeeping::DebitAmount"
     has_many :credit_amounts, class_name: "Bookkeeping::CreditAmount"
@@ -22,42 +23,43 @@ module Bookkeeping
     validates :transactionable, :description, presence: true
     validate :has_credit_amounts?
     validate :has_debit_amounts?
-    validate :amounts_cancel?
+    validate :amounts_equal?
 
     def self.prepare(options = {}, &block)
-      new(options) do |entry|
-        dsl = Bookkeeping::DSL.new(entry)
-        dsl.instance_eval &block
-        dsl.build
-      end
+      Bookkeeping::DSL.new(new(options), &block).build
     end
 
-# TODO: not work
-    def rollback!(ref = nil)
+    # TODO: not work
+    def rollback(ref = nil)
       tran = self
-      res = self.class.prepare do
+      inverse_entry = self.class.prepare do
         tran.debit_amounts.each { |di| debit(di.account, -di.amount) }
         tran.credit_amounts.each { |ci| credit(ci.account, -ci.amount) }
         transactionable(ref || tran)
         description("Rollback of #{tran.description}")
       end
-      self.rollback_transaction_id = res.id
-      save!
-      res
+      inverse_entry.save!
+
+      unless inverse_entry.new_record?
+        self.rollback_entry = inverse_entry
+        self.save!
+      end
+
+      inverse_entry
     end
 
     private
 
       def has_credit_amounts?
-        errors[:base] << "Entry must have at least one credit amount" if self.credit_amounts.blank?
+        errors[:credit_amounts] << "Entry must have at least one credit amount" if self.credit_amounts.blank?
       end
 
       def has_debit_amounts?
-        errors[:base] << "Entry must have at least one debit amount" if self.debit_amounts.blank?
+        errors[:debit_amounts] << "Entry must have at least one debit amount" if self.debit_amounts.blank?
       end
 
-      def amounts_cancel?
-        errors[:base] << "The credit and debit amounts are not equal" if credit_amounts.to_a.sum(&:amount) != debit_amounts.to_a.sum(&:amount)
+      def amounts_equal?
+        errors[:amounts_equality] << "The credit and debit amounts are not equal" if credit_amounts.to_a.sum(&:amount) != debit_amounts.to_a.sum(&:amount)
       end
   end
 end

data/lib/bookkeeping/dsl.rb

@@ -1,45 +1,58 @@
 module Bookkeeping
   class DSL
-    attr_reader :debits, :credits, :description, :reference
-    attr_accessor :entry
+    attr_reader :__debits, :__credits, :__description, :__reference
 
-    def initialize(entry)
-      @debits ||= {}
-      @credits ||= {}
-      @entry = entry
+    def initialize(entry, &block)
+      @__debits = {}
+      @__credits = {}
+
+      self.extend Bookkeeping::Proxy
+      self.caller = block.binding.eval "self"
+
+      @__entry = entry
+
+      instance_eval &block
     end
 
     def debit(account, amount)
-      @debits ||= {}
-      @debits[account] ||= 0
-      @debits[account] += amount
+      @__debits[account] ||= 0
+      @__debits[account] += amount
     end
 
     def credit(account, amount)
-      @credits ||= {}
-      @credits[account] ||= 0
-      @credits[account] += amount
+      @__credits[account] ||= 0
+      @__credits[account] += amount
     end
 
     def description(description)
-      @description = description
+      @__description = description
     end
 
     def transactionable(transactionable)
-      @transactionable = transactionable
+      @__transactionable = transactionable
+    end
+
+    def entry
+      @__entry
+    end
+
+    def entry=(entry)
+      @__entry = entry
     end
 
     def build
-      entry.transactionable = @transactionable || entry.transactionable
-      entry.description = @description || entry.description
+      entry.transactionable = @__transactionable || entry.transactionable
+      entry.description = @__description || entry.description
 
-      debits.each do |account, amount|
+      __debits.each do |account, amount|
         entry.debit_amounts.build(account: account, amount: amount)
       end
 
-      credits.each do |account, amount|
+      __credits.each do |account, amount|
         entry.credit_amounts.build(account: account, amount: amount)
       end
+
+      entry
     end
 
   end

data/lib/bookkeeping/engine.rb

@@ -1,3 +1,5 @@
+require "bookkeeping/proxy"
+
 module Bookkeeping
   class Engine < ::Rails::Engine
     isolate_namespace Bookkeeping

data/lib/bookkeeping/proxy.rb

@@ -0,0 +1,25 @@
+module Bookkeeping
+  module Proxy
+    def caller= context
+      @caller = context
+      exec_in_caller(context)
+    end
+
+    def method_missing(name, *args, &block)
+      @caller.send(name, *args, &block)
+    end
+
+    def respond_to?(name, include_private = false)
+      @caller.respond_to?(name) || super
+    end
+
+    def exec_in_caller(context)
+      return unless context
+
+      context.instance_variables.each do |ivar|
+        value_from_caller = context.instance_variable_get(ivar)
+        self.instance_variable_set(ivar, value_from_caller)
+      end
+    end
+  end
+end

data/lib/bookkeeping/version.rb

@@ -1,3 +1,3 @@
 module Bookkeeping
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bookkeeping
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Alexander Shlinchak
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-07 00:00:00.000000000 Z
+date: 2015-07-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -108,6 +108,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: shoulda-matchers
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: The goal of this gem is to build accounting (bookkeeping) system for
   Rails projects using double entry theory.
 email:
@@ -138,6 +152,7 @@ files:
 - lib/bookkeeping.rb
 - lib/bookkeeping/dsl.rb
 - lib/bookkeeping/engine.rb
+- lib/bookkeeping/proxy.rb
 - lib/bookkeeping/version.rb
 - lib/generators/bookkeeping/bookkeeping_generator.rb
 - lib/generators/bookkeeping/templates/migration.rb