keepr 0.3.2 → 0.4.0

data/lib/keepr/journal.rb

@@ -2,16 +2,16 @@ class Keepr::Journal < ActiveRecord::Base
   self.table_name = 'keepr_journals'
 
   validates_presence_of :date
-  validates_uniqueness_of :number, :allow_blank => true
+  validates_uniqueness_of :number, allow_blank: true
 
-  has_many :keepr_postings, -> { order(:amount => :desc) },
-           :class_name => 'Keepr::Posting', :foreign_key => 'keepr_journal_id', :dependent => :destroy
+  has_many :keepr_postings, -> { order(amount: :desc) },
+           class_name: 'Keepr::Posting', foreign_key: 'keepr_journal_id', dependent: :destroy
 
-  belongs_to :accountable, :polymorphic => true
+  belongs_to :accountable, polymorphic: true
 
-  accepts_nested_attributes_for :keepr_postings, :allow_destroy => true, :reject_if => :all_blank
+  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
 

data/lib/keepr/journal_export.rb

@@ -18,7 +18,7 @@ private
   def export
     export = Datev::BookingExport.new(@header_options)
 
-    @journals.includes(:keepr_postings => :keepr_account).reorder(:date, :id).each do |journal|
+    @journals.includes(keepr_postings: :keepr_account).reorder(:date, :id).each do |journal|
       to_datev(journal).each do |hash|
         export << hash
       end

data/lib/keepr/posting.rb

@@ -4,10 +4,10 @@ class Keepr::Posting < ActiveRecord::Base
   validates_presence_of :keepr_account_id, :amount
   validate :cost_center_validation
 
-  belongs_to :keepr_account, :class_name => 'Keepr::Account'
-  belongs_to :keepr_journal, :class_name => 'Keepr::Journal'
-  belongs_to :keepr_cost_center, :class_name => 'Keepr::CostCenter'
-  belongs_to :accountable, :polymorphic => true
+  belongs_to :keepr_account, class_name: 'Keepr::Account'
+  belongs_to :keepr_journal, class_name: 'Keepr::Journal'
+  belongs_to :keepr_cost_center, class_name: 'Keepr::CostCenter'
+  belongs_to :accountable, polymorphic: true
 
   SIDE_DEBIT  = 'debit'
   SIDE_CREDIT = 'credit'
@@ -22,14 +22,14 @@ class Keepr::Posting < ActiveRecord::Base
   end
 
   def side=(value)
+    raise ArgumentError unless [ SIDE_DEBIT, SIDE_CREDIT ].include?(value)
     @side = value
+    return unless amount
 
     if credit?
-      self.raw_amount = -amount if amount
+      self.raw_amount = -amount
     elsif debit?
-      self.raw_amount =  amount if amount
-    else
-      raise ArgumentError
+      self.raw_amount =  amount
     end
   end
 

data/lib/keepr/tax.rb

@@ -4,8 +4,8 @@ class Keepr::Tax < ActiveRecord::Base
   validates_presence_of :name, :value, :keepr_account_id
   validates_numericality_of :value
 
-  belongs_to :keepr_account, :class_name => 'Keepr::Account'
-  has_many :keepr_accounts, :class_name => 'Keepr::Account', :foreign_key => 'keepr_tax_id', :dependent => :restrict_with_error
+  belongs_to :keepr_account, class_name: 'Keepr::Account'
+  has_many :keepr_accounts, class_name: 'Keepr::Account', foreign_key: 'keepr_tax_id', dependent: :restrict_with_error
 
   validate do |tax|
     tax.errors.add(:keepr_account_id, :circular_reference) if tax.keepr_account.try(:keepr_tax) == tax

data/lib/keepr/version.rb

@@ -1,3 +1,3 @@
 module Keepr
-  VERSION = '0.3.2'
+  VERSION = '0.4.0'
 end

data/spec/factories/account.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :account, class: Keepr::Account do
     number 12345
     kind :asset

data/spec/factories/cost_center.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :cost_center, class: Keepr::CostCenter do
     number 'FZ1'
     name 'Kleintransporter'

data/spec/factories/group.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :group, class: Keepr::Group do
     target :asset
     name 'Foo'

data/spec/factories/tax.rb

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

data/spec/keepr/account_export_spec.rb

@@ -1,13 +1,13 @@
 require 'spec_helper'
 
 describe Keepr::AccountExport do
