acts_as_account 3.4.1 → 3.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f273511f34e3a338870be2d7f3c1337917913b210b70f4237f4c206cc13a380e
-  data.tar.gz: e472770750dd7277e8d7343dc057ae1c289d19abc80ca0c812d9ca22efeaf9a1
+  metadata.gz: c967cdb648bf8b3606030d45e54fd95150457fc7e1e380719d4f9d042d144af7
+  data.tar.gz: b0810ca4cc4444d56612cc8f6a3a127735923ba071dcf20492ec2ef608cc8767
 SHA512:
-  metadata.gz: f4e102e34de51ac78effb0d97fb80c4af26d37c3749de3545acf0ea6566e560720bdbfc7ec64572e2cdc811bc7db23681ceb4f9cc323dffab024056bd3feb31e
-  data.tar.gz: fe1dabd0b53ff1f8a06e23b046794b7c504ed2e862d454f430174643386aaa51cae1c33faf19ffa14a2d3f5d7df3063b331bca74c9c43b376ae58b905392916d
+  metadata.gz: c1f991f1af38f2ae583e4e88f96b2d9f9866959dde98b13eca27b9933fa7ff2d2e2b383977682fac25a2168c9f6d1a558434a5b74910992c7f994828325fe1d1
+  data.tar.gz: eaab3ae3d6555781b9de03274459c890ecf8f4391118e3923e791c676423cabd5094feac97b3047972f2425710814abc838556ae75ec22a6c0012a5557589e1b

data/.gitignore

@@ -3,6 +3,7 @@
 .DS_Store
 .byebug_history
 .rvmrc
