Fix test passing blank input into required field

SQLite3::SQLException: circular reference

.gitignore

@@ -15,6 +15,9 @@
 /config/master.key
 /config/puma.rb
 
+# Ignore test database.
+/db/test.sqlite3
+
 # Ignore all logfiles and tempfiles.
 /log/*
 /tmp/*
@@ -30,7 +33,7 @@
 
 /tmp/restart.txt
 
-# Ignore user files
+# Ignore user files.
 /.bash_history
 /.byebug_history
 /.config
@@ -38,6 +41,7 @@
 /.lesshst
 /.local
 /.mysql_history
+/.sqlite_history
 /.ssh
 /.vim
 /.viminfo

CLAUDE.md

@@ -1,122 +0,0 @@
-# CLAUDE.md
-
-This file provides guidance to Claude Code (claude.ai/code) when working with code in this repository.
-
-## Project Overview
-
-Fixin.me is a "quantified self" Rails 7.2.3 application for personal data tracking. Users define hierarchical **quantities** (metrics to track), **units** (with optional conversion hierarchies), and **readouts** (individual measurements). There is also a non-persistent **measurement** model used as a form wrapper.
-
-## Setup
-
-Configuration files are distributed as `.dist` templates — copy and customize before use:
-
-```bash
-cp config/application.rb.dist config/application.rb
-cp config/database.yml.dist config/database.yml
-cp config/puma.rb.dist config/puma.rb
-```
-
-```bash
-bundle config --local frozen true
-bundle config --local path .gem
-bundle config --local with mysql development test   # or: pg, sqlite
-bundle install
-RAILS_ENV=development bundle exec rails db:create db:migrate db:seed
-```
-
-## Common Commands
-
-```bash
-bundle exec rails s                                          # start server
-bundle exec rails test                                       # all unit/model/controller tests
-bundle exec rails test:system                                # all system tests (Capybara + Selenium)
-bundle exec rails test test/system/units_test.rb            # single test file
-bundle exec rails test --seed 64690 --name test_add_unit    # single test by name
-bundle exec rails db:seed:export                             # export default settings as seed file
-```
-
-## Architecture
-
-### Data Model
-
-- **Quantity** — hierarchical tree (self-referential `parent_id`). Cached `depth` and `pathname` fields are recomputed via recursive CTEs on write. Direct assignment to cached fields is blocked.
-- **Unit** — optional hierarchy via `base_id` and `multiplier` for unit conversion. Multiplier precision/scale is validated by a custom validator.
-- **Readout** — single measurement: `value` (IEEE 754 float), `quantity`, `unit`, `category`.
-- **Measurement** — `ActiveModel::Model` form wrapper (not database-backed); bridges the readout creation form.
-- **User** — Devise-managed with a status enum: `admin`, `active`, `restricted`, `locked`, `disabled`. Admins can disguise as other users.
-
-### Hierarchical Queries
-
-Both `Quantity` and `Unit` use recursive CTEs for tree traversal (ordered traversal, ancestors, progenies, common ancestors). `lib/core_ext/arel/` patches Arel to support CTE with `UPDATE`/`DELETE` statements, working around Rails issue #54658.
-
-### Custom Extensions (`lib/core_ext/`)
-
-- **arel/** — CTE support for UPDATE/DELETE
-- **active_model/** — precision/scale validator used by `Unit#multiplier`
-- **active_record/** — `attr_cached` mechanism (see `ApplicationRecord`)
-- **action_view/** — record identifier suffixes
-- Miscellaneous: `Array#delete_bang`, `BigDecimal` scientific notation
-
-### Response Handling
-
-Controllers respond to both HTML and Turbo Stream formats. Errors during Turbo Stream requests trigger a redirect with flash rather than rendering inline, handled in `ApplicationController`.
-
-### Numeric Precision
-
-Readout values are stored as IEEE 754 double-precision floats (not fixed-point decimals). Rationale in `DESIGN.md`: biological values span many orders of magnitude; 15-digit float precision is sufficient and avoids conversion overhead.
-
-### Routes
-
-```
-measurements   GET/POST /measurements
-readouts       GET/POST /readouts, DELETE /readouts/:id/discard
-quantities     CRUD + POST /quantities/:id/reparent
-units          CRUD + POST /units/:id/rebase
-users          CRUD + POST /users/:id/disguise, POST /users/revert
-default/       namespace for default units import/export and admin panel
-root           → /units (authenticated), /sign_in (unauthenticated)
-```
-
-## JavaScript Conventions
-
-### Use Stimulus for all JS behavior
-
-This app uses **Hotwire = Turbo + Stimulus**. All JavaScript behavior must be in Stimulus controllers under `app/javascript/controllers/`. Never use:
-- Inline HTML event handlers: `onclick="..."`, `onkeydown="..."`, `ondragstart="..."` etc.
-- Global `window.*` function exports
-- Bare `<script>` blocks in templates
-- `turbo:load` listeners for behavior that belongs in a controller's `connect()` lifecycle
-
-**Instead:**
-- Put behavior in a Stimulus controller method
-- Wire it with `data-action="event->controller#method"` in the template
-- Use `data-controller="name"` on the root element, `data-[name]-target="targetName"` for targets, `data-[name]-[valueName]-value="..."` for values
-- Use `connect()` / `disconnect()` for setup/teardown (MutationObservers, event listeners, etc.)
-
-Controller filename `foo_bar_controller.js` → identifier `foo-bar` → `data-controller="foo-bar"`.
-
-### No manual fetch() — use Turbo
-
-Never make AJAX requests with `fetch()` in JavaScript. Use Turbo's built-in mechanisms instead:
-
-- **Links/buttons that trigger server actions**: use `data: {turbo_stream: true}` on the element (link or button_to form).
-- **Dynamic form submissions from JS** (where HTML alone isn't enough): create a form element, append hidden inputs, and call `form.requestSubmit()`. Turbo intercepts it automatically — no manual CSRF handling, no `Turbo.renderStreamMessage()`.
-  ```javascript
-  var form = document.createElement('form');
-  form.action = url; form.method = 'post'; form.dataset.turboStream = 'true';
-  // append hidden inputs...
-  form.addEventListener('turbo:submit-end', function() { form.remove(); });
-  document.body.appendChild(form);
-  form.requestSubmit();
-  ```
-- **Server-rendered HTML**: use ERB partials and Turbo Stream views (`*.turbo_stream.erb`), never build HTML in JavaScript.
-
-### No HTML generation in JavaScript
-
-Never use JavaScript to build and insert HTML (no `innerHTML =`, no `createElement` trees for content). Render HTML server-side in ERB partials; update the DOM via Turbo Stream actions (`replace`, `update`, `append`, etc.).
-
-## Database Requirements
-
-The database must support:
-- Recursive CTEs with `UPDATE`/`DELETE` (MySQL ≥ 8.0, PostgreSQL, or SQLite3)
-- Decimal precision of 30+ digits

DESIGN.md

@@ -32,3 +32,14 @@ whenever a change is considered, to avoid regressions.
     * as a standard with hardware implementations ensures both: computing
       efficiency and hardware/3rd party library compatibility as opposed to Ruby
       custom `BigDecimal` type
+
+### Database layer vs application layer data model constraints
+* database constraints are the final guard against data integrity corruption,
+    * they should safeguard against data referential integrity loss under _all_
+      data (not schema) manipulation scenarios, including application level
+      logic errors and direct data manipulation (e.g. through `dbconsole`),
+* application constraints can be as restrictive as database constraints or more,
+  but not less, as it doesn't serve any use case,
+    * proper application level constraints should prevent unhandled database
+      exception occurences, e.g `ActiveRecord::InvalidForeignKey` for operations
+      performed through Models (i.e. not `#delete_all` etc.)

Gemfile

@@ -1,14 +1,18 @@
 source "https://rubygems.org"
 
 # The requirement for the Ruby version comes from Rails
-gem "rails", "~> 7.2.3"
+# NOTE: after updating Rails make sure that schema dump is not sorted:
+#   v8.1.3/activerecord/lib/active_record/schema_dumper.rb#L195
+# Waiting for this change to be reverted/configuration setting added:
+# https://github.com/rails/rails/pull/56842, https://github.com/rails/rails/pull/55414
+gem "rails", "~> 8.1.3"
 gem "sprockets-rails"
 gem "puma", "~> 6.0"
 gem "sassc-rails"
 # Windows does not include zoneinfo files, so bundle the tzinfo-data gem
 gem "tzinfo-data", platforms: %i[ mingw mswin x64_mingw jruby ]
 
-# TODO: select db gems automatically
+# TODO: select db gems automatically?
 #   database_config = ERB.new(File.read("config/database.yml")).result
 #   YAML.load(database_config, aliases: true).values.map { |env| env["adapter"] }.uniq
 group :mysql, optional: true do
@@ -25,7 +29,6 @@ gem "devise"
 
 gem "importmap-rails"
 gem "turbo-rails", "~> 2.0"
-gem "stimulus-rails"
 
 group :development, :test do
   gem "byebug"
@@ -43,11 +46,4 @@ group :test do
   # Use system testing [https://guides.rubyonrails.org/testing.html#system-testing]
   gem "capybara"
   gem "selenium-webdriver"
-
-  # Remove minitest version restriction after error fixed:
-  #   railties-7.2.3/lib/rails/test_unit/line_filtering.rb:7:in `run':
-  #     wrong number of arguments (given 3, expected 1..2) (ArgumentError)
-  #   from /var/www/.gem/ruby/3.3.0/gems/minitest-6.0.2/lib/minitest.rb:473:in
-  #     `block (2 levels) in run_suite'
-  gem "minitest", "< 6"
 end

Gemfile.lock

@@ -1,85 +1,85 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (7.2.3)
+    action_text-trix (2.1.18)
-      actionpack (= 7.2.3)
+      railties
-      activesupport (= 7.2.3)
+    actioncable (8.1.3)
+      actionpack (= 8.1.3)
+      activesupport (= 8.1.3)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
       zeitwerk (~> 2.6)
-    actionmailbox (7.2.3)
+    actionmailbox (8.1.3)
-      actionpack (= 7.2.3)
+      actionpack (= 8.1.3)
-      activejob (= 7.2.3)
+      activejob (= 8.1.3)
-      activerecord (= 7.2.3)
+      activerecord (= 8.1.3)
-      activestorage (= 7.2.3)
+      activestorage (= 8.1.3)
-      activesupport (= 7.2.3)
+      activesupport (= 8.1.3)
       mail (>= 2.8.0)
-    actionmailer (7.2.3)
+    actionmailer (8.1.3)
-      actionpack (= 7.2.3)
+      actionpack (= 8.1.3)
-      actionview (= 7.2.3)
+      actionview (= 8.1.3)
-      activejob (= 7.2.3)
+      activejob (= 8.1.3)
-      activesupport (= 7.2.3)
+      activesupport (= 8.1.3)
       mail (>= 2.8.0)
       rails-dom-testing (~> 2.2)
-    actionpack (7.2.3)
+    actionpack (8.1.3)
-      actionview (= 7.2.3)
+      actionview (= 8.1.3)
-      activesupport (= 7.2.3)
+      activesupport (= 8.1.3)
-      cgi
       nokogiri (>= 1.8.5)
-      racc
+      rack (>= 2.2.4)
-      rack (>= 2.2.4, < 3.3)
       rack-session (>= 1.0.1)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.2)
       rails-html-sanitizer (~> 1.6)
       useragent (~> 0.16)
-    actiontext (7.2.3)
+    actiontext (8.1.3)
-      actionpack (= 7.2.3)
+      action_text-trix (~> 2.1.15)
-      activerecord (= 7.2.3)
+      actionpack (= 8.1.3)
-      activestorage (= 7.2.3)
+      activerecord (= 8.1.3)
-      activesupport (= 7.2.3)
+      activestorage (= 8.1.3)
+      activesupport (= 8.1.3)
       globalid (>= 0.6.0)
       nokogiri (>= 1.8.5)
-    actionview (7.2.3)
+    actionview (8.1.3)
-      activesupport (= 7.2.3)
+      activesupport (= 8.1.3)
       builder (~> 3.1)
-      cgi
       erubi (~> 1.11)
       rails-dom-testing (~> 2.2)
       rails-html-sanitizer (~> 1.6)
-    activejob (7.2.3)
+    activejob (8.1.3)
-      activesupport (= 7.2.3)
+      activesupport (= 8.1.3)
       globalid (>= 0.3.6)
-    activemodel (7.2.3)
+    activemodel (8.1.3)
-      activesupport (= 7.2.3)
+      activesupport (= 8.1.3)
-    activerecord (7.2.3)
+    activerecord (8.1.3)
-      activemodel (= 7.2.3)
+      activemodel (= 8.1.3)
-      activesupport (= 7.2.3)
+      activesupport (= 8.1.3)
       timeout (>= 0.4.0)
-    activestorage (7.2.3)
+    activestorage (8.1.3)
-      actionpack (= 7.2.3)
+      actionpack (= 8.1.3)
-      activejob (= 7.2.3)
+      activejob (= 8.1.3)
-      activerecord (= 7.2.3)
+      activerecord (= 8.1.3)
-      activesupport (= 7.2.3)
+      activesupport (= 8.1.3)
       marcel (~> 1.0)
-    activesupport (7.2.3)
+    activesupport (8.1.3)
       base64
-      benchmark (>= 0.3)
       bigdecimal
       concurrent-ruby (~> 1.0, >= 1.3.1)
       connection_pool (>= 2.2.5)
       drb
       i18n (>= 1.6, < 2)
+      json
       logger (>= 1.4.2)
       minitest (>= 5.1)
       securerandom (>= 0.3)
       tzinfo (~> 2.0, >= 2.0.5)
-    addressable (2.8.8)
+      uri (>= 0.13.1)
+    addressable (2.9.0)
       public_suffix (>= 2.0.2, < 8.0)
     base64 (0.3.0)
-    bcrypt (3.1.21)
+    bcrypt (3.1.22)
-    benchmark (0.5.0)
+    bigdecimal (4.1.2)
-    bigdecimal (4.0.1)
     bindex (0.8.1)
     builder (3.3.0)
     byebug (13.0.0)
@@ -93,28 +93,27 @@ GEM
       rack-test (>= 0.6.3)
       regexp_parser (>= 1.5, < 3.0)
       xpath (~> 3.2)
-    cgi (0.5.1)
     concurrent-ruby (1.3.6)
     connection_pool (3.0.2)
     crass (1.0.6)
     date (3.5.1)
-    devise (5.0.2)
+    devise (5.0.3)
       bcrypt (~> 3.0)
       orm_adapter (~> 0.1)
       railties (>= 7.0)
       responders
       warden (~> 1.2.3)
     drb (2.2.3)
-    erb (6.0.2)
+    erb (6.0.4)
     erubi (1.13.1)
-    ffi (1.17.3-aarch64-linux-gnu)
+    ffi (1.17.4-aarch64-linux-gnu)
-    ffi (1.17.3-aarch64-linux-musl)
+    ffi (1.17.4-aarch64-linux-musl)
-    ffi (1.17.3-arm-linux-gnu)
+    ffi (1.17.4-arm-linux-gnu)
-    ffi (1.17.3-arm-linux-musl)
+    ffi (1.17.4-arm-linux-musl)
-    ffi (1.17.3-arm64-darwin)
+    ffi (1.17.4-arm64-darwin)
-    ffi (1.17.3-x86_64-darwin)
+    ffi (1.17.4-x86_64-darwin)
-    ffi (1.17.3-x86_64-linux-gnu)
+    ffi (1.17.4-x86_64-linux-gnu)
-    ffi (1.17.3-x86_64-linux-musl)
+    ffi (1.17.4-x86_64-linux-musl)
     globalid (1.3.0)
       activesupport (>= 6.1)
     i18n (1.14.8)
@@ -124,13 +123,14 @@ GEM
       activesupport (>= 6.0.0)
       railties (>= 6.0.0)
     io-console (0.8.2)
-    irb (1.17.0)
+    irb (1.18.0)
       pp (>= 0.6.0)
       prism (>= 1.3.0)
       rdoc (>= 4.0.0)
       reline (>= 0.4.2)
+    json (2.19.4)
     logger (1.7.0)
-    loofah (2.25.0)
+    loofah (2.25.1)
       crass (~> 1.0.2)
       nokogiri (>= 1.12.0)
     mail (2.9.0)
@@ -142,10 +142,12 @@ GEM
     marcel (1.1.0)
     matrix (0.4.3)
     mini_mime (1.1.5)
-    minitest (5.27.0)
+    minitest (6.0.6)
+      drb (~> 2.0)
+      prism (~> 1.5)
     mysql2 (0.5.7)
       bigdecimal
-    net-imap (0.6.3)
+    net-imap (0.6.4)
       date
       net-protocol
     net-pop (0.1.2)
@@ -155,21 +157,21 @@ GEM
     net-smtp (0.5.1)
       net-protocol
     nio4r (2.7.5)
-    nokogiri (1.19.1-aarch64-linux-gnu)
+    nokogiri (1.19.3-aarch64-linux-gnu)
       racc (~> 1.4)
-    nokogiri (1.19.1-aarch64-linux-musl)
+    nokogiri (1.19.3-aarch64-linux-musl)
       racc (~> 1.4)
-    nokogiri (1.19.1-arm-linux-gnu)
+    nokogiri (1.19.3-arm-linux-gnu)
       racc (~> 1.4)
-    nokogiri (1.19.1-arm-linux-musl)
+    nokogiri (1.19.3-arm-linux-musl)
       racc (~> 1.4)
-    nokogiri (1.19.1-arm64-darwin)
+    nokogiri (1.19.3-arm64-darwin)
       racc (~> 1.4)
-    nokogiri (1.19.1-x86_64-darwin)
+    nokogiri (1.19.3-x86_64-darwin)
       racc (~> 1.4)
-    nokogiri (1.19.1-x86_64-linux-gnu)
+    nokogiri (1.19.3-x86_64-linux-gnu)
       racc (~> 1.4)
-    nokogiri (1.19.1-x86_64-linux-musl)
+    nokogiri (1.19.3-x86_64-linux-musl)
       racc (~> 1.4)
     orm_adapter (0.5.0)
     pg (1.6.3)
@@ -186,32 +188,32 @@ GEM
     psych (5.3.1)
       date
       stringio
-    public_suffix (7.0.2)
+    public_suffix (7.0.5)
     puma (6.6.1)
       nio4r (~> 2.0)
     racc (1.8.1)
-    rack (3.2.5)
+    rack (3.2.6)
-    rack-session (2.1.1)
+    rack-session (2.1.2)
       base64 (>= 0.1.0)
       rack (>= 3.0.0)
     rack-test (2.2.0)
       rack (>= 1.3)
     rackup (2.3.1)
       rack (>= 3)
-    rails (7.2.3)
+    rails (8.1.3)
-      actioncable (= 7.2.3)
+      actioncable (= 8.1.3)
-      actionmailbox (= 7.2.3)
+      actionmailbox (= 8.1.3)
-      actionmailer (= 7.2.3)
+      actionmailer (= 8.1.3)
-      actionpack (= 7.2.3)
+      actionpack (= 8.1.3)
-      actiontext (= 7.2.3)
+      actiontext (= 8.1.3)
-      actionview (= 7.2.3)
+      actionview (= 8.1.3)
-      activejob (= 7.2.3)
+      activejob (= 8.1.3)
-      activemodel (= 7.2.3)
+      activemodel (= 8.1.3)
-      activerecord (= 7.2.3)
+      activerecord (= 8.1.3)
-      activestorage (= 7.2.3)
+      activestorage (= 8.1.3)
-      activesupport (= 7.2.3)
+      activesupport (= 8.1.3)
       bundler (>= 1.15.0)
-      railties (= 7.2.3)
+      railties (= 8.1.3)
     rails-dom-testing (2.3.0)
       activesupport (>= 5.0.0)
       minitest
@@ -219,29 +221,28 @@ GEM
     rails-html-sanitizer (1.7.0)
       loofah (~> 2.25)
       nokogiri (>= 1.15.7, != 1.16.7, != 1.16.6, != 1.16.5, != 1.16.4, != 1.16.3, != 1.16.2, != 1.16.1, != 1.16.0.rc1, != 1.16.0)
-    railties (7.2.3)
+    railties (8.1.3)
-      actionpack (= 7.2.3)
+      actionpack (= 8.1.3)
-      activesupport (= 7.2.3)
+      activesupport (= 8.1.3)
-      cgi
       irb (~> 1.13)
       rackup (>= 1.0.0)
       rake (>= 12.2)
       thor (~> 1.0, >= 1.2.2)
       tsort (>= 0.2)
       zeitwerk (~> 2.6)
-    rake (13.3.1)
+    rake (13.4.2)
     rdoc (7.2.0)
       erb
       psych (>= 4.0.0)
       tsort
-    regexp_parser (2.11.3)
+    regexp_parser (2.12.0)
     reline (0.6.3)
       io-console (~> 0.5)
     responders (3.2.0)
       actionpack (>= 7.0)
       railties (>= 7.0)
     rexml (3.4.4)
-    rubyzip (3.2.2)
+    rubyzip (3.3.0)
     sassc (2.4.0)
       ffi (~> 1.9)
     sassc-rails (2.1.2)
@@ -251,7 +252,7 @@ GEM
       sprockets-rails
       tilt
     securerandom (0.4.1)
-    selenium-webdriver (4.41.0)
+    selenium-webdriver (4.43.0)
       base64 (~> 0.2)
       logger (~> 1.4)
       rexml (~> 3.2, >= 3.2.5)
@@ -265,34 +266,32 @@ GEM
       actionpack (>= 6.1)
       activesupport (>= 6.1)
       sprockets (>= 3.0.0)
-    sqlite3 (2.9.0-aarch64-linux-gnu)
+    sqlite3 (2.9.3-aarch64-linux-gnu)
-    sqlite3 (2.9.0-aarch64-linux-musl)
+    sqlite3 (2.9.3-aarch64-linux-musl)
-    sqlite3 (2.9.0-arm-linux-gnu)
+    sqlite3 (2.9.3-arm-linux-gnu)
-    sqlite3 (2.9.0-arm-linux-musl)
+    sqlite3 (2.9.3-arm-linux-musl)
-    sqlite3 (2.9.0-arm64-darwin)
+    sqlite3 (2.9.3-arm64-darwin)
-    sqlite3 (2.9.0-x86_64-darwin)
+    sqlite3 (2.9.3-x86_64-darwin)
-    sqlite3 (2.9.0-x86_64-linux-gnu)
+    sqlite3 (2.9.3-x86_64-linux-gnu)
-    sqlite3 (2.9.0-x86_64-linux-musl)
+    sqlite3 (2.9.3-x86_64-linux-musl)
-    stimulus-rails (1.3.4)
-      railties (>= 6.0.0)
     stringio (3.2.0)
     thor (1.5.0)
     tilt (2.7.0)
-    timeout (0.6.0)
+    timeout (0.6.1)
     tsort (0.2.0)
     turbo-rails (2.0.23)
       actionpack (>= 7.1.0)
       railties (>= 7.1.0)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
+    uri (1.1.1)
     useragent (0.16.11)
     warden (1.2.9)
       rack (>= 2.0.9)
-    web-console (4.2.1)
+    web-console (4.3.0)
-      actionview (>= 6.0.0)
+      actionview (>= 8.0.0)
-      activemodel (>= 6.0.0)
       bindex (>= 0.4.0)
-      railties (>= 6.0.0)
+      railties (>= 8.0.0)
     websocket (1.2.11)
     websocket-driver (0.8.0)
       base64
@@ -317,16 +316,14 @@ DEPENDENCIES
   capybara
   devise
   importmap-rails
-  minitest (< 6)
   mysql2 (~> 0.5)
   pg (~> 1.5)
   puma (~> 6.0)
-  rails (~> 7.2.3)
+  rails (~> 8.1.3)
   sassc-rails
   selenium-webdriver
   sprockets-rails
   sqlite3 (~> 2.7)
-  stimulus-rails
   turbo-rails (~> 2.0)
   tzinfo-data
   web-console

README.md

@@ -89,14 +89,10 @@ Running
 
 ### Standalone Rails server + Apache proxy
 
-Customize Puma config template:
+Copy and customize Puma config template if required:
 
     cp -a config/puma.rb.dist config/puma.rb
 
-and specify server IP/port, either with `port` or `bind`, e.g.:
-
-    bind 'tcp://0.0.0.0:3000'
-
 #### (option 1) Start server manually
 
     bundle exec rails s -e production
@@ -123,9 +119,10 @@ Contributing
 
 ### Gems
 
-Apart from database adapter, install development and testing gems:
+Install development and testing gems, including at least MySQL and SQLite
+database adapters:
 
-    bundle config --local with mysql development test
+    bundle config --local with development test mysql sqlite
 
 ### Configuration
 
@@ -138,20 +135,29 @@ assets.
 
 ### Database
 
-Grant database user privileges for development and test environments,
+Grant database user privileges for development and test environments. Example
-possibly with different Ruby versions:
+below shows how to grant privileges to all databases which names start with
+`fixinme-` on MySQL:
 
     > mysql -p
     mysql> create user `fixinme-dev`@localhost identified by '<some password>';
     mysql> grant all privileges on `fixinme-%`.* to `fixinme-dev`@localhost;
     mysql> flush privileges;
 
+Dumping development data before database reset:
+
+    mysqldump -h <address> -u <user> -p --no-create-info --no-tablespaces --complete-insert <database> > tmp/data.sql
+
 ### Development environment
 
 Starting application server in development environment:
 
     bundle exec rails s -e development
 
+Accessing database console when more than one test db is present:
+
+    bundle exec rails dbconsole -e test --db sqlite3
+
 For running rake tasks, prepend command with environment:
 
     RAILS_ENV=development bundle exec rails ...
@@ -164,14 +170,22 @@ Tests need to be run from within toplevel application directory:
 
         bundle exec rails test:system
 
-* system test(s) with seed/test name specified:
+* system test(s) with seed or test name specified:
 
-        bundle exec rails test:system --seed 64690 --name test_add_unit
+        bundle exec rails test:system --include test_add_unit --seed 64690
 
-* all tests from one file, with optional seed:
+* all tests from one file, optionally with seed:
 
         bundle exec rails test test/system/users_test.rb --seed 1234
 
+* system tests for selected database configuration (if multiple present):
+
+        bundle exec rails test:system --include /^test_sqlite3_/
+
+* single system test for all database configurations (if multiple present):
+
+        bundle exec rails test:system --include /^test_\\w+_add_unit$/
+
 ### Icons
 
 Pictogrammers Material Design Icons: https://pictogrammers.com/library/mdi/

app/assets/images/pictograms/view-columns.svg

@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" id="icon" viewBox="0 0 24 24"><path d="M4,4H8V20H4V4M10,4H14V20H10V4M16,4H21V20H16V4Z"/></svg>

app/assets/images/pictograms/view-rows.svg

@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" id="icon" viewBox="0 0 24 24"><path d="M3,5H21V7H3V5M3,11H21V13H3V11M3,17H21V19H3V17Z"/></svg>

app/assets/stylesheets/application.css

@@ -36,7 +36,6 @@
   --color-blue: #009ade;
   --color-dark-red: #b21237;
   --color-red: #ff1f5b;
-  --color-purple: #8b2be2;
 
   --depth: 0;
 
@@ -111,11 +110,6 @@ svg {
 svg:last-child {
   margin-right: 0;
 }
-.chart-panel svg {
-  height: auto;
-  margin: 0;
-  width: auto;
-}
 textarea {
   margin: 0;
 }
@@ -237,16 +231,17 @@ textarea:invalid {
   text-decoration: underline 1px var(--color-border-gray);
   text-underline-offset: 0.25em;
 }
-button.link {
-  border: none;
-  padding: 0;
-}
-[name=cancel],
 .auxiliary {
-  border-color: var(--color-border-gray);
+  border-color: var(--color-nav-gray);
   color: var(--color-nav-gray);
   fill: var(--color-nav-gray);
 }
+table .button {
+  border-color: var(--color-border-gray);
+  font-weight: normal;
+  height: 100%;
+  padding: 0.4em;
+}
 .button:focus-visible,
 .tab:focus-visible,
 .tab:hover {
@@ -262,13 +257,6 @@ button.link {
   background-color: var(--color-red);
   border-color: var(--color-red);
 }
-tr:has(select[data-changed]) button[name="button"],
-.set-default-unit:not([disabled]) {
-  background-color: var(--color-purple);
-  border-color: var(--color-purple);
-  color: white;
-  fill: white;
-}
 .link:focus-visible {
   text-decoration-color: var(--color-gray);
 }
@@ -276,13 +264,6 @@ tr:has(select[data-changed]) button[name="button"],
   color: var(--color-blue);
   text-decoration-color: var(--color-blue);
 }
-table .button {
-  border-color: var(--color-border-gray);
-  color: var(--color-table-gray);
-  font-weight: normal;
-  height: 100%;
-  padding: 0.4em;
-}
 
 
 /* NOTE: collapse gaps around empty rows (`topside`) once possible with
@@ -377,20 +358,20 @@ header {
   line-height: 2.2em;
   pointer-events: auto;
 }
-.flash:before {
+.flash::before {
-  filter: invert(100%);
+  filter: invert(1);
   height: 1.4em;
   margin: 0 0.5em;
   width: 1.4em;
 }
-.flash.alert:before {
+.flash.alert::before {
   content: url('pictograms/alert-outline.svg');
 }
 .flash.alert {
   border-color: var(--color-red);
   background-color: var(--color-red);
 }
-.flash.notice:before {
+.flash.notice::before {
   content: url('pictograms/check-circle-outline.svg');
 }
 .flash.notice {
@@ -454,15 +435,18 @@ header {
 
 .tabular-form table {
   border: none;
-  border-spacing: 0.4em 0;
+  border-spacing: 0;
-  margin-inline: -0.4em;
 }
 .tabular-form table td {
   border: none;
+  padding-inline-start: 0.4em;
   vertical-align: middle;
 }
-.tabular-form table td {
+.tabular-form table td:first-child {
-  padding-inline: 0;
+  padding-inline-start: 0;
+}
+.tabular-form table td:last-child {
+  padding-inline-end: 0;
 }
 .tabular-form table :is(form, input, select, textarea):only-child {
   margin-inline-start: 0;
@@ -530,7 +514,7 @@ header {
   cursor: grab;
 }
 .items-table .form td {
-  vertical-align: middle;
+  vertical-align: top;
 }
 .items-table td:not(:first-child),
 .grayed {
@@ -657,45 +641,3 @@ li::marker {
   min-width: 66%;
   width: max-content;
 }
-.measurements-section {
-  overflow-x: auto;
-}
-body[data-measurements-view=wide] .measurements-compact,
-body[data-measurements-view=compact] .measurements-wide {
-  display: none;
-}
-body[data-measurements-view=compact] .view-toggle[data-view=compact],
-body[data-measurements-view=wide] .view-toggle[data-view=wide] {
-  background-color: var(--color-blue);
-  border-color: var(--color-blue);
-  color: white;
-  fill: white;
-}
-.chart-panel {
-  width: 100%;
-}
-#measurements tr.grouped td {
-  border-top: none;
-}
-#measurements tr.grouped .taken-at,
-#measurements tr.grouped .created-at {
-  visibility: hidden;
-}
-.measurements-wide td {
-  vertical-align: middle;
-  white-space: nowrap;
-}
-.wide-cell {
-  align-items: center;
-  display: inline-flex;
-  gap: 0.25em;
-}
-.wide-cell .button {
-  border: none;
-  font-size: inherit;
-  height: auto;
-  padding: 0;
-}
-.wide-cell button.link::after {
-  content: none;
-}

app/controllers/charts_controller.rb

@@ -1,12 +0,0 @@
-class ChartsController < ApplicationController
-  def index
-    readouts = current_user.readouts.includes(:quantity, :unit).order(:taken_at, :id)
-    @readouts_json = readouts.map { |r|
-      { takenAt: r.taken_at&.iso8601,
-        quantityId: r.quantity_id,
-        quantityName: r.quantity.name,
-        value: r.value.to_f,
-        unit: r.unit.symbol }
-    }.to_json
-  end
-end

app/controllers/measurements_controller.rb

@@ -1,12 +1,7 @@
 class MeasurementsController < ApplicationController
-  before_action :find_readout, only: [:destroy, :edit, :update]
-
-  before_action except: :index do
-    raise AccessForbidden unless current_user.at_least(:active)
-  end
-
   def index
-    load_measurements
+    @measurements = []
+    #@measurements = current_user.units.ordered.includes(:base, :subunits)
   end
 
   def new
@@ -14,49 +9,8 @@ class MeasurementsController < ApplicationController
   end
 
   def create
-    taken_at = params.permit(:taken_at)[:taken_at]
-    readout_params = params.permit(readouts: Readout::ATTRIBUTES).fetch(:readouts, [])
-    @readouts = readout_params.map { |rp| current_user.readouts.build(rp.merge(taken_at: taken_at)) }
-
-    if @readouts.present? && @readouts.all?(&:valid?)
-      ActiveRecord::Base.transaction { @readouts.each(&:save!) }
-      load_measurements
-      flash.now[:notice] = t('.success', count: @readouts.size)
-    else
-      errors = @readouts.flat_map { |r| r.errors.full_messages }
-      flash.now[:alert] = errors.present? ? errors.first : t('.no_readouts')
-    end
-  end
-
-  def edit
-    @user_units = current_user.units.ordered
-  end
-
-  def update
-    if @readout.update(params.require(:readout).permit(:value, :unit_id, :taken_at))
-      load_measurements
-      flash.now[:notice] = t('.success')
-    else
-      @user_units = current_user.units.ordered
-      render :edit
-    end
   end
 
   def destroy
-    @readout.destroy!
-    load_measurements
-    flash.now[:notice] = t('.success')
-  end
-
-  private
-
-  def find_readout
-    @readout = current_user.readouts.find(params[:id])
-  end
-
-  def load_measurements
-    @measurements = current_user.readouts.includes(:quantity, :unit).order(taken_at: :desc, id: :desc)
-    @wide_groups = @measurements.group_by(&:taken_at)
-    @wide_quantities = @measurements.map(&:quantity).uniq.sort_by(&:name)
   end
 end

app/controllers/quantities_controller.rb

@@ -8,10 +8,6 @@ class QuantitiesController < ApplicationController
     raise AccessForbidden unless current_user.at_least(:active)
   end
 
-  before_action only: [:new, :edit, :create, :update] do
-    @user_units = current_user.units.ordered
-  end
-
   def index
     @quantities = current_user.quantities.ordered.includes(:parent, :subquantities)
   end

app/controllers/readouts_controller.rb

@@ -6,7 +6,7 @@ class ReadoutsController < ApplicationController
   def new
     @quantities -= @prev_quantities
     # TODO: raise ParameterInvalid if new_quantities.empty?
-    @readouts = current_user.readouts.build(@quantities.map { |q| {quantity: q} })
+    @readouts = @quantities.map { |q| q.readouts.build }
 
     @user_units = current_user.units.ordered
 

app/helpers/application_helper.rb

@@ -86,7 +86,6 @@ module ApplicationHelper
     def initialize(...)
       super(...)
       @default_options.merge!(@options.slice(:form))
-      @default_html_options.merge!(@options.slice(:form))
     end
 
     [:text_field, :password_field, :text_area].each do |selector|
@@ -171,7 +170,6 @@ module ApplicationHelper
       ['measurements', 'scale-bathroom', :restricted],
       ['quantities', 'axis-arrow', :restricted, 'right'],
       ['units', 'weight-gram', :restricted],
-      ['charts', 'chart-line', :restricted],
       # TODO: display users tab only if >1 user present; sole_user?/sole_admin?
       ['users', 'account-multiple-outline', :admin],
     ]
@@ -210,9 +208,7 @@ module ApplicationHelper
 
   def image_link_to_unless_current(name, image = nil, options = nil, html_options = {})
     name, html_options = link_or_button_options(:link, name, image, html_options)
-    # NOTE: Starting from Rails 8.1.0, below condition can be replaced with:
+    if current_page?(options, method: [:get, :post])
-    #   current_page?(options, method: [:get, :post])
-    if request.path == url_for(options)
       html_options = html_options.deep_merge DISABLED_ATTRIBUTES
     end
     link_to name, options, html_options

app/javascript/application.js

@@ -1,15 +1,54 @@
 // Configure your import map in config/importmap.rb. Read more:
 // https://github.com/rails/importmap-rails
 import "@hotwired/turbo-rails"
-import "controllers"
 
 
 /* Hide page before loaded for testing purposes */