-  let!(:account_1000)  { FactoryGirl.create :account, :kind => :asset,     :number => 1000,  :name => 'Kasse'                     }
-  let!(:account_1776)  { FactoryGirl.create :account, :kind => :liability, :number => 1776,  :name => 'Umsatzsteuer 19 %'         }
-  let!(:account_4920)  { FactoryGirl.create :account, :kind => :expense,   :number => 4920,  :name => 'Telefon'                   }
-  let!(:account_8400)  { FactoryGirl.create :account, :kind => :revenue,   :number => 8400,  :name => 'Erlöse 19 %'               }
-  let!(:account_9000)  { FactoryGirl.create :account, :kind => :neutral,   :number => 9000,  :name => 'Saldenvorträge Sachkonten' }
-  let!(:account_10000) { FactoryGirl.create :account, :kind => :creditor,  :number => 10000, :name => 'Diverse Kreditoren'        }
-  let!(:account_70000) { FactoryGirl.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: 10000, name: 'Diverse Kreditoren'        }
+  let!(:account_70000) { FactoryBot.create :account, kind: :debtor,    number: 70000, name: 'Diverse Debitoren'         }
 
   let(:scope) { Keepr::Account.all }
 

data/spec/keepr/account_spec.rb

@@ -4,86 +4,86 @@ require 'spec_helper'
 describe Keepr::Account do
   describe :number_as_string do
     it "should return number with leading zeros for low values" do
-      account = Keepr::Account.new(:number => 999)
+      account = Keepr::Account.new(number: 999)
       expect(account.number_as_string).to eq('0999')
     end
 
     it "should return number unchanged for high values" do
-      account = Keepr::Account.new(:number => 70000)
+      account = Keepr::Account.new(number: 70000)
       expect(account.number_as_string).to eq('70000')
     end
   end
 
   describe :to_s do
     it "should format" do
-      account = Keepr::Account.new(:number => 27, :name => 'Software')
+      account = Keepr::Account.new(number: 27, name: 'Software')
       expect(account.to_s).to eq('0027 (Software)')
     end
   end
 end
 
 describe Keepr::Account do
-  let!(:account_1000) { FactoryGirl.create(:account, :number => 1000) }
-  let!(:account_1200) { FactoryGirl.create(:account, :number => 1200) }
+  let!(:account_1000) { FactoryBot.create(:account, number: 1000) }
+  let!(:account_1200) { FactoryBot.create(:account, number: 1200) }
 
   before :each do
