keepr 0.4.0 → 0.5.0

data/lib/keepr/active_record_extension.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Keepr::ActiveRecordExtension
   def self.included(base)
     base.extend ClassMethods
@@ -17,7 +19,7 @@ module Keepr::ActiveRecordExtension
     def has_keepr_journals
       has_many :keepr_journals, class_name: 'Keepr::Journal', as: :accountable, dependent: :restrict_with_error
 
-      class_eval <<-EOT
+      class_eval <<-CODE, __FILE__, __LINE__ + 1
         def keepr_booked?
           keepr_journals.exists?
         end
@@ -27,7 +29,7 @@ module Keepr::ActiveRecordExtension
                                     where('keepr_journals.id' => nil)
                                   }
         scope :keepr_booked,   -> { joins(:keepr_journals) }
-      EOT
+      CODE
     end
 
     def has_keepr_postings

data/lib/keepr/contact_export.rb

@@ -1,5 +1,7 @@
+# frozen_string_literal: true
+
 class Keepr::ContactExport
-  def initialize(accounts, header_options={}, &block)
+  def initialize(accounts, header_options = {}, &block)
     raise ArgumentError unless block_given?
 
     @accounts = accounts
@@ -15,22 +17,19 @@ class Keepr::ContactExport
     export.to_file(filename)
   end
 
-private
+  private
 
   def export
     export = Datev::ContactExport.new(@header_options)
 
     @accounts.reorder(:number).each do |account|
-      if account.debtor? || account.creditor?
-        export << to_datev(account)
-      end
+      export << to_datev(account) if account.debtor? || account.creditor?
     end
 
     export
   end
 
   def to_datev(account)
-    { 'Konto' => account.number
-    }.merge(@block.call(account))
+    { 'Konto' => account.number }.merge(@block.call(account))
   end
 end

data/lib/keepr/cost_center.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Keepr::CostCenter < ActiveRecord::Base
   self.table_name = 'keepr_cost_centers'
 

data/lib/keepr/group.rb

@@ -1,15 +1,17 @@
+# frozen_string_literal: true
+
 class Keepr::Group < ActiveRecord::Base
   self.table_name = 'keepr_groups'
 
   has_ancestry orphan_strategy: :restrict
 
-  enum target: [ :asset, :liability, :profit_and_loss ]
+  enum target: %i[asset liability profit_and_loss]
 
   validates_presence_of :name
 
   has_many :keepr_accounts, class_name: 'Keepr::Account', foreign_key: 'keepr_group_id', dependent: :restrict_with_error
 
-  before_validation :get_from_parent
+  before_validation :set_target_from_parent
 
   validate :check_result_and_target
 
@@ -19,30 +21,29 @@ class Keepr::Group < ActiveRecord::Base
 
   def keepr_postings
     if is_result
-      Keepr::Posting.
-        joins(:keepr_account).
-        where(keepr_accounts: { kind: [
-          Keepr::Account.kinds[:revenue],
-          Keepr::Account.kinds[:expense]
-        ]})
+      Keepr::Posting
+        .joins(:keepr_account)
+        .where(keepr_accounts: { kind: [
+                 Keepr::Account.kinds[:revenue],
+                 Keepr::Account.kinds[:expense]
+               ] })
     else
-      Keepr::Posting.
-        joins(keepr_account: :keepr_group).
-        merge(self.subtree)
+      Keepr::Posting
+        .joins(keepr_account: :keepr_group)
+        .merge(subtree)
     end
   end
 
-private
-  def get_from_parent
-    if self.parent
-      self.target = self.parent.target
-    end
+  private
+
+  def set_target_from_parent
+    self.target = parent.target if parent
   end
 
   def check_result_and_target
-    if is_result
-      # Attribute `is_result` allowed for liability target only
-      errors.add :base, :liability_needed_for_result unless liability?
-    end
+    return unless is_result
+
+    # Attribute `is_result` allowed for liability target only
+    errors.add :base, :liability_needed_for_result unless liability?
   end
 end

data/lib/keepr/groups_creator.rb

@@ -1,7 +1,8 @@
-# encoding: utf-8
+# frozen_string_literal: true
+
 class Keepr::GroupsCreator
   def initialize(target)