-function showPage() {
+function showPage(event) {
   document.documentElement.style.visibility="visible"
 }
 document.addEventListener('turbo:load', showPage)
 
+function detailsChange(event) {
+  var target = event.currentTarget
+  var count = target.querySelectorAll('input:checked:not([disabled])').length
+  var span = target.querySelector('summary > span')
+  var button = target.querySelector('button')
+  if (count > 0) {
+    span.textContent = count + ' selected';
+    Turbo.StreamElement.prototype.enableElement(button)
+  } else {
+    span.textContent = span.getAttribute('data-prompt')
+    Turbo.StreamElement.prototype.disableElement(button)
+  }
+}
+window.detailsChange = detailsChange
+
+/* Close open <details> when focus lost */
+function detailsClose(event) {
+  if (!event.relatedTarget ||
+      event.relatedTarget.closest("details") != event.currentTarget) {
+    event.currentTarget.removeAttribute("open")
+  }
+}
+window.detailsClose = detailsClose
+
+window.detailsObserver = new MutationObserver((mutations) => {
+  mutations[0].target.dispatchEvent(new Event('change', {bubbles: true}))
+});
+
+function formValidate(event) {
+  var id = event.submitter.getAttribute("data-validate")
+  if (!id) return;
+
+  var input = document.getElementById(id)
+  if (!input.checkValidity()) {
+    input.reportValidity()
+    event.preventDefault()
+  }
+}
+window.formValidate = formValidate
+
 
 /* Turbo stream actions */
 Turbo.StreamElement.prototype.disableElement = function(element) {
@@ -72,3 +111,117 @@ Turbo.StreamActions.unselect = function() {
     this.enableElement(e)
   })
 }
