keepr 0.3.2 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: c91b1ad75caddcdc40fea241881c31b7f6c4da1d
-  data.tar.gz: 11643a043c97b47c09d9623992fd70d2cbaa607a
+SHA256:
+  metadata.gz: c077965d94021d6d19a624c4c93a3d6ac23f3f90f1c4f74b6518c56da54ac625
+  data.tar.gz: 22afd3248d4a5e3476c09c383323a402847c73d997b14216066432083c968236
 SHA512:
-  metadata.gz: a207f1ebce4fe8bb4fa594ad73bda3035c9da0d82d05b7258e681b8c53478989c2b8155c3495bb7a9ccbf4345ac2a29b1a51762ab907cd248c1811f42ec74284
-  data.tar.gz: dd41650bac870b4173f9cfe460ab187e42216bbd206bc36563032c3d75b9f550e3871bf842945c94781b0df73d3ccd697a4fd18b5df0bd8f41ad6378a7ef8d52
+  metadata.gz: 278fc8320da492345c89a0e957e65d933b479c1a48fa286454353f5a1814f8d8ee6ae95e894ec1ee9f3083193629f537f361f54be7a66cd14da45937ec528b0f
+  data.tar.gz: 6456e4cad08500ba0d8c80891588b2c3e8c65ec26cc014908c9a7e15b9398cdcc63506483d0499ffb05677930445be0bf029193215752f38b8164bbe00c07cdc

data/.travis.yml

@@ -1,26 +1,22 @@
 language: ruby
 rvm:
-  - 2.0.0
-  - 2.1.10
-  - 2.2.7
-  - 2.3.3
-  - 2.4.1
+  - 2.2.10
+  - 2.3.7
+  - 2.4.4
+  - 2.5.1
 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
 matrix:
   exclude:
-    - rvm: 2.0.0
-      gemfile: ci/Gemfile-rails-5-1
-    - rvm: 2.1.10
-      gemfile: ci/Gemfile-rails-5-1
-    - rvm: 2.0.0
-      gemfile: ci/Gemfile-rails-5-0
-    - rvm: 2.1.10
-      gemfile: ci/Gemfile-rails-5-0
-    - rvm: 2.4.1
+    - rvm: 2.4.4
       gemfile: ci/Gemfile-rails-4-1
-before_install: gem update bundler
+    - rvm: 2.5.1
+      gemfile: ci/Gemfile-rails-4-1
+before_install:
+  - gem update --system
+  - gem update bundler
 sudo: false

data/LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2013-2017 Georg Ledermann
+Copyright (c) 2013-2018 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.0.0 or later
-* Rails 4.1 or newer (including Rails 5.x)
+* Ruby 2.2+
+* Rails 4.1+ (including Rails 5.2)
 
 
 ## Installation
@@ -64,4 +64,4 @@ TODO: Write usage instructions here
 * https://github.com/bigfleet/accountable
 
 