-    raise ArgumentError unless [ :balance, :profit_and_loss ].include?(target)
+    raise ArgumentError unless %i[balance profit_and_loss].include?(target)
 
     @target = target
   end
@@ -16,7 +17,8 @@ class Keepr::GroupsCreator
     end
   end
 
-private
+  private
+
   def load(filename, options)
     full_filename = File.join(File.dirname(__FILE__), "groups_creator/#{filename}".downcase)
     lines = File.readlines(full_filename)
@@ -31,11 +33,9 @@ private
       number, name = line.lstrip.match(/^(.*?)\s(.+)$/).to_a[1..-1]
 
       attributes = options.merge(name: name, number: number)
-      if @target == :balance && name == 'Jahresüberschuss/Jahresfehlbetrag'
-        attributes[:is_result] = true
-      end
+      attributes[:is_result] = true if @target == :balance && name == 'Jahresüberschuss/Jahresfehlbetrag'
 
-      if depth == 0
+      if depth.zero?
         parents = []
         group = Keepr::Group.create!(attributes)
       else

data/lib/keepr/journal.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Keepr::Journal < ActiveRecord::Base
   self.table_name = 'keepr_journals'
 
@@ -11,7 +13,7 @@ class Keepr::Journal < ActiveRecord::Base
 
   accepts_nested_attributes_for :keepr_postings, allow_destroy: true, reject_if: :all_blank
 
-  default_scope { order({date: :desc}, {id: :desc}) }
+  default_scope { order({ date: :desc }, id: :desc) }
 
   validate :validate_postings
 
@@ -31,7 +33,8 @@ class Keepr::Journal < ActiveRecord::Base
   before_update :check_permanent
   before_destroy :check_permanent
 
-private
+  private
+
   def existing_postings
     keepr_postings.to_a.delete_if(&:marked_for_destruction?)
   end
@@ -51,15 +54,15 @@ private
   end
 
   def check_permanent
-    if self.permanent_was
-      # If marked as permanent, no changes are allowed
-      errors.add :base, :changes_not_allowed
-
-      if ActiveRecord::VERSION::MAJOR < 5
-        false
-      else
-        throw :abort
-      end
+    return unless permanent_was
+
+    # If marked as permanent, no changes are allowed
+    errors.add :base, :changes_not_allowed
+
+    if ActiveRecord::VERSION::MAJOR < 5
+      false
+    else
+      throw :abort
     end
   end
 end

data/lib/keepr/journal_export.rb

@@ -1,5 +1,7 @@
+# frozen_string_literal: true
+
 class Keepr::JournalExport
-  def initialize(journals, header_options={}, &block)
+  def initialize(journals, header_options = {}, &block)
     @journals = journals
     @header_options = header_options
     @block = block
@@ -13,7 +15,7 @@ class Keepr::JournalExport
     export.to_file(filename)
   end
 
-private
+  private
 
   def export
     export = Datev::BookingExport.new(@header_options)
@@ -29,19 +31,20 @@ private
 
   def to_datev(journal)
     main_posting = journal.keepr_postings.find { |p| p.keepr_account.debtor? || p.keepr_account.creditor? }
-    main_posting ||= journal.keepr_postings.sort_by(&:amount).last
+    main_posting ||= journal.keepr_postings.max_by(&:amount)
 
-    journal.keepr_postings.sort_by { |p| [ p.side == main_posting.side ? 1 : 0, -p.amount ] }.map do |posting|
+    journal.keepr_postings.sort_by { |p| [p.side == main_posting.side ? 1 : 0, -p.amount] }.map do |posting|
       next if posting == main_posting
 
