keepr 0.3.0 → 0.6.0

data/spec/keepr/journal_spec.rb

@@ -1,27 +1,29 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Keepr::Journal do
-  let!(:account_1000) { FactoryGirl.create(:account, :number => 1000, :kind => :asset) }
-  let!(:account_1200) { FactoryGirl.create(:account, :number => 1200, :kind => :asset) }
-  let!(:account_1210) { FactoryGirl.create(:account, :number => 1210, :kind => :asset) }
-  let!(:account_4910) { FactoryGirl.create(:account, :number => 4910, :kind => :expense) }
-  let!(:account_4920) { FactoryGirl.create(:account, :number => 4920, :kind => :expense) }
-  let!(:account_1576) { FactoryGirl.create(:account, :number => 1576, :kind => :asset) }
-  let!(:account_1600) { FactoryGirl.create(:account, :number => 1600, :kind => :liability) }
+  let!(:account_1000) { FactoryBot.create(:account, number: 1000, kind: :asset) }
+  let!(:account_1200) { FactoryBot.create(:account, number: 1200, kind: :asset) }
+  let!(:account_1210) { FactoryBot.create(:account, number: 1210, kind: :asset) }
+  let!(:account_4910) { FactoryBot.create(:account, number: 4910, kind: :expense) }
+  let!(:account_4920) { FactoryBot.create(:account, number: 4920, kind: :expense) }
+  let!(:account_1576) { FactoryBot.create(:account, number: 1576, kind: :asset) }
+  let!(:account_1600) { FactoryBot.create(:account, number: 1600, kind: :liability) }
 
   let :simple_journal do
-    Keepr::Journal.create :keepr_postings_attributes => [
-                                { :keepr_account => account_1000, :amount => 100.99, :side => 'debit' },
-                                { :keepr_account => account_1200, :amount => 100.99, :side => 'credit' }
-                              ]
+    Keepr::Journal.create keepr_postings_attributes: [
+      { keepr_account: account_1000, amount: 100.99, side: 'debit' },
+      { keepr_account: account_1200, amount: 100.99, side: 'credit' }
+    ]
   end
 
   let :complex_journal do
-    Keepr::Journal.create :keepr_postings_attributes => [
-                                { :keepr_account => account_4920, :amount =>  8.40, :side => 'debit' },
-                                { :keepr_account => account_1576, :amount =>  1.60, :side => 'debit' },
-                                { :keepr_account => account_1600, :amount => 10.00, :side => 'credit' }
-                               ]
+    Keepr::Journal.create keepr_postings_attributes: [
+      { keepr_account: account_4920, amount: 8.40, side: 'debit' },
+      { keepr_account: account_1576, amount: 1.60, side: 'debit' },
+      { keepr_account: account_1600, amount: 10.00, side: 'credit' }
+    ]
   end
 
   describe :initialization do
@@ -33,8 +35,8 @@ describe Keepr::Journal do
 
     context 'with date given' do
       it 'should not modify the date' do
-        old_date = Date.new(2013,10,1)
-        expect(Keepr::Journal.new(:date => old_date).date).to eq(old_date)
+        old_date = Date.new(2013, 10, 1)
+        expect(Keepr::Journal.new(date: old_date).date).to eq(old_date)
       end
     end
   end
@@ -47,60 +49,60 @@ describe Keepr::Journal do
 
     it 'should accept journal with postings marked for destruction' do
       complex_journal.keepr_postings.first.mark_for_destruction
-      complex_journal.keepr_postings.build :keepr_account => account_4910, :amount => 8.4, :side => 'debit'
+      complex_journal.keepr_postings.build keepr_account: account_4910, amount: 8.4, side: 'debit'
 
       expect(complex_journal).to be_valid
     end
 
     it 'should fail for journal with only one posting' do
-      journal = Keepr::Journal.create :keepr_postings_attributes => [
-                                  { :keepr_account => account_4920, :amount => 8.40, :side => 'debit' }
-                                ]
+      journal = Keepr::Journal.create keepr_postings_attributes: [
+        { keepr_account: account_4920, amount: 8.40, side: 'debit' }
+      ]
       expect(journal).not_to be_valid
