Merge e1efb21 into 23466a0

Gemfile.lock

@@ -289,7 +289,7 @@ GEM
     activerecord (6.1.7.7)
       activemodel (= 6.1.7.7)
       activesupport (= 6.1.7.7)
-    activerecord-import (1.5.1)
+    activerecord-import (1.6.0)
       activerecord (>= 4.2)
     activestorage (6.1.7.7)
       actionpack (= 6.1.7.7)
@@ -312,8 +312,8 @@ GEM
       erubi (>= 1.0.0)
       rack (>= 0.9.0)
       rouge (>= 1.0.0)
-    binding_of_caller (1.0.0)
-      debug_inspector (>= 0.0.1)
+    binding_of_caller (1.0.1)
+      debug_inspector (>= 1.2.0)
     bootstrap4-kaminari-views (1.0.1)
       kaminari (>= 0.13)
       rails (>= 3.1)
@@ -331,7 +331,7 @@ GEM
     capybara-puma (1.0.1)
       capybara
       puma
-    carrierwave (3.0.5)
+    carrierwave (3.0.6)
       activemodel (>= 6.0.0)
       activesupport (>= 6.0.0)
       addressable (~> 2.6)
@@ -414,10 +414,10 @@ GEM
     erubi (1.12.0)
     erubis (2.7.0)
     eventmachine (1.2.7)
-    excon (0.109.0)
+    excon (0.110.0)
     execjs (2.9.1)
     ffi (1.16.3)
-    fog-aws (3.21.0)
+    fog-aws (3.22.0)
       fog-core (~> 2.1)
       fog-json (~> 1.1)
       fog-xml (~> 0.1)
@@ -445,7 +445,7 @@ GEM
       nokogiri (>= 1.6.0)
       ruby_parser (~> 3.5)
     htmlentities (4.3.4)
-    i18n (1.14.1)
+    i18n (1.14.4)
       concurrent-ruby (~> 1.0)
     i18n-tasks (0.9.37)
       activesupport (>= 4.0.2)
@@ -503,7 +503,7 @@ GEM
     mime-types-data (3.2024.0305)
     mini_magick (4.12.0)
     mini_mime (1.1.5)
-    minitest (5.22.2)
+    minitest (5.22.3)
     multi_json (1.15.0)
     multi_test (0.1.2)
     mustermann (3.0.0)
@@ -519,11 +519,11 @@ GEM
     net-smtp (0.4.0.1)
       net-protocol
     nio4r (2.7.0)
-    nokogiri (1.16.2-arm64-darwin)
+    nokogiri (1.16.3-arm64-darwin)
       racc (~> 1.4)
-    nokogiri (1.16.2-x86_64-darwin)
+    nokogiri (1.16.3-x86_64-darwin)
       racc (~> 1.4)
-    nokogiri (1.16.2-x86_64-linux)
+    nokogiri (1.16.3-x86_64-linux)
       racc (~> 1.4)
     parallel (1.24.0)
     parser (3.3.0.5)
@@ -576,7 +576,7 @@ GEM
     rails-html-sanitizer (1.6.0)
       loofah (~> 2.21)
       nokogiri (~> 1.14)
-    rails-i18n (7.0.8)
+    rails-i18n (7.0.9)
       i18n (>= 0.7, < 2)
       railties (>= 6.0.0, < 8)
     railties (6.1.7.7)
@@ -594,7 +594,7 @@ GEM
       json
     regexp_parser (2.9.0)
     rexml (3.2.6)
-    rouge (4.2.0)
+    rouge (4.2.1)
     rr (3.1.0)
     rspec (3.13.0)
       rspec-core (~> 3.13.0)
@@ -611,29 +611,29 @@ GEM
     rspec-mocks (3.13.0)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
-    rspec-rails (6.1.1)
+    rspec-rails (6.1.2)
       actionpack (>= 6.1)
       activesupport (>= 6.1)
       railties (>= 6.1)
-      rspec-core (~> 3.12)
-      rspec-expectations (~> 3.12)
-      rspec-mocks (~> 3.12)
-      rspec-support (~> 3.12)
+      rspec-core (~> 3.13)
+      rspec-expectations (~> 3.13)
+      rspec-mocks (~> 3.13)
+      rspec-support (~> 3.13)
     rspec-support (3.13.1)
     rspec_junit_formatter (0.6.0)
       rspec-core (>= 2, < 4, != 2.12.0)
-    rubocop (1.61.0)
+    rubocop (1.62.1)
       json (~> 2.3)
       language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)
       parser (>= 3.3.0.2)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
       rexml (>= 3.2.5, < 4.0)
-      rubocop-ast (>= 1.30.0, < 2.0)
+      rubocop-ast (>= 1.31.1, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 3.0)
-    rubocop-ast (1.31.1)
+    rubocop-ast (1.31.2)
       parser (>= 3.3.0.4)
     rubocop-capybara (2.20.0)
       rubocop (~> 1.41)

card/lib/card/query/abstract_query/tie.rb

@@ -2,9 +2,9 @@ class Card
   module Query
     class AbstractQuery
       # The "Tie" methods support tying two queries (CardQuery, ReferenceQuery, etc)
-      # together.  The "fasten" variable determines which tying strategy is used.
+      # together.  The "subquery_type" variable determines which tying strategy is used.
       #
-      # We currently support three values for "fasten": :join, :exist, and :in
+      # We currently support three values for "subquery_type": :join, :exist, and :in
       #
       # In concept, here's how the different strategies would tie table A to table B
       # in SQL assuming A.id = B.a_id

mod/bar_and_box/set/all/bar.rb

@@ -43,11 +43,13 @@
   def build_accordion_bar open: false
     prepare_bar mini_bar_cols
     class_up "accordion-item", "bar #{classy 'bar'}"
-    accordion_item render_bar_body,
-                   subheader: render_menu,
-                   body: render_bar_bottom,
-                   open: open,
-                   context: :accordion_bar
+    wrap do
+      accordion_item render_bar_body,
+                     subheader: render_menu,
+                     body: render_bar_bottom,
+                     open: open,
+                     context: :accordion_bar
+    end
   end
 
   def build_bar