-Copyright (c) 2013-2017 [Georg Ledermann](http://www.georg-ledermann.de), released under the MIT license
+Copyright (c) 2013-2018 [Georg Ledermann](http://www.georg-ledermann.de), released under the MIT license

data/Rakefile

@@ -3,4 +3,4 @@ require 'rspec/core/rake_task'
 
 RSpec::Core::RakeTask.new(:spec)
 
-task :default => :spec
+task default: :spec

data/ci/Gemfile-rails-4-1

@@ -8,5 +8,5 @@ gem 'rspec'
 gem 'simplecov'
 gem 'coveralls'
 gem 'database_cleaner'
-gem 'factory_girl'
+gem 'factory_bot'
 gem 'datev'

data/ci/Gemfile-rails-4-2

@@ -8,5 +8,5 @@ gem 'rspec'
 gem 'simplecov'
 gem 'coveralls'
 gem 'database_cleaner'
-gem 'factory_girl'
+gem 'factory_bot'
 gem 'datev'

data/ci/Gemfile-rails-5-0

@@ -8,5 +8,5 @@ gem 'rspec'
 gem 'simplecov'
 gem 'coveralls'
 gem 'database_cleaner'
-gem 'factory_girl'
+gem 'factory_bot'
 gem 'datev'

data/ci/Gemfile-rails-5-1

@@ -8,5 +8,5 @@ gem 'rspec'
 gem 'simplecov'
 gem 'coveralls'
 gem 'database_cleaner'
-gem 'factory_girl'
+gem 'factory_bot'
 gem 'datev'

data/ci/Gemfile-rails-5-2

@@ -0,0 +1,12 @@
+source 'https://rubygems.org'
+
+gem 'activerecord', '~> 5.2.0'
+gem 'ancestry'
+gem 'sqlite3'
+gem 'rake'
+gem 'rspec'
+gem 'simplecov'
+gem 'coveralls'
+gem 'database_cleaner'
+gem 'factory_bot'
+gem 'datev'

data/keepr.gemspec

@@ -12,7 +12,7 @@ Gem::Specification.new do |spec|
   spec.summary       = %q{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.0.0'
+  spec.required_ruby_version = '>= 2.2.2'
 
   spec.files         = `git ls-files`.split($/)
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
@@ -28,7 +28,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'sqlite3'
   spec.add_development_dependency 'rspec'
   spec.add_development_dependency 'database_cleaner'
-  spec.add_development_dependency 'factory_girl'
+  spec.add_development_dependency 'factory_bot'
   spec.add_development_dependency 'coveralls'
   spec.add_development_dependency 'simplecov'
 end

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

@@ -1,55 +1,55 @@
 class KeeprMigration < Keepr::MIGRATION_BASE_CLASS
   def self.up
     create_table Keepr::Group, force: true do |t|
-      t.integer    :target, :null => false
+      t.integer    :target, null: false
       t.string     :number
-      t.string     :name, :null => false
-      t.boolean    :is_result, :null => false, :default => false
-      t.string     :ancestry, :index => true
+      t.string     :name, null: false
+      t.boolean    :is_result, null: false, default: false
+      t.string     :ancestry, index: true
     end
 
     create_table Keepr::Tax, force: true do |t|
-      t.string     :name, :null => false
+      t.string     :name, null: false
       t.string     :description
-      t.decimal    :value, :precision => 8, :scale => 2, :null => false
-      t.references :keepr_account, :null => false, :index => true
+      t.decimal    :value, precision: 8, scale: 2, null: false
+      t.references :keepr_account, null: false, index: true
     end
 
     create_table Keepr::CostCenter, force: true do |t|
-      t.string     :number, :null => false
-      t.string     :name, :null => false
+      t.string     :number, null: false
+      t.string     :name, null: false
       t.text       :note
     end
 
     create_table Keepr::Account, force: true do |t|
-      t.integer    :number, :null => false, :index => true
-      t.string     :ancestry, :index => true
-      t.string     :name, :null => false
-      t.integer    :kind, :null => false
-      t.references :keepr_group, :index => true
-      t.references :accountable, :polymorphic => true, :index => true
-      t.references :keepr_tax, :index => true
+      t.integer    :number, null: false, index: true
+      t.string     :ancestry, index: true
+      t.string     :name, null: false
+      t.integer    :kind, null: false
+      t.references :keepr_group, index: true
+      t.references :accountable, polymorphic: true, index: true
+      t.references :keepr_tax, index: true
       t.datetime   :created_at
       t.datetime   :updated_at
     end
 
     create_table Keepr::Journal, force: true do |t|
       t.string   :number
-      t.date     :date, :null => false, :index => true
+      t.date     :date, null: false, index: true
       t.string   :subject
-      t.references :accountable, :polymorphic => true, :index => true
+      t.references :accountable, polymorphic: true, index: true
       t.text     :note
-      t.boolean  :permanent, :null => false, :default => false
+      t.boolean  :permanent, null: false, default: false
       t.datetime :created_at
       t.datetime :updated_at
     end
 
     create_table Keepr::Posting, force: true do |t|
-      t.references :keepr_account, :null => false, :index => true
-      t.references :keepr_journal, :null => false, :index => true
-      t.decimal    :amount, :precision => 8, :scale => 2, :null => false
-      t.references :keepr_cost_center, :index => true
-      t.references :accountable, :polymorphic => true, :index => true
+      t.references :keepr_account, null: false, index: true
+      t.references :keepr_journal, null: false, index: true
+      t.decimal    :amount, precision: 8, scale: 2, null: false
+      t.references :keepr_cost_center, index: true
+      t.references :accountable, polymorphic: true, index: true
     end
   end
 

data/lib/keepr/account.rb

@@ -1,21 +1,21 @@
 class Keepr::Account < ActiveRecord::Base
   self.table_name = 'keepr_accounts'
 
-  has_ancestry :orphan_strategy => :restrict
+  has_ancestry orphan_strategy: :restrict
 
-  enum :kind => [ :asset, :liability, :revenue, :expense, :neutral, :debtor, :creditor ]
+  enum kind: [ :asset, :liability, :revenue, :expense, :forward, :debtor, :creditor ]
 
   validates_presence_of :number, :name
   validates_uniqueness_of :number
   validate :group_validation
   validate :tax_validation
 
-  has_many :keepr_postings, :class_name => 'Keepr::Posting', :foreign_key => 'keepr_account_id', :dependent => :restrict_with_error
-  has_many :keepr_taxes, :class_name => 'Keepr::Tax', :foreign_key => 'keepr_account_id', :dependent => :restrict_with_error
+  has_many :keepr_postings, class_name: 'Keepr::Posting', foreign_key: 'keepr_account_id', dependent: :restrict_with_error
+  has_many :keepr_taxes, class_name: 'Keepr::Tax', foreign_key: 'keepr_account_id', dependent: :restrict_with_error
 
-  belongs_to :keepr_tax, :class_name => 'Keepr::Tax'
-  belongs_to :keepr_group, :class_name => 'Keepr::Group'
-  belongs_to :accountable, :polymorphic => true
+  belongs_to :keepr_tax, class_name: 'Keepr::Tax'
+  belongs_to :keepr_group, class_name: 'Keepr::Group'
+  belongs_to :accountable, polymorphic: true
 
   default_scope { order(:number) }
 
@@ -30,18 +30,18 @@ class Keepr::Account < ActiveRecord::Base
     date           = options[:date]
     permanent_only = options[:permanent_only]
 
-    if date
-      if date.is_a?(Date)
-        subquery = subquery.where "keepr_journals.date <= '#{date.to_s(:db)}'"
-      elsif date.is_a?(Range)
-        subquery = subquery.where "keepr_journals.date BETWEEN '#{date.first.to_s(:db)}' AND '#{date.last.to_s(:db)}'"
-      else
-        raise ArgumentError
-      end
+    case date
+    when nil
+    when Date
+      subquery = subquery.where('keepr_journals.date <= ?', date)
+    when Range
+      subquery = subquery.where(keepr_journals: { date: date.first..date.last })
+    else
+      raise ArgumentError
     end
 
     if permanent_only
-      subquery = subquery.where "keepr_journals.permanent = #{connection.quoted_true}"
+      subquery = subquery.where(keepr_journals: { permanent: true })
     end
 
     select "keepr_accounts.*, (#{subquery.to_sql}) AS sum_amount"
@@ -80,17 +80,22 @@ class Keepr::Account < ActiveRecord::Base
   end
 
   def balance(date=nil)
-    if date
-      if date.is_a?(Date)
-        keepr_postings.joins(:keepr_journal).where("keepr_journals.date <= '#{date.to_s(:db)}'").sum(:amount)
-      elsif date.is_a?(Range)
-        keepr_postings.joins(:keepr_journal).where("keepr_journals.date BETWEEN '#{date.first.to_s(:db)}' AND '#{date.last.to_s(:db)}'").sum(:amount)
-      else
-        raise ArgumentError
-      end
+    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
-      keepr_postings.sum(:amount)
+      raise ArgumentError
     end
+
+    scope.sum(:amount)
   end
 
   def number_as_string
@@ -107,19 +112,19 @@ class Keepr::Account < ActiveRecord::Base
 
 private
   def group_validation
-    if keepr_group.present?
-      if asset?
-        errors.add(:kind, :group_mismatch) unless keepr_group.asset?
-      elsif liability?
-        errors.add(:kind, :group_mismatch) unless keepr_group.liability?
-      elsif profit_and_loss?
-        errors.add(:kind, :group_mismatch) unless keepr_group.profit_and_loss?
-      else
-        errors.add(:kind, :group_conflict)
-      end
-
-      errors.add(:keepr_group_id, :no_group_allowed_for_result) if keepr_group.is_result
+    return unless keepr_group.present?
+
+    if asset?
+      errors.add(:kind, :group_mismatch) unless keepr_group.asset?
+    elsif liability?
+      errors.add(:kind, :group_mismatch) unless keepr_group.liability?
+    elsif profit_and_loss?
+      errors.add(:kind, :group_mismatch) unless keepr_group.profit_and_loss?
+    else
+      errors.add(:kind, :group_conflict)
     end
+
+    errors.add(:keepr_group_id, :no_group_allowed_for_result) if keepr_group.is_result
   end
 
   def tax_validation

data/lib/keepr/active_record_extension.rb

@@ -5,17 +5,17 @@ module Keepr::ActiveRecordExtension
 
   module ClassMethods
     def has_one_keepr_account
-      has_one :keepr_account, :class_name => 'Keepr::Account', :as => :accountable, :dependent => :restrict_with_error
-      has_many :keepr_postings, :class_name => 'Keepr::Posting', :through => :keepr_account, :dependent => :restrict_with_error
+      has_one :keepr_account, class_name: 'Keepr::Account', as: :accountable, dependent: :restrict_with_error
+      has_many :keepr_postings, class_name: 'Keepr::Posting', through: :keepr_account, dependent: :restrict_with_error
     end
 
     def has_many_keepr_accounts
-      has_many :keepr_accounts, :class_name => 'Keepr::Account', :as => :accountable, :dependent => :restrict_with_error
-      has_many :keepr_postings, :class_name => 'Keepr::Posting', :through => :keepr_accounts, :dependent => :restrict_with_error
+      has_many :keepr_accounts, class_name: 'Keepr::Account', as: :accountable, dependent: :restrict_with_error
+      has_many :keepr_postings, class_name: 'Keepr::Posting', through: :keepr_accounts, dependent: :restrict_with_error
     end
 
     def has_keepr_journals
-      has_many :keepr_journals, :class_name => 'Keepr::Journal', :as => :accountable, :dependent => :restrict_with_error
+      has_many :keepr_journals, class_name: 'Keepr::Journal', as: :accountable, dependent: :restrict_with_error
 
       class_eval <<-EOT
         def keepr_booked?
@@ -31,7 +31,7 @@ module Keepr::ActiveRecordExtension
     end
 
     def has_keepr_postings
-      has_many :keepr_postings, :class_name => 'Keepr::Posting', :as => :accountable, :dependent => :restrict_with_error
+      has_many :keepr_postings, class_name: 'Keepr::Posting', as: :accountable, dependent: :restrict_with_error
     end
   end
 end

data/lib/keepr/cost_center.rb

@@ -4,5 +4,5 @@ class Keepr::CostCenter < ActiveRecord::Base
   validates_presence_of :number, :name
   validates_uniqueness_of :number
 
-  has_many :keepr_postings, :class_name => 'Keepr::Posting', :foreign_key => 'keepr_cost_center_id', :dependent => :restrict_with_error
+  has_many :keepr_postings, class_name: 'Keepr::Posting', foreign_key: 'keepr_cost_center_id', dependent: :restrict_with_error
 end

data/lib/keepr/group.rb

@@ -1,28 +1,34 @@
 class Keepr::Group < ActiveRecord::Base
   self.table_name = 'keepr_groups'
 
-  has_ancestry :orphan_strategy => :restrict
+  has_ancestry orphan_strategy: :restrict
 
-  enum :target => [ :asset, :liability, :profit_and_loss ]
+  enum target: [ :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
+  has_many :keepr_accounts, class_name: 'Keepr::Account', foreign_key: 'keepr_group_id', dependent: :restrict_with_error
 
   before_validation :get_from_parent
 
   validate :check_result_and_target
 
   def self.result
-    where(:is_result => true).first
+    where(is_result: true).first
   end
 
   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(self.subtree)
     end
   end
 

data/lib/keepr/groups_creator.rb

@@ -9,10 +9,10 @@ class Keepr::GroupsCreator
   def run
     case @target
     when :balance then
-      load 'asset.txt', :target => :asset
-      load 'liability.txt', :target => :liability
+      load 'asset.txt', target: :asset
+      load 'liability.txt', target: :liability
     when :profit_and_loss
-      load 'profit_and_loss.txt', :target => :profit_and_loss
+      load 'profit_and_loss.txt', target: :profit_and_loss
     end
   end
 
@@ -30,7 +30,7 @@ private
       # Remove leading spaces and separate number and name
       number, name = line.lstrip.match(/^(.*?)\s(.+)$/).to_a[1..-1]
 
-      attributes = options.merge(:name => name, :number => number)
+      attributes = options.merge(name: name, number: number)
       if @target == :balance && name == 'Jahresüberschuss/Jahresfehlbetrag'
         attributes[:is_result] = true
       end