resume work

Author: seuros

.env.example

@@ -0,0 +1,10 @@
+# Copy this file to .env and update with your database connection strings
+
+# PostgreSQL primary database
+DATABASE_URL_PG=postgresql://closure_tree:closure_tree_pass@localhost:5434/closure_tree_test
+
+# MySQL secondary database
+DATABASE_URL_MYSQL=mysql2://closure_tree:closure_tree_pass@localhost:3367/closure_tree_test
+
+# SQLite database (optional, in-memory by default)
+# DATABASE_URL_SQLITE3=sqlite3:closure_tree_test.db

.release-please-manifest.json

@@ -1 +1,2 @@
+
 {".":"8.0.0"}

Gemfile

@@ -4,6 +4,7 @@ source 'https://rubygems.org'
 
 gemspec
 
+gem 'dotenv'
 gem 'railties'
 gem 'with_advisory_lock', github: 'closuretree/with_advisory_lock'
 
@@ -16,9 +17,8 @@ platforms :ruby, :truffleruby do
   gem 'sqlite3'
 end
 
-platform :jruby do
-  # JRuby-specific gems
-  gem 'activerecord-jdbcmysql-adapter'
-  gem 'activerecord-jdbcpostgresql-adapter'
-  gem 'activerecord-jdbcsqlite3-adapter'
+# Testing gems
+group :test do
+  gem 'maxitest'
+  gem 'mocha'
 end

README.md

@@ -24,7 +24,7 @@ closure_tree has some great features:
   * 2 SQL INSERTs on node creation
   * 3 SQL INSERT/UPDATEs on node reparenting
 * __Support for [concurrency](#concurrency)__ (using [with_advisory_lock](https://github.com/ClosureTree/with_advisory_lock))
-* __Tested against ActiveRecord 7.1+ with Ruby 3.3+__
+* __Tested against ActiveRecord 7.2+ with Ruby 3.3+__
 * Support for reparenting children (and all their descendants)
 * Support for [single-table inheritance (STI)](#sti) within the hierarchy
 * ```find_or_create_by_path``` for [building out heterogeneous hierarchies quickly and conveniently](#find_or_create_by_path)
@@ -52,7 +52,7 @@ for a description of different tree storage algorithms.
 
 ## Installation
 
-Note that closure_tree only supports ActiveRecord 7.1 and later, and has test coverage for MySQL, PostgreSQL, and SQLite.
+Note that closure_tree only supports ActiveRecord 7.2 and later, and has test coverage for MySQL, PostgreSQL, and SQLite.
 
 1.  Add `gem 'closure_tree'` to your Gemfile
 
@@ -629,57 +629,37 @@ Upgrade to MySQL 5.7.12 or later if you see [this issue](https://github.com/Clos
 
 ## Testing with Closure Tree
 
-Closure tree comes with some RSpec2/3 matchers which you may use for your tests:
+Closure tree comes with test matchers which you may use in your tests:
 
 ```ruby
-require 'spec_helper'
+require 'test_helper'
 require 'closure_tree/test/matcher'
 
-describe Category do
- # Should syntax
- it { should be_a_closure_tree }
- # Expect syntax
- it { is_expected.to be_a_closure_tree }
-end
-
-describe Label do
- # Should syntax
- it { should be_a_closure_tree.ordered }
- # Expect syntax
- it { is_expected.to be_a_closure_tree.ordered }
-end
-
-describe TodoList::Item do
- # Should syntax
- it { should be_a_closure_tree.ordered(:priority_order) }
- # Expect syntax
- it { is_expected.to be_a_closure_tree.ordered(:priority_order) }
+class CategoryTest < ActiveSupport::TestCase
+  test "should be a closure tree" do
+    assert Category.new.is_a?(ClosureTree::Model)
+  end
 end
-
 ```
 
 ## Testing
 
 Closure tree is [tested under every valid combination](https://github.com/ClosureTree/closure_tree/blob/master/.github/workflows/ci.yml) of
 
 * Ruby 3.3+
-* ActiveRecord 7.1+
+* ActiveRecord 7.2+
 * PostgreSQL, MySQL, and SQLite. Concurrency tests are only run with MySQL and PostgreSQL.
 
 ```shell
 $ bundle
-$ appraisal bundle # this will install the matrix of dependencies
-$ appraisal rake # this will run the tests in all combinations
-$ appraisal activerecord-7.0 rake # this will run the tests in AR 7.0 only
-$ appraisal activerecord-7.0 rake spec # this will run rspec in AR 7.0 only
-$ appraisal activerecord-7.0 rake test # this will run minitest in AR 7.0 only
+$ rake test # this will run the tests
 ```
 
 By default the test are run with sqlite3 only. 
 You run test with other databases by passing the database url as environment variable:
 
 ```shell
-$ DATABASE_URL=postgres://localhost/my_database appraisal activerecord-7.0 rake test 
+$ DATABASE_URL=postgres://localhost/my_database rake test 
 ```
 
 ## Change log

Rakefile

@@ -24,7 +24,6 @@ namespace :test do
   end
 end
 
-
 require_relative 'test/dummy/config/application'
 
-Rails.application.load_tasks
+Rails.application.load_tasks

bin/appraisal

@@ -12,4 +12,4 @@ ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__)
 require 'bundler/setup' if File.exist?(ENV['BUNDLE_GEMFILE'])
 
 require 'rails/all'
-require 'rails/engine/commands'
+require 'rails/engine/commands'

bin/rails

@@ -8,11 +8,11 @@
 # this file is here to facilitate running it.
 #
 
-require "pathname"
-ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile",
-  Pathname.new(__FILE__).realpath)
+require 'pathname'
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile',
+                                           Pathname.new(__FILE__).realpath)
 
-bundle_binstub = File.expand_path("../bundle", __FILE__)
+bundle_binstub = File.expand_path('bundle', __dir__)
 
 if File.file?(bundle_binstub)
   if File.read(bundle_binstub, 300) =~ /This file was generated by Bundler/
@@ -23,7 +23,7 @@ Replace `bin/bundle` by running `bundle binstubs bundler --force`, then run this
   end
 end
 
-require "rubygems"
-require "bundler/setup"
+require 'rubygems'
+require 'bundler/setup'
 
-load Gem.bin_path("rake", "rake")
+load Gem.bin_path('rake', 'rake')

bin/rake

@@ -9,31 +9,31 @@ Gem::Specification.new do |gem|
   gem.email       = %w[matthew+github@mceachen.org terminale@gmail.com]
   gem.homepage    = 'https://github.com/ClosureTree/closure_tree/'
 
-  gem.summary     = %q(Easily and efficiently make your ActiveRecord model support hierarchies)
+  gem.summary     = 'Easily and efficiently make your ActiveRecord model support hierarchies'
   gem.license     = 'MIT'
 
   gem.metadata = {
-    'bug_tracker_uri'   => "https://github.com/ClosureTree/closure_tree/issues",
-    'changelog_uri'     => "https://github.com/ClosureTree/closure_tree/blob/master/CHANGELOG.md",
+    'bug_tracker_uri' => 'https://github.com/ClosureTree/closure_tree/issues',
+    'changelog_uri' => 'https://github.com/ClosureTree/closure_tree/blob/master/CHANGELOG.md',
     'documentation_uri' => "https://www.rubydoc.info/gems/closure_tree/#{gem.version}",
-    'homepage_uri'      => "https://closuretree.github.io/closure_tree/",
-    'source_code_uri'   => "https://github.com/ClosureTree/closure_tree",
+    'homepage_uri' => 'https://closuretree.github.io/closure_tree/',
+    'source_code_uri' => 'https://github.com/ClosureTree/closure_tree',
+    'rubygems_mfa_required' => 'true'
   }
 
-  gem.files         = `git ls-files`.split($/).reject do |f|
-    f.match(%r{^(test|img|gemfiles)})
+  gem.files = `git ls-files`.split($/).reject do |f|
+    f.match(/^(test|img|gemfiles)/)
   end
 
-  gem.test_files  = gem.files.grep(%r{^test/})
   gem.required_ruby_version = '>= 3.3.0'
 
-  gem.add_runtime_dependency 'activerecord', '>= 7.1.0'
-  gem.add_runtime_dependency 'with_advisory_lock', '>= 6.0.0'
+  gem.add_dependency 'activerecord', '>= 7.2.0'
+  gem.add_dependency 'with_advisory_lock', '>= 7.0.0'
 
   gem.add_development_dependency 'database_cleaner'
-  gem.add_development_dependency 'parallel'
   gem.add_development_dependency 'minitest'
   gem.add_development_dependency 'minitest-reporters'
+  gem.add_development_dependency 'parallel'
   gem.add_development_dependency 'simplecov'
   gem.add_development_dependency 'timecop'
   # gem.add_development_dependency 'byebug'