-    Keepr::Journal.create! :date => Date.yesterday,
-                           :permanent => true,
-                           :keepr_postings_attributes => [
-                             { :keepr_account => account_1000, :amount => 20, :side => 'debit' },
-                             { :keepr_account => account_1200, :amount => 20, :side => 'credit' }
+    Keepr::Journal.create! date: Date.yesterday,
+                           permanent: true,
+                           keepr_postings_attributes: [
+                             { keepr_account: account_1000, amount: 20, side: 'debit' },
+                             { keepr_account: account_1200, amount: 20, side: 'credit' }
                             ]
 
-    Keepr::Journal.create! :date => Date.yesterday,
-                           :keepr_postings_attributes => [
-                             { :keepr_account => account_1000, :amount =>  10, :side => 'credit' },
-                             { :keepr_account => account_1200, :amount =>  10, :side => 'debit' },
+    Keepr::Journal.create! date: Date.yesterday,
+                           keepr_postings_attributes: [
+                             { keepr_account: account_1000, amount:  10, side: 'credit' },
+                             { keepr_account: account_1200, amount:  10, side: 'debit' },
                             ]
 
-    Keepr::Journal.create! :date => Date.today,
-                           :keepr_postings_attributes => [
-                             { :keepr_account => account_1000, :amount => 200, :side => 'debit' },
-                             { :keepr_account => account_1200, :amount => 200, :side => 'credit' }
+    Keepr::Journal.create! date: Date.today,
+                           keepr_postings_attributes: [
+                             { keepr_account: account_1000, amount: 200, side: 'debit' },
+                             { keepr_account: account_1200, amount: 200, side: 'credit' }
                             ]
 
-    Keepr::Journal.create! :date => Date.today,
-                           :keepr_postings_attributes => [
-                             { :keepr_account => account_1000, :amount => 100, :side => 'credit' },
-                             { :keepr_account => account_1200, :amount => 100, :side => 'debit' },
+    Keepr::Journal.create! date: Date.today,
+                           keepr_postings_attributes: [
+                             { keepr_account: account_1000, amount: 100, side: 'credit' },
+                             { keepr_account: account_1200, amount: 100, side: 'debit' },
                             ]
   end
 
   describe 'validations' do
-    let!(:result_group)    { FactoryGirl.create(:group, :target => :liability, :is_result => true) }
-    let!(:liability_group) { FactoryGirl.create(:group, :target => :liability) }
-    let!(:asset_group)     { FactoryGirl.create(:group, :target => :asset) }
+    let!(:result_group)    { FactoryBot.create(:group, target: :liability, is_result: true) }
+    let!(:liability_group) { FactoryBot.create(:group, target: :liability) }
+    let!(:asset_group)     { FactoryBot.create(:group, target: :asset) }
 
     it "should not allow assigning to result group" do
-      account = FactoryGirl.build(:account, :keepr_group => result_group)
+      account = FactoryBot.build(:account, keepr_group: result_group)
       expect(account).to_not be_valid
       expect(account.errors.added? :keepr_group_id, :no_group_allowed_for_result).to eq(true)
     end
 
     it "should not allow assigning asset account to liability group" do
-      account = FactoryGirl.build(:account, :kind => :asset, :keepr_group => liability_group)
+      account = FactoryBot.build(:account, kind: :asset, keepr_group: liability_group)
       expect(account).to_not be_valid
       expect(account.errors.added? :kind, :group_mismatch).to eq(true)
     end
 
     it "should not allow assigning liability account to asset group" do
-      account = FactoryGirl.build(:account, :kind => :liability, :keepr_group => asset_group)
+      account = FactoryBot.build(:account, kind: :liability, keepr_group: asset_group)
       expect(account).to_not be_valid
       expect(account.errors.added? :kind, :group_mismatch).to eq(true)
     end
 
-    it "should not allow assigning neutral account to asset group" do
-      account = FactoryGirl.build(:account, :kind => :neutral, :keepr_group => asset_group)
+    it "should not allow assigning forward account to asset group" do
+      account = FactoryBot.build(:account, kind: :forward, keepr_group: asset_group)
       expect(account).to_not be_valid
       expect(account.errors.added? :kind, :group_conflict).to eq(true)
     end
 
     it "should allow target match" do
-      account = FactoryGirl.build(:account, :kind => :asset, :keepr_group => asset_group)
+      account = FactoryBot.build(:account, kind: :asset, keepr_group: asset_group)
       expect(account).to be_valid
     end
   end
@@ -131,7 +131,7 @@ describe Keepr::Account do
 
     context 'with date option' do
       it 'should work with Date' do
-        account1, account2 = Keepr::Account.with_sums(:date => Date.yesterday)
+        account1, account2 = Keepr::Account.with_sums(date: Date.yesterday)
 
         expect(account1.number).to eq(1000)
         expect(account1.sum_amount).to eq(10)
@@ -140,7 +140,7 @@ describe Keepr::Account do
       end
 
       it 'should work with Range' do
-        account1, account2 = Keepr::Account.with_sums(:date => Date.today..Date.tomorrow)
+        account1, account2 = Keepr::Account.with_sums(date: Date.today..Date.tomorrow)
 
         expect(account1.number).to eq(1000)
         expect(account1.sum_amount).to eq(100)
@@ -149,14 +149,14 @@ describe Keepr::Account do
       end
 
       it 'should raise for other class' do
-        expect { Keepr::Account.with_sums(:date => Time.current) }.to raise_error(ArgumentError)
-        expect { Keepr::Account.with_sums(:date => :foo)         }.to raise_error(ArgumentError)
+        expect { Keepr::Account.with_sums(date: Time.current) }.to raise_error(ArgumentError)
+        expect { Keepr::Account.with_sums(date: :foo)         }.to raise_error(ArgumentError)
       end
     end
 
     context 'with permanent_only option' do
       it 'should filter the permanent journals' do
-        account1, account2 = Keepr::Account.with_sums(:permanent_only => true)
+        account1, account2 = Keepr::Account.with_sums(permanent_only: true)
 
         expect(account1.number).to eq(1000)
         expect(account1.sum_amount).to eq(20)
@@ -175,16 +175,16 @@ describe Keepr::Account do
 end
 
 describe Keepr::Account, 'with subaccounts' do
-  let!(:account_1400) { FactoryGirl.create(:account, :number => 1400) }
-  let!(:account_10000) { FactoryGirl.create(:account, :number => 10000, :parent => account_1400) }
-  let!(:account_10001) { FactoryGirl.create(:account, :number => 10001, :parent => account_1400) }
-  let!(:account_8400) { FactoryGirl.create(:account, :number => 8400) }
+  let!(:account_1400) { FactoryBot.create(:account, number: 1400) }
+  let!(:account_10000) { FactoryBot.create(:account, number: 10000, parent: account_1400) }
+  let!(:account_10001) { FactoryBot.create(:account, number: 10001, parent: account_1400) }
+  let!(:account_8400) { FactoryBot.create(:account, number: 8400) }
 
   before :each do
-    Keepr::Journal.create! :date => Date.yesterday,
-                           :keepr_postings_attributes => [
-                             { :keepr_account => account_10000, :amount => 20, :side => 'debit' },
-                             { :keepr_account => account_8400, :amount => 20, :side => 'credit' }
+    Keepr::Journal.create! date: Date.yesterday,
+                           keepr_postings_attributes: [
+                             { keepr_account: account_10000, amount: 20, side: 'debit' },
+                             { keepr_account: account_8400, amount: 20, side: 'credit' }
                             ]
   end
 
@@ -227,20 +227,20 @@ describe Keepr::Account, 'with subaccounts' do
 end
 
 describe Keepr::Account, 'with tax' do
-  let!(:tax_account) { Keepr::Account.create! :number => 1776,
-                                              :name => 'Umsatzsteuer 19%',
-                                              :kind => :asset }
+  let!(:tax_account) { Keepr::Account.create! number: 1776,
+                                              name: 'Umsatzsteuer 19%',
+                                              kind: :asset }
 
-  let!(:tax) { Keepr::Tax.create! :name          => 'USt19',
-                                  :description   => 'Umsatzsteuer 19%',
-                                  :value         => 19.0,
-                                  :keepr_account => tax_account }
+  let!(:tax) { Keepr::Tax.create! name: 'USt19',
+                                  description: 'Umsatzsteuer 19%',
+                                  value: 19.0,
+                                  keepr_account: tax_account }
 
   it "should link to tax" do
-    account = Keepr::Account.new :number    => 8400,
-                                 :name      => 'Erlöse 19% USt',
-                                 :kind      => :revenue,
-                                 :keepr_tax => tax
+    account = Keepr::Account.new number: 8400,
+                                 name: 'Erlöse 19% USt',
+                                 kind: :revenue,
+                                 keepr_tax: tax
     expect(account).to be_valid
   end
 

data/spec/keepr/active_record_extension_spec.rb

@@ -1,25 +1,25 @@
 require 'spec_helper'
 
 describe Keepr::ActiveRecordExtension do
-  let(:account_1000) { FactoryGirl.create(:account, :number => 1000, :kind => :asset) }
-  let(:account_1200) { FactoryGirl.create(:account, :number => 1200, :kind => :asset) }
+  let(:account_1000) { FactoryBot.create(:account, number: 1000, kind: :asset) }
+  let(:account_1200) { FactoryBot.create(:account, number: 1200, kind: :asset) }
 
   describe 'ledger with associated account' do
-    let(:ledger) { Ledger.create! :bank_name => 'Sparkasse' }
-    let!(:account) { ledger.create_keepr_account! :number => '1250', :kind => :asset, :name => 'Girokonto' }
+    let(:ledger) { Ledger.create! bank_name: 'Sparkasse' }
+    let!(:account) { ledger.create_keepr_account! number: '1250', kind: :asset, name: 'Girokonto' }
 
     it 'has keepr_account' do
       expect(ledger.keepr_account).to eq(account)
     end
 
     it 'has keepr_postings' do
-      journal = Keepr::Journal.create! :keepr_postings_attributes => [
-                               { :keepr_account => account,      :amount => 30, :side => 'debit'  },
-                               { :keepr_account => account_1200, :amount => 30, :side => 'credit' }
+      journal = Keepr::Journal.create! keepr_postings_attributes: [
+                               { keepr_account: account,      amount: 30, side: 'debit'  },
+                               { keepr_account: account_1200, amount: 30, side: 'credit' }
                              ]
-      other_journal = Keepr::Journal.create! :keepr_postings_attributes => [
-                               { :keepr_account => account_1000, :amount => 20, :side => 'debit'  },
-                               { :keepr_account => account_1200, :amount => 20, :side => 'credit' }
+      other_journal = Keepr::Journal.create! keepr_postings_attributes: [
+                               { keepr_account: account_1000, amount: 20, side: 'debit'  },
+                               { keepr_account: account_1200, amount: 20, side: 'credit' }
                              ]
 
       expect(ledger.keepr_postings.count).to eq(1)
@@ -28,22 +28,22 @@ describe Keepr::ActiveRecordExtension do
   end
 
   describe 'contact with multiple associated accounts' do
-    let(:contact) { Contact.create! :name => 'John Doe' }
-    let(:account1) { contact.keepr_accounts.create! :number => '70001', :kind => :debtor, :name => "Doe's main account" }
-    let(:account2) { contact.keepr_accounts.create! :number => '70002', :kind => :debtor, :name => "Doe's second account" }
+    let(:contact) { Contact.create! name: 'John Doe' }
+    let(:account1) { contact.keepr_accounts.create! number: '70001', kind: :debtor, name: "Doe's main account" }
+    let(:account2) { contact.keepr_accounts.create! number: '70002', kind: :debtor, name: "Doe's second account" }
 
     it 'has multiple keepr_accounts' do
       expect(contact.keepr_accounts).to eq([account1, account2])
     end
 
     it 'has keepr_postings' do
-      journal = Keepr::Journal.create! :keepr_postings_attributes => [
-                               { :keepr_account => account1,     :amount => 30, :side => 'debit'  },
-                               { :keepr_account => account_1200, :amount => 30, :side => 'credit' }
+      journal = Keepr::Journal.create! keepr_postings_attributes: [
+                               { keepr_account: account1,     amount: 30, side: 'debit'  },
+                               { keepr_account: account_1200, amount: 30, side: 'credit' }
                              ]
-      other_journal = Keepr::Journal.create! :keepr_postings_attributes => [
-                               { :keepr_account => account_1000, :amount => 20, :side => 'debit'  },
-                               { :keepr_account => account_1200, :amount => 20, :side => 'credit' }
+      other_journal = Keepr::Journal.create! keepr_postings_attributes: [
+                               { keepr_account: account_1000, amount: 20, side: 'debit'  },
+                               { keepr_account: account_1200, amount: 20, side: 'credit' }
                              ]
 
       expect(contact.keepr_postings.count).to eq(1)
@@ -53,11 +53,11 @@ describe Keepr::ActiveRecordExtension do
 
   describe 'Document with associated journal' do
     subject do
-      document = Document.create! :number => 'RE-2013-10-12345'
-      Keepr::Journal.create! :accountable => document,
-                             :keepr_postings_attributes => [
-                               { :keepr_account => account_1000, :amount => 100.99, :side => 'debit'  },
-                               { :keepr_account => account_1200, :amount => 100.99, :side => 'credit' }
+      document = Document.create! number: 'RE-2013-10-12345'
+      Keepr::Journal.create! accountable: document,
+                             keepr_postings_attributes: [
+                               { keepr_account: account_1000, amount: 100.99, side: 'debit'  },
+                               { keepr_account: account_1200, amount: 100.99, side: 'credit' }
                              ]
       document
     end
@@ -69,13 +69,13 @@ describe Keepr::ActiveRecordExtension do
   end
 
   describe 'scopes' do
-    let!(:unbooked_document) { Document.create! :number => 'Unbooked' }
+    let!(:unbooked_document) { Document.create! number: 'Unbooked' }
     let!(:booked_document) {
-      document = Document.create! :number => 'Booked'
-      Keepr::Journal.create! :accountable => document,
-                             :keepr_postings_attributes => [
-                               { :keepr_account => account_1000, :amount => 100.99, :side => 'debit'  },
-                               { :keepr_account => account_1200, :amount => 100.99, :side => 'credit' }
+      document = Document.create! number: 'Booked'
+      Keepr::Journal.create! accountable: document,
+                             keepr_postings_attributes: [
+                               { keepr_account: account_1000, amount: 100.99, side: 'debit'  },
+                               { keepr_account: account_1200, amount: 100.99, side: 'credit' }
                              ]
       document
     }