-      expect(journal.errors.added? :base, :account_missing).to eq(true)
+      expect(journal.errors.added?(:base, :account_missing)).to eq(true)
     end
 
     it 'should fail for booking the same account twice' do
-      journal = Keepr::Journal.create :keepr_postings_attributes => [
-                                  { :keepr_account => account_1000, :amount => 10, :side => 'debit' },
-                                  { :keepr_account => account_1000, :amount => 10, :side => 'credit' }
-                                ]
+      journal = Keepr::Journal.create keepr_postings_attributes: [
+        { keepr_account: account_1000, amount: 10, side: 'debit' },
+        { keepr_account: account_1000, amount: 10, side: 'credit' }
+      ]
       expect(journal).not_to be_valid
-      expect(journal.errors.added? :base, :account_missing).to eq(true)
+      expect(journal.errors.added?(:base, :account_missing)).to eq(true)
     end
 
     it 'should fail for unbalanced journal' do
-      journal = Keepr::Journal.create :keepr_postings_attributes => [
-                                  { :keepr_account => account_1000, :amount => 10, :side => 'debit' },
-                                  { :keepr_account => account_1200, :amount => 10, :side => 'debit' }
-                                ]
+      journal = Keepr::Journal.create keepr_postings_attributes: [
+        { keepr_account: account_1000, amount: 10, side: 'debit' },
+        { keepr_account: account_1200, amount: 10, side: 'debit' }
+      ]
       expect(journal).not_to be_valid
-      expect(journal.errors.added? :base, :amount_mismatch).to eq(true)
+      expect(journal.errors.added?(:base, :amount_mismatch)).to eq(true)
     end
 
     it 'should fail for nil amount' do
-      journal = Keepr::Journal.create :keepr_postings_attributes => [
-                                  { :keepr_account => account_1000, :amount => 10,  :side => 'debit' },
-                                  { :keepr_account => account_1200, :amount => nil, :side => 'credit' }
-                                ]
+      journal = Keepr::Journal.create keepr_postings_attributes: [
+        { keepr_account: account_1000, amount: 10, side: 'debit' },
+        { keepr_account: account_1200, amount: nil, side: 'credit' }
+      ]
       expect(journal).not_to be_valid
-      expect(journal.errors.added? :base, :amount_mismatch).to eq(true)
+      expect(journal.errors.added?(:base, :amount_mismatch)).to eq(true)
     end
   end
 
   describe :permanent do
     before :each do
-      simple_journal.update_attributes! :permanent => true
+      simple_journal.update! permanent: true
     end
 
-    it "should not allow update" do
-      expect(simple_journal.update_attributes :subject => 'foo').to eq(false)
-      expect(simple_journal.errors.added? :base, :changes_not_allowed).to eq(true)
+    it 'should not allow update' do
+      expect(simple_journal.update(subject: 'foo')).to eq(false)
+      expect(simple_journal.errors.added?(:base, :changes_not_allowed)).to eq(true)
     end
 
-    it "should not allow destroy" do
+    it 'should not allow destroy' do
       expect(simple_journal.destroy).to eq(false)
-      expect(simple_journal.errors.added? :base, :changes_not_allowed).to eq(true)
+      expect(simple_journal.errors.added?(:base, :changes_not_allowed)).to eq(true)
     end
   end
 
@@ -111,8 +113,8 @@ describe Keepr::Journal do
     end
 
     it 'should order postings' do
-      expect(simple_journal.keepr_postings.map(&:side)).to eq(['debit','credit'])
-      expect(complex_journal.keepr_postings.map(&:side)).to eq(['debit','debit','credit'])
+      expect(simple_journal.keepr_postings.map(&:side)).to eq(%w[debit credit])
+      expect(complex_journal.keepr_postings.map(&:side)).to eq(%w[debit debit credit])
     end
   end
 

data/spec/keepr/posting_spec.rb