-      { 'Umsatz (ohne Soll/Haben-Kz)'    => posting.amount,
+      {
+        'Umsatz (ohne Soll/Haben-Kz)'    => posting.amount,
         'Soll/Haben-Kennzeichen'         => 'S',
         'Konto'                          => posting.debit?  ? posting.keepr_account.number : main_posting.keepr_account.number,
         'Gegenkonto (ohne BU-Schlüssel)' => posting.credit? ? posting.keepr_account.number : main_posting.keepr_account.number,
         'BU-Schlüssel'                   => '40', # Steuerautomatik deaktivieren
         'Belegdatum'                     => journal.date,
         'Belegfeld 1'                    => journal.number,
-        'Buchungstext'                   => journal.subject.slice(0,60),
+        'Buchungstext'                   => journal.subject.slice(0, 60),
         'Festschreibung'                 => journal.permanent
       }.merge(@block ? @block.call(posting) : {})
     end.compact

data/lib/keepr/posting.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Keepr::Posting < ActiveRecord::Base
   self.table_name = 'keepr_postings'
 
@@ -17,19 +19,20 @@ class Keepr::Posting < ActiveRecord::Base
 
   def side
     @side || begin
-      (raw_amount < 0 ? SIDE_CREDIT : SIDE_DEBIT) if raw_amount
+      (raw_amount.negative? ? SIDE_CREDIT : SIDE_DEBIT) if raw_amount
     end
   end
 
   def side=(value)
-    raise ArgumentError unless [ SIDE_DEBIT, SIDE_CREDIT ].include?(value)
+    raise ArgumentError unless [SIDE_DEBIT, SIDE_CREDIT].include?(value)
+
     @side = value
     return unless amount
 
     if credit?
-      self.raw_amount = -amount
+      self.raw_amount = -amount.to_d
     elsif debit?
-      self.raw_amount =  amount
+      self.raw_amount =  amount.to_d
     end
   end
 
@@ -54,23 +57,25 @@ class Keepr::Posting < ActiveRecord::Base
   end
 
   def amount=(value)
-    raise ArgumentError.new('Negative amount not allowed!') if value.to_f < 0
     @side ||= SIDE_DEBIT
 
-    if credit?
-      self.raw_amount = -value
-    else
-      self.raw_amount = value
+    unless value
+      self.raw_amount = nil
+      return
     end
+
+    raise ArgumentError, 'Negative amount not allowed!' if value.to_d.negative?
+
+    self.raw_amount = credit? ? -value.to_d : value.to_d
   end
 
-private
+  private
+
   def cost_center_validation
-    if keepr_cost_center
-      unless keepr_account.profit_and_loss?
-        # allowed for expense or revenue accounts only
-        errors.add :keepr_cost_center_id, :allowed_for_expense_or_revenue_only
-      end
-    end
+    return unless keepr_cost_center
+    return if keepr_account.profit_and_loss?
+
+    # allowed for expense or revenue accounts only
+    errors.add :keepr_cost_center_id, :allowed_for_expense_or_revenue_only
   end
 end

data/lib/keepr/tax.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Keepr::Tax < ActiveRecord::Base
   self.table_name = 'keepr_taxes'
 

data/lib/keepr/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Keepr
-  VERSION = '0.4.0'
+  VERSION = '0.5.0'
 end

data/spec/factories/account.rb

@@ -1,7 +1,9 @@
+# frozen_string_literal: true
+
 FactoryBot.define do
   factory :account, class: Keepr::Account do
-    number 12345
-    kind :asset
-    name 'Foo'
+    number { 12_345 }
+    kind { :asset }
+    name { 'Foo' }
   end
 end

data/spec/factories/cost_center.rb

@@ -1,6 +1,8 @@
+# frozen_string_literal: true
+
 FactoryBot.define do
   factory :cost_center, class: Keepr::CostCenter do
-    number 'FZ1'
-    name 'Kleintransporter'
+    number { 'FZ1' }
+    name { 'Kleintransporter' }
   end
 end

data/spec/factories/group.rb

@@ -1,6 +1,8 @@
+# frozen_string_literal: true
+
 FactoryBot.define do
   factory :group, class: Keepr::Group do
-    target :asset
-    name 'Foo'
+    target { :asset }
+    name { 'Foo' }
   end
 end

data/spec/factories/tax.rb

@@ -1,8 +1,10 @@
+# frozen_string_literal: true
+
 FactoryBot.define do
   factory :tax, class: Keepr::Tax do
-    name 'USt19'
-    description 'Umsatzsteuer 19%'
-    value 19.0
+    name { 'USt19' }
+    description { 'Umsatzsteuer 19%' }
+    value { 19.0 }
     keepr_account { FactoryBot.create :account, number: 1776 }
   end
 end

data/spec/keepr/account_export_spec.rb

@@ -1,26 +1,29 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Keepr::AccountExport do
-  let!(:account_1000)  { FactoryBot.create :account, kind: :asset,     number: 1000,  name: 'Kasse'                     }
-  let!(:account_1776)  { FactoryBot.create :account, kind: :liability, number: 1776,  name: 'Umsatzsteuer 19 %'         }
-  let!(:account_4920)  { FactoryBot.create :account, kind: :expense,   number: 4920,  name: 'Telefon'                   }
-  let!(:account_8400)  { FactoryBot.create :account, kind: :revenue,   number: 8400,  name: 'Erlöse 19 %'               }
-  let!(:account_9000)  { FactoryBot.create :account, kind: :forward,   number: 9000,  name: 'Saldenvorträge Sachkonten' }
-  let!(:account_10000) { FactoryBot.create :account, kind: :creditor,  number: 10000, name: 'Diverse Kreditoren'        }
-  let!(:account_70000) { FactoryBot.create :account, kind: :debtor,    number: 70000, name: 'Diverse Debitoren'         }
+  let!(:account_1000)  { FactoryBot.create :account, kind: :asset,     number:  1000,  name: 'Kasse'                     }
+  let!(:account_1776)  { FactoryBot.create :account, kind: :liability, number:  1776,  name: 'Umsatzsteuer 19 %'         }
+  let!(:account_4920)  { FactoryBot.create :account, kind: :expense,   number:  4920,  name: 'Telefon'                   }
+  let!(:account_8400)  { FactoryBot.create :account, kind: :revenue,   number:  8400,  name: 'Erlöse 19 %'               }
+  let!(:account_9000)  { FactoryBot.create :account, kind: :forward,   number:  9000,  name: 'Saldenvorträge Sachkonten' }
+  let!(:account_10000) { FactoryBot.create :account, kind: :creditor,  number: 10_000, name: 'Diverse Kreditoren'        }
+  let!(:account_70000) { FactoryBot.create :account, kind: :debtor,    number: 70_000, name: 'Diverse Debitoren'         }
 
   let(:scope) { Keepr::Account.all }
 
-  let(:export) {
-    Keepr::AccountExport.new(scope,
-      'Berater'     => 1234567,
-      'Mandant'     => 78901,
-      'WJ-Beginn'   => Date.new(2016,1,1),
+  let(:export) do
+    Keepr::AccountExport.new(
+      scope,
+      'Berater'     => 1_234_567,
+      'Mandant'     => 78_901,
+      'WJ-Beginn'   => Date.new(2016, 1, 1),
       'Bezeichnung' => 'Keepr-Konten'
-    ) do |account|
+    ) do
       { 'Sprach-ID' => 'de-DE' }
     end
-  }
+  end
 
   describe :to_s do
     subject { export.to_s }
@@ -29,17 +32,17 @@ describe Keepr::AccountExport do
       subject.lines[2..-1].map { |line| line.encode(Encoding::UTF_8) }
     end
 
-    it "should return CSV lines" do
+    it 'should return CSV lines' do
       subject.lines.each { |line| expect(line).to include(';') }
     end
 
-    it "should include header data" do
+    it 'should include header data' do
       expect(subject.lines[0]).to include('1234567;')
       expect(subject.lines[0]).to include('78901;')
       expect(subject.lines[0]).to include('"Keepr-Konten";')
     end
 
-    it "should include all accounts except debtor/creditor" do
+    it 'should include all accounts except debtor/creditor' do
       expect(account_lines.count).to eq(5)
 
       expect(account_lines[0]).to include('1000;')
@@ -58,14 +61,14 @@ describe Keepr::AccountExport do
       expect(account_lines[4]).to include('"Saldenvorträge Sachkonten";')
     end
 
-    it "should include data from block" do
+    it 'should include data from block' do
       expect(account_lines[0]).to include(';"de-DE"')
       expect(account_lines[1]).to include(';"de-DE"')
     end
   end
 
   describe :to_file do
-    it "should create CSV file" do
+    it 'should create CSV file' do
       Dir.mktmpdir do |dir|
         filename = "#{dir}/EXTF_Kontenbeschriftungen.csv"
         export.to_file(filename)