+/log/*
 Gemfile.lock
 coverage
 pkg

data/CHANGELOG.md

@@ -1,5 +1,25 @@
 # Changes
 
+## 2024-11-01 v3.4.2
+
+* Add compact to attributes handling of transfer method:
+  + Use `posting1.attributes.compact` and `posting2.attributes.compact` instead
+    of just `posting1.attributes` and `posting2.attributes`.
+* Update logging configuration and ignore log files:
+  + Update `DATABASE_LOG` handling in `features/support/env.rb`
+  + Add `log/*` to `.gitignore`
+  + Modify `transfer` method in `lib/acts_as_account/journal.rb` to safely
+    reference objects.
+  + Added log directory
+* Add mysql for database testing:
+  + Add `mysql2` as a development dependency to Gemfile
+  + Update `acts_as_account.gemspec` to reflect new dependencies and version
+  + Update Rakefile to be able to use `mysql2` for connecting to MySQL database
+  + Add Docker Compose file for running MySQL service for testing
+  + Update database.yml files to point to MySQL or SQLite databases
+  + Create a new file features/support/db.rb for setting up the database connection
+* Update copyright year upto **2024**
+
 ## 2024-10-28 v3.4.1
 
 * Improved account management features:

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2010 gut.org gAG
+Copyright (c) 2010-2024 gut.org gAG
 
 Apache License
                            Version 2.0, January 2004

data/README.md

@@ -52,4 +52,4 @@ This gem was written for the payment backend of betterplace.org by [Thies C. Arn
 
 ## Copyright
 
-Copyright (c) 2010, 2022 [gut.org gAG](https://gut.org), released under the [Apache License v2.0](LICENSE).
+Copyright (c) 2010-2024 [gut.org gAG](https://gut.org), released under the [Apache License v2.0](LICENSE).

data/Rakefile

@@ -8,10 +8,16 @@ GemHadar do
   email       'developers@betterplace.org'
   homepage    "https://github.com/betterplace/acts_as_account"
   summary     'acts_as_account implements double entry accounting for Rails models'
-  description 'acts_as_account implements double entry accounting for Rails models. Your models get accounts and you can do consistent transactions between them. Since the documentation is sparse, see the transfer.feature for usage examples.'
+  description <<~EOT
+    acts_as_account implements double entry accounting for Rails models. Your
+    models get accounts and you can do consistent transactions between them.
+    Since the documentation is sparse, see the transfer.feature for usage
+    examples.
+  EOT
+
   test_dir    'tests'
   ignore      '.*.sw[pon]', 'pkg', 'Gemfile.lock', 'coverage', '.rvmrc',
-    '.AppleDouble', 'tags', '.byebug_history', '.DS_Store'
+    '.AppleDouble', 'tags', '.byebug_history', '.DS_Store', '/log/*'
   readme      'README.md'
   title       "#{name.camelize} -- More Math in Ruby"
   licenses << 'Apache-2.0'
@@ -20,23 +26,21 @@ GemHadar do
   dependency 'actionpack'  ,         '>= 4.1', '<8'
   development_dependency 'cucumber'
   development_dependency 'sqlite3'
+  development_dependency 'mysql2'
   development_dependency 'rspec'
   development_dependency 'simplecov'
   development_dependency 'database_cleaner'
   development_dependency 'rubocop'
-end
-
-def connect_database
-  require 'active_record'
-  require 'yaml'
-  db_config = YAML.load_file('features/db/database.yml')
-  ActiveRecord::Base.establish_connection(db_config).lease_connection
+  development_dependency 'debug'
 end
 
 namespace :features do
+  task :connect_database do
+    load("#{__dir__}/features/support/db.rb")
+  end
+
   desc "create test database out of db/schema.rb"
-  task :create_database do
-    connect_database
+  task :create_database => :connect_database do
     load("#{__dir__}/features/db/schema.rb")
   end
 end

data/VERSION

@@ -1 +1 @@
-3.4.1
+3.4.2

data/acts_as_account.gemspec

@@ -1,18 +1,18 @@
 # -*- encoding: utf-8 -*-
-# stub: acts_as_account 3.4.1 ruby lib
+# stub: acts_as_account 3.4.2 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "acts_as_account".freeze
-  s.version = "3.4.1".freeze
+  s.version = "3.4.2".freeze
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib".freeze]
   s.authors = ["Thies C. Arntzen, Norman Timmler, Matthias Frick, Phillip Oertel".freeze]
-  s.date = "2024-10-28"
-  s.description = "acts_as_account implements double entry accounting for Rails models. Your models get accounts and you can do consistent transactions between them. Since the documentation is sparse, see the transfer.feature for usage examples.".freeze
+  s.date = "2024-11-01"
+  s.description = "acts_as_account implements double entry accounting for Rails models. Your\nmodels get accounts and you can do consistent transactions between them.\nSince the documentation is sparse, see the transfer.feature for usage\nexamples.\n".freeze
   s.email = "developers@betterplace.org".freeze
   s.extra_rdoc_files = ["README.md".freeze, "lib/acts_as_account.rb".freeze, "lib/acts_as_account/account.rb".freeze, "lib/acts_as_account/active_record_extensions.rb".freeze, "lib/acts_as_account/configuration.rb".freeze, "lib/acts_as_account/global_account.rb".freeze, "lib/acts_as_account/journal.rb".freeze, "lib/acts_as_account/manually_created_account.rb".freeze, "lib/acts_as_account/posting.rb".freeze, "lib/acts_as_account/rails.rb".freeze, "lib/acts_as_account/transfer.rb".freeze, "lib/acts_as_account/version.rb".freeze]
-  s.files = [".github/workflows/lint.yml".freeze, ".github/workflows/tests.yml".freeze, ".gitignore".freeze, ".rubocop.yml".freeze, "CHANGELOG.md".freeze, "Gemfile".freeze, "LICENSE".freeze, "README.md".freeze, "Rakefile".freeze, "VERSION".freeze, "acts_as_account.gemspec".freeze, "acts_as_account.sqlite".freeze, "cucumber.yml".freeze, "features/account/account_creation.feature".freeze, "features/db/database.yml".freeze, "features/db/schema.rb".freeze, "features/step_definitions/account_steps.rb".freeze, "features/support/abstract_user.rb".freeze, "features/support/cheque.rb".freeze, "features/support/env.rb".freeze, "features/support/inheriting_user.rb".freeze, "features/support/user.rb".freeze, "features/transfer/journal_creation.feature".freeze, "features/transfer/transfer.feature".freeze, "init.rb".freeze, "lib/acts_as_account.rb".freeze, "lib/acts_as_account/account.rb".freeze, "lib/acts_as_account/active_record_extensions.rb".freeze, "lib/acts_as_account/configuration.rb".freeze, "lib/acts_as_account/global_account.rb".freeze, "lib/acts_as_account/journal.rb".freeze, "lib/acts_as_account/manually_created_account.rb".freeze, "lib/acts_as_account/posting.rb".freeze, "lib/acts_as_account/rails.rb".freeze, "lib/acts_as_account/transfer.rb".freeze, "lib/acts_as_account/version.rb".freeze]
+  s.files = [".github/workflows/lint.yml".freeze, ".github/workflows/tests.yml".freeze, ".gitignore".freeze, ".rubocop.yml".freeze, "CHANGELOG.md".freeze, "Gemfile".freeze, "LICENSE".freeze, "README.md".freeze, "Rakefile".freeze, "VERSION".freeze, "acts_as_account.gemspec".freeze, "acts_as_account.sqlite".freeze, "cucumber.yml".freeze, "docker-compose.yml".freeze, "features/account/account_creation.feature".freeze, "features/db/database.yml".freeze, "features/db/schema.rb".freeze, "features/step_definitions/account_steps.rb".freeze, "features/support/abstract_user.rb".freeze, "features/support/cheque.rb".freeze, "features/support/db.rb".freeze, "features/support/env.rb".freeze, "features/support/inheriting_user.rb".freeze, "features/support/user.rb".freeze, "features/transfer/journal_creation.feature".freeze, "features/transfer/transfer.feature".freeze, "init.rb".freeze, "lib/acts_as_account.rb".freeze, "lib/acts_as_account/account.rb".freeze, "lib/acts_as_account/active_record_extensions.rb".freeze, "lib/acts_as_account/configuration.rb".freeze, "lib/acts_as_account/global_account.rb".freeze, "lib/acts_as_account/journal.rb".freeze, "lib/acts_as_account/manually_created_account.rb".freeze, "lib/acts_as_account/posting.rb".freeze, "lib/acts_as_account/rails.rb".freeze, "lib/acts_as_account/transfer.rb".freeze, "lib/acts_as_account/version.rb".freeze, "log/.keep".freeze]
   s.homepage = "https://github.com/betterplace/acts_as_account".freeze
   s.licenses = ["Apache-2.0".freeze]
   s.rdoc_options = ["--title".freeze, "ActsAsAccount -- More Math in Ruby".freeze, "--main".freeze, "README.md".freeze]
@@ -24,10 +24,12 @@ Gem::Specification.new do |s|
   s.add_development_dependency(%q<gem_hadar>.freeze, ["~> 1.19".freeze])
   s.add_development_dependency(%q<cucumber>.freeze, [">= 0".freeze])
   s.add_development_dependency(%q<sqlite3>.freeze, [">= 0".freeze])
+  s.add_development_dependency(%q<mysql2>.freeze, [">= 0".freeze])
   s.add_development_dependency(%q<rspec>.freeze, [">= 0".freeze])
   s.add_development_dependency(%q<simplecov>.freeze, [">= 0".freeze])
   s.add_development_dependency(%q<database_cleaner>.freeze, [">= 0".freeze])
   s.add_development_dependency(%q<rubocop>.freeze, [">= 0".freeze])
+  s.add_development_dependency(%q<debug>.freeze, [">= 0".freeze])
   s.add_runtime_dependency(%q<activerecord>.freeze, [">= 5.1".freeze, "< 8".freeze])
   s.add_runtime_dependency(%q<actionpack>.freeze, [">= 4.1".freeze, "< 8".freeze])
 end

data/docker-compose.yml

@@ -0,0 +1,12 @@
+services:
+  mysql:
+    image: mysql:8.0
+    restart: unless-stopped
+    ports:
+    - "127.0.0.1:3306:3306"
+    volumes:
+    - "mysql-data:/var/lib/mysql:delegated"
+    environment:
+      - "MYSQL_ALLOW_EMPTY_PASSWORD=1"
+volumes:
+  mysql-data:

data/features/db/database.yml

@@ -1,5 +1,13 @@
-adapter: sqlite3
-encoding: utf8
-database: acts_as_account.sqlite
-username: root
-host: localhost
+mysql:
+  adapter: mysql2
+  encoding: utf8
+  database: acts_as_account
+  username: root
+  host: 127.0.0.1
+  port: 3306
+sqlite:
+  adapter: sqlite3
+  encoding: utf8
+  database: acts_as_account.sqlite
+  username: root
+  host: localhost

data/features/support/db.rb

@@ -0,0 +1,12 @@
+require 'active_record'
+require 'yaml'
+db_type   = ENV.fetch('DATABASE_TYPE', 'sqlite')
+db_config = YAML.load_file('features/db/database.yml').fetch(db_type)
+if db_type == 'mysql'
+  ActiveRecord::Base.establish_connection(db_config.except('database')).with_connection do |c|
+    c.execute p %{CREATE DATABASE IF NOT EXISTS #{db_config.fetch('database')}}
+  end
+end
+ActiveRecord::Base.establish_connection(db_config).with_connection do |c|
+  c.execute %{ SELECT 1}
+end

data/features/support/env.rb

@@ -6,9 +6,7 @@ if ENV['START_SIMPLECOV'].to_i == 1
 end
 
 require 'acts_as_account'
-require 'yaml'
-db_config = YAML.load_file(__dir__ + '/../db/database.yml')
-ActiveRecord::Base.establish_connection(db_config)
+require_relative 'db'
 
 require 'database_cleaner'
 require 'database_cleaner/cucumber'
@@ -30,4 +28,7 @@ Before do
     # Default values:
     # config.persist_attributes_on_account = true
   end
+  if ENV['DATABASE_LOG'].to_i == 1 && ActiveRecord::Base.logger.nil?
+    ActiveRecord::Base.logger = Logger.new(File.open("log/cucumber.log", 'a'))
+  end
 end

data/lib/acts_as_account/journal.rb

@@ -37,7 +37,7 @@ module ActsAsAccount
               "amount: #{amount}",
               "from: #{from_account.id}",
               "to: #{to_account.id}",
-              "reference: #{reference.class.name}(#{reference.id})",
+              "reference: #{reference.class.name}(#{reference&.id})",
               "valuta: #{valuta}",
             ].join(' ')
           )
@@ -52,7 +52,7 @@ module ActsAsAccount
         posting1 = build_posting(-amount,  from_account,   to_account, reference, valuta)
         posting2 = build_posting( amount,    to_account, from_account, reference, valuta)
 
-        result = postings.model.insert_all([ posting1.attributes, posting2.attributes ])
+        result = postings.model.insert_all([ posting1.attributes.compact, posting2.attributes.compact ])
 
         update_attributes_on(from_account, -amount)
         update_attributes_on(to_account,    amount)

data/lib/acts_as_account/version.rb

@@ -1,6 +1,6 @@
 module ActsAsAccount
   # ActsAsAccount version
-  VERSION         = '3.4.1'
+  VERSION         = '3.4.2'
   VERSION_ARRAY   = VERSION.split('.').map(&:to_i) # :nodoc:
   VERSION_MAJOR   = VERSION_ARRAY[0] # :nodoc:
   VERSION_MINOR   = VERSION_ARRAY[1] # :nodoc:

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: acts_as_account
 version: !ruby/object:Gem::Version
-  version: 3.4.1
+  version: 3.4.2
 platform: ruby
 authors:
 - Thies C. Arntzen, Norman Timmler, Matthias Frick, Phillip Oertel
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-10-28 00:00:00.000000000 Z
+date: 2024-11-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gem_hadar
@@ -52,6 +52,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: mysql2
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -108,6 +122,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: debug
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
@@ -148,9 +176,11 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '8'
-description: acts_as_account implements double entry accounting for Rails models.
-  Your models get accounts and you can do consistent transactions between them. Since
-  the documentation is sparse, see the transfer.feature for usage examples.
+description: |
+  acts_as_account implements double entry accounting for Rails models. Your
+  models get accounts and you can do consistent transactions between them.
+  Since the documentation is sparse, see the transfer.feature for usage
+  examples.
 email: developers@betterplace.org
 executables: []
 extensions: []
@@ -181,12 +211,14 @@ files:
 - acts_as_account.gemspec
 - acts_as_account.sqlite
 - cucumber.yml
+- docker-compose.yml
 - features/account/account_creation.feature
 - features/db/database.yml
 - features/db/schema.rb
 - features/step_definitions/account_steps.rb
 - features/support/abstract_user.rb
 - features/support/cheque.rb
+- features/support/db.rb
 - features/support/env.rb
 - features/support/inheriting_user.rb
 - features/support/user.rb
@@ -204,6 +236,7 @@ files:
 - lib/acts_as_account/rails.rb
 - lib/acts_as_account/transfer.rb
 - lib/acts_as_account/version.rb
+- log/.keep
 homepage: https://github.com/betterplace/acts_as_account
 licenses:
 - Apache-2.0