@@ -1,7 +1,9 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Keepr::Posting do
-  let!(:account_1000) { FactoryGirl.create(:account, :number => 1000, :kind => :asset) }
+  let!(:account_1000) { FactoryBot.create(:account, number: 1000, kind: :asset) }
 
   describe 'side/amount' do
     it 'should handle empty object' do
@@ -11,7 +13,7 @@ describe Keepr::Posting do
     end
 
     it 'should set credit amount' do
-      posting = Keepr::Posting.new :amount => 10, :side => 'credit'
+      posting = Keepr::Posting.new amount: 10, side: 'credit'
 
       expect(posting).to be_credit
       expect(posting.amount).to eq(10)
@@ -19,7 +21,7 @@ describe Keepr::Posting do
     end
 
     it 'should set debit amount' do
-      posting = Keepr::Posting.new :amount => 10, :side => 'debit'
+      posting = Keepr::Posting.new amount: 10, side: 'debit'
 
       expect(posting).to be_debit
       expect(posting.amount).to eq(10)
@@ -39,7 +41,7 @@ describe Keepr::Posting do
     end
 
     it 'should change to credit' do
-      posting = Keepr::Posting.new :amount => 10, :side => 'debit'
+      posting = Keepr::Posting.new amount: 10, side: 'debit'
       posting.side = 'credit'
 
       expect(posting).to be_credit
@@ -47,7 +49,7 @@ describe Keepr::Posting do
     end
 
     it 'should change to debit' do
-      posting = Keepr::Posting.new :amount => 10, :side => 'credit'
+      posting = Keepr::Posting.new amount: 10, side: 'credit'
       posting.side = 'debit'
 
       expect(posting).to be_debit
@@ -55,21 +57,21 @@ describe Keepr::Posting do
     end
 
     it 'should default to debit' do
-      posting = Keepr::Posting.new :amount => 10
+      posting = Keepr::Posting.new amount: 10
 
       expect(posting).to be_debit
       expect(posting.amount).to eq(10)
     end
 
     it 'should handle string amount' do
-      posting = Keepr::Posting.new :amount => '0.5'
+      posting = Keepr::Posting.new amount: '0.5'
 
       expect(posting).to be_debit
       expect(posting.amount).to eq(0.5)
     end
 
     it 'should recognized saved debit posting' do
-      posting = Keepr::Posting.create!(:amount => 10, :side => 'debit', :keepr_account => account_1000, :keepr_journal_id => 42)
+      posting = Keepr::Posting.create!(amount: 10, side: 'debit', keepr_account: account_1000, keepr_journal_id: 42)
       posting.reload
 
       expect(posting).to be_debit
@@ -77,7 +79,7 @@ describe Keepr::Posting do
     end
 
     it 'should recognized saved credit posting' do
-      posting = Keepr::Posting.create!(:amount => 10, :side => 'credit', :keepr_account => account_1000, :keepr_journal_id => 42)
+      posting = Keepr::Posting.create!(amount: 10, side: 'credit', keepr_account: account_1000, keepr_journal_id: 42)
       posting.reload
 
       expect(posting).to be_credit
@@ -85,21 +87,21 @@ describe Keepr::Posting do
     end
 
     it 'should fail for negative amount' do
-      expect {
-        Keepr::Posting.new(:amount => -10)
-      }.to raise_error(ArgumentError)
+      expect do
+        Keepr::Posting.new(amount: -10)
+      end.to raise_error(ArgumentError)
     end
 
     it 'should fail for unknown side' do
-      expect {
-        Keepr::Posting.new(:side => 'foo')
-      }.to raise_error(ArgumentError)
+      expect do
+        Keepr::Posting.new(side: 'foo')
+      end.to raise_error(ArgumentError)
     end
   end
 
   describe 'scopes' do
