has_accounts 0.2.1 → 0.2.2

data/README.md

@@ -9,7 +9,7 @@ Install
 
 In Rails 3 simply add
 
-  gem 'has_accounts'
+    gem 'has_accounts'
 
 
 Example
@@ -17,24 +17,24 @@ Example
 
 A few models are available:
 
-  class Booking
-  class Account
-  class AccountType
+    class Booking
+    class Account
+    class AccountType
 
 There's also a ready to use module available to attach accountable
 functionality to existing models.
 
 To use it, simply add the following to your Model:
 
-  include HasAccounts::Model
+    include HasAccounts::Model
 
 
 License
 =======
 
-Copyright (c) 2008 Agrabah <http://www.agrabah.ch>
-Copyright (c) 2008-2011 Simon Hürlimann <simon.huerlimann@cyt.ch>
-Copyright (c) 2010-2011 CyT <http://www.cyt.ch>
-Copyright (c) 2008-2010 ZytoLabor <http://www.zyto-labor.com>
+* Copyright (c) 2008 Agrabah <http://www.agrabah.ch>
+* Copyright (c) 2008-2011 Simon Hürlimann <simon.huerlimann@cyt.ch>
+* Copyright (c) 2010-2011 CyT <http://www.cyt.ch>
+* Copyright (c) 2008-2010 ZytoLabor <http://www.zyto-labor.com>
 
 Released under the MIT license.

data/app/models/account.rb

@@ -83,8 +83,16 @@ class Account < ActiveRecord::Base
           }]
         end
       elsif
-        # TODO support inclusive param
-        condition = {:value_date => selector}
+        if selector.first == selector.last
+          condition = ["date(value_date) = :value_date", {
+            :value_date => selector.first
+          }]
+        else
+          condition = ["date(value_date) BETWEEN :first_value_date AND :latest_value_date", {
+            :first_value_date => selector.first,
+            :latest_value_date => selector.last
+          }]
+        end
       end
     else
       if selector.is_a? Booking
@@ -93,7 +101,7 @@ class Account < ActiveRecord::Base
         condition = ["(value_date < :value_date) OR (date(value_date) = :value_date AND id <#{equality} :id)", {:value_date => selector.value_date, :id => selector.id}]
       else
         equality = "=" if inclusive
-        condition = ["value_date <#{equality} ?", selector]
+        condition = ["date(value_date) <#{equality} ?", selector]
       end
     end
 

data/app/models/account.rb~

@@ -0,0 +1,113 @@
+class Account < ActiveRecord::Base
+  # Scopes
+  default_scope :order => 'code'
+  
+  # Dummy scope to make scoped_by happy
+  scope :by_value_period, scoped
+  
+  # Validation
+  validates_presence_of :code, :title
+  
+  # String
+  def to_s(format = :default)
+    "%s (%s)" % [title, code]
+  end
+
+  # Account Type
+  # ============
+  belongs_to :account_type
+
+  def is_asset_account?
+    [1, 2, 5].include? account_type_id
+  end
+  
+  def is_liability_account?
+    [3, 4, 6].include? account_type_id
+  end
+
+  scope :current_assets, where('account_type_id = 1') do
+    include AccountScopeExtension
+  end
+  scope :capital_assets, where('account_type_id = 2') do
+    include AccountScopeExtension
+  end
+  scope :outside_capital, where('account_type_id = 3') do
+    include AccountScopeExtension
+  end
+  scope :equity_capital, where('account_type_id = 4') do
+    include AccountScopeExtension
+  end
+  scope :expenses, where('account_type_id = 5') do
+    include AccountScopeExtension
+  end
+  scope :earnings, where('account_type_id = 6') do
+    include AccountScopeExtension
+  end
+
+  # Holder
+  # ======
+  belongs_to :holder, :polymorphic => true
+  
+  # Bookings
+  # ========
+  has_many :credit_bookings, :class_name => "Booking", :foreign_key => "credit_account_id"
+  has_many :debit_bookings, :class_name => "Booking", :foreign_key => "debit_account_id"
+  
+  def bookings
+    Booking.by_account(id)
+  end
+  
+  # Helpers
+  # =======
+  def self.overview(value_range = Date.today, format = :default)
+    Account.all.map{|a| a.to_s(value_range, format)}
+  end
+  
+  # Calculations
+  def turnover(selector = Date.today, inclusive = true)
+    if selector.is_a? Range or selector.is_a? Array
+      if selector.first.is_a? Booking
+        equality = "=" if inclusive
+        if selector.first.value_date == selector.last.value_date
+          condition = ["date(value_date) = :value_date AND id >#{equality} :first_id AND id <#{equality} :last_id", {
+            :value_date => selector.first.value_date,
+            :first_id => selector.first.id,
+            :last_id => selector.last.id
+          }]
+        else
+          condition = ["(value_date > :first_value_date AND value_date < :latest_value_date) OR (date(value_date) = :first_value_date AND id >#{equality} :first_id) OR (date(value_date) = :latest_value_date AND id <#{equality} :last_id)", {
+            :first_value_date => selector.first.value_date,
+            :latest_value_date => selector.last.value_date,
+            :first_id => selector.first.id,
+            :last_id => selector.last.id
+          }]
+        end
+      elsif
+        # TODO support inclusive param
+        condition = {:value_date => selector}
+      end
+    else
+      if selector.is_a? Booking
+        equality = "=" if inclusive
+        # date(value_date) is needed on sqlite!
+        condition = ["(value_date < :value_date) OR (date(value_date) = :value_date AND id <#{equality} :id)", {:value_date => selector.value_date, :id => selector.id}]
+      else
+        equality = "=" if inclusive
+        condition = ["value_date <#{equality} ?", selector]
+      end
+    end
+
+    credit_amount = credit_bookings.where(condition).sum(:amount)
+    debit_amount = debit_bookings.where(condition).sum(:amount)
+    
+    [credit_amount || 0.0, debit_amount || 0.0]
+  end
+  
+  def saldo(selector = Date.today, inclusive = true)
+    credit_amount, debit_amount = turnover(selector, inclusive)
+
+    amount = credit_amount - debit_amount
+    
+    return is_asset_account? ? amount : -amount
+  end
+end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 2
-  - 1
-  version: 0.2.1
+  - 2
+  version: 0.2.2
 platform: ruby
 authors: 
 - "Simon H\xC3\xBCrlimann (CyT)"
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-11 00:00:00 +02:00
+date: 2011-04-12 00:00:00 +02:00
 default_executable: 
 dependencies: []
 
@@ -28,15 +28,14 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
+- app/models/account.rb~
 - app/models/account_scope_extension.rb
 - app/models/bank.rb
 - app/models/account.rb
 - app/models/booking.rb
 - app/models/account_type.rb
 - app/models/bank_account.rb
-- lib/has_accounts.rb~
 - lib/has_accounts.rb
-- lib/booking.rb~
 - lib/has_accounts/class_methods.rb
 - lib/has_accounts/railtie.rb~
 - lib/has_accounts/core_ext/rounding.rb~

data/lib/booking.rb~

@@ -1,92 +0,0 @@
-class Booking < ActiveRecord::Base
-  # Validation
-  validates_presence_of :debit_account, :credit_account, :title, :amount, :value_date
-  validates_time :value_date
-
-  belongs_to :debit_account, :foreign_key => 'debit_account_id', :class_name => "Account"
-  belongs_to :credit_account, :foreign_key => 'credit_account_id', :class_name => "Account"
-
-  # Scoping
-  named_scope :by_value_date, lambda {|value_date| { :conditions => { :value_date => value_date } } }
-  named_scope :by_value_period, lambda {|from, to| { :conditions => { :value_date => from..to } } }
-  
-  named_scope :by_account, lambda {|account_id|
-    { :conditions => ["debit_account_id = :account_id OR credit_account_id = :account_id", {:account_id => account_id}] }
-  } do
-    # Returns array of all booking titles.
-    def titles
-      find(:all, :group => :title).map{|booking| booking.title}
-    end
-    
-    # Statistics per booking title.
-    #
-    # The statistics are an array of hashes with keys title, count, sum, average.
-    def statistics
-      find(:all, :select => "title, count(*) AS count, sum(amount) AS sum, avg(amount) AS avg", :group => :title).map{|stat| stat.attributes}
-    end
-  end
-
-  # Returns array of all years we have bookings for
-  def self.fiscal_years
-    with_exclusive_scope do
-      find(:all, :select => "year(value_date) AS year", :group => "year(value_date)").map{|booking| booking.year}
-    end
-  end
-
-  def self.scope_by_value_date(value_date)
-    scoping = self.default_scoping - [@by_value_scope]
-    
-    @by_value_scope = {:find => {:conditions => {:value_date => value_date}}}
-    scoping << @by_value_scope
-    
-    Thread.current["#{self}_scoped_methods"] = nil
-    self.default_scoping = scoping
-  end
-  
-  def self.filter(controller, &block)
-    if controller.value_date_scope
-      with_scope(:find => {:conditions => {:value_date => controller.value_date_scope}}, &block)
-    else
-      block.call
-    end
-  end
-  
-  # Standard methods
-  def to_s(format = :default)
-    case format
-    when :short
-      "#{value_date.strftime('%d.%m.%Y')}: #{credit_account.code} / #{debit_account.code} CHF #{amount_as_string} "
-    else
-      "#{value_date.strftime('%d.%m.%Y')}: #{credit_account.title} (#{credit_account.code}) an #{debit_account.title} (#{debit_account.code}) CHF #{amount_as_string}, #{title} " +
-        (comments.blank? ? "" :"(#{comments})")
-    end
-  end
-
-  # Helpers
-  def accounted_amount(account)
-    if credit_account == account
-      return amount
-    elsif debit_account == account
-      return -(amount)
-    else
-      return 0.0
-    end
-  end
-
-  def amount_as_string
-    '%0.2f' % amount
-  end
-  
-  def amount_as_string=(value)
-    self.amount = value
-  end
-  
-  # Reference
-  belongs_to :reference, :polymorphic => true
-  after_save :notify_references
-
-  private
-  def notify_references
-    reference.booking_saved(self) if reference.respond_to?(:booking_saved)
-  end
-end

data/lib/has_accounts.rb~

@@ -1,3 +0,0 @@
-require 'has_accounts/model'
-
-require 'has_accounts/railtie' if defined?(::Rails::Railtie)