has_accounts 2.0.3 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 06d316a3fd4a7b490063349460f0140a921f6c26
-  data.tar.gz: 9bf3cca646fe8891cdec4b63cd0c5f583f13a3e5
+  metadata.gz: 403d094803675510f38b33a494676ed9f70050b5
+  data.tar.gz: 0a39e6943b89d82857bf0386c9342c97c395a355
 SHA512:
-  metadata.gz: 56e43de8b3f4a065ee84a68028876e5a1a0faea6e9ccd07dce4fc636ddfde0ee6d909db4b1988ee347c717acd85886981bdcb6cb3d863ae5ab2899ce1d22a2da
-  data.tar.gz: adbcaece3c6db8dcbf2abe90242cf2810827e340391ea7b04b2c89fdd34ebc80789a95c7043828e67958ec1f799f57f7b86bb0827ffac9dfdc0374ea6b7b8877
+  metadata.gz: 06fad61f4d896918f0bb135062f4a7f29504699e2f1d7544f6e711d25d16034bfa85bf03218b90ed2699453026e6d2ef31543ee7ba6ab18a7ee9181dd4e98589
+  data.tar.gz: f9a03bb6639014b0de59b8a98ba80ef84d1fead4b9f6f922772fecc9d1df65e894d1b14f4426882be1f9abce270e45cfe8754d2248f824baf9e6009b3cf99a91

data/README.md

@@ -9,7 +9,7 @@ Rails plugin providing financal accounting models and helpers.
 Install
 =======
 
-In Rails simply add
+In Rails simply add to your Gemfile:
 
     gem 'has_accounts'
 

data/app/models/account.rb

@@ -4,7 +4,7 @@ class Account < ActiveRecord::Base
   attr_accessible :title, :code
 
   # Scopes
-  default_scope :order => 'code'
+  default_scope order: 'code'
 
   # Dummy scope to make scoped_by happy
   scope :by_value_period, scoped
@@ -13,13 +13,13 @@ class Account < ActiveRecord::Base
   validates_presence_of :code, :title
 
   # String
-  def to_s(format = :default)
-    "%s (%s)" % [title, code]
+  def to_s(_format = :default)
+    '%s (%s)' % [title, code]
   end
 
   # Parent Account
   # ==============
-  belongs_to :parent, :class_name => Account
+  belongs_to :parent, class_name: Account
   attr_accessible :parent, :parent_id
 
   # Account Type
@@ -29,7 +29,7 @@ class Account < ActiveRecord::Base
   validates_presence_of :account_type
 
   def asset_account?
-    Account.by_type(['current_assets', 'capital_assets', 'costs']).exists?(self)
+    Account.by_type(%w(current_assets capital_assets costs)).exists?(self)
   end
 
   def liability_account?
@@ -37,14 +37,14 @@ class Account < ActiveRecord::Base
   end
 
   def balance_account?
-    Account.by_type(['current_assets', 'capital_assets', 'outside_capital', 'equity_capital']).exists?(self)
+    Account.by_type(%w(current_assets capital_assets outside_capital equity_capital)).exists?(self)
   end
 
   def profit_account?
     !balance_account?
   end
 
-  scope :by_type, lambda {|value| includes(:account_type).where('account_types.name' => value)} do
+  scope :by_type, lambda { |value| includes(:account_type).where('account_types.name' => value) } do
     include AccountScopeExtension
   end
 
@@ -65,12 +65,12 @@ class Account < ActiveRecord::Base
 
   # Holder
   # ======
-  belongs_to :holder, :polymorphic => true
+  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"
+  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)
@@ -78,51 +78,51 @@ class Account < ActiveRecord::Base
 
   # Balances grouped by references which have not 0
   def unbalanced_references
-    bookings.unbalanced_by_grouped_reference(self.id)
+    bookings.unbalanced_by_grouped_reference(id)
   end
 
   # Helpers
   # =======
   def self.overview(value_range = Date.today, format = :default)
-    Account.all.map{|a| a.to_s(value_range, format)}
+    Account.all.map { |a| a.to_s(value_range, format) }
   end
 
   # Calculations
   def turnover(selector = Date.today, inclusive = true)