-    let!(:debit_posting) { Keepr::Posting.create!(:amount => 10, :side => 'debit', :keepr_account => account_1000, :keepr_journal_id => 42) }
-    let!(:credit_posting) { Keepr::Posting.create!(:amount => 10, :side => 'credit', :keepr_account => account_1000, :keepr_journal_id => 42) }
+    let!(:debit_posting) { Keepr::Posting.create!(amount: 10, side: 'debit', keepr_account: account_1000, keepr_journal_id: 42) }
+    let!(:credit_posting) { Keepr::Posting.create!(amount: 10, side: 'credit', keepr_account: account_1000, keepr_journal_id: 42) }
 
     it 'should filter' do
       expect(account_1000.keepr_postings.debits).to eq([debit_posting])
@@ -108,16 +110,16 @@ describe Keepr::Posting do
   end
 
   describe 'cost_center handling' do
-    let!(:cost_center) { FactoryGirl.create(:cost_center) }
-    let!(:account_8400) { FactoryGirl.create(:account, :number => 8400, :kind => :revenue) }
+    let!(:cost_center) { FactoryBot.create(:cost_center) }
+    let!(:account_8400) { FactoryBot.create(:account, number: 8400, kind: :revenue) }
 
-    it "should allow cost_center" do
-      posting = Keepr::Posting.new :keepr_account => account_8400, :amount => 100, :keepr_cost_center => cost_center
+    it 'should allow cost_center' do
+      posting = Keepr::Posting.new keepr_account: account_8400, amount: 100, keepr_cost_center: cost_center
       expect(posting).to be_valid
     end
 
-    it "should not allow cost_center" do
-      posting = Keepr::Posting.new :keepr_account => account_1000, :amount => 100, :keepr_cost_center => cost_center
+    it 'should not allow cost_center' do
+      posting = Keepr::Posting.new keepr_account: account_1000, amount: 100, keepr_cost_center: cost_center
       expect(posting).to_not be_valid
     end
   end

data/spec/keepr/tax_spec.rb

@@ -1,20 +1,27 @@
-# encoding: utf-8
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Keepr::Tax do
-  let!(:tax_account) { Keepr::Account.create! :number => 1776,
-                                              :name => 'Umsatzsteuer 19%',
-                                              :kind => :asset }
+  let!(:tax_account) do
+    Keepr::Account.create! number: 1776,
+                           name: 'Umsatzsteuer 19%',
+                           kind: :asset
+  end
 
-  let!(:tax) { Keepr::Tax.create! :name          => 'USt19',
-                                  :description   => 'Umsatzsteuer 19%',
-                                  :value         => 19.0,
-                                  :keepr_account => tax_account }
+  let!(:tax) do
+    Keepr::Tax.create! name: 'USt19',
+                       description: 'Umsatzsteuer 19%',
+                       value: 19.0,
+                       keepr_account: tax_account
+  end
 
-  let!(:account) { Keepr::Account.create! :number    => 8400,
-                                          :name      => 'Erlöse 19% USt',
-                                          :kind      => :revenue,
-                                          :keepr_tax => tax }
+  let!(:account) do
+    Keepr::Account.create! number: 8400,
+                           name: 'Erlöse 19% USt',
+                           kind: :revenue,
+                           keepr_tax: tax
+  end
 
   it 'should be direct linked from account' do
     expect(tax.keepr_accounts).to eq([account])
@@ -22,12 +29,12 @@ describe Keepr::Tax do
     expect(tax_account.keepr_tax).to eq(nil)
   end
 
-  it "should be reverse found from account" do
+  it 'should be reverse found from account' do
     expect(tax_account.keepr_taxes).to eq([tax])
     expect(account.keepr_taxes).to eq([])
   end
 
-  it "should avoid circular reference" do
+  it 'should avoid circular reference' do
     tax.keepr_account = account
     expect(tax).to be_invalid
     expect(tax.errors[:keepr_account_id]).to be_present

data/spec/spec_helper.rb

@@ -1,28 +1,35 @@
+# frozen_string_literal: true
+
 require 'simplecov'
 require 'coveralls'
 
 SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter.new([
-  SimpleCov::Formatter::HTMLFormatter,
-  Coveralls::SimpleCov::Formatter
-])
+                                                                 SimpleCov::Formatter::HTMLFormatter,
+                                                                 Coveralls::SimpleCov::Formatter
+                                                               ])
 SimpleCov.start do
   add_filter '/spec/'
 end
 
 require 'active_record'