+
+function formProcessKey(event) {
+  switch (event.key) {
+    case "Escape":
+      event.currentTarget.querySelector("a[name=cancel]").click()
+      break
+    case "Enter":
+      event.currentTarget.querySelector("button[name=button]").click()
+      event.preventDefault()
+      break
+  }
+}
+window.formProcessKey = formProcessKey
+
+function detailsProcessKey(event) {
+  // TODO: up/down arrows to move focus to prev/next line
+  switch (event.key) {
+    case "Escape":
+      if (event.currentTarget.hasAttribute("open")) {
+        event.currentTarget.removeAttribute("open")
+        event.stopPropagation()
+      }
+      break
+    case "Enter":
+      var button = event.currentTarget.querySelector("button:not([disabled])")
+      if (button) {
+        button.click()
+        // Autofocus won't be respected unless target is blurred
+        event.target.blur()
+        event.preventDefault()
+        event.stopPropagation()
+      }
+      break
+  }
+}
+window.detailsProcessKey = detailsProcessKey;
+
+/* Items table drag and drop support */
+var lastEnterTime
+function dragStart(event) {
+  lastEnterTime = event.timeStamp
+  var row = event.currentTarget
+  row.closest("table").querySelectorAll("thead tr").forEach((tr) => {
+    tr.toggleAttribute("hidden")
+  })
+  event.dataTransfer.setData("text/plain", row.getAttribute("data-drag-path"))
+  var rowRectangle = row.getBoundingClientRect()
+  event.dataTransfer.setDragImage(row, event.x - rowRectangle.left, event.y - rowRectangle.top)
+  event.dataTransfer.dropEffect = "move"
+}
+window.dragStart = dragStart
+
+/*
+* Drag tracking assumptions (based on FF 122.0 experience):
+*   * Enter/Leave events at the same timeStamp may not be logically ordered
+*     (e.g. E -> E -> L, not E -> L -> E),
+*   * not every Enter event has corresponding Leave event, especially during
+*     rapid pointer moves
+* NOTE: sometimes Leave is not emitted when pointer goes fast over table
+* and outside. This should probably be fixed in browser, than patched here.
+*/
+function dragEnter(event) {
+  //console.log(event.timeStamp + " " + event.type + ": " + event.currentTarget.id)
+  dragLeave(event)
+  lastEnterTime = event.timeStamp
+  const id = event.currentTarget.getAttribute("data-drop-id")
+  document.getElementById(id).classList.add("dropzone")
+}
+window.dragEnter = dragEnter
+
+function dragOver(event) {
+  event.preventDefault()
+}
+window.dragOver = dragOver
+
+function dragLeave(event) {
+  //console.log(event.timeStamp + " " + event.type + ": " + event.currentTarget.id)
+  // Leave has been accounted for by Enter at the same timestamp, processed earlier
+  if (event.timeStamp <= lastEnterTime) return
+  event.currentTarget.closest("table").querySelectorAll(".dropzone").forEach((tr) => {
+    tr.classList.remove("dropzone")
+  })
+}
+window.dragLeave = dragLeave
+
+function dragEnd(event) {
+  dragLeave(event)
+  event.currentTarget.closest("table").querySelectorAll("thead tr").forEach((tr) => {
+    tr.toggleAttribute("hidden")
+  })
+}
+window.dragEnd = dragEnd
+
+function drop(event) {
+  event.preventDefault()
+
+  var params = new URLSearchParams()
+  var id_param = event.currentTarget.getAttribute("data-drop-id-param")
+  var id = event.currentTarget.getAttribute("data-drop-id").split("_").pop()
+  params.append(id_param, id)
+
+  fetch(event.dataTransfer.getData("text/plain"), {
+    body: params,
+    headers: {
+      "Accept": "text/vnd.turbo-stream.html",
+      "X-CSRF-Token": document.head.querySelector("meta[name=csrf-token]").content,
+      "X-Requested-With": "XMLHttpRequest"
+    },
+    method: "POST"
+  })
+  .then(response => response.text())
+  .then(html => Turbo.renderStreamMessage(html))
+}
+window.drop = drop

app/javascript/controllers/application.js

@@ -1,7 +0,0 @@
-import { Application } from "@hotwired/stimulus"
-
-const application = Application.start()
-application.debug = false
-window.Stimulus = application
-
-export { application }

app/javascript/controllers/charts_controller.js

@@ -1,45 +0,0 @@
-import { Controller } from "@hotwired/stimulus"
-
-export default class extends Controller {
-  static targets = ["container", "data"]
-
-  connect() {
-    const readouts = JSON.parse(this.dataTarget.textContent)
-    if (readouts.length === 0) return
-
-    const quantities = new Map()
-    readouts.forEach(r => {
-      if (!r.takenAt) return
-      if (!quantities.has(r.quantityId)) {
-        quantities.set(r.quantityId, { name: r.quantityName, unit: r.unit, x: [], y: [] })
-      }
-      const q = quantities.get(r.quantityId)
-      q.x.push(r.takenAt)
-      q.y.push(r.value)
-    })
-
-    const traces = []
-    quantities.forEach(q => {
-      traces.push({
-        x: q.x, y: q.y,
-        mode: 'lines+markers', type: 'scatter',
-        name: q.name + ' (' + q.unit + ')',
-        marker: { size: 5 }
-      })
-    })
-
-    const div = document.createElement('div')
-    div.className = 'chart-panel'
-    this.containerTarget.appendChild(div)
-
-    Plotly.newPlot(div, traces, {
-      xaxis: { type: 'date', tickformat: '%Y-%m-%d %H:%M' },
-      yaxis: {},
-      margin: { t: 20, r: 20, b: 80, l: 60 },
-      paper_bgcolor: 'transparent',
-      plot_bgcolor: 'transparent',
-      font: { family: 'system-ui' },
-      legend: { orientation: 'h', y: -0.25 }
-    }, { responsive: true, displayModeBar: false })
-  }
-}

app/javascript/controllers/details_controller.js

@@ -1,55 +0,0 @@
-import { Controller } from "@hotwired/stimulus"
-
-export default class extends Controller {
-  static targets = ["countLabel", "submitButton", "list"]
-
-  connect() {
-    this._observer = new MutationObserver(() => {
-      this.element.dispatchEvent(new Event('change', { bubbles: true }))
-    })
-    this._observer.observe(this.listTarget, { subtree: true, attributeFilter: ['disabled'] })
-  }
-
-  disconnect() {
-    this._observer?.disconnect()
-  }
-
-  change() {
-    const count = this.element.querySelectorAll('input:checked:not([disabled])').length
-    if (count > 0) {
-      this.countLabelTarget.textContent = count + ' selected'
-      Turbo.StreamElement.prototype.enableElement(this.submitButtonTarget)
-    } else {
-      this.countLabelTarget.textContent = this.countLabelTarget.dataset.prompt
-      Turbo.StreamElement.prototype.disableElement(this.submitButtonTarget)
-    }
-  }
-
-  close(event) {
-    if (!event.relatedTarget ||
-        event.relatedTarget.closest("details") != this.element) {
-      this.element.removeAttribute("open")
-    }
-  }
-
-  processKey(event) {
-    switch (event.key) {
-      case "Escape":
-        if (this.element.hasAttribute("open")) {
-          this.element.removeAttribute("open")
-          event.stopPropagation()
-        }
-        break
-      case "Enter": {
-        const button = this.element.querySelector("button:not([disabled])")
-        if (button) {
-          button.click()
-          event.target.blur()
-          event.preventDefault()
-          event.stopPropagation()
-        }
-        break
-      }
-    }
-  }
-}

app/javascript/controllers/drag_controller.js

@@ -1,62 +0,0 @@
-import { Controller } from "@hotwired/stimulus"
-
-// Shared across all instances — drag spans multiple elements
-let lastEnterTime
-
-export default class extends Controller {
-  static values = {
-    dragPath: String,
-    dropId: String,
-    dropIdParam: String
-  }
-
-  start(event) {
-    lastEnterTime = event.timeStamp
-    this.element.closest("table").querySelectorAll("thead tr").forEach(tr => {
-      tr.toggleAttribute("hidden")
-    })
-    event.dataTransfer.setData("text/plain", this.dragPathValue)
-    const rect = this.element.getBoundingClientRect()
-    event.dataTransfer.setDragImage(this.element, event.x - rect.left, event.y - rect.top)
-    event.dataTransfer.dropEffect = "move"
-  }
-
-  end(event) {
-    this.leave(event)
-    this.element.closest("table").querySelectorAll("thead tr").forEach(tr => {
-      tr.toggleAttribute("hidden")
-    })
-  }
-
-  enter(event) {
-    this.leave(event)
-    lastEnterTime = event.timeStamp
-    document.getElementById(this.dropIdValue)?.classList.add("dropzone")
-  }
-
-  over(event) {
-    event.preventDefault()
-  }
-
-  leave(event) {
-    if (event.timeStamp <= lastEnterTime) return
-    this.element.closest("table").querySelectorAll(".dropzone").forEach(tr => {
-      tr.classList.remove("dropzone")
-    })
-  }
-
-  drop(event) {
-    event.preventDefault()
-    const id = this.dropIdValue.split("_").pop()
-    const form = document.createElement('form')
-    form.action = event.dataTransfer.getData("text/plain")
-    form.method = 'post'
-    form.dataset.turboStream = 'true'
-    const input = document.createElement('input')
-    input.type = 'hidden'; input.name = this.dropIdParamValue; input.value = id
-    form.appendChild(input)
-    form.addEventListener('turbo:submit-end', () => form.remove())
-    document.body.appendChild(form)
-    form.requestSubmit()
-  }
-}

app/javascript/controllers/form_controller.js

@@ -1,25 +0,0 @@
-import { Controller } from "@hotwired/stimulus"
-
-export default class extends Controller {
-  processKey(event) {
-    switch (event.key) {
-      case "Escape":
-        this.element.querySelector("a[name=cancel]").click()
-        break
-      case "Enter":
-        this.element.querySelector("button[name=button]").click()
-        event.preventDefault()
-        break
-    }
-  }
-
-  validate(event) {
-    const id = event.submitter?.getAttribute("data-validate")
-    if (!id) return
-    const input = document.getElementById(id)
-    if (!input.checkValidity()) {
-      input.reportValidity()
-      event.preventDefault()
-    }
-  }
-}

app/javascript/controllers/index.js

@@ -1,3 +0,0 @@
-import { application } from "controllers/application"
-import { eagerLoadControllersFrom } from "@hotwired/stimulus-loading"
-eagerLoadControllersFrom("controllers", application)

app/javascript/controllers/measurements_controller.js

@@ -1,29 +0,0 @@
-import { Controller } from "@hotwired/stimulus"
-
-export default class extends Controller {
-  static targets = ["tbody"]
-
-  connect() {
-    this.#group()
-    this._observer = new MutationObserver(() => this.#group())
-    this._observer.observe(this.tbodyTarget, {
-      childList: true, subtree: true,
-      attributes: true, attributeFilter: ['style']
-    })
-  }
-
-  disconnect() {
-    this._observer?.disconnect()
-  }
-
-  #group() {
-    let prevTakenAt = null
-    Array.from(this.tbodyTarget.querySelectorAll('tr[data-taken-at]'))
-      .filter(row => row.style.display !== 'none')
-      .forEach(row => {
-        const takenAt = row.dataset.takenAt
-        row.classList.toggle('grouped', takenAt !== null && takenAt === prevTakenAt)
-        prevTakenAt = takenAt
-      })
-  }
-}

app/javascript/controllers/measurements_view_controller.js

@@ -1,17 +0,0 @@
-import { Controller } from "@hotwired/stimulus"
-
-export default class extends Controller {
-  connect() {
-    document.body.dataset.measurementsView = this.#get()
-  }
-
-  set(event) {
-    const view = event.params.name
-    localStorage.setItem('measurements-view', view)
-    document.body.dataset.measurementsView = view
-  }
-
-  #get() {
-    return localStorage.getItem('measurements-view') || 'compact'
-  }
-}

app/javascript/controllers/readout_unit_controller.js

@@ -1,36 +0,0 @@
-import { Controller } from "@hotwired/stimulus"
-
-export default class extends Controller {
-  static targets = ["select", "button"]
-
-  unitChanged() {
-    if (this.selectTarget.value && this.selectTarget.value !== this.selectTarget.dataset.defaultUnitId) {
-      Turbo.StreamElement.prototype.enableElement(this.buttonTarget)
-    } else {
-      Turbo.StreamElement.prototype.disableElement(this.buttonTarget)
-    }
-  }
-
-  setDefault() {
-    const select = this.selectTarget
-    const form = document.createElement('form')
-    form.action = this.buttonTarget.dataset.path
-    form.method = 'post'
-    form.dataset.turboStream = 'true'
-    const methodInput = document.createElement('input')
-    methodInput.type = 'hidden'; methodInput.name = '_method'; methodInput.value = 'patch'
-    const unitInput = document.createElement('input')
-    unitInput.type = 'hidden'; unitInput.name = 'quantity[default_unit_id]'; unitInput.value = select.value
-    form.appendChild(methodInput)
-    form.appendChild(unitInput)
-    form.addEventListener('turbo:submit-end', event => {
-      if (event.detail.success) {
-        select.dataset.defaultUnitId = select.value
-        this.unitChanged()
-      }
-      form.remove()
-    })
-    document.body.appendChild(form)
-    form.requestSubmit()
-  }
-}

app/models/note.rb

@@ -0,0 +1,3 @@
+class Note < ApplicationRecord
+  ATTRIBUTES = [:text]
+end

app/models/quantity.rb

@@ -1,12 +1,12 @@
 class Quantity < ApplicationRecord
-  ATTRIBUTES = [:name, :description, :parent_id, :default_unit_id]
+  ATTRIBUTES = [:name, :description, :parent_id]
   attr_cached :depth, :pathname
 
   belongs_to :user, optional: true
   belongs_to :parent, optional: true, class_name: "Quantity"
-  belongs_to :default_unit, optional: true, class_name: "Unit"
   has_many :subquantities, ->{ order(:name) }, class_name: "Quantity",
     inverse_of: :parent, dependent: :restrict_with_error
+  has_many :readouts, dependent: :restrict_with_error
 
   validate if: ->{ parent.present? } do
     errors.add(:parent, :user_mismatch) unless user_id == parent.user_id

app/models/readout.rb

@@ -1,7 +1,9 @@
 class Readout < ApplicationRecord
-  ATTRIBUTES = [:quantity_id, :value, :unit_id, :taken_at]
+  ATTRIBUTES = [:quantity_id, :value, :unit_id]
 
   belongs_to :user
   belongs_to :quantity
   belongs_to :unit
+
+  # TODO: validate quantity.user_id == unit.user_id != NULL
 end

app/models/unit.rb

@@ -77,15 +77,13 @@ class Unit < ApplicationRecord
       .from(units).group(:base_id, :symbol)
   }
   scope :ordered, ->{
-    left_outer_joins(:base).order(ordering)
+    left_outer_joins(:base).order([
-  }
+      arel_table.coalesce(Arel::Table.new(:bases_units)[:symbol], arel_table[:symbol]),
-
-  def self.ordering
-    [arel_table.coalesce(Arel::Table.new(:bases_units)[:symbol], arel_table[:symbol]),
       arel_table[:base_id].not_eq(nil),
-     :multiplier,
+      arel_table[:multiplier],
-     :symbol]
+      arel_table[:symbol]
-  end
+    ])
+  }
 
   before_destroy do
     # TODO: disallow destruction if any object depends on this unit
@@ -114,11 +112,10 @@ class Unit < ApplicationRecord
 
   def successive
     units = Unit.arel_table
-    lead = Arel::Nodes::NamedFunction.new('LAG', [units[:id]])
+    Unit.with(units_with_lag: user.units.ordered.select(
-    window = Arel::Nodes::Window.new.order(*Unit.ordering)
+      units[Arel.star],
-    lag_id = lead.over(window).as('lag_id')
+      Arel::Nodes::NamedFunction.new('LAG', [units[:id]]).over.as('lag_id')
-    Unit.with(
+    )).from(Arel::Table.new(:units_with_lag).as(:units))
-      units: user.units.left_outer_joins(:base).select(units[Arel.star], lag_id)
+      .where(units[:lag_id].eq(id)).first
-    ).where(units[:lag_id].eq(id)).first
   end
 end

app/views/charts/index.html.erb

@@ -1,4 +0,0 @@
-<div data-controller="charts">
-  <div class="main-area" id="measurements-charts" data-charts-target="container"></div>
-  <script id="charts-data" type="application/json" data-charts-target="data"><%= raw @readouts_json %></script>
-</div>

app/views/layouts/application.html.erb

@@ -14,7 +14,6 @@
     <%= csp_meta_tag %>
 
     <%= stylesheet_link_tag "spreadsheet" %>
-    <script src="https://cdn.plot.ly/plotly-basic-2.35.2.min.js"></script>
     <%= javascript_importmap_tags %>
 
     <%#= turbo_page_requires_reload_tag %>

app/views/measurements/_edit_form.html.erb

@@ -1,25 +0,0 @@
-<%= tabular_fields_for @readout, form: form_tag do |form| %>
-  <%- tag.tr id: row, class: "form",
-    data: {controller: 'form', action: 'keydown->form#processKey',
-           form: form_tag, hidden_row: hidden_row, link: link} do %>
-    <td><%= @readout.quantity %></td>
-    <td class="ralign">
-      <%= form.number_field :value, required: true, autofocus: true %>
-    </td>
-    <td>
-      <%= form.collection_select :unit_id, @user_units, :id,
-        ->(u){ sanitize('&emsp;' * (u.base_id? ? 1 : 0) + u.symbol) },
-        {}, required: true %>
-    </td>
-    <td>
-      <%= form.datetime_field :taken_at %>
-    </td>
-    <td></td>
-    <td class="flex">
-      <%= form.button %>
-      <%= image_link_to t(:cancel), "close-outline", measurements_path,
-        class: 'dangerous', name: :cancel,
-        onclick: render_turbo_stream('edit_form_close', {row: row}) %>
-    </td>
-  <% end %>
-<% end %>

app/views/measurements/_edit_form_close.html.erb

@@ -1,2 +0,0 @@
-<%= turbo_stream.close_form row %>
-<%= turbo_stream.update :flashes %>

app/views/measurements/_edit_panel.html.erb

@@ -1,34 +0,0 @@
-<% form_tag = dom_id(@readout, :edit, :form) %>
-<% row = dom_id(@readout, :edit) %>
-<% hidden_row = dom_id(@readout) %>
-
-<%= tabular_form_with model: @readout, url: measurement_path(@readout),
-  id: form_tag do |form| %>
-  <table class="items-table">
-    <tbody>
-      <%= tag.tr id: row, class: "form",
-        data: {controller: 'form', action: 'keydown->form#processKey',
-               form: form_tag, hidden_row: hidden_row} do %>
-        <td><%= @readout.quantity %></td>
-        <td class="ralign">
-          <%= form.number_field :value, required: true, autofocus: true %>
-        </td>
-        <td>
-          <%= form.collection_select :unit_id, @user_units, :id,
-            ->(u){ sanitize('&emsp;' * (u.base_id? ? 1 : 0) + u.symbol) },
-            {}, required: true %>
-        </td>
-        <td>
-          <%= form.datetime_field :taken_at %>
-        </td>
-        <td></td>
-        <td class="flex">
-          <%= form.button %>
-          <%= image_link_to t(:cancel), "close-outline", measurements_path,
-            class: 'dangerous', name: :cancel,
-            onclick: render_turbo_stream('edit_form_close', {row: row}) %>
-        </td>
-      <% end %>
-    </tbody>
-  </table>
-<% end %>

app/views/measurements/_form.html.erb

@@ -1,6 +1,6 @@
 <%= tabular_form_with model: Measurement.new, id: :measurement_form,
   class: 'topside-area flex vertical center',
-  html: {data: {controller: 'form', action: 'keydown->form#processKey'}} do |form| %>
+  html: {onkeydown: 'formProcessKey(event)'} do |form| %>
 
   <table class="items-table center">
     <tbody id="readouts">
@@ -8,7 +8,7 @@
         <tr class="italic">
           <td class="hexpand hmin50"><%= t '.taken_at_html' %></td>
           <td colspan="3" class="ralign">
-            <%= form.datetime_field :taken_at, required: true, value: Time.current.strftime('%Y-%m-%dT%H:%M') %>
+            <%= form.datetime_field :taken_at, required: true %>
           </td>
         </tr>
       <% end %>
@@ -17,23 +17,29 @@
 
   <%# TODO: right-click selection; unnecessary with hierarchical tags? %>
   <details id="quantity_select" class="center hexpand" open
-           data-controller="details"
+           onkeydown="detailsProcessKey(event)">
-           data-action="focusout->details#close change->details#change keydown->details#processKey">
     <summary autofocus>
       <!-- TODO: Set content with CSS when span empty to avoid duplication -->
-      <span data-prompt="<%= t('.select_quantity') %>" data-details-target="countLabel">
+      <span data-prompt="<%= t('.select_quantity') %>">
         <%= t('.select_quantity') %>
       </span>
       <%= image_button_tag t(:apply), "update", name: nil, disabled: true,
         formaction: new_readout_path, formmethod: :get, formnovalidate: true,
-        data: {turbo_stream: true, details_target: 'submitButton'} %>
+        data: {turbo_stream: true} %>
     </summary>
-    <ul data-details-target="list"><%= quantities_check_boxes(@quantities) %></ul>
+    <ul><%= quantities_check_boxes(@quantities) %></ul>
   </details>
 
   <div class="flex reverse">
     <%= form.button id: :create_measurement_button, disabled: true -%>
     <%= image_link_to t(:cancel), "close-outline", measurements_path, name: :cancel,
-      class: 'dangerous', onclick: render_turbo_stream('form_close') %>
+      class: 'auxiliary dangerous', onclick: render_turbo_stream('form_close') %>
   </div>
 <% end %>
+
+<script>
+  quantity_select.addEventListener('focusout', detailsClose)
+  quantity_select.addEventListener('change', detailsChange)
+  detailsObserver.observe(quantity_select.querySelector('ul'),
+    {subtree: true, attributeFilter: ['disabled']})
+</script>

app/views/measurements/_readout.html.erb

@@ -1,22 +0,0 @@
-<%= tag.tr id: dom_id(readout), data: {taken_at: readout.taken_at&.iso8601,
-  quantity_id: readout.quantity_id, quantity_name: readout.quantity.name,
-  value: format("%.10g", readout.value), unit: readout.unit.symbol} do %>
-  <td>
-    <% if current_user.at_least(:active) %>
-      <%= link_to readout.quantity, edit_measurement_path(readout),
-        class: 'link', onclick: 'this.blur();', data: {turbo_stream: true} %>
-    <% else %>
-      <%= readout.quantity %>
-    <% end %>
-  </td>
-  <td class="ralign"><%= format("%.10g", readout.value) %></td>
-  <td><%= readout.unit %></td>
-  <td class="taken-at"><%= l(readout.taken_at) if readout.taken_at %></td>
-  <td class="created-at"><%= l(readout.created_at) %></td>
-  <% if current_user.at_least(:active) %>
-    <td class="flex">
-      <%= image_button_to t('.destroy'), 'delete-outline', measurement_path(readout),
-        method: :delete, data: {turbo_stream: true} %>
-    </td>
-  <% end %>
-<% end %>

app/views/measurements/_wide_table.html.erb

@@ -1,41 +0,0 @@
-<table class="items-table">
-  <thead>
-    <tr>
-      <th><%= Readout.human_attribute_name(:taken_at) %></th>
-      <% wide_quantities.each do |q| %>
-        <th><%= q.name %></th>
-      <% end %>
-      <th><%= Readout.human_attribute_name(:created_at) %></th>
-    </tr>
-  </thead>
-  <tbody>
-    <% wide_groups.each do |taken_at, readouts| %>
-      <tr>
-        <td><%= l(taken_at) if taken_at %></td>
-        <% wide_quantities.each do |q| %>
-          <% readout = readouts.find { |r| r.quantity_id == q.id } %>
-          <td class="ralign">
-            <% if readout %>
-              <span class="wide-cell">
-                <% if current_user.at_least(:active) %>
-                  <%= link_to format("%.10g", readout.value),
-                    edit_measurement_path(readout, view: :wide),
-                    class: 'link', onclick: 'this.blur();',
-                    data: {turbo_stream: true} %>
-                <% else %>
-                  <%= format("%.10g", readout.value) %>
-                <% end %>
-                &nbsp;<%= readout.unit.symbol %>
-                <% if current_user.at_least(:active) %>
-                  <%= image_button_to '', 'delete-outline', measurement_path(readout),
-                    method: :delete, data: {turbo_stream: true} %>
-                <% end %>
-              </span>
-            <% end %>
-          </td>
-        <% end %>
-        <td><%= l(readouts.first.created_at) %></td>
-      </tr>
-    <% end %>
-  </tbody>
-</table>

app/views/measurements/create.turbo_stream.erb

@@ -1,13 +0,0 @@
-<% if @readouts.present? && @readouts.all?(&:persisted?) %>
-  <%= turbo_stream.update :flashes %>
-  <%= turbo_stream.remove :measurement_form %>
-  <%= turbo_stream.enable :new_measurement_link %>
-  <%= turbo_stream.remove :no_items %>
-  <% @readouts.each do |readout| %>
-    <%= turbo_stream.prepend :measurements, partial: 'readout', locals: {readout: readout} %>
-  <% end %>
-  <%= turbo_stream.update 'measurements-wide', partial: 'wide_table',
-    locals: {wide_groups: @wide_groups, wide_quantities: @wide_quantities} %>
-<% else %>
-  <%= turbo_stream.update :flashes %>
-<% end %>

app/views/measurements/destroy.turbo_stream.erb

@@ -1,5 +0,0 @@
-<%= turbo_stream.update :flashes %>
-<%= turbo_stream.remove @readout %>
-<%= turbo_stream.append(:measurements, render_no_items) if current_user.readouts.empty? %>
-<%= turbo_stream.update 'measurements-wide', partial: 'wide_table',
-  locals: {wide_groups: @wide_groups, wide_quantities: @wide_quantities} %>

app/views/measurements/edit.turbo_stream.erb

@@ -1,18 +0,0 @@
-<% ids = {row: dom_id(@readout, :edit),
-          hidden_row: dom_id(@readout),
-          link: nil,
-          form_tag: dom_id(@readout, :edit, :form)} %>
-
-<% if params[:view] == 'wide' %>
-  <%= turbo_stream.update :measurement_edit_form, partial: 'edit_panel' %>
-  <%= turbo_stream.hide ids[:hidden_row] %>
-<% else %>
-  <%= turbo_stream.append :measurement_edit_form do %>
-    <%- tabular_form_with model: @readout, url: measurement_path(@readout),
-      html: {id: ids[:form_tag]} do %>
-    <% end %>
-  <% end %>
-  <%= turbo_stream.hide ids[:hidden_row] %>
-  <%= turbo_stream.remove ids[:row] %>
-  <%= turbo_stream.after @readout, partial: 'edit_form', locals: ids -%>
-<% end %>

app/views/measurements/index.html.erb

@@ -1,41 +1,14 @@
 <%# TODO: show hint when no quantities/units defined %>
-<div class="rightside-area buttongrid" data-controller="measurements-view">
+<div class="rightside-area buttongrid">
   <% if current_user.at_least(:active) %>
     <%= image_link_to t('.new_measurement'), 'plus-outline', new_measurement_path,
       id: :new_measurement_link, onclick: 'this.blur();',
       data: {turbo_stream: true} %>
   <% end %>
-  <%= image_button_tag '', 'view-rows', name: nil, type: 'button',
-    class: 'view-toggle', title: t('.view_compact'),
-    data: {view: 'compact', action: 'click->measurements-view#set',
-           'measurements-view-name-param': 'compact'} %>
-  <%= image_button_tag '', 'view-columns', name: nil, type: 'button',
-    class: 'view-toggle', title: t('.view_wide'),
-    data: {view: 'wide', action: 'click->measurements-view#set',
-           'measurements-view-name-param': 'wide'} %>
 </div>
 
-<div class="main-area measurements-section">
+<table class="main-area">
-  <%= tag.div id: :measurement_edit_form %>
+  <tbody id="measurements">
-  <table class="items-table measurements-compact" data-controller="measurements">
+    <%= render(@measurements) || render_no_items %>
-    <thead>
-      <tr>
-        <th><%= Quantity.model_name.human %></th>
-        <th><%= Readout.human_attribute_name(:value) %></th>
-        <th><%= Unit.model_name.human %></th>
-        <th data-column="taken-at"><%= Readout.human_attribute_name(:taken_at) %></th>
-        <th data-column="created-at"><%= Readout.human_attribute_name(:created_at) %></th>
-        <% if current_user.at_least(:active) %>
-          <th></th>
-        <% end %>
-      </tr>
-    </thead>
-    <tbody id="measurements" data-measurements-target="tbody">
-      <%= render(partial: 'readout', collection: @measurements, as: :readout) || render_no_items %>
   </tbody>
 </table>
-
-  <div id="measurements-wide" class="measurements-wide">
-    <%= render 'wide_table', wide_groups: @wide_groups, wide_quantities: @wide_quantities %>
-  </div>
-</div>

app/views/measurements/update.turbo_stream.erb

@@ -1,4 +0,0 @@
-<%= turbo_stream.close_form dom_id(@readout, :edit) %>
-<%= turbo_stream.replace @readout, partial: 'measurements/readout', locals: {readout: @readout} %>
-<%= turbo_stream.update 'measurements-wide', partial: 'wide_table',
-  locals: {wide_groups: @wide_groups, wide_quantities: @wide_quantities} %>

app/views/quantities/_form.html.erb

@@ -1,7 +1,6 @@
 <%= tabular_fields_for @quantity, form: form_tag do |form| %>
-  <%- tag.tr id: row, class: "form",
+  <%- tag.tr id: row, class: "form", onkeydown: "formProcessKey(event)",
-    data: {controller: 'form', action: 'keydown->form#processKey',
+    data: {link: link, form: form_tag, hidden_row: hidden_row} do %>
-           link: link, form: form_tag, hidden_row: hidden_row} do %>
 
     <td style="--depth:<%= @quantity.depth %>">
       <%= form.text_field :name, required: true, autofocus: true, size: 20 %>
@@ -9,11 +8,6 @@
     <td>
       <%= form.text_area :description, cols: 30, rows: 1, escape: false %>
     </td>
-    <td>
-      <%= form.collection_select :default_unit_id, @user_units, :id,
-        ->(u){ sanitize('&emsp;' * (u.base_id? ? 1 : 0) + u.symbol) },
-        {include_blank: true}, onchange: "this.dataset.changed = ''" %>
-    </td>
 
     <td class="flex">
       <%= form.button %>

app/views/quantities/_quantity.html.erb

@@ -1,17 +1,15 @@
 <%= tag.tr id: dom_id(quantity),
-           draggable: true,
+           ondragstart: "dragStart(event)", ondragend: "dragEnd(event)",
-           data: {controller: 'drag',
+           ondragover: "dragOver(event)", ondrop: "drop(event)",
-                  action: 'dragstart->drag#start dragend->drag#end dragover->drag#over drop->drag#drop dragenter->drag#enter dragleave->drag#leave',
+           ondragenter: "dragEnter(event)", ondragleave: "dragLeave(event)",
-                  drag_drag_path_value: reparent_quantity_path(quantity),
+           data: {drag_path: reparent_quantity_path(quantity), drop_id: dom_id(quantity),
-                  drag_drop_id_value: dom_id(quantity),
+                  drop_id_param: "quantity[parent_id]"} do %>
-                  drag_drop_id_param_value: 'quantity[parent_id]'} do %>
 
   <td style="--depth:<%= quantity.depth %>">
     <%= link_to quantity, edit_quantity_path(quantity), class: 'link',
       onclick: 'this.blur();', data: {turbo_stream: true} %>
   </td>
   <td><%= quantity.description %></td>
-  <td><%= quantity.default_unit&.symbol %></td>
 
   <% if current_user.at_least(:active) %>
     <td class="flex">

app/views/quantities/index.html.erb

@@ -16,18 +16,16 @@
     <tr>
       <th><%= Quantity.human_attribute_name(:name) %></th>
       <th class="hexpand"><%= Quantity.human_attribute_name(:description) %></th>
-      <th><%= Quantity.human_attribute_name(:default_unit) %></th>
       <% if current_user.at_least(:active) %>
         <th><%= t :actions %></th>
         <th></th>
       <% end %>
     </tr>
     <%= tag.tr id: "quantity_", hidden: true,
-               data: {controller: 'drag',
+               ondragover: "dragOver(event)", ondrop: "drop(event)",
-                      action: 'dragover->drag#over drop->drag#drop dragenter->drag#enter dragleave->drag#leave',
+               ondragenter: "dragEnter(event)", ondragleave: "dragLeave(event)",
-                      drag_drop_id_value: 'quantity_',
+               data: {drop_id: "quantity_", drop_id_param: "quantity[parent_id]"} do %>
-                      drag_drop_id_param_value: 'quantity[parent_id]'} do %>
+      <th colspan="4"><%= t '.top_level_drop' %></th>
-      <th colspan="5"><%= t '.top_level_drop' %></th>
     <% end %>
   </thead>
   <tbody id="quantities">

app/views/readouts/_form.html.erb

@@ -1,6 +1,6 @@
+<%# TODO: add readout reordering by dragging %>
 <%= tabular_fields_for 'readouts[]', readout do |form| %>
-  <%- tag.tr id: dom_id(readout.quantity, :new, :readout),
+  <%- tag.tr id: dom_id(readout.quantity, :new, :readout) do %>
-             data: {controller: 'readout-unit'} do %>
     <td>
       <%# TODO: add grayed readout index (in separate column?) %>
       <%= readout.quantity.relative_pathname(@superquantity) %>
@@ -12,19 +12,10 @@
     <td>
       <%= form.collection_select :unit_id, @user_units, :id,
         ->(u){ sanitize('&emsp;' * (u.base_id ? 1 : 0) + u.symbol) },
-        {prompt: '', disabled: '', selected: readout.quantity.default_unit_id || ''}, required: true,
+        {prompt: '', disabled: '', selected: ''}, required: true %>
-        data: {default_unit_id: readout.quantity.default_unit_id || '',
-               readout_unit_target: 'select',
-               action: 'change->readout-unit#unitChanged'} %>
     </td>
     <td class="flex">
       <%# TODO: change to _link_ after giving up displaying relative paths %>
-      <%= image_button_tag '', 'check-circle-outline',
-        class: 'set-default-unit', name: nil, type: 'button', disabled: true,
-        title: t('readouts.form.set_default_unit'),
-        data: {path: quantity_path(readout.quantity),
-               readout_unit_target: 'button',
-               action: 'click->readout-unit#setDefault'} %>
       <%= image_button_tag '', 'delete-outline', class: 'dangerous', name: nil,
         formaction: discard_readouts_path(readout.quantity),
         formmethod: :get, formnovalidate: true, data: {turbo_stream: true} %>

app/views/units/_form.html.erb

@@ -1,7 +1,6 @@
 <%= tabular_fields_for @unit, form: form_tag do |form| %>
-  <%- tag.tr id: row, class: "form",
+  <%- tag.tr id: row, class: "form", onkeydown: "formProcessKey(event)",
-    data: {controller: 'form', action: 'keydown->form#processKey',
+    data: {link: link, form: form_tag, hidden_row: hidden_row} do %>
-           link: link, form: form_tag, hidden_row: hidden_row} do %>
 
     <td style="--depth:<%= @unit.base_id? ? 1 : 0 %>">
       <%= form.text_field :symbol, required: true, autofocus: true, size: 12 %>

app/views/units/_unit.html.erb

@@ -1,10 +1,10 @@
 <%= tag.tr id: dom_id(unit),
-           draggable: true,
+           ondragstart: "dragStart(event)", ondragend: "dragEnd(event)",
-           data: {controller: 'drag',
+           ondragover: "dragOver(event)", ondrop: "drop(event)",
-                  action: 'dragstart->drag#start dragend->drag#end dragover->drag#over drop->drag#drop dragenter->drag#enter dragleave->drag#leave',
+           ondragenter: "dragEnter(event)", ondragleave: "dragLeave(event)",
-                  drag_drag_path_value: rebase_unit_path(unit),
+           data: {drag_path: rebase_unit_path(unit),
-                  drag_drop_id_value: dom_id(unit.base || unit),
+                  drop_id: dom_id(unit.base || unit),
-                  drag_drop_id_param_value: 'unit[base_id]'} do %>
+                  drop_id_param: "unit[base_id]"} do %>
 
   <td style="--depth:<%= unit.base_id? ? 1 : 0 %>">
     <%= link_to unit, edit_unit_path(unit), class: 'link', onclick: 'this.blur();',

app/views/units/index.html.erb

@@ -22,10 +22,9 @@
       <% end %>
     </tr>
     <%= tag.tr id: "unit_", hidden: true,
-               data: {controller: 'drag',
+               ondragover: "dragOver(event)", ondrop: "drop(event)",
-                      action: 'dragover->drag#over drop->drag#drop dragenter->drag#enter dragleave->drag#leave',
+               ondragenter: "dragEnter(event)", ondragleave: "dragLeave(event)",
-                      drag_drop_id_value: 'unit_',
+               data: {drop_id: "unit_", drop_id_param: "unit[base_id]"} do %>
-                      drag_drop_id_param_value: 'unit[base_id]'} do %>
       <th colspan="5"><%= t '.top_level_drop' %></th>
     <% end %>
   </thead>

app/views/users/profiles/new.html.erb

@@ -1,5 +1,5 @@
 <%= labeled_form_for resource, url: user_registration_path,
-  html: {class: 'main-area', data: {controller: 'form', action: 'submit->form#validate'}} do |f| %>
+  html: {class: 'main-area', onsubmit: 'formValidate(event)'} do |f| %>
 
   <%= f.email_field :email, required: true, size: 30, autofocus: true,
     autocomplete: 'email' %>

app/views/users/sessions/new.html.erb

@@ -1,5 +1,5 @@
 <%= labeled_form_for resource, url: user_session_path,
-  html: {class: 'main-area', data: {controller: 'form', action: 'submit->form#validate'}} do |f| %>
+  html: {class: 'main-area', onsubmit: 'formValidate(event)'} do |f| %>
 
   <%= f.email_field :email, required: true, size: 30, autofocus: true,
     autocomplete: 'email' %>

bin/ci

@@ -0,0 +1,6 @@
+#!/usr/bin/env ruby
+require_relative "../config/boot"
+require "active_support/continuous_integration"
+
+CI = ActiveSupport::ContinuousIntegration
+require_relative "../config/ci.rb"

bin/dev

@@ -0,0 +1,2 @@
+#!/usr/bin/env ruby
+exec "./bin/rails", "server", *ARGV

bin/setup

@@ -1,11 +1,10 @@
 #!/usr/bin/env ruby
 require "fileutils"
 
-# path to your application root.
 APP_ROOT = File.expand_path("..", __dir__)
 
 def system!(*args)
-  system(*args) || abort("\n== Command #{args} failed ==")
+  system(*args, exception: true)
 end
 
 FileUtils.chdir APP_ROOT do
@@ -14,7 +13,6 @@ FileUtils.chdir APP_ROOT do
   # Add necessary setup steps to this file.
 
   puts "== Installing dependencies =="
-  system! "gem install bundler --conservative"
   system("bundle check") || system!("bundle install")
 
   # puts "\n== Copying sample files =="
@@ -24,10 +22,14 @@ FileUtils.chdir APP_ROOT do
 
   puts "\n== Preparing database =="
   system! "bin/rails db:prepare"
+  system! "bin/rails db:reset" if ARGV.include?("--reset")
 
   puts "\n== Removing old logs and tempfiles =="
   system! "bin/rails log:clear tmp:clear"
 
-  puts "\n== Restarting application server =="
+  unless ARGV.include?("--skip-server")
-  system! "bin/rails restart"
+    puts "\n== Starting development server =="
+    STDOUT.flush # flush the output before exec(2) so that it displays
+    exec "bin/dev"
+  end
 end

config/application.rb.dist

@@ -18,14 +18,17 @@ require "rails/test_unit/railtie"
 # you've limited to :test, :development, or :production.
 Bundler.require(*Rails.groups)
 
+require_relative '../lib/default_settings_strategy'
+
 module FixinMe
   class Application < Rails::Application
     # Initialize configuration defaults for originally generated Rails version.
-    config.load_defaults 7.0
+    config.load_defaults 8.1
 
-    # Autoload lib/, required e.g. for core library extensions.
+    # Please, add to the `ignore` list any other `lib` subdirectories that do
-    # https://guides.rubyonrails.org/autoloading_and_reloading_constants.html#config-autoload-lib-ignore.
+    # not contain `.rb` files, or that should not be reloaded or eager loaded.
-    config.autoload_lib(ignore: %w(assets tasks))
+    # Common ones are `templates`, `generators`, or `middleware`, for example.
+    config.autoload_lib(ignore: %w[assets tasks])
 
     # Configuration for the application, engines, and railties goes here.
     #
@@ -38,16 +41,19 @@ module FixinMe
     config.action_dispatch.rescue_responses['ApplicationController::AccessForbidden'] = :forbidden
     config.action_dispatch.rescue_responses['ApplicationController::ParameterInvalid'] = :unprocessable_entity
 
+    # Set default migrations parameters.
+    config.active_record.migration_strategy = DefaultSettingsStrategy
+
     # SETUP: Below settings need to be updated on a per-installation basis.
     #
-    # URL to use in sent e-mails.
+    # Set host to be used by links generated in mailer templates.
-    config.action_mailer.default_url_options = {host: 'localhost', :protocol => 'https'}
+    config.action_mailer.default_url_options = {host: 'localhost', protocol: 'https'}
     # https://guides.rubyonrails.org/configuring.html#config-action-mailer-delivery-method
     config.action_mailer.delivery_method = :sendmail
 
     # List of hosts this app is available at.
     # https://guides.rubyonrails.org/configuring.html#actiondispatch-hostauthorization
-    config.hosts += ['localhost', 'example.com', IPAddr.new('1.2.3.4/32')]
+    config.hosts |= ['localhost']
 
     # Email address of admin account
     config.admin = 'admin@localhost'

config/ci.rb

@@ -0,0 +1,20 @@
+# Run using bin/ci
+
+CI.run do
+  step "Setup", "bin/setup --skip-server"
+
+  step "Security: Importmap vulnerability audit", "bin/importmap audit"
+  step "Tests: Rails", "bin/rails test"
+  step "Tests: Seeds", "env RAILS_ENV=test bin/rails db:seed:replant"
+
+  # Optional: Run system tests
+  # step "Tests: System", "bin/rails test:system"
+
+  # Optional: set a green GitHub commit status to unblock PR merge.
+  # Requires the `gh` CLI and `gh extension install basecamp/gh-signoff`.
+  # if success?
+  #   step "Signoff: All systems go. Ready for merge and deploy.", "gh signoff"
+  # else
+  #   failure "Signoff: CI failed. Do not merge or deploy.", "Fix the issues and try again."
+  # end
+end

config/credentials.yml.enc

@@ -1 +1 @@
-yQ/e5AEwReoZ6yiIqCZjBbl2Tp41JNcuwfWF3FeSSk2K0XBtE+VQXHlAHMBPRwbBdkutB8jls+YKou3JX58j88BEH3Ft/8h7GIepYF+nOhdb79y05lqEhARA4IZYnHe1Do72MdmseE0ectfDpfk6Q1qnfiTFe3X1KyfLR0hiSEM5+1ZYfk2loUBWSIfgYuqtK7bEOZiL6imU46n4+58g3VZd0cK7getT7rwNlVt1s6ME9PTwT/RqE736fLEIyDeaEg8hBxTrPVeYyii2o4IWM02/0HsuRPxXLLQAgXyzHhlT9wo18X5FaaecgGloBie0UMrPS3j6oBlVn61WQbkuEe/yQKnzyiw0v5HSmzME4PiDTaSW2em/BtGiMAhJpyukipQa4/leR3OTJxv3TAMha1bnk/OC--QU+gjSEvBsZpr3XT--osCoTfqZ4ENeas+nFdXefA==
+3nm9KZNtyLhPgZBVzOOkN2FXHD0uEMuzgb5Sl1MrAMmi6+iEFSzyTHfZFW2mz18VyNz5DDYvTODZqBDQKK+FQh70uEQkmGqaY5XsTOzUFzk56quaPNtZvFEGux1nX2avSbYQBs3HeyYyWyTAFhez5j8tVb6sZD2xZ8twa9KAB42j86NIHT9w/ZMFqZbGbdBoR1Mrqoy9/IWv2QgxMTpGR6JBpTUwauXm6wS/bTt8SCXF57JSVgvdw/BxFzoA3Xj6N5E89LbMfh54W2ruMhybka5E7zXN9z0v4oXt8GiYZFIODEYZwqzEVaUK1WXS5qb5OrDJFAzs29Uf/gDrIDx71Lot+jejCS+xFfI9454EnHcVH66wKuwF6ylKupJDffM0hQHplcEfVSq5UiDfbPXm46Vr0g1A--2RrmuzCBuHvYpPNA--ugbuRe7ivfDqeUCt6ahciA==

config/database.yml.dist

@@ -24,27 +24,45 @@
 # Read https://guides.rubyonrails.org/configuring.html#configuring-a-database
 # for a full overview on how database connection configuration can be specified.
 default: &default
-  adapter: mysql2
+  pool: <%= ENV.fetch('RAILS_MAX_THREADS', 3) %>
-  encoding: utf8mb4
+
-  collation: utf8mb4_0900_as_ci
+#mysql_default: &mysql_default
-  pool: <%= ENV.fetch("RAILS_MAX_THREADS") { 5 } %>
+#  <<: *default
-  username: fixinme
+#  username: fixinme
-  password: Some-password1%
+#  password: Some-password1%
-  socket: /run/mysqld/mysqld.sock
+#  host: 127.0.0.1
+#  encoding: utf8mb4
+#  collation: utf8mb4_0900_as_ci
 
 production:
   <<: *default
-  database: fixinme
+  adapter: sqlite3
+  database: db/production.sqlite3
 
-# Unless you're planning on developing the application, you can skip
+# Unless you're planning on developing the application, you can skip/remove
 # configurations for development and test databases altogether.
 #development:
-#  <<: *default
+#  <<: *mysql_default
+#  adapter: mysql2
 #  database: fixinme_dev
 
-# Warning: The database defined as "test" will be erased and
+# Warning: The database(s) defined as "test" will be erased and
 # re-generated from your development database when you run "rake".
 # Do not set this db to the same as development or production.
 #test:
-#  <<: *default
+#  <<: *mysql_default
+#  adapter: mysql2
 #  database: fixinme_test
+
+# Multiple test databases can be provided. When more than one test db is
+# present, every test task (test, test:models, test:system, etc.) runs against
+# all of them.
+#test:
+#  mysql2:
+#    <<: *mysql_default
+#    adapter: mysql2
+#    database: fixinme_test
+#  sqlite3:
+#    <<: *default
+#    adapter: sqlite3
+#    database: db/test.sqlite3

config/environments/development.rb

@@ -3,10 +3,8 @@ require "active_support/core_ext/integer/time"
 Rails.application.configure do
   # Settings specified here will take precedence over those in config/application.rb.
 
-  # In the development environment your application's code is reloaded any time
+  # Make code changes take effect immediately without server restart.
-  # it changes. This slows down response time but is perfect for development
+  config.enable_reloading = true
-  # since you don't have to restart the web server when you make code changes.
-  config.cache_classes = false
 
   # Do not eager load code on boot.
   config.eager_load = false
@@ -14,54 +12,52 @@ Rails.application.configure do
   # Show full error reports.
   config.consider_all_requests_local = true
 
-  # Enable server timing
+  # Enable server timing.
   config.server_timing = true
 
-  # Enable/disable caching. By default caching is disabled.
+  # Enable/disable Action Controller caching. By default Action Controller caching is disabled.
-  # Run rails dev:cache to toggle caching.
+  # Run rails dev:cache to toggle Action Controller caching.
   if Rails.root.join("tmp/caching-dev.txt").exist?
     config.action_controller.perform_caching = true
     config.action_controller.enable_fragment_cache_logging = true
-
+    config.public_file_server.headers = { "cache-control" => "public, max-age=#{2.days.to_i}" }
-    config.cache_store = :memory_store
-    config.public_file_server.headers = {
-      "Cache-Control" => "public, max-age=#{2.days.to_i}"
-    }
   else
     config.action_controller.perform_caching = false
-
-    config.cache_store = :null_store
   end
 
+  # Change to :null_store to avoid any caching.
+  config.cache_store = :memory_store
+
   # Don't care if the mailer can't send.
   config.action_mailer.raise_delivery_errors = false
 
+  # Make template changes take effect immediately.
   config.action_mailer.perform_caching = false
 
   # Print deprecation notices to the Rails logger.
   config.active_support.deprecation = :log
 
-  # Raise exceptions for disallowed deprecations.
-  config.active_support.disallowed_deprecation = :raise
-
-  # Tell Active Support which deprecation messages to disallow.
-  config.active_support.disallowed_deprecation_warnings = []
-
   # Raise an error on page load if there are pending migrations.
   config.active_record.migration_error = :page_load
 
   # Highlight code that triggered database queries in logs.
   config.active_record.verbose_query_logs = true
 
-  # Suppress logger output for asset requests.
+  # Append comments with runtime information tags to SQL queries in logs.
-  config.assets.quiet = true
+  config.active_record.query_log_tags_enabled = true
+
+  # Highlight code that enqueued background job in logs.
+  config.active_job.verbose_enqueue_logs = true
+
+  # Highlight code that triggered redirect in logs.
+  config.action_dispatch.verbose_redirect_logs = true
 
   # Raises error for missing translations.
   # config.i18n.raise_on_missing_translations = true
 
   # Annotate rendered view with file names.
-  # config.action_view.annotate_rendered_view_with_filenames = true
+  config.action_view.annotate_rendered_view_with_filenames = true
 
-  # Uncomment if you wish to allow Action Cable access from any origin.
+  # Raise error when a before_action's only/except options reference missing actions.
-  # config.action_cable.disable_request_forgery_protection = true
+  config.action_controller.raise_on_missing_callback_actions = true
 end

config/environments/production.rb

@@ -4,78 +4,83 @@ Rails.application.configure do
   # Settings specified here will take precedence over those in config/application.rb.
 
   # Code is not reloaded between requests.
-  config.cache_classes = true
+  config.enable_reloading = false
 
-  # Eager load code on boot. This eager loads most of Rails and
+  # Eager load code on boot for better performance and memory savings (ignored by Rake tasks).
-  # your application in memory, allowing both threaded web servers
-  # and those relying on copy on write to perform better.
-  # Rake tasks automatically ignore this option for performance.
   config.eager_load = true
 
-  # Full error reports are disabled and caching is turned on.
+  # Full error reports are disabled.
   config.consider_all_requests_local = false
+
+  # Turn on fragment caching in view templates.
   config.action_controller.perform_caching = true
 
-  # Ensures that a master key has been made available in either ENV["RAILS_MASTER_KEY"]
+  # Cache assets for far-future expiry since they are all digest stamped.
-  # or in config/master.key. This key is used to decrypt credentials (and other encrypted files).
+  config.public_file_server.headers = { "cache-control" => "public, max-age=#{1.year.to_i}" }
-  # config.require_master_key = true
-
-  # Disable serving static files from the `/public` folder by default since
-  # Apache or NGINX already handles this.
-  config.public_file_server.enabled = ENV["RAILS_SERVE_STATIC_FILES"].present?
-
-  # Compress CSS using a preprocessor.
-  # config.assets.css_compressor = :sass
-
-  # Do not fallback to assets pipeline if a precompiled asset is missed.
-  config.assets.compile = false
 
   # Enable serving of images, stylesheets, and JavaScripts from an asset server.
   # config.asset_host = "http://assets.example.com"
 
-  # Specifies the header that your server uses for sending files.
+  # Assume all access to the app is happening through a SSL-terminating reverse proxy.
-  # config.action_dispatch.x_sendfile_header = "X-Sendfile" # for Apache
+  config.assume_ssl = true
-  # config.action_dispatch.x_sendfile_header = "X-Accel-Redirect" # for NGINX
 
   # Force all access to the app over SSL, use Strict-Transport-Security, and use secure cookies.
-  # config.force_ssl = true
+  config.force_ssl = true
 
-  # Include generic and useful information about system operation, but avoid logging too much
+  # Skip http-to-https redirect for the default health check endpoint.
-  # information to avoid inadvertent exposure of personally identifiable information (PII).
+  # config.ssl_options = { redirect: { exclude: ->(request) { request.path == "/up" } } }
-  config.log_level = :info
 
-  # Prepend all log lines with the following tags.
+  # Log to STDOUT with the current request id as a default log tag.
   config.log_tags = [ :request_id ]
+  config.logger   = ActiveSupport::TaggedLogging.logger(STDOUT)
 
-  # Use a different cache store in production.
+  # Change to "debug" to log everything (including potentially personally-identifiable information!).
+  config.log_level = ENV.fetch("RAILS_LOG_LEVEL", "info")
+
+  # Prevent health checks from clogging up the logs.
+  config.silence_healthcheck_path = "/up"
+
+  # Don't log any deprecations.
+  config.active_support.report_deprecations = false
+
+  # Replace the default in-process memory cache store with a durable alternative.
   # config.cache_store = :mem_cache_store
 
-  config.action_mailer.perform_caching = false
+  # Replace the default in-process and non-durable queuing backend for Active Job.
+  # config.active_job.queue_adapter = :resque
 
   # Ignore bad email addresses and do not raise email delivery errors.
   # Set this to true and configure the email server for immediate delivery to raise delivery errors.
   # config.action_mailer.raise_delivery_errors = false
 
+  # Specify outgoing SMTP server. Remember to add smtp/* credentials via bin/rails credentials:edit.
+  # config.action_mailer.smtp_settings = {
+  #   user_name: Rails.application.credentials.dig(:smtp, :user_name),
+  #   password: Rails.application.credentials.dig(:smtp, :password),
+  #   address: "smtp.example.com",
+  #   port: 587,
+  #   authentication: :plain
+  # }
+
   # Enable locale fallbacks for I18n (makes lookups for any locale fall back to
   # the I18n.default_locale when a translation cannot be found).
   config.i18n.fallbacks = true
 
-  # Don't log any deprecations.
-  config.active_support.report_deprecations = false
-
-  # Use default logging formatter so that PID and timestamp are not suppressed.
-  config.log_formatter = ::Logger::Formatter.new
-
-  # Use a different logger for distributed setups.
-  # require "syslog/logger"
-  # config.logger = ActiveSupport::TaggedLogging.new(Syslog::Logger.new "app-name")
-
-  if ENV["RAILS_LOG_TO_STDOUT"].present?
-    logger           = ActiveSupport::Logger.new(STDOUT)
-    logger.formatter = config.log_formatter
-    config.logger    = ActiveSupport::TaggedLogging.new(logger)
-  end
-
   # Do not dump schema after migrations.
   config.active_record.dump_schema_after_migration = false
+
+  # Only use :id for inspections in production.
+  config.active_record.attributes_for_inspect = [ :id ]
+
+  # Enable DNS rebinding protection and other `Host` header attacks.
+  # config.hosts = [
+  #   "example.com",     # Allow requests from example.com
+  #   /.*\.example\.com/ # Allow requests from subdomains like `www.example.com`
+  # ]
+  #
+  # Skip DNS rebinding protection for the default health check endpoint.
+  # config.host_authorization = { exclude: ->(request) { request.path == "/up" } }
+
+  # Protect e-mail addresses from being logged only in production.
+  config.filter_parameters += [:email]
 end

config/environments/test.rb

@@ -1,5 +1,3 @@
-require "active_support/core_ext/integer/time"
-
 # The test environment is used exclusively to run your application's
 # test suite. You never need to work with it otherwise. Remember that
 # your test database is "scratch space" for the test suite and is wiped
@@ -8,57 +6,49 @@ require "active_support/core_ext/integer/time"
 Rails.application.configure do
   # Settings specified here will take precedence over those in config/application.rb.
 
-  # Turn false under Spring and add config.action_view.cache_template_loading = true.
+  # While tests run files are not watched, reloading is not necessary.
-  config.cache_classes = true
+  config.enable_reloading = false
 
-  # Eager loading loads your whole application. When running a single test locally,
+  # Eager loading loads your entire application. When running a single test locally,
-  # this probably isn't necessary. It's a good idea to do in a continuous integration
+  # this is usually not necessary, and can slow down your test suite. However, it's
-  # system, or in some way before deploying your code.
+  # recommended that you enable it in continuous integration systems to ensure eager
+  # loading is working properly before deploying your code.
   config.eager_load = ENV["CI"].present?
 
-  # Configure public file server for tests with Cache-Control for performance.
+  # Configure public file server for tests with cache-control for performance.
-  config.public_file_server.enabled = true
+  config.public_file_server.headers = { "cache-control" => "public, max-age=3600" }
-  config.public_file_server.headers = {
-    "Cache-Control" => "public, max-age=#{1.hour.to_i}"
-  }
 
-  # Hide full error reports.
+  # Behave as in `production`.
   config.consider_all_requests_local = false
-  # Render exception templates instead of raising exceptions.
-  config.action_dispatch.show_exceptions = :all
 
-  # Disable caching.
-  config.action_controller.perform_caching = false
   config.cache_store = :null_store
 
   # Disable request forgery protection in test environment.
   config.action_controller.allow_forgery_protection = false
 
-  config.action_mailer.perform_caching = false
-
   # Tell Action Mailer not to deliver emails to the real world.
   # The :test delivery method accumulates sent emails in the
   # ActionMailer::Base.deliveries array.
   config.action_mailer.delivery_method = :test
-  config.action_mailer.default_url_options = {host: '127.0.0.1', :protocol => 'http'}
+
+  # Set host to be used by links generated in mailer templates.
+  config.action_mailer.default_url_options = {host: Capybara.server_host,
+                                              protocol: 'http'}
 
   # Print deprecation notices to the stderr.
   config.active_support.deprecation = :stderr
 
-  # Raise exceptions for disallowed deprecations.
-  config.active_support.disallowed_deprecation = :raise
-
-  # Tell Active Support which deprecation messages to disallow.
-  config.active_support.disallowed_deprecation_warnings = []
-
   # Raises error for missing translations.
   config.i18n.raise_on_missing_translations = true
 
   # Annotate rendered view with file names.
   # config.action_view.annotate_rendered_view_with_filenames = true
 
-  config.log_level = :info
+  # Raise error when a before_action's only/except options reference missing actions.
+  config.action_controller.raise_on_missing_callback_actions = true
 
-  # Allow Capybara's dynamic test server host (127.0.0.1:<random_port>)
+  # Allow Capybara application server IP
-  config.hosts << '127.0.0.1'
+  config.hosts |= [IPAddr.new(Capybara.server_host)]
+
+  config.log_level = :info
 end

config/importmap.rb

@@ -2,6 +2,3 @@
 
 pin "application", preload: true
 pin "@hotwired/turbo-rails", to: "turbo.min.js", preload: true
-pin "@hotwired/stimulus", to: "stimulus.min.js", preload: true
-pin "@hotwired/stimulus-loading", to: "stimulus-loading.js", preload: true
-pin_all_from "app/javascript/controllers", under: "controllers"

config/initializers/assets.rb

@@ -5,8 +5,3 @@ Rails.application.config.assets.version = "1.0"
 
 # Add additional assets to the asset load path.
 # Rails.application.config.assets.paths << Emoji.images_path
-
-# Precompile additional assets.
-# application.js, application.css, and all non-JS/CSS in the app/assets
-# folder are already added.
-Rails.application.config.assets.precompile += %w( '*.svg' )

config/initializers/content_security_policy.rb

@@ -16,9 +16,13 @@
 #     # policy.report_uri "/csp-violation-report-endpoint"
 #   end
 #
-#   # Generate session nonces for permitted importmap and inline scripts
+#   # Generate session nonces for permitted importmap, inline scripts, and inline styles.
 #   config.content_security_policy_nonce_generator = ->(request) { request.session.id.to_s }
-#   config.content_security_policy_nonce_directives = %w(script-src)
+#   config.content_security_policy_nonce_directives = %w(script-src style-src)
+#
+#   # Automatically add `nonce` to `javascript_tag`, `javascript_include_tag`, and `stylesheet_link_tag`
+#   # if the corresponding directives are specified in `content_security_policy_nonce_directives`.
+#   # config.content_security_policy_nonce_auto = true
 #
 #   # Report violations without enforcing the policy.
 #   # config.content_security_policy_report_only = true

config/initializers/devise.rb

@@ -179,7 +179,7 @@ Devise.setup do |config|
 
   # ==> Configuration for :validatable
   # Range for password length.
-  config.password_length = 5..128
+  config.password_length = 5..32
 
   # Email regex used to validate email formats. It simply asserts that
   # one (and only one) @ exists in the given string. This is mainly

config/initializers/filter_parameter_logging.rb

@@ -1,8 +1,8 @@
 # Be sure to restart your server when you modify this file.
 
-# Configure parameters to be filtered from the log file. Use this to limit dissemination of
+# Configure parameters to be partially matched (e.g. passw matches password) and filtered from the log file.
-# sensitive information. See the ActiveSupport::ParameterFilter documentation for supported
+# Use this to limit dissemination of sensitive information.
-# notations and behaviors.
+# See the ActiveSupport::ParameterFilter documentation for supported notations and behaviors.
 Rails.application.config.filter_parameters += [
-  :passw, :secret, :token, :_key, :crypt, :salt, :certificate, :otp, :ssn
+  :passw, :secret, :token, :_key, :crypt, :salt, :certificate, :otp, :ssn, :cvv, :cvc
 ]

config/locales/en.yml

@@ -11,13 +11,8 @@ en:
   activerecord:
     attributes:
       quantity:
-        default_unit: Default unit
         description: Description
         name: Name
-      readout:
-        created_at: Recorded at
-        taken_at: Taken at
-        value: Value
       unit:
         base: Base unit
         description: Description
@@ -86,11 +81,6 @@ en:
       revert: Revert
       sign_out: Sign out
       source_code: Get code
-  readouts:
-    form:
-      set_default_unit: Set as default unit
-  charts:
-    navigation: Charts
   measurements:
     navigation: Measurements
     no_items: There are no measurements taken. You can Add some now.
@@ -99,21 +89,6 @@ en:
       taken_at_html: Measurement taken at 
     index:
       new_measurement: Add measurement
-      view_compact: Compact view
-      view_wide: Wide view
-      view_charts: Charts
-    readout:
-      edit: Edit
-      destroy: Delete
-    create:
-      success:
-        one: Recorded 1 measurement.
-        other: Recorded %{count} measurements.
-      no_readouts: No readouts selected.
-    update:
-      success: Measurement updated.
-    destroy:
-      success: Measurement deleted.
   quantities:
     navigation: Quantities
     no_items: There are no configured quantities. You can Add some or Import from defaults.

config/puma.rb.dist

@@ -1,43 +1,41 @@
-# Puma can serve each request in a thread from an internal thread pool.
+# This configuration file will be evaluated by Puma. The top-level methods that
-# The `threads` method setting takes two numbers: a minimum and maximum.
+# are invoked here are part of Puma's configuration DSL. For more information
-# Any libraries that use thread pools should be configured to match
+# about methods provided by the DSL, see https://puma.io/puma/Puma/DSL.html.
-# the maximum value specified for Puma. Default is set to 5 threads for minimum
-# and maximum; this matches the default thread size of Active Record.
 #
-max_threads_count = ENV.fetch("RAILS_MAX_THREADS") { 5 }
+# Puma starts a configurable number of processes (workers) and each process
-min_threads_count = ENV.fetch("RAILS_MIN_THREADS") { max_threads_count }
+# serves each request in a thread from an internal thread pool.
-threads min_threads_count, max_threads_count
-
-# Specifies the `worker_timeout` threshold that Puma will use to wait before
-# terminating a worker in development environments.
 #
-worker_timeout 3600 if ENV.fetch("RAILS_ENV", "development") == "development"
+# You can control the number of workers using ENV["WEB_CONCURRENCY"]. You
+# should only set this value when you want to run 2 or more workers. The
+# default is already 1.
+#
+# The ideal number of threads per worker depends both on how much time the
+# application spends waiting for IO operations and on how much you wish to
+# prioritize throughput over latency.
+#
+# As a rule of thumb, increasing the number of threads will increase how much
+# traffic a given process can handle (throughput), but due to CRuby's
+# Global VM Lock (GVL) it has diminishing returns and will degrade the
+# response time (latency) of the application.
+#
+# The default is set to 3 threads as it's deemed a decent compromise between
+# throughput and latency for the average Rails application.
+#
+# Any libraries that use a connection pool or another resource pool should
+# be configured to provide at least as many connections as the number of
+# threads. This includes Active Record's `pool` parameter in `database.yml`.
+threads_count = ENV.fetch("RAILS_MAX_THREADS", 3)
+threads threads_count, threads_count
 
 # Specifies the `port` that Puma will listen on to receive requests; default is 3000.
-#
+port ENV.fetch("PORT", 3000), '127.0.0.1'
-port ENV.fetch("PORT") { 3000 }
-
-# Specifies the `environment` that Puma will run in.
-#
-environment ENV.fetch("RAILS_ENV") { "development" }
-
-# Specifies the `pidfile` that Puma will use.
-pidfile ENV.fetch("PIDFILE") { "tmp/pids/server.pid" }
-
-# Specifies the number of `workers` to boot in clustered mode.
-# Workers are forked web server processes. If using threads and workers together
-# the concurrency of the application would be max `threads` * `workers`.
-# Workers do not work on JRuby or Windows (both of which do not support
-# processes).
-#
-# workers ENV.fetch("WEB_CONCURRENCY") { 2 }
-
-# Use the `preload_app!` method when specifying a `workers` number.
-# This directive tells Puma to first boot the application and load code
-# before forking the application. This takes advantage of Copy On Write
-# process behavior so workers use less memory.
-#
-# preload_app!
 
 # Allow puma to be restarted by `bin/rails restart` command.
 plugin :tmp_restart
+
+# Run the Solid Queue supervisor inside of Puma for single-server deployments
+plugin :solid_queue if ENV["SOLID_QUEUE_IN_PUMA"]
+
+# Specify the PID file. Defaults to tmp/pids/server.pid in development.
+# In other environments, only set the PID file if requested.
+pidfile ENV["PIDFILE"] if ENV["PIDFILE"]

config/routes.rb

@@ -1,6 +1,5 @@
 Rails.application.routes.draw do
   resources :measurements
-  resources :charts, only: [:index]
 
   resources :readouts, only: [:new] do
     collection {get 'new/:id/discard', action: :discard, as: :discard}
@@ -16,7 +15,10 @@ Rails.application.routes.draw do
 
   namespace :default do
     resources :units, only: [:index, :destroy] do
-      member { post :import, :export }
+      member {
+        post :import
+        post :export
+      }
       #collection { post :import_all }
     end
   end

db/migrate/20230309185340_create_users.rb

@@ -1,11 +1,11 @@
-class CreateUsers < ActiveRecord::Migration[7.0]
+class CreateUsers < ActiveRecord::Migration[8.1]
   def change
     create_table :users do |t|
       t.string :email, null: false, limit: 64
       t.integer :status, null: false, default: 0
 
-      t.timestamps null: false
+      t.timestamps
     end
-    add_index :users, :email, unique: true
+    add_index :users, :email
   end
 end

db/migrate/20230311220654_add_devise_to_users.rb

@@ -1,4 +1,4 @@
-class AddDeviseToUsers < ActiveRecord::Migration[7.0]
+class AddDeviseToUsers < ActiveRecord::Migration[8.1]
   def change
     change_table :users do |t|
       ## NOTE: commented fields left for reference/inclusion in future migrations
@@ -34,8 +34,8 @@ class AddDeviseToUsers < ActiveRecord::Migration[7.0]
       # t.integer :failed_attempts, default: 0, null: false 
     end
 
-    add_index :users, :reset_password_token, unique: true
+    add_index :users, :reset_password_token
-    add_index :users, :confirmation_token, unique: true
+    add_index :users, :confirmation_token
     # add_index :users, :unlock_token, unique: true
   end
 end

db/migrate/20230602185352_create_units.rb

@@ -1,14 +1,15 @@
-class CreateUnits < ActiveRecord::Migration[7.0]
+class CreateUnits < ActiveRecord::Migration[8.1]
   def change
     create_table :units do |t|
-      t.references :user, foreign_key: true
+      t.references :user, foreign_key: {on_delete: :cascade}
       t.string :symbol, null: false, limit: 15
       t.text :description
       t.decimal :multiplier, null: false, precision: 30, scale: 15, default: 1.0
       t.references :base, foreign_key: {to_table: :units, on_delete: :cascade}
 
-      t.timestamps null: false
+      t.timestamps
     end
-    add_index :units, [:user_id, :symbol], unique: true
+    add_index :units, [:user_id, :symbol]
+    add_index :units, [:id, :user_id]
   end
 end

db/migrate/20250104194343_create_quantities.rb

@@ -1,17 +1,18 @@
-class CreateQuantities < ActiveRecord::Migration[7.2]
+class CreateQuantities < ActiveRecord::Migration[8.1]
   def change
     create_table :quantities do |t|
-      t.references :user, foreign_key: true
+      t.references :user, foreign_key: {on_delete: :cascade}
       t.string :name, null: false, limit: 31
       t.text :description
       t.references :parent, foreign_key: {to_table: :quantities, on_delete: :cascade}
 
-      t.timestamps null: false
+      t.timestamps
 
       # Caches; can be computed from other attributes
       t.integer :depth, null: false, default: 0
       t.string :pathname, null: false, limit: 511
     end
-    add_index :quantities, [:user_id, :parent_id, :name], unique: true
+    add_index :quantities, [:user_id, :parent_id, :name]
+    add_index :quantities, [:id, :user_id]
   end
 end

db/migrate/20250121230456_create_readouts.rb

@@ -1,19 +1,69 @@
-class CreateReadouts < ActiveRecord::Migration[7.2]
+class CreateReadouts < ActiveRecord::Migration[8.1]
   def change
-    create_table :readouts do |t|
+    create_table :notes do |t|
-      # Reference :user through :quantity (:measurement may be NULL).
+      t.text :text, null: false
-      t.references :measurement, foreign_key: true
+
-      t.references :quantity, null: false, foreign_key: true
+      t.timestamps
-      # :category + :value + :unit as a separate table? (NumericValue, TextValue)
+    end
-      t.integer :category, null: false, default: 0
+
-      t.float :value, null: false, limit: Float::MANT_DIG
+    create_table :measurements do |t|
-      t.references :unit, foreign_key: true
+      t.datetime :taken_at, null: false
-      # Move to Measurement?
       #t.references :collector, foreign_key: true
       #t.references :device, foreign_key: true
+      t.references :note, foreign_key: {on_delete: :nullify}
 
-      t.timestamps null: false
+      t.timestamps
     end
-    add_index :readouts, [:quantity_id, :created_at], unique: true
+    add_index :measurements, :taken_at
+
+    # Defining Readouts as a super-/subclass polymorphic relations for different
+    # subclass data types (numeric, string, file) is not possible with proper
+    # referential integrity constraints. The required constraints are:
+    # * for every subclass record to have superclass record,
+    # * for every superclass record to have only one type of subclass record,
+    # * for every superclass record to have subclass record (unenforcable).
+    #   * this can be partially remedied by making superlass an abstract class in
+    #     Rails and disallow direct creation of records, but direct data
+    #     manipulation can still break referential integrity.
+    # Defining separate {Numeric,Text,File}_Readouts tables would make the
+    # unique index constraint unenforcable.
+    create_table :readouts do |t|
+      t.references :user, null: false, foreign_key: {on_delete: :cascade}
+      t.references :measurement, foreign_key: {on_delete: :cascade}
+      t.references :quantity, null: false, foreign_key: {on_delete: :cascade}
+      t.integer :category, null: false, default: 0
+      t.float :value, null: false, limit: Float::MANT_DIG
+      t.references :unit, null: false, foreign_key: {on_delete: :cascade}
+      # TODO: consider additional columns to allow wider range of value types
+      # t.text :text
+      # t.datetime :time
+      # t.references :file
+      # Possibly mutually exclusive with :unit or check constraint for:
+      #   :unit is not null <=> :value is not null
+
+      t.timestamps
+    end
+    add_index :readouts, [:measurement_id, :quantity_id, :category]
+    add_foreign_key :readouts, :quantities, column: [:quantity_id, :user_id],
+      primary_key: [:id, :user_id]
+    add_foreign_key :readouts, :units, column: [:unit_id, :user_id],
+      primary_key: [:id, :user_id]
+
+    # TODO: remove below tables after current setup verified
+    #create_table :numeric_values do |t|
+    #  t.references :readout, null: false, foreign_key: {on_delete: :cascade}
+    #  t.float :value, null: false, limit: Float::MANT_DIG
+    #  t.references :unit, null: false, foreign_key: {on_delete: :cascade}
+    #  # + generated, not stored column :value_type
+    #  # + foreign key constraint to readouts: [:readout_id, :value_id, :value_type]
+    #  # or 2 constraints: [:readout_id, :value_id], [:value_id, :value_type]
+    #  # if readouts.value_id needed, otherwise just one constraint:
+    #  # [:readout_id, :value_type]
+    #end
+
+    #create_table :string_values do |t|
+    #  t.references :readout, null: false, foreign_key: {on_delete: :cascade}
+    #  t.string :value, null: false, limit: 32
+    #end
   end
 end

db/migrate/20260402000000_add_taken_at_to_readouts.rb

@@ -1,6 +0,0 @@
-class AddTakenAtToReadouts < ActiveRecord::Migration[7.2]
-  def change
-    add_column :readouts, :taken_at, :datetime
-    add_index :readouts, [:user_id, :taken_at]
-  end
-end

db/migrate/20260403000000_add_default_unit_to_quantities.rb

@@ -1,5 +0,0 @@
-class AddDefaultUnitToQuantities < ActiveRecord::Migration[7.2]
-  def change
-    add_reference :quantities, :default_unit, foreign_key: {to_table: :units}, null: true
-  end
-end

db/schema.rb

@@ -10,7 +10,22 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema[7.2].define(version: 2026_04_03_000000) do
+ActiveRecord::Schema[8.1].define(version: 2025_01_21_230456) do
+  create_table "measurements", charset: "utf8mb4", collation: "utf8mb4_0900_as_ci", force: :cascade do |t|
+    t.datetime "taken_at", null: false
+    t.bigint "note_id"
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+    t.index ["note_id"], name: "index_measurements_on_note_id"
+    t.index ["taken_at"], name: "index_measurements_on_taken_at", unique: true
+  end
+
+  create_table "notes", charset: "utf8mb4", collation: "utf8mb4_0900_as_ci", force: :cascade do |t|
+    t.text "text", null: false
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+  end
+
   create_table "quantities", charset: "utf8mb4", collation: "utf8mb4_0900_as_ci", force: :cascade do |t|
     t.bigint "user_id"
     t.string "name", limit: 31, null: false
@@ -20,8 +35,7 @@ ActiveRecord::Schema[7.2].define(version: 2026_04_03_000000) do
     t.datetime "updated_at", null: false
     t.integer "depth", default: 0, null: false
     t.string "pathname", limit: 511, null: false
-    t.bigint "default_unit_id"
+    t.index ["id", "user_id"], name: "index_quantities_on_id_and_user_id", unique: true
-    t.index ["default_unit_id"], name: "index_quantities_on_default_unit_id"
     t.index ["parent_id"], name: "index_quantities_on_parent_id"
     t.index ["user_id", "parent_id", "name"], name: "index_quantities_on_user_id_and_parent_id_and_name", unique: true
     t.index ["user_id"], name: "index_quantities_on_user_id"
@@ -29,17 +43,20 @@ ActiveRecord::Schema[7.2].define(version: 2026_04_03_000000) do
 
   create_table "readouts", charset: "utf8mb4", collation: "utf8mb4_0900_as_ci", force: :cascade do |t|
     t.bigint "user_id", null: false
+    t.bigint "measurement_id"
     t.bigint "quantity_id", null: false
-    t.bigint "unit_id"
+    t.integer "category", default: 0, null: false
-    t.decimal "value", precision: 30, scale: 15, null: false
+    t.float "value", limit: 53, null: false
+    t.bigint "unit_id", null: false
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
-    t.datetime "taken_at"
+    t.index ["measurement_id", "quantity_id", "category"], name: "index_readouts_on_measurement_id_and_quantity_id_and_category", unique: true
-    t.index ["quantity_id", "created_at"], name: "index_readouts_on_quantity_id_and_created_at", unique: true
+    t.index ["measurement_id"], name: "index_readouts_on_measurement_id"
+    t.index ["quantity_id", "user_id"], name: "fk_rails_9d92eaafc6"
     t.index ["quantity_id"], name: "index_readouts_on_quantity_id"
+    t.index ["unit_id", "user_id"], name: "fk_rails_348b0fb4c5"
     t.index ["unit_id"], name: "index_readouts_on_unit_id"
     t.index ["user_id"], name: "index_readouts_on_user_id"
-    t.index ["user_id", "taken_at"], name: "index_readouts_on_user_id_and_taken_at"
   end
 
   create_table "units", charset: "utf8mb4", collation: "utf8mb4_0900_as_ci", force: :cascade do |t|
@@ -51,6 +68,7 @@ ActiveRecord::Schema[7.2].define(version: 2026_04_03_000000) do
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
     t.index ["base_id"], name: "index_units_on_base_id"
+    t.index ["id", "user_id"], name: "index_units_on_id_and_user_id", unique: true
     t.index ["user_id", "symbol"], name: "index_units_on_user_id_and_symbol", unique: true
     t.index ["user_id"], name: "index_units_on_user_id"
   end
@@ -73,12 +91,15 @@ ActiveRecord::Schema[7.2].define(version: 2026_04_03_000000) do
     t.index ["reset_password_token"], name: "index_users_on_reset_password_token", unique: true
   end
 
+  add_foreign_key "measurements", "notes", on_delete: :nullify
   add_foreign_key "quantities", "quantities", column: "parent_id", on_delete: :cascade
-  add_foreign_key "quantities", "units", column: "default_unit_id"
+  add_foreign_key "quantities", "users", on_delete: :cascade
-  add_foreign_key "quantities", "users"
+  add_foreign_key "readouts", "measurements", on_delete: :cascade
-  add_foreign_key "readouts", "quantities"
+  add_foreign_key "readouts", "quantities", column: ["quantity_id", "user_id"], primary_key: ["id", "user_id"]
-  add_foreign_key "readouts", "units"
+  add_foreign_key "readouts", "quantities", on_delete: :cascade
-  add_foreign_key "readouts", "users"
+  add_foreign_key "readouts", "units", column: ["unit_id", "user_id"], primary_key: ["id", "user_id"]
+  add_foreign_key "readouts", "units", on_delete: :cascade
+  add_foreign_key "readouts", "users", on_delete: :cascade
   add_foreign_key "units", "units", column: "base_id", on_delete: :cascade
-  add_foreign_key "units", "users"
+  add_foreign_key "units", "users", on_delete: :cascade
 end

db/seeds.rb

@@ -7,18 +7,21 @@
 User.transaction do
   break if User.find_by status: :admin
 
-  User.create! email: Rails.configuration.admin, password: 'admin', status: :admin do |user|
+  email = Rails.configuration.admin
+  password_length = SecureRandom.rand(Rails.configuration.devise.password_length)
+  password = SecureRandom.alphanumeric(password_length)
+
+  User.create!(email: email, password: password, status: :admin) do |user|
     user.skip_confirmation!
-    print "Creating #{user.status} account '#{user.email}' with password '#{user.password}'..."
+    print "Creating #{user.status} account '#{user.email}'" \
+      " with password '#{user.password}'..."
   end
   puts "done."
-
 rescue ActiveRecord::RecordInvalid => exception
-  puts "failed. #{exception.message}"
+  puts "failed.", exception.message
 end
 
 # Formulas will be deleted as dependent on Quantities
 #[Source, Quantity, Unit].each { |model| model.defaults.delete_all }
 
-require_relative 'seeds/units.rb'
+load "db/seeds/units.rb"
-require_relative 'seeds/demo.rb'

db/seeds/demo.rb

@@ -1,87 +0,0 @@
-demo_email = 'demo@localhost'
-
-User.transaction do
-  break if User.find_by(email: demo_email)
-
-  demo = User.create! email: demo_email, password: 'demo123', status: :active do |user|
-    user.skip_confirmation!
-    print "Creating demo account '#{user.email}' with password '#{user.password}'..."
-  end
-  puts "done."
-
-  # --- Units ---
-  u = {}
-  u[:kg]  = demo.units.create! symbol: 'kg',  description: 'kilogram'
-  u[:g]   = demo.units.create! symbol: 'g',   description: 'gram',       base: u[:kg], multiplier: 1e-3
-  u[:cm]  = demo.units.create! symbol: 'cm',  description: 'centimetre'
-  u[:bpm] = demo.units.create! symbol: 'bpm', description: 'beats per minute'
-  u[:pct] = demo.units.create! symbol: '%',   description: 'percent'
-  u[:h]   = demo.units.create! symbol: 'h',   description: 'hour'
-  u[:min] = demo.units.create! symbol: 'min', description: 'minute',     base: u[:h], multiplier: (1.0/60).round(10)
-  u[:kcal]= demo.units.create! symbol: 'kcal',description: 'kilocalorie'
-  u[:mg]  = demo.units.create! symbol: 'mg',  description: 'milligram',  base: u[:kg], multiplier: 1e-6
-  u[:mmhg]= demo.units.create! symbol: 'mmHg',description: 'millimetre of mercury'
-
-  # --- Quantities ---
-  body      = demo.quantities.create! name: 'Body'
-  weight    = demo.quantities.create! name: 'Weight',        parent: body
-  height    = demo.quantities.create! name: 'Height',        parent: body
-  fat       = demo.quantities.create! name: 'Body fat',      parent: body
-
-  cardio    = demo.quantities.create! name: 'Cardiovascular'
-  hr_rest   = demo.quantities.create! name: 'Resting HR',    parent: cardio
-  hr_peak   = demo.quantities.create! name: 'Peak HR',       parent: cardio
-  bp_sys    = demo.quantities.create! name: 'BP systolic',   parent: cardio
-  bp_dia    = demo.quantities.create! name: 'BP diastolic',  parent: cardio
-
-  activity  = demo.quantities.create! name: 'Activity'
-  sleep_dur = demo.quantities.create! name: 'Sleep',         parent: activity
-  calories  = demo.quantities.create! name: 'Calories out',  parent: activity
-
-  nutrition = demo.quantities.create! name: 'Nutrition'
-  cal_in    = demo.quantities.create! name: 'Calories in',   parent: nutrition
-  caffeine  = demo.quantities.create! name: 'Caffeine',      parent: nutrition
-
-  # --- Readouts (60 days of daily-ish data) ---
-  base_time = 60.days.ago.beginning_of_day
-  rng = Random.new(42)
-
-  weight_val  = 82.4
-  fat_val     = 21.5
-  hr_rest_val = 62.0
-
-  60.times do |i|
-    t = base_time + i.days + rng.rand(3600 * 2)
-
-    weight_val  += rng.rand(-0.3..0.3)
-    fat_val     += rng.rand(-0.15..0.15)
-    hr_rest_val += rng.rand(-1.5..1.5)
-    hr_rest_val  = hr_rest_val.clamp(52, 72)
-
-    demo.readouts.create! quantity: weight,   unit: u[:kg],  value: weight_val.round(1),  created_at: t
-    demo.readouts.create! quantity: fat,      unit: u[:pct], value: fat_val.round(1),     created_at: t
-    demo.readouts.create! quantity: hr_rest,  unit: u[:bpm], value: hr_rest_val.round,    created_at: t
-
-    if i % 2 == 0
-      demo.readouts.create! quantity: bp_sys,  unit: u[:mmhg], value: (115 + rng.rand(-8..8)).round, created_at: t
-      demo.readouts.create! quantity: bp_dia,  unit: u[:mmhg], value: (75  + rng.rand(-5..5)).round,  created_at: t
-    end
-
-    if i % 3 == 0
-      demo.readouts.create! quantity: hr_peak, unit: u[:bpm], value: (155 + rng.rand(-10..10)).round, created_at: t
-    end
-
-    demo.readouts.create! quantity: sleep_dur, unit: u[:h],   value: (6.5 + rng.rand(-1.5..1.5)).round(1), created_at: t
-    demo.readouts.create! quantity: calories,  unit: u[:kcal],value: (2100 + rng.rand(-300..300)).round,    created_at: t
-    demo.readouts.create! quantity: cal_in,    unit: u[:kcal],value: (1900 + rng.rand(-400..400)).round,    created_at: t
-
-    if i % 4 == 0
-      demo.readouts.create! quantity: caffeine, unit: u[:mg], value: (200 + rng.rand(-80..80)).round, created_at: t
-    end
-  end
-
-  # height is stable — record once
-  demo.readouts.create! quantity: height, unit: u[:cm], value: 178.0, created_at: base_time
-
-  puts "  Created #{demo.units.count} units, #{demo.quantities.count} quantities, #{demo.readouts.count} readouts."
-end

db/sqlite3_schema.rb

@@ -0,0 +1,103 @@
+# This file is auto-generated from the current state of the database. Instead
+# of editing this file, please use the migrations feature of Active Record to
+# incrementally modify your database, and then regenerate this schema definition.
+#
+# This file is the source Rails uses to define your schema when running `bin/rails
+# db:schema:load`. When creating a new database, `bin/rails db:schema:load` tends to
+# be faster and is potentially less error prone than running all of your
+# migrations from scratch. Old migrations may fail to apply correctly if those
+# migrations use external dependencies or application code.
+#
+# It's strongly recommended that you check this file into your version control system.
+
+ActiveRecord::Schema[8.1].define(version: 2025_01_21_230456) do
+  create_table "measurements", force: :cascade do |t|
+    t.datetime "taken_at", null: false
+    t.integer "note_id"
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+    t.index ["note_id"], name: "index_measurements_on_note_id"
+    t.index ["taken_at"], name: "index_measurements_on_taken_at", unique: true
+  end
+
+  create_table "notes", force: :cascade do |t|
+    t.text "text", limit: 65535, null: false
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+  end
+
+  create_table "quantities", force: :cascade do |t|
+    t.integer "user_id"
+    t.string "name", limit: 31, null: false
+    t.text "description", limit: 65535
+    t.integer "parent_id"
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+    t.integer "depth", default: 0, null: false
+    t.string "pathname", limit: 511, null: false
+    t.index ["id", "user_id"], name: "index_quantities_on_id_and_user_id", unique: true
+    t.index ["parent_id"], name: "index_quantities_on_parent_id"
+    t.index ["user_id", "parent_id", "name"], name: "index_quantities_on_user_id_and_parent_id_and_name", unique: true
+    t.index ["user_id"], name: "index_quantities_on_user_id"
+  end
+
+  create_table "readouts", force: :cascade do |t|
+    t.integer "user_id", null: false
+    t.integer "measurement_id"
+    t.integer "quantity_id", null: false
+    t.integer "category", default: 0, null: false
+    t.float "value", limit: 53, null: false
+    t.integer "unit_id", null: false
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+    t.index ["measurement_id", "quantity_id", "category"], name: "index_readouts_on_measurement_id_and_quantity_id_and_category", unique: true
+    t.index ["measurement_id"], name: "index_readouts_on_measurement_id"
+    t.index ["quantity_id"], name: "index_readouts_on_quantity_id"
+    t.index ["unit_id"], name: "index_readouts_on_unit_id"
+    t.index ["user_id"], name: "index_readouts_on_user_id"
+  end
+
+  create_table "units", force: :cascade do |t|
+    t.integer "user_id"
+    t.string "symbol", limit: 15, null: false
+    t.text "description", limit: 65535
+    t.decimal "multiplier", precision: 30, scale: 15, default: "1.0", null: false
+    t.integer "base_id"
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+    t.index ["base_id"], name: "index_units_on_base_id"
+    t.index ["id", "user_id"], name: "index_units_on_id_and_user_id", unique: true
+    t.index ["user_id", "symbol"], name: "index_units_on_user_id_and_symbol", unique: true
+    t.index ["user_id"], name: "index_units_on_user_id"
+  end
+
+  create_table "users", force: :cascade do |t|
+    t.string "email", limit: 64, null: false
+    t.integer "status", default: 0, null: false
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+    t.string "encrypted_password", default: "", null: false
+    t.string "reset_password_token"
+    t.datetime "reset_password_sent_at"
+    t.datetime "remember_created_at"
+    t.string "confirmation_token"
+    t.datetime "confirmed_at"
+    t.datetime "confirmation_sent_at"
+    t.string "unconfirmed_email", limit: 64
+    t.index ["confirmation_token"], name: "index_users_on_confirmation_token", unique: true
+    t.index ["email"], name: "index_users_on_email", unique: true
+    t.index ["reset_password_token"], name: "index_users_on_reset_password_token", unique: true
+  end
+
+  add_foreign_key "measurements", "notes", on_delete: :nullify
+  add_foreign_key "quantities", "quantities", column: "parent_id", on_delete: :cascade
+  add_foreign_key "quantities", "users", on_delete: :cascade
+  add_foreign_key "readouts", "measurements", on_delete: :cascade
+  add_foreign_key "readouts", "quantities", column: ["quantity_id", "user_id"], primary_key: ["id", "user_id"]
+  add_foreign_key "readouts", "quantities", on_delete: :cascade
+  add_foreign_key "readouts", "units", column: ["unit_id", "user_id"], primary_key: ["id", "user_id"]
+  add_foreign_key "readouts", "units", on_delete: :cascade
+  add_foreign_key "readouts", "users", on_delete: :cascade
+  add_foreign_key "units", "units", column: "base_id", on_delete: :cascade
+  add_foreign_key "units", "users", on_delete: :cascade
+end

lib/default_settings_strategy.rb

@@ -0,0 +1,55 @@
+class DefaultSettingsStrategy < ActiveRecord::Migration::DefaultStrategy
+  COLUMN_DEFAULTS = {
+    # TODO: all types `null: false` ?
+    # TODO: references `foreign_key: {on_delete: :cascade}` ?
+    # `timestamps` - Rails defaults to `null: false, precision: true`.
+    # `limit:` for `text` - `text` can be theoretically up to 1GB or
+    #   longer, so roughly unlimited for practical purposes. But:
+    #   * the actual usable length depends on additional factors, like compile
+    #     time limits (`SQLITE_MAX_LENGTH` in SQLite), runtime settings
+    #     (`max_allowed_packet` in MySQL) and probably other,
+    #   * Rails does not report limit for `text` column types, unless it is
+    #     explicitly set.
+    #   The decision is to always set safe limit and enforce it by validations, to
+    #   avoid surprises (e.g. text truncation) when saving to dabatase.
+    text: {limit: 2**16 - 1}
+  }
+  COLUMN_DEFAULTS.default = {}
+  COLUMN_DEFAULTS.freeze
+
+  module ColumnSettingsStrategy
+    def column(name, type, **options)
+      super(name, type, **COLUMN_DEFAULTS[type].merge(options))
+    end
+  end
+  ActiveRecord::ConnectionAdapters::TableDefinition.prepend ColumnSettingsStrategy
+
+  # `force: :cascade` - does nothing on MySQL, so `force:` is useless.
+  # `if_not_exists: true`/`if_exists: true` - without these options it's impossible
+  #   to change migration status once migration fails partially. If `up` migration
+  #   creates some, but not all objects, its status is not updated from `down` to
+  #   `up`. Then it's impossible to migrate: a) up - due to `already exists`
+  #   errors and b) down - due to migration status.
+  MIGRATION_DEFAULTS = {
+    add_check_constraint: {if_not_exists: true},
+    add_column:           {if_not_exists: true},
+    add_foreign_key:      {if_not_exists: true},
+    add_index:            {if_not_exists: true, unique: true},
+    add_timestamps:       {if_not_exists: true},
+    create_table:         {if_not_exists: true},
+    drop_table:               {if_exists: true},
+    remove_check_constraint:  {if_exists: true},
+    remove_column:            {if_exists: true},
+    remove_foreign_key:       {if_exists: true},
+    remove_index:             {if_exists: true},
+    remove_timestamps:        {if_exists: true},
+  }
+  MIGRATION_DEFAULTS.default = {}
+  MIGRATION_DEFAULTS.freeze
+
+  def method_missing(method, *args, **kwargs, &)
+    conflicts = kwargs.has_key?(:force) ? [:if_not_exists, :if_exists] : []
+    defaults = MIGRATION_DEFAULTS[method.to_sym].except(*conflicts)
+    super(method, *args, **defaults.merge(kwargs), &)
+  end
+end

public/icon.svg

@@ -0,0 +1,3 @@
+<svg width="512" height="512" xmlns="http://www.w3.org/2000/svg">
+  <circle cx="256" cy="256" r="256" fill="red"/>
+</svg>

test/application_system_test_case.rb

@@ -25,9 +25,10 @@ class ApplicationSystemTestCase < ActionDispatch::SystemTestCase
     user
   end
 
-  def inject_button_to(after, *button_options)
+  def inject_button_to(inside, *button_options)
     button = button_to *button_options
-    evaluate_script("arguments[0].insertAdjacentHTML('beforeend', '#{button.html_safe}');", after)
+    inside.evaluate_script("this.insertAdjacentHTML('beforeend', arguments[0]);",
+                           button.html_safe)
   end
 
   # Allow skipping interpolations when translating for testing purposes
@@ -38,6 +39,32 @@ class ApplicationSystemTestCase < ActionDispatch::SystemTestCase
   end
   alias :t :translate
 
+  DB_CONFIGS = ActiveRecord::Base.configurations.configs_for(env_name: "test")
+  TEST_CONFIGS = Hash.new(DB_CONFIGS.first.name.to_sym)
+  class << self
+    # NOTE: alternative to current solution is to create shards:
+    #   ActiveRecord::Base.connects_to(
+    #     shards: {mysql2: {writing: :mysql2}, sqlite3: {writing: :sqlite3}}
+    #   )
+    # and use them in one of the following ways:
+    # * set config.active_record.shard_selector/shard_resolver
+    # * run tests within: ActiveRecord::Base.connected_to(shard: :sqlite3) { test_ }
+    # Remove this note once current solution is confirmed to work.
+    #
+    # Test block should not be modified here, as it would change its binding from
+    # instance level to class level.
+    if DB_CONFIGS.many?
+      def test(name, ...)
+        DB_CONFIGS.each do |config|
+          TEST_CONFIGS[super("#{config.name} #{name}", ...)] = config.name.to_sym
+        end
+      end
+    end
+  end
+  setup do
+    ActiveRecord::Base.establish_connection(TEST_CONFIGS[name.to_sym])
+  end
+
   #def assert_stale(element)
   #  assert_raises(Selenium::WebDriver::Error::StaleElementReferenceError) { element.tag_name }
   #end

test/controllers/charts_controller_test.rb

@@ -1,63 +0,0 @@
-require "test_helper"
-
-class ChartsControllerTest < ActionDispatch::IntegrationTest
-  setup do
-    host! '127.0.0.1'
-    @user = users(:alice)
-    post new_user_session_path, params: { user: { email: @user.email, password: 'alice' } }
-    @quantity = @user.quantities.create!(name: 'Weight')
-    @unit = @user.units.create!(symbol: 'kg')
-  end
-
-  test "requires authentication" do
-    delete destroy_user_session_path
-    get charts_path
-    assert_response :redirect
-  end
-
-  test "index returns ok" do
-    get charts_path
-    assert_response :success
-  end
-
-  test "embeds readout data as JSON in script tag" do
-    users(:alice).readouts.create!(quantity: @quantity, unit: @unit, value: 82.5, taken_at: 1.day.ago)
-
-    get charts_path
-
-    assert_select 'script#charts-data[type="application/json"]' do |elements|
-      data = JSON.parse(elements.first.children.first.to_s)
-      assert_equal 1, data.size
-      assert_equal 'Weight', data.first['quantityName']
-      assert_in_delta 82.5, data.first['value']
-      assert_equal 'kg', data.first['unit']
-      assert_not_nil data.first['takenAt']
-    end
-  end
-
-  test "orders readouts by taken_at ascending" do
-    older = users(:alice).readouts.create!(quantity: @quantity, unit: @unit, value: 80.0, taken_at: 2.days.ago)
-    newer = users(:alice).readouts.create!(quantity: @quantity, unit: @unit, value: 82.5, taken_at: 1.day.ago)
-
-    get charts_path
-
-    assert_select 'script#charts-data[type="application/json"]' do |elements|
-      data = JSON.parse(elements.first.children.first.to_s)
-      assert_equal older.taken_at.iso8601, data.first['takenAt']
-      assert_equal newer.taken_at.iso8601, data.last['takenAt']
-    end
-  end
-
-  test "does not expose other users readouts" do
-    bob_quantity = users(:bob).quantities.create!(name: 'Steps')
-    bob_unit = users(:bob).units.create!(symbol: 'steps')
-    users(:bob).readouts.create!(quantity: bob_quantity, unit: bob_unit, value: 5000, taken_at: 1.day.ago)
-
-    get charts_path
-
-    assert_select 'script#charts-data[type="application/json"]' do |elements|
-      data = JSON.parse(elements.first.children.first.to_s)
-      assert data.none? { |r| r['quantityName'] == 'Steps' }, "Bob's data must not appear"
-    end
-  end
-end

test/controllers/measurements_controller_test.rb

@@ -1,65 +0,0 @@
-require "test_helper"
-
-class MeasurementsControllerTest < ActionDispatch::IntegrationTest
-  setup do
-    host! '127.0.0.1'
-    @user = users(:alice)
-    post new_user_session_path, params: { user: { email: @user.email, password: 'alice' } }
-    @quantity = @user.quantities.create!(name: 'Weight')
-    @unit = @user.units.create!(symbol: 'kg')
-  end
-
-  test "index returns ok" do
-    get measurements_path
-    assert_response :success
-  end
-
-  test "index requires authentication" do
-    delete destroy_user_session_path
-    get measurements_path
-    assert_response :redirect
-  end
-
-  test "create records readout with taken_at" do
-    taken_at = 1.day.ago.change(usec: 0)
-    assert_difference -> { @user.readouts.count } do
-      post measurements_path, params: {
-        taken_at: taken_at.iso8601,
-        readouts: [{ quantity_id: @quantity.id, value: '82.5', unit_id: @unit.id }]
-      }, as: :turbo_stream
-    end
-    assert_response :success
-    assert_equal taken_at, @user.readouts.last.taken_at
-  end
-
-  test "create with no readouts selected shows alert" do
-    post measurements_path, params: { taken_at: Time.now.iso8601 }, as: :turbo_stream
-    assert_response :success
-  end
-
-  test "destroy removes readout" do
-    readout = @user.readouts.create!(quantity: @quantity, unit: @unit, value: 82.5, taken_at: 1.day.ago)
-    assert_difference -> { @user.readouts.count }, -1 do
-      delete measurement_path(readout), as: :turbo_stream
-    end
-    assert_response :success
-  end
-
-  test "destroy cannot remove another user's readout" do
-    other_quantity = users(:bob).quantities.create!(name: 'Weight')
-    other_unit = users(:bob).units.create!(symbol: 'kg')
-    readout = users(:bob).readouts.create!(quantity: other_quantity, unit: other_unit, value: 70.0, taken_at: 1.day.ago)
-    assert_no_difference -> { users(:bob).readouts.count } do
-      delete measurement_path(readout), as: :turbo_stream
-    end
-  end
-
-  test "update changes readout value" do
-    readout = @user.readouts.create!(quantity: @quantity, unit: @unit, value: 82.5, taken_at: 1.day.ago)
-    patch measurement_path(readout), params: {
-      readout: { value: '83.0', unit_id: @unit.id, taken_at: readout.taken_at.iso8601 }
-    }, as: :turbo_stream
-    assert_response :success
-    assert_in_delta 83.0, readout.reload.value
-  end
-end

test/controllers/quantities_controller_test.rb

@@ -1,7 +0,0 @@
-require "test_helper"
-
-class QuantitiesControllerTest < ActionDispatch::IntegrationTest
-  # test "the truth" do
-  #   assert true
-  # end
-end

test/controllers/units_controller_test.rb

@@ -1,7 +0,0 @@
-require "test_helper"
-
-class UnitsControllerTest < ActionDispatch::IntegrationTest
-  # test "the truth" do
-  #   assert true
-  # end
-end

test/controllers/users_controller_test.rb

@@ -1,5 +1,7 @@
 require "test_helper"
 
+# TODO: make sure tested actions are covered by system tests and remove all
+# controller tests.
 class UsersControllerTest < ActionDispatch::IntegrationTest
   setup do
     @user = users(:one)

test/models/user_test.rb

@@ -1,7 +0,0 @@
-require "test_helper"
-
-class UserTest < ActiveSupport::TestCase
-  # test "the truth" do
-  #   assert true
-  # end
-end

test/system/charts_test.rb

@@ -1,26 +0,0 @@
-require "application_system_test_case"
-
-class ChartsTest < ApplicationSystemTestCase
-  setup do
-    @user = sign_in(user: users(:alice))
-    @quantity = @user.quantities.create!(name: 'Weight')
-    @unit = @user.units.create!(symbol: 'kg')
-    @user.readouts.create!(quantity: @quantity, unit: @unit, value: 82.5, taken_at: 1.day.ago)
-    @user.readouts.create!(quantity: @quantity, unit: @unit, value: 83.1, taken_at: Time.now)
-    visit charts_path
-  end
-
-  test "charts page is reachable from navigation" do
-    visit root_path
-    click_on t('charts.navigation')
-    assert_current_path charts_path
-  end
-
-  test "renders Plotly chart panel" do
-    assert_selector '#measurements-charts .chart-panel', wait: 5
-  end
-
-  test "chart legend shows quantity name with unit" do
-    assert_text 'Weight (kg)', wait: 5
-  end
-end

test/system/measurements_test.rb

@@ -1,64 +0,0 @@
-require "application_system_test_case"
-
-class MeasurementsTest < ApplicationSystemTestCase
-  setup do
-    @user = sign_in(user: users(:alice))
-
-    @quantity = @user.quantities.create!(name: 'Weight')
-    @unit = @user.units.create!(symbol: 'kg')
-    @readout = @user.readouts.create!(quantity: @quantity, unit: @unit, value: 82.5)
-
-    visit measurements_path
-  end
-
-  test "index shows quantity name as edit link for active user" do
-    within 'tbody' do
-      assert_selector :link, exact_text: @quantity.name
-    end
-  end
-
-  test "edit opens inline form on quantity link click" do
-    within 'tbody' do
-      click_on @quantity.name
-      assert_selector ':focus'
-      assert_selector 'input[name="readout[value]"]'
-    end
-  end
-
-  test "edit and update measurement value" do
-    within 'tbody' do
-      click_on @quantity.name
-      fill_in 'readout[value]', with: '83.1'
-      assert_difference ->{ @readout.reload.value }, 83.1 - @readout.value do
-        click_on t('helpers.submit.update')
-      end
-      assert_no_selector :fillable_field
-      assert_selector :link, exact_text: @quantity.name
-    end
-    assert_selector '.flash.notice', text: t('measurements.update.success')
-  end
-
-  test "cancel edit restores original row" do
-    within 'tbody' do
-      click_on @quantity.name
-      assert_selector 'input[name="readout[value]"]'
-      click_on t(:cancel)
-      assert_no_selector :fillable_field
-      assert_selector :link, exact_text: @quantity.name
-    end
-  end
-
-  test "wide view edit opens panel form" do
-    @readout.update!(taken_at: Time.now)
-    visit measurements_path
-    execute_script("localStorage.removeItem('measurements-view')")
-    visit measurements_path
-
-    find('button[data-view="wide"]').click
-    within '#measurements-wide' do
-      assert_text format("%.10g", 82.5), wait: 3
-      find('button.link').click
-    end
-    assert_selector '#measurement_edit_form input[name="readout[value]"]', wait: 5
-  end
-end

test/system/quantities_test.rb

@@ -1,45 +0,0 @@
-require "application_system_test_case"
-
-class QuantitiesTest < ApplicationSystemTestCase
-  setup do
-    @user = sign_in(user: users(:alice))
-    @unit = @user.units.create!(symbol: 'kg')
-    @quantity = @user.quantities.create!(name: 'Weight')
-    visit quantities_path
-  end
-
-  test "update button turns red when default unit changes" do
-    click_on 'Weight'
-
-    button = find('button[name=button]')
-    initial_color = evaluate_script("getComputedStyle(arguments[0]).backgroundColor", button)
-
-    select 'kg', from: 'quantity[default_unit_id]'
-
-    changed_color = evaluate_script("getComputedStyle(arguments[0]).backgroundColor", button)
-    refute_equal initial_color, changed_color, "Button color should change when default unit is altered"
-  end
-
-  test "saving default unit pre-selects it in measurements form" do
-    click_on 'Weight'
-    select 'kg', from: 'quantity[default_unit_id]'
-    click_on t('helpers.submit.update')
-    assert_selector '.flash.notice'
-
-    @quantity.reload
-    assert_equal @unit.id, @quantity.default_unit_id
-
-    visit measurements_path
-    find(:link_or_button, t('measurements.index.new_measurement')).click
-    assert_selector '#measurement_form'
-
-    within '#quantity_select' do
-      check 'Weight'
-    end
-    find('button[formaction]').click
-
-    within 'tbody#readouts' do
-      assert_selector "option[value='#{@unit.id}'][selected]"
-    end
-  end
-end

test/system/tasks_test.rb

@@ -0,0 +1,20 @@
+require 'application_system_test_case'
+
+Rails.application.load_tasks
+# NOTE: for some reason task for checking pending migrations messes up
+# transaction when run during test. It causes all DB changes made before its
+# execution to be rolled back.
+# Run it before tests, so any rake task dependent on it will see it as
+# #already_invoked and won't run it during test. It is redundant anyway, as
+# migrations are run before starting test suite.
+Rake::Task['db:abort_if_pending_migrations'].invoke
+
+class TasksTest < ApplicationSystemTestCase
+  test "db:seed creates admin account" do
+    User.admin.delete_all
+    assert_output /Creating admin account/ do
+      Rake::Task['db:seed'].execute
+    end
+    assert User.admin.exists?
+  end
+end

test/system/units_test.rb

@@ -44,10 +44,12 @@ class UnitsTest < ApplicationSystemTestCase
     within 'tbody > tr:has(input[type=text], textarea)' do
       assert_selector ':focus'
 
-      maxlength = all(:fillable_field).to_h { |f| [f[:name], f[:maxlength].to_i || 2**16] }
+      maxlength = all(:fillable_field).to_h do |field|
+        [field[:name], field[:maxlength].to_i || 2**16]
+      end
       values = {
-        symbol: random_string(rand([1..3, 4..maxlength['unit[symbol]']].sample),
+        symbol: random_string(deep_rand(1..3, 4..maxlength['unit[symbol]']),
-                              except: units.map(&:symbol)),
+                              except: units.map(&:symbol), allow_blank: false),
         description: random_string(rand(0..maxlength['unit[description]']))
       }.with_indifferent_access
       within :field, 'unit[multiplier]' do |field|
@@ -61,7 +63,8 @@ class UnitsTest < ApplicationSystemTestCase
       end
     end
 
-    assert_selector '.flash.notice', text: t('units.create.success', unit: Unit.last.symbol)
+    assert_selector '.flash.notice',
+      text: t('units.create.success', unit: Unit.last.symbol)
     within 'tbody' do
       assert_no_selector :fillable_field
       assert_selector 'tr', count: @user.units.count

test/system/users_test.rb

@@ -204,6 +204,7 @@ class UsersTest < ApplicationSystemTestCase
 
   test 'update profile' do
     # TODO
+    assert true
   end
 
   test 'update status' do
@@ -227,9 +228,10 @@ class UsersTest < ApplicationSystemTestCase
 
     within all(:xpath, "//tbody//tr[not(descendant::select)]").sample do |tr|
       user = User.find_by_email!(first(:link).text)
-      inject_button_to first('td:not(.link)'), "update status", user_path(user), method: :patch,
+      inject_button_to find('td', exact_text: user.status), "update status",
+        user_path(user), method: :patch,
         params: {user: {status: User.statuses.keys.sample}}, data: {turbo: false}
-      execute_script("arguments[0].click()", find_button("update status"))
+      click_on "update status"
     end
     assert_title 'The change you wanted was rejected (422)'
   end
@@ -237,8 +239,8 @@ class UsersTest < ApplicationSystemTestCase
   test 'update status forbidden for non admin' do
     sign_in user: users.reject(&:admin?).select(&:confirmed?).sample
     visit units_path
-    inject_button_to find('body'), "update status", user_path(User.all.sample), method: :patch,
+    inject_button_to find('body'), "update status", user_path(User.all.sample),
-      params: {user: {status: User.statuses.keys.sample}}
+      method: :patch, params: {user: {status: User.statuses.keys.sample}}
     click_on "update status"
     assert_text t('actioncontroller.exceptions.status.forbidden')
   end

test/test_helper.rb

@@ -13,27 +13,36 @@ class ActiveSupport::TestCase
   include ActionView::Helpers::TranslationHelper
 
   # List of categorized Unicode characters:
-  # * http://www.unicode.org/Public/UNIDATA/UnicodeData.txt
+  #   * source: http://www.unicode.org/Public/UNIDATA/UnicodeData.txt
-  # File format: http://www.unicode.org/L2/L1999/UnicodeData.html
+  #   * file format: http://www.unicode.org/L2/L1999/UnicodeData.html
-  # Select from graphic ranges: L, M, N, P, S, Zs
+  #   * select from graphic ranges: L, M, N, P, S, Zs
-  UNICODE_CHARS = {
+  UNICODE_CHARS = [
-    1 => [*"\u0020".."\u007E"],
+    *"\u0020".."\u007E",
-    2 => [*"\u00A0".."\u00AC",
+    *"\u00A0".."\u00AC",
     *"\u00AE".."\u05FF",
     *"\u0606".."\u061B",
     *"\u061D".."\u06DC",
     *"\u06DE".."\u070E",
-          *"\u0710".."\u07FF"]
+    *"\u0710".."\u07FF"
-  }
+  ]
-  UNICODE_CHARS.default = UNICODE_CHARS[1] + UNICODE_CHARS[2]
+  def random_string(length, except: [], allow_blank: true)
-  def random_string(bytes = 10, except: [])
     begin
-      result = ''
+      result = UNICODE_CHARS.sample(length).join
-      result += UNICODE_CHARS[bytes - result.bytesize].sample while bytes > result.bytesize
+    end while except.include?(result) || (!allow_blank && result.blank?)
-    end while except.include?(result)
     result
   end
 
+  def deep_rand(*args)
+    case args
+    when Array
+      args = args.sample
+    when Range
+      args = rand(args)
+    else
+      return args
+    end while true
+  end
+
   # Assumes: max >= step and step = 1e[-]N, both as strings
   def random_number(max, step)
     max.delete!('.')