-    equality = "=" if inclusive
+    equality = '=' if inclusive
 
-    if selector.respond_to?(:first) and selector.respond_to?(:last)
+    if selector.respond_to?(:first) && selector.respond_to?(:last)
       if selector.first.is_a? Booking
         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
+            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
+            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
         if selector.first == selector.last
-          condition = ["date(value_date) = :value_date", {
-            :value_date => selector.first
+          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
+          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
         # 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}]
+        condition = ["(value_date < :value_date) OR (date(value_date) = :value_date AND id <#{equality} :id)", { value_date: selector.value_date, id: selector.id }]
       else
         condition = ["date(value_date) <#{equality} ?", selector]
       end
@@ -139,6 +139,6 @@ class Account < ActiveRecord::Base
 
     amount = debit_amount - credit_amount
 
-    return asset_account? ? amount : -amount
+    asset_account? ? amount : -amount
   end
 end

data/app/models/account_scope_extension.rb

@@ -6,6 +6,6 @@ module AccountScopeExtension
       new_saldo += account.saldo(selector, inclusive)
     end
 
-    return new_saldo
+    new_saldo
   end
 end

data/app/models/booking.rb

@@ -4,21 +4,22 @@ class Booking < ActiveRecord::Base
 
   # Validation
   validates_presence_of :debit_account, :credit_account, :title, :value_date
-  validates :amount, :presence => true, :numericality => true
+  validates :amount, presence: true, numericality: true
   validates_time :value_date
 
   # Template
-  belongs_to :template, :polymorphic => true
+  belongs_to :template, polymorphic: true
 
   # Account
-  belongs_to :debit_account, :foreign_key => 'debit_account_id', :class_name => "Account"
+  belongs_to :debit_account, foreign_key: 'debit_account_id', class_name: 'Account'
   attr_accessible :debit_account, :debit_account_id
-  belongs_to :credit_account, :foreign_key => 'credit_account_id', :class_name => "Account"
+  belongs_to :credit_account, foreign_key: 'credit_account_id', class_name: 'Account'
   attr_accessible :credit_account, :credit_account_id
 
   def debit_account_code
     debit_account.code
   end
+
   def debit_account_code=(value)
     debit_account = Account.find_by_code(value)
   end
@@ -26,6 +27,7 @@ class Booking < ActiveRecord::Base
   def credit_account_code
     credit_account.code
   end
+
   def credit_account_code=(value)
     credit_account = Account.find_by_code(value)
   end
@@ -64,12 +66,12 @@ class Booking < ActiveRecord::Base
   # Scoping
   default_scope order('value_date, id')
 
-  scope :by_value_date, lambda {|value_date| where("date(value_date) = ?", value_date) }
+  scope :by_value_date, lambda { |value_date| where('date(value_date) = ?', value_date) }
   scope :by_value_period, lambda {|from, to|
     if from.present?
-      where("date(value_date) BETWEEN :from AND :to", :from => from, :to => to)
+      where('date(value_date) BETWEEN :from AND :to', from: from, to: to)
     else
-      where("date(value_date) <= :to", :to => to)
+      where('date(value_date) <= :to', to: to)
     end
   }
 
@@ -77,18 +79,18 @@ class Booking < ActiveRecord::Base
   #
   # @param account_id [Integer]
   scope :by_account, lambda {|account_id|
-    where("debit_account_id = :account_id OR credit_account_id = :account_id", :account_id => account_id)
+    where('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}
+      find(:all, group: :title).map(&: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}
+      find(:all, select: 'title, count(*) AS count, sum(amount) AS sum, avg(amount) AS avg', group: :title).map(&:attributes)
     end
   end
 
@@ -96,7 +98,7 @@ class Booking < ActiveRecord::Base
   #
   # @returns all involved credit and debit accounts
   def self.accounts
-    Account.where(:id => pluck(:debit_account_id).uniq + pluck(:credit_account_id).uniq)
+    Account.where(id: pluck(:debit_account_id).uniq + pluck(:credit_account_id).uniq)
   end
 
   # Accounts with balances
@@ -112,17 +114,17 @@ class Booking < ActiveRecord::Base
 
   # Accounted bookings
   # ==================
-  SELECT_ACCOUNTED_AMOUNT=
-    'CASE WHEN credit_account_id = debit_account_id THEN 0.0 WHEN credit_account_id = %{account_id} THEN -bookings.amount WHEN debit_account_id = %{account_id} THEN bookings.amount ELSE 0 END'
+  SELECT_ACCOUNTED_AMOUNT =     'CASE WHEN credit_account_id = debit_account_id THEN 0.0 WHEN credit_account_id = %{account_id} THEN -bookings.amount WHEN debit_account_id = %{account_id} THEN bookings.amount ELSE 0 END'
 
   private
+
   def self.get_account_id(account_or_id)
     if account_or_id.is_a? Account
       return account_or_id.id
     elsif Account.exists?(account_or_id)
       return account_or_id
     else
-      raise "argument needs to be a record of type Account or an id for an existing Account record."
+      fail 'argument needs to be a record of type Account or an id for an existing Account record.'
     end
   end
 
@@ -132,14 +134,14 @@ class Booking < ActiveRecord::Base
   #
   # @param account_or_id Account id or object
   scope :accounted_by, lambda {|account_or_id|
-    select("bookings.*, #{SELECT_ACCOUNTED_AMOUNT % {:account_id => get_account_id(account_or_id)}} AS amount")
+    select("bookings.*, #{SELECT_ACCOUNTED_AMOUNT % { account_id: get_account_id(account_or_id) }} AS amount")
   }
 
   # Balance of bookings for the specified account
   #
   # @param account_or_id Account id or object
   def self.balance_by(account_or_id)
-    BigDecimal.new(sum(SELECT_ACCOUNTED_AMOUNT % {:account_id => get_account_id(account_or_id)}), 2)
+    BigDecimal.new(sum(SELECT_ACCOUNTED_AMOUNT % { account_id: get_account_id(account_or_id) }), 2)
   end
 
   # Balance of bookings for the specified account with 0 balance, grouped by reference
@@ -147,24 +149,24 @@ class Booking < ActiveRecord::Base
   # @param account_or_id Account id or object
   def self.unbalanced_by_grouped_reference(account_or_id)
     # Do a manual sum using select() to be able to give it an alias we can use in having()
-    balance_select = "sum(#{SELECT_ACCOUNTED_AMOUNT % {:account_id => get_account_id(account_or_id)}})"
+    balance_select = "sum(#{SELECT_ACCOUNTED_AMOUNT % { account_id: get_account_id(account_or_id) }})"
     summs = group(:reference_type, :reference_id).having("#{balance_select} != 0.0").select("reference_type, reference_id, #{balance_select} AS balance").reorder(nil)
 
     # Simulate Rails grouped summing result format
-    grouped = Hash[summs.map{ |group| [[group[:reference_type], group[:reference_id]], group[:balance]] }]
+    grouped = Hash[summs.map { |group| [[group[:reference_type], group[:reference_id]], group[:balance]] }]
 
     # Convert value to BigDecimal
-    Hash[grouped.map{|reference, value| [reference, BigDecimal.new(value, 2)] }]
+    Hash[grouped.map { |reference, value| [reference, BigDecimal.new(value, 2)] }]
   end
 
   # Balance of bookings for the specified account, grouped by reference
   #
   # @param account_or_id Account id or object
   def self.balance_by_grouped_reference(account_or_id)
-    grouped = group(:reference_type, :reference_id).sum(SELECT_ACCOUNTED_AMOUNT % {:account_id => get_account_id(account_or_id)})
+    grouped = group(:reference_type, :reference_id).sum(SELECT_ACCOUNTED_AMOUNT % { account_id: get_account_id(account_or_id) })
 
     # Convert value to BigDecimal
-    Hash[grouped.map{|reference, value| [reference, BigDecimal.new(value, 2)] }]
+    Hash[grouped.map { |reference, value| [reference, BigDecimal.new(value, 2)] }]
   end
 
   scope :by_text, lambda {|value|
@@ -181,13 +183,13 @@ class Booking < ActiveRecord::Base
     rescue ArgumentError
     end
 
-    where("title LIKE :text OR comments LIKE :text OR amount = :amount OR value_date = :value_date", :text => text, :amount => amount, :value_date => date)
+    where('title ILIKE :text OR comments ILIKE :text OR amount = :amount OR value_date = :value_date', text: text, amount: amount, value_date: date)
   }
 
   # Returns array of all years we have bookings for
   def self.fiscal_years
     with_exclusive_scope do
-      select("DISTINCT year(value_date) AS year").all.map{|booking| booking.year}
+      select('DISTINCT year(value_date) AS year').all.map(&:year)
     end
   end
 
@@ -195,20 +197,20 @@ class Booking < ActiveRecord::Base
   def to_s(format = :default)
     case format
     when :long
-      "%s: %s an %s CHF %s, %s (%s)" % [
+      '%s: %s an %s CHF %s, %s (%s)' % [
         value_date ? value_date : '?',
         debit_account ? "#{debit_account.title} (#{debit_account.code})" : '?',
         credit_account ? "#{credit_account.title} (#{credit_account.code})" : '?',
-        amount ? "%0.2f" % amount : '?',
+        amount ? '%0.2f' % amount : '?',
         title.present? ? title : '?',
         comments.present? ? comments : '?'
       ]
     else
-      "%s: %s / %s CHF %s" % [
+      '%s: %s / %s CHF %s' % [
         value_date ? value_date : '?',
         debit_account ? debit_account.code : '?',
         credit_account ? credit_account.code : '?',
-        amount ? "%0.2f" % amount : '?',
+        amount ? '%0.2f' % amount : '?'
       ]
     end
   end
@@ -240,31 +242,31 @@ class Booking < ActiveRecord::Base
 
   def rounded_amount
     if amount.nil?
-    	return 0
+      return 0
     else
-    	return (amount * 20).round / 20.0
+      return (amount * 20).round / 20.0
     end
   end
 
   # Helpers
   def split(amount, params = {})
     # Clone
-    new_booking = self.clone
+    new_booking = clone
 
     # Set amount
     new_booking[:amount] = amount
     self.amount -= amount
 
     # Update attributes
-    params.each{|key, value|
+    params.each do|key, value|
       new_booking[key] = value
-    }
+    end
 
     [self, new_booking]
   end
 
   # Reference
-  belongs_to :reference, :polymorphic => true, :touch => true, :inverse_of => :bookings
+  belongs_to :reference, polymorphic: true, touch: true, inverse_of: :bookings
   attr_accessible :reference_id, :reference_type, :reference
 
   after_save :touch_previous_reference
@@ -290,7 +292,7 @@ class Booking < ActiveRecord::Base
   end
 
   scope :by_reference, lambda {|value|
-    where(:reference_id => value.id, :reference_type => value.class.base_class)
+    where(reference_id: value.id, reference_type: value.class.base_class)
   } do
     # TODO duplicated in Invoice
     def direct_balance(direct_account)
@@ -305,8 +307,9 @@ class Booking < ActiveRecord::Base
   end
 
   private
+
   def notify_references
-    return unless reference and reference.respond_to?(:booking_saved)
+    return unless reference && reference.respond_to?(:booking_saved)
     reference.booking_saved(self)
   end
 end

data/app/models/booking_template.rb

@@ -3,34 +3,34 @@ class BookingTemplate < ActiveRecord::Base
   attr_accessible :title, :code, :amount, :amount_relates_to, :comments, :charge_rate_code
 
   # Associations
-  belongs_to :debit_account, :foreign_key => 'debit_account_id', :class_name => "Account"
+  belongs_to :debit_account, foreign_key: 'debit_account_id', class_name: 'Account'
   attr_accessible :debit_account_id, :debit_account
-  belongs_to :credit_account, :foreign_key => 'credit_account_id', :class_name => "Account"
+  belongs_to :credit_account, foreign_key: 'credit_account_id', class_name: 'Account'
   attr_accessible :credit_account_id, :credit_account
 
-  has_many :bookings, :through => :line_items
+  has_many :bookings, through: :line_items
 
   # Default ordering
   default_scope order(:code)
 
   # Scopes
-  scope :by_type, lambda{|value| where("code LIKE ?", value + ':%')}
+  scope :by_type, lambda { |value| where('code LIKE ?', value + ':%') }
 
   # Standard methods
   include ApplicationHelper
   def to_s(format = :default)
     case format
     when :short
-      "%s / %s %s" % [
+      '%s / %s %s' % [
         debit_account ? debit_account.to_s(:short) : '?',
         credit_account ? credit_account.to_s(:short) : '?',
-        amount ? "%0.2f" % amount.to_f : '?',
+        amount ? '%0.2f' % amount.to_f : '?'
       ]
     when :long
-      "%s an %s %s, %s (%s)" % [
+      '%s an %s %s, %s (%s)' % [
         debit_account ? debit_account.to_s : '?',
         credit_account ? credit_account.to_s : '?',
-        amount ? "%0.2f" % amount.to_f : '?',
+        amount ? '%0.2f' % amount.to_f : '?',
         title.present? ? title : '?',
         comments.present? ? comments : '?'
       ]
@@ -41,7 +41,7 @@ class BookingTemplate < ActiveRecord::Base
 
   def amount_to_s
     if amount_relates_to.present?
-      return "%.2f%%" % (amount.to_f * 100)
+      return '%.2f%%' % (amount.to_f * 100)
     else
       return currency_fmt(amount)
     end
@@ -60,17 +60,17 @@ class BookingTemplate < ActiveRecord::Base
     params = HashWithIndifferentAccess.new(params)
 
     # Prepare parameters set by template
-    booking_params = attributes.reject{|key, value| !["title", "comments", "credit_account_id", "debit_account_id"].include?(key)}
+    booking_params = attributes.reject { |key, _value| !%w(title comments credit_account_id debit_account_id).include?(key) }
 
     # Calculate amount
-    booking_amount = BigDecimal.new(self.amount.to_s || '0')
+    booking_amount = BigDecimal.new(amount.to_s || '0')
 
     # Lookup reference
     reference = params['reference']
     unless reference
       ref_type = params['reference_type']
       ref_id = params['reference_id']
-      if ref_type.present? and ref_id.present?
+      if ref_type.present? && ref_id.present?
         reference = ref_type.constantize.find(ref_id)
       end
     end
@@ -79,15 +79,15 @@ class BookingTemplate < ActiveRecord::Base
 
     if reference
       # Calculate amount
-      booking_amount = amount(reference.value_date, :person_id => person_id) if person_id
+      booking_amount = amount(reference.value_date, person_id: person_id) if person_id
 
-      case self.amount_relates_to
+      case amount_relates_to
         when 'reference_amount'
           booking_amount *= reference.amount unless reference.amount.nil?
         when 'reference_balance'
           booking_amount *= reference.balance unless reference.balance.nil?
         when 'reference_amount_minus_balance'
-          booking_amount *= reference.amount - reference.balance unless (reference.amount.nil? or reference.balance.nil?)
+          booking_amount *= reference.amount - reference.balance unless reference.amount.nil? || reference.balance.nil?
       end
     end
 
@@ -117,7 +117,7 @@ class BookingTemplate < ActiveRecord::Base
   # @return [Booking] unsaved Booking
   def self.build_booking(code, params = {})
     template = find_by_code(code)
-    raise "BookingTemplate not found for '#{code}'" unless template
+    fail "BookingTemplate not found for '#{code}'" unless template
 
     template.build_booking params
   end
@@ -130,36 +130,36 @@ class BookingTemplate < ActiveRecord::Base
   has_many :line_items
 
   def build_line_item
-    if self.amount.match(/%/) or self.amount_relates_to.blank?
+    if amount.match(/%/) || amount_relates_to.blank?
       line_item_class = LineItem
     else
       line_item_class = SaldoLineItem
     end
 
     line_item = line_item_class.new(
-      :booking_template      => self,
-      :title                 => self.title,
-      :code                  => self.code,
-      :credit_account        => self.credit_account,
-      :debit_account         => self.debit_account,
-      :position              => self.position,
-      :include_in_saldo_list => self.include_in_saldo_list,
-      :reference_code        => self.amount_relates_to
+      booking_template: self,
+      title: title,
+      code: code,
+      credit_account: credit_account,
+      debit_account: debit_account,
+      position: position,
+      include_in_saldo_list: include_in_saldo_list,
+      reference_code: amount_relates_to
     )
 
-    if self.amount.match(/%/)
+    if amount.match(/%/)
       line_item.quantity = '%'
-      line_item.times    = self.amount.delete('%')
+      line_item.times    = amount.delete('%')
       # TODO: hack
       line_item.price    = line_item.price
-    elsif self.amount_relates_to.present?
+    elsif amount_relates_to.present?
       line_item.quantity = 'saldo_of'
       # TODO: hack
       line_item.price    = line_item.price
     else
       line_item.quantity = 'x'
       line_item.times    = 1
-      line_item.price    = self.amount
+      line_item.price    = amount
     end
 
     line_item
@@ -170,10 +170,10 @@ class BookingTemplate < ActiveRecord::Base
   attr_accessible :matcher
 
   def self.import(struct)
-    templates = self.all.inject([]) do |found, template|
-      puts "matcher: " + template.matcher
+    templates = all.inject([]) do |found, template|
+      puts 'matcher: ' + template.matcher
       puts 'text: ' + struct.text
-      found << template if not Regexp.new(template.matcher).match(struct.text).eql?nil
+      found << template unless Regexp.new(template.matcher).match(struct.text).eql? nil
     end
     puts templates.inspect
   end

data/db/migrate/20111108000000_create_has_accounts_tables.rb

@@ -1,68 +1,68 @@
 class CreateHasAccountsTables < ActiveRecord::Migration
   def self.up
-    create_table "account_types" do |t|
-      t.string   "name",       :limit => 100
-      t.string   "title",      :limit => 100
-      t.datetime "created_at"
-      t.datetime "updated_at"
+    create_table 'account_types' do |t|
+      t.string 'name',       limit: 100
+      t.string 'title',      limit: 100
+      t.datetime 'created_at'
+      t.datetime 'updated_at'
     end
 
-    add_index "account_types", "name"
+    add_index 'account_types', 'name'
 
-    create_table "accounts" do |t|
-      t.string   "title",           :limit => 100
-      t.integer  "parent_id"
-      t.integer  "account_type_id"
-      t.integer  "number"
-      t.string   "code"
-      t.string   "type"
-      t.integer  "holder_id"
-      t.string   "holder_type"
-      t.integer  "bank_id"
-      t.integer  "esr_id"
-      t.string   "pc_id"
-      t.datetime "created_at"
-      t.datetime "updated_at"
-      t.string   "iban"
+    create_table 'accounts' do |t|
+      t.string 'title',           limit: 100
+      t.integer 'parent_id'
+      t.integer 'account_type_id'
+      t.integer 'number'
+      t.string 'code'
+      t.string 'type'
+      t.integer 'holder_id'
+      t.string 'holder_type'
+      t.integer 'bank_id'
+      t.integer 'esr_id'
+      t.string 'pc_id'
+      t.datetime 'created_at'
+      t.datetime 'updated_at'
+      t.string 'iban'
     end
 
-    add_index "accounts", ["account_type_id"], :name => "index_accounts_on_account_type_id"
-    add_index "accounts", ["bank_id"], :name => "index_accounts_on_bank_id"
-    add_index "accounts", ["code"], :name => "index_accounts_on_code"
-    add_index "accounts", ["holder_id", "holder_type"], :name => "index_accounts_on_holder_id_and_holder_type"
-    add_index "accounts", ["type"], :name => "index_accounts_on_type"
+    add_index 'accounts', ['account_type_id'], name: 'index_accounts_on_account_type_id'
+    add_index 'accounts', ['bank_id'], name: 'index_accounts_on_bank_id'
+    add_index 'accounts', ['code'], name: 'index_accounts_on_code'
+    add_index 'accounts', %w(holder_id holder_type), name: 'index_accounts_on_holder_id_and_holder_type'
+    add_index 'accounts', ['type'], name: 'index_accounts_on_type'
 
-    create_table "banks" do |t|
-      t.integer  "vcard_id"
-      t.string   "swift"
-      t.string   "clearing"
-      t.datetime "created_at"
-      t.datetime "updated_at"
+    create_table 'banks' do |t|
+      t.integer 'vcard_id'
+      t.string 'swift'
+      t.string 'clearing'
+      t.datetime 'created_at'
+      t.datetime 'updated_at'
     end
 
-    add_index "banks", :vcard_id
+    add_index 'banks', :vcard_id
 
-    create_table "bookings" do |t|
-      t.string   "title",             :limit => 100
-      t.decimal  "amount"
-      t.integer  "credit_account_id"
-      t.integer  "debit_account_id"
-      t.date     "value_date"
-      t.text     "comments",          :limit => 1000
-      t.string   "scan"
-      t.string   "debit_currency",                    :default => "CHF"
-      t.string   "credit_currency",                   :default => "CHF"
-      t.float    "exchange_rate",                     :default => 1.0
-      t.datetime "created_at"
-      t.datetime "updated_at"
-      t.integer  "reference_id"
-      t.string   "reference_type"
+    create_table 'bookings' do |t|
+      t.string 'title',             limit: 100
+      t.decimal 'amount'
+      t.integer 'credit_account_id'
+      t.integer 'debit_account_id'
+      t.date 'value_date'
+      t.text 'comments',          limit: 1000
+      t.string 'scan'
+      t.string 'debit_currency',                    default: 'CHF'
+      t.string 'credit_currency',                   default: 'CHF'
+      t.float 'exchange_rate',                     default: 1.0
+      t.datetime 'created_at'
+      t.datetime 'updated_at'
+      t.integer 'reference_id'
+      t.string 'reference_type'
     end
 
-    add_index "bookings", ["credit_account_id"], :name => "index_bookings_on_credit_account_id"
-    add_index "bookings", ["debit_account_id"], :name => "index_bookings_on_debit_account_id"
-    add_index "bookings", ["reference_id", "reference_type"], :name => "index_bookings_on_reference_id_and_reference_type"
-    add_index "bookings", ["value_date"], :name => "index_bookings_on_value_date"
+    add_index 'bookings', ['credit_account_id'], name: 'index_bookings_on_credit_account_id'
+    add_index 'bookings', ['debit_account_id'], name: 'index_bookings_on_debit_account_id'
+    add_index 'bookings', %w(reference_id reference_type), name: 'index_bookings_on_reference_id_and_reference_type'
+    add_index 'bookings', ['value_date'], name: 'index_bookings_on_value_date'
   end
 
   def self.down

data/db/migrate/20130707121400_create_booking_templates.rb

@@ -1,20 +1,20 @@
 class CreateBookingTemplates < ActiveRecord::Migration
   def change
     create_table :booking_templates do |t|
-      t.string   "title"
-      t.string   "amount"
-      t.integer  "credit_account_id"
-      t.integer  "debit_account_id"
-      t.text     "comments"
-      t.datetime "created_at",              :null => false
-      t.datetime "updated_at",              :null => false
-      t.string   "code"
-      t.string   "matcher"
-      t.string   "amount_relates_to"
-      t.string   "type"
-      t.string   "charge_rate_code"
-      t.string   "salary_declaration_code"
-      t.integer  "position"
+      t.string 'title'
+      t.string 'amount'
+      t.integer 'credit_account_id'
+      t.integer 'debit_account_id'
+      t.text 'comments'
+      t.datetime 'created_at',              null: false
+      t.datetime 'updated_at',              null: false
+      t.string 'code'
+      t.string 'matcher'
+      t.string 'amount_relates_to'
+      t.string 'type'
+      t.string 'charge_rate_code'
+      t.string 'salary_declaration_code'
+      t.integer 'position'
 
       t.timestamps
     end

data/db/migrate/20131021123821_change_bookings_amount_to_use_decimal_scope.rb

@@ -1,5 +1,5 @@
 class ChangeBookingsAmountToUseDecimalScope < ActiveRecord::Migration
   def up
-    change_column :bookings, :amount, :decimal, :precision => 10, :scale => 2
+    change_column :bookings, :amount, :decimal, precision: 10, scale: 2
   end
 end

data/lib/has_accounts/class_methods.rb

@@ -1,6 +1,6 @@
 module HasAccounts
   module ClassMethods
-    def has_accounts(options = {})
+    def has_accounts(_options = {})
       class_eval <<-end_eval
         has_many :accounts, :as => 'holder'
         has_one :account, :as => 'holder'

data/lib/has_accounts/core_ext/rounding.rb

@@ -15,14 +15,14 @@ module HasAccounts #:nodoc:
         end
       end
     end
-    
+
     module BigDecimal
       module Rounding
         def currency_round
           if self.nil?
-            return BigDecimal.new("0")
+            return BigDecimal.new('0')
           else
-            return (self * 20).round / BigDecimal("20")
+            return (self * 20).round / BigDecimal('20')
           end
         end
       end

data/lib/has_accounts/model.rb

@@ -1,23 +1,23 @@
 module HasAccounts
   module Model
     extend ActiveSupport::Concern
-    
+
     included do
       class_attribute :direct_account
 
-      has_many :bookings, :as => :reference, :dependent => :nullify, :inverse_of => :reference do
+      has_many :bookings, as: :reference, dependent: :nullify, inverse_of: :reference do
         # TODO: duplicated in Booking (without parameter)
         def direct_balance(value_date = nil, direct_account = nil)
           return BigDecimal.new('0') unless proxy_association.owner.direct_account
-          
+
           direct_account ||= proxy_association.owner.direct_account
           balance = BigDecimal.new('0')
 
           # Scope by value_date
-          if value_date.is_a? Range or value_date.is_a? Array
-            direct_bookings = where("date(value_date) BETWEEN :from AND :to", :from => value_date.first, :to => value_date.last)
+          if value_date.is_a?(Range) || value_date.is_a?(Array)
+            direct_bookings = where('date(value_date) BETWEEN :from AND :to', from: value_date.first, to: value_date.last)
           elsif value_date
-            direct_bookings = where("date(value_date) <= ?", value_date) if value_date
+            direct_bookings = where('date(value_date) <= ?', value_date) if value_date
           else
             direct_bookings = scoped
           end
@@ -43,7 +43,7 @@ module HasAccounts
       booking_template = BookingTemplate.find_by_code(template_code)
 
       # Prepare booking parameters
-      booking_params = {:reference => self}
+      booking_params = { reference: self }
       booking_params.merge!(params)
 
       # Build and assign booking

data/lib/has_accounts/railtie.rb

@@ -8,6 +8,6 @@ require 'validates_timeliness'
 
 module HasAccounts
   class Railtie < Rails::Engine
-    engine_name "has_accounts"
+    engine_name 'has_accounts'
   end
 end

data/lib/has_accounts/version.rb

@@ -1,3 +1,3 @@
 module HasAccounts
-  VERSION = "2.0.3"
+  VERSION = '2.1.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: has_accounts
 version: !ruby/object:Gem::Version
-  version: 2.0.3
+  version: 2.1.0
 platform: ruby
 authors:
 - Simon Hürlimann (CyT)
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-16 00:00:00.000000000 Z
+date: 2015-02-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -38,7 +38,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: HasAccounts is a full featured Rails 3 gem providing models for financial
+description: HasAccounts is a full featured Rails gem providing models for financial
   accounting.
 email:
 - simon.huerlimann@cyt.ch
@@ -89,9 +89,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: HasAccounts provides models for financial accounting.
 test_files: []
-has_rdoc: