keepr 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c077965d94021d6d19a624c4c93a3d6ac23f3f90f1c4f74b6518c56da54ac625
-  data.tar.gz: 22afd3248d4a5e3476c09c383323a402847c73d997b14216066432083c968236
+  metadata.gz: b05feec2870ab3c67b501c7f485f7c2a0a05e44357c416f2f83b5749b4c5a860
+  data.tar.gz: c706bf22151ff63fff5be0921ae4f49c1f72ef79907bc719dea5b7485298469e
 SHA512:
-  metadata.gz: 278fc8320da492345c89a0e957e65d933b479c1a48fa286454353f5a1814f8d8ee6ae95e894ec1ee9f3083193629f537f361f54be7a66cd14da45937ec528b0f
-  data.tar.gz: 6456e4cad08500ba0d8c80891588b2c3e8c65ec26cc014908c9a7e15b9398cdcc63506483d0499ffb05677930445be0bf029193215752f38b8164bbe00c07cdc
+  metadata.gz: 15ac6a10623a8441a17ac7c7eea8ec97094c7d5e7a8498028f21d993b05c5d27ae245bbf9e804a8dfdcf67f5770dec664d34810d48d19d10850461fcb3b29026
+  data.tar.gz: '08cfa52e53f1aa28a588be6e2646f38f99b65b2ac21eadcff0069d8622d1b8323ac7937dc368e4498ae5b5872208a9b617a3307f3dd29567ff08f02512ade605'

data/.rubocop.yml

@@ -0,0 +1,44 @@
+AllCops:
+  TargetRubyVersion: 2.4
+
+
+Metrics/LineLength:
+  Max: 150
+
+Metrics/BlockLength:
+  Max: 150
+
+Metrics/MethodLength:
+  Max: 50
+
+Metrics/ClassLength:
+  Max: 120
+
+
+Style/Documentation:
+  Enabled: false
+
+Style/ClassAndModuleChildren:
+  Enabled: false
+
+
+Layout/AlignHash:
+  Enabled: false
+
+
+Naming/PredicateName:
+  Enabled: false
+
+
+Lint/EmptyWhen:
+  Enabled: false
+
+
+Metrics/AbcSize:
+  Max: 40
+
+Metrics/CyclomaticComplexity:
+  Max: 10
+
+Metrics/PerceivedComplexity:
+  Max: 10

data/.travis.yml

@@ -1,21 +1,21 @@
 language: ruby
 rvm:
-  - 2.2.10
-  - 2.3.7
-  - 2.4.4
-  - 2.5.1
+  - 2.4.6
+  - 2.5.5
+  - 2.6.3
 gemfile:
-  - 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
 matrix:
   exclude:
-    - rvm: 2.4.4
-      gemfile: ci/Gemfile-rails-4-1
-    - rvm: 2.5.1
-      gemfile: ci/Gemfile-rails-4-1
+    - rvm: 2.4.6
+      gemfile: ci/Gemfile-rails-6-0
+  script:
+  - bundle exec rake
+  - bundle exec rubocop
 before_install:
   - gem update --system
   - gem update bundler

data/Gemfile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 source 'https://rubygems.org'
 
 # Specify your gem's dependencies in keepr.gemspec

data/LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2013-2018 Georg Ledermann
+Copyright (c) 2013-2019 Georg Ledermann
 
 MIT License
 

data/README.md

@@ -19,8 +19,8 @@ This Ruby gem provides a double entry accounting system for use in any Rails app
 
 ## Dependencies
 
-* Ruby 2.2+
-* Rails 4.1+ (including Rails 5.2)
+* Ruby 2.4+
+* Rails 4.2+ (including Rails 6.0)
 
 
 ## Installation
@@ -64,4 +64,4 @@ TODO: Write usage instructions here
 * https://github.com/bigfleet/accountable
 
 
-Copyright (c) 2013-2018 [Georg Ledermann](http://www.georg-ledermann.de), released under the MIT license
+Copyright (c) 2013-2019 [Georg Ledermann](http://www.georg-ledermann.de), released under the MIT license

data/Rakefile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'bundler/gem_tasks'
 require 'rspec/core/rake_task'
 

data/ci/Gemfile-rails-4-2

@@ -1,8 +1,8 @@
 source 'https://rubygems.org'
 
-gem 'activerecord', '~> 4.2.8'
+gem 'activerecord', '~> 4.2.11'
 gem 'ancestry'
-gem 'sqlite3'
+gem 'sqlite3', '~> 1.3.6'
 gem 'rake'
 gem 'rspec'
 gem 'simplecov'
@@ -10,3 +10,4 @@ gem 'coveralls'
 gem 'database_cleaner'
 gem 'factory_bot'
 gem 'datev'
+gem 'rubocop'

data/ci/Gemfile-rails-5-0

@@ -1,8 +1,8 @@
 source 'https://rubygems.org'
 
-gem 'activerecord', '~> 5.0.2'
+gem 'activerecord', '~> 5.0.7'
 gem 'ancestry'
-gem 'sqlite3'
+gem 'sqlite3', '~> 1.3.6'
 gem 'rake'
 gem 'rspec'
 gem 'simplecov'
@@ -10,3 +10,4 @@ gem 'coveralls'
 gem 'database_cleaner'
 gem 'factory_bot'
 gem 'datev'
+gem 'rubocop'

data/ci/Gemfile-rails-5-1

@@ -1,8 +1,8 @@
 source 'https://rubygems.org'
 
-gem 'activerecord', '~> 5.1.0'
+gem 'activerecord', '~> 5.1.7'
 gem 'ancestry'
-gem 'sqlite3'
+gem "sqlite3", "~> 1.3", ">= 1.3.6"
 gem 'rake'
 gem 'rspec'
 gem 'simplecov'
@@ -10,3 +10,4 @@ gem 'coveralls'
 gem 'database_cleaner'
 gem 'factory_bot'
 gem 'datev'
+gem 'rubocop'

data/ci/Gemfile-rails-5-2

@@ -1,8 +1,8 @@
 source 'https://rubygems.org'
 
-gem 'activerecord', '~> 5.2.0'
+gem 'activerecord', '~> 5.2.3'
 gem 'ancestry'
-gem 'sqlite3'
+gem "sqlite3", "~> 1.3", ">= 1.3.6"
 gem 'rake'
 gem 'rspec'
 gem 'simplecov'
@@ -10,3 +10,4 @@ gem 'coveralls'
 gem 'database_cleaner'
 gem 'factory_bot'
 gem 'datev'
+gem 'rubocop'

data/ci/{Gemfile-rails-4-1 → Gemfile-rails-6-0}

@@ -1,8 +1,8 @@
 source 'https://rubygems.org'
 
-gem 'activerecord', '~> 4.1.16'
+gem 'activerecord', '~> 6.0.0'
 gem 'ancestry'
-gem 'sqlite3'
+gem 'sqlite3', "~> 1.4"
 gem 'rake'
 gem 'rspec'
 gem 'simplecov'
@@ -10,3 +10,4 @@ gem 'coveralls'
 gem 'database_cleaner'
 gem 'factory_bot'
 gem 'datev'
+gem 'rubocop'

data/keepr.gemspec

@@ -1,34 +1,36 @@
-# coding: utf-8
-lib = File.expand_path('../lib', __FILE__)
+# frozen_string_literal: true
+
+lib = File.expand_path('lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'keepr/version'
 
 Gem::Specification.new do |spec|
-  spec.name          = "keepr"
+  spec.name          = 'keepr'
   spec.version       = Keepr::VERSION
   spec.authors       = 'Georg Ledermann'
   spec.email         = 'mail@georg-ledermann.de'
-  spec.description   = %q{Double entry bookkeeping with Rails}
-  spec.summary       = %q{Some basic ActiveRecord models to build a double entry bookkeeping application}
+  spec.description   = 'Double entry bookkeeping with Rails'
+  spec.summary       = 'Some basic ActiveRecord models to build a double entry bookkeeping application'
   spec.homepage      = 'https://github.com/ledermann/keepr'
   spec.license       = 'MIT'
-  spec.required_ruby_version = '>= 2.2.2'
+  spec.required_ruby_version = '>= 2.4'
 
-  spec.files         = `git ls-files`.split($/)
+  spec.files         = `git ls-files`.split($INPUT_RECORD_SEPARATOR)
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'activerecord', '>= 4.1'
+  spec.add_dependency 'activerecord', '>= 4.2'
   spec.add_dependency 'ancestry'
   spec.add_dependency 'datev', '>= 0.5.0'
 
   spec.add_development_dependency 'bundler'
-  spec.add_development_dependency 'rake'
-  spec.add_development_dependency 'sqlite3'
-  spec.add_development_dependency 'rspec'
+  spec.add_development_dependency 'coveralls'
   spec.add_development_dependency 'database_cleaner'
   spec.add_development_dependency 'factory_bot'
-  spec.add_development_dependency 'coveralls'
+  spec.add_development_dependency 'rake'
+  spec.add_development_dependency 'rspec'
+  spec.add_development_dependency 'rubocop'
   spec.add_development_dependency 'simplecov'
+  spec.add_development_dependency 'sqlite3'
 end

data/lib/generators/keepr/migration/migration_generator.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rails/generators'
 require 'rails/generators/migration'
 
@@ -6,7 +8,7 @@ module Keepr
     include Rails::Generators::Migration
 
     desc 'Generates migration for keepr'
-    source_root File.expand_path('../templates', __FILE__)
+    source_root File.expand_path('templates', __dir__)
 
     def create_migration_file
       migration_template 'migration.rb', 'db/migrate/keepr_migration.rb'
@@ -14,9 +16,9 @@ module Keepr
 
     def self.next_migration_number(dirname)
       if ActiveRecord::Base.timestamped_migrations
-        Time.now.utc.strftime("%Y%m%d%H%M%S")
+        Time.now.utc.strftime('%Y%m%d%H%M%S')
       else
-        "%.3d" % (current_migration_number(dirname) + 1)
+        format('%.3d', (current_migration_number(dirname) + 1))
       end
     end
   end

data/lib/generators/keepr/migration/templates/migration.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class KeeprMigration < Keepr::MIGRATION_BASE_CLASS
   def self.up
     create_table Keepr::Group, force: true do |t|

data/lib/keepr.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'ancestry'
 require 'datev'
 
@@ -19,7 +21,7 @@ class ActiveRecord::Base
 end
 
 Keepr::MIGRATION_BASE_CLASS = if ActiveRecord::VERSION::MAJOR >= 5
-  ActiveRecord::Migration[5.0]
-else
-  ActiveRecord::Migration
-end
+                                ActiveRecord::Migration[5.0]
+                              else
+                                ActiveRecord::Migration
+                              end

data/lib/keepr/account.rb

@@ -1,9 +1,11 @@
+# frozen_string_literal: true
+
 class Keepr::Account < ActiveRecord::Base
   self.table_name = 'keepr_accounts'
 
   has_ancestry orphan_strategy: :restrict
 
-  enum kind: [ :asset, :liability, :revenue, :expense, :forward, :debtor, :creditor ]
+  enum kind: %i[asset liability revenue expense forward debtor creditor]
 
   validates_presence_of :number, :name
   validates_uniqueness_of :number
@@ -19,13 +21,13 @@ class Keepr::Account < ActiveRecord::Base
 
   default_scope { order(:number) }
 
-  def self.with_sums(options={})
+  def self.with_sums(options = {})
     raise ArgumentError unless options.is_a?(Hash)
 
-    subquery = Keepr::Posting.
-                 select('SUM(keepr_postings.amount)').
-                 joins(:keepr_journal).
-                 where('keepr_postings.keepr_account_id = keepr_accounts.id')
+    subquery = Keepr::Posting
+               .select('SUM(keepr_postings.amount)')
+               .joins(:keepr_journal)
+               .where('keepr_postings.keepr_account_id = keepr_accounts.id')
 
     date           = options[:date]
     permanent_only = options[:permanent_only]
@@ -40,27 +42,24 @@ class Keepr::Account < ActiveRecord::Base
       raise ArgumentError
     end
 
-    if permanent_only
-      subquery = subquery.where(keepr_journals: { permanent: true })
-    end
+    subquery = subquery.where(keepr_journals: { permanent: true }) if permanent_only
 
     select "keepr_accounts.*, (#{subquery.to_sql}) AS sum_amount"
   end
 
-  def self.merged_with_sums(options={})
+  def self.merged_with_sums(options = {})
     accounts = with_sums(options).to_a
 
     # Sum up child accounts to parent
     position = 0
-    while account = accounts[position] do
+    while (account = accounts[position])
       if account.parent_id && account.sum_amount
-        if parent_account = accounts.find { |a| a.id == account.parent_id }
-          parent_account.sum_amount ||= 0
-          parent_account.sum_amount += account.sum_amount
-          accounts.delete_at(position)
-        else
-          raise RuntimeError
-        end
+        parent_account = accounts.find { |a| a.id == account.parent_id }
+        raise RuntimeError unless parent_account
+
+        parent_account.sum_amount ||= 0
+        parent_account.sum_amount += account.sum_amount
+        accounts.delete_at(position)
       else
         position += 1
       end
@@ -74,33 +73,33 @@ class Keepr::Account < ActiveRecord::Base
   end
 
   def keepr_postings
-    Keepr::Posting.
-      joins(:keepr_account).
-      where(subtree_conditions)
+    Keepr::Posting
+      .joins(:keepr_account)
+      .where(subtree_conditions)
   end
 
-  def balance(date=nil)
+  def balance(date = nil)
     scope = case date
-    when nil
-      keepr_postings
-    when Date
-      keepr_postings.
-        joins(:keepr_journal).
-        where('keepr_journals.date <= ?', date)
-    when Range
-      keepr_postings.
-        joins(:keepr_journal).
-        where(keepr_journals: { date: date.first..date.last })
-    else
-      raise ArgumentError
-    end
+            when nil
+              keepr_postings
+            when Date
+              keepr_postings
+            .joins(:keepr_journal)
+            .where('keepr_journals.date <= ?', date)
+            when Range
+              keepr_postings
+            .joins(:keepr_journal)
+            .where(keepr_journals: { date: date.first..date.last })
+            else
+              raise ArgumentError
+            end
 
     scope.sum(:amount)
   end
 
   def number_as_string
     if number < 1000
-      "%04d" % number
+      format('%04d', number)
     else
       number.to_s
     end
@@ -110,7 +109,8 @@ class Keepr::Account < ActiveRecord::Base
     "#{number_as_string} (#{name})"
   end
 
-private
+  private
+
   def group_validation
     return unless keepr_group.present?
 

data/lib/keepr/account_export.rb

@@ -1,35 +1,31 @@
+# frozen_string_literal: true
+
 class Keepr::AccountExport
-  def initialize(accounts, header_options={}, &block)
+  def initialize(accounts, header_options = {}, &block)
     @accounts = accounts
     @header_options = header_options
     @block = block
   end
 
-  def to_s
-    export.to_s
-  end
-
-  def to_file(filename)
-    export.to_file(filename)
-  end
+  delegate :to_s, :to_file,
+           to: :export
 
-private
+  private
 
   def export
     export = Datev::AccountExport.new(@header_options)
 
     @accounts.reorder(:number).each do |account|
-      unless account.debtor? || account.creditor?
-        export << to_datev(account)
-      end
+      export << to_datev(account) unless account.debtor? || account.creditor?
     end
 
     export
   end
 
   def to_datev(account)
-    { 'Konto'               => account.number,
-      'Kontenbeschriftung'  => account.name.slice(0,40)
+    {
+      'Konto'              => account.number,
+      'Kontenbeschriftung' => account.name.slice(0, 40)
     }.merge(@block ? @block.call(account) : {})
   end
 end