+puts "Testing with ActiveRecord #{ActiveRecord::VERSION::STRING}"
+ActiveRecord::Base.configurations = YAML.load_file(File.expand_path('database.yml', File.dirname(__FILE__)))
+ActiveRecord::Base.establish_connection(:sqlite)
+ActiveRecord::Migration.verbose = false
+
 require 'database_cleaner'
 require 'keepr'
 require 'generators/keepr/migration/templates/migration.rb'
 
-require 'factory_girl'
-FactoryGirl.find_definitions
+require 'factory_bot'
+FactoryBot.find_definitions
 
 # Avoid warning message
 I18n.enforce_available_locales = false
 
 # Requires supporting ruby files with custom matchers and macros, etc,
 # in spec/support/ and its subdirectories.
-Dir[File.expand_path(File.join(File.dirname(__FILE__),'support','**','*.rb'))].each {|f| require f}
+Dir[File.expand_path(File.join(File.dirname(__FILE__), 'support', '**', '*.rb'))].each { |f| require f }
 
 # This file was generated by the `rspec --init` command. Conventionally, all
 # specs live under a `spec` directory, which RSpec adds to the `$LOAD_PATH`.
@@ -58,8 +65,3 @@ RSpec.configure do |config|
     DatabaseCleaner.clean
   end
 end
-
-puts "Testing with ActiveRecord #{ActiveRecord::VERSION::STRING}"
-ActiveRecord::Base.configurations = YAML.load_file(File.expand_path('database.yml', File.dirname(__FILE__)))
-ActiveRecord::Base.establish_connection(:sqlite)
-ActiveRecord::Migration.verbose = false

data/spec/support/contact.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Contact < ActiveRecord::Base
   has_many_keepr_accounts
 end

data/spec/support/document.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Document < ActiveRecord::Base
   has_keepr_journals
   has_keepr_postings

data/spec/support/ledger.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Ledger < ActiveRecord::Base
   has_one_keepr_account
 end

data/spec/support/spec_migration.rb

@@ -1,4 +1,6 @@
-class SpecMigration < ActiveRecord::Migration
+# frozen_string_literal: true
+
+class SpecMigration < Keepr::MIGRATION_BASE_CLASS
   def self.up
     create_table Contact, force: true do |t|
       t.string :name

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: keepr
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Georg Ledermann
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-07-01 00:00:00.000000000 Z
+date: 2020-08-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -16,42 +16,42 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.1'
+        version: '4.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.1'
+        version: '4.2'
 - !ruby/object:Gem::Dependency
   name: ancestry
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.1.0
 - !ruby/object:Gem::Dependency
   name: datev
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: 0.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: 0.5.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -67,7 +67,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: coveralls
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -81,7 +81,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: sqlite3
+  name: database_cleaner
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -95,7 +95,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: factory_bot
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -109,7 +109,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: database_cleaner
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -123,7 +123,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: factory_girl
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -137,7 +137,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: coveralls
+  name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -151,7 +151,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: simplecov
+  name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -176,9 +176,11 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
-- ci/Gemfile-rails-4-1
 - ci/Gemfile-rails-4-2
 - ci/Gemfile-rails-5-0
+- ci/Gemfile-rails-5-1
+- ci/Gemfile-rails-5-2
+- ci/Gemfile-rails-6-0
 - keepr.gemspec
 - lib/generators/keepr/migration/migration_generator.rb
 - lib/generators/keepr/migration/templates/migration.rb
@@ -223,7 +225,7 @@ homepage: https://github.com/ledermann/keepr
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -231,16 +233,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.0.0
+      version: '2.5'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.6
-signing_key: 
+rubygems_version: 3.1.4
+signing_key:
 specification_version: 4
 summary: Some basic ActiveRecord models to build a double entry bookkeeping application
 test_files: