mensa 0.7.4 → 0.8.1

data/app/components/mensa/views/component.css

@@ -1,111 +1,109 @@
-.mensa-table {
-    &__views {
-        @apply relative flex-none;
-
-        &__trigger {
-            @apply h-full flex items-center gap-1.5 px-3 text-sm font-semibold text-gray-700 dark:text-gray-200 hover:bg-gray-50 dark:hover:bg-gray-700 whitespace-nowrap cursor-pointer transition-colors;
-        }
-
-        &__trigger-icon {
-            @apply text-gray-500 dark:text-gray-400 text-xs;
-        }
-
-        &__dropdown {
-            @apply absolute left-0 top-full z-20 mt-1 min-w-[12rem] rounded-lg bg-white dark:bg-gray-800 shadow-lg ring-1 ring-black/5 dark:ring-white/10 py-1;
-        }
-
-        &__option {
-            @apply flex items-center justify-between px-1 hover:bg-gray-50 dark:hover:bg-gray-700;
-
-            &-btn {
-                @apply flex items-center gap-2 flex-1 px-2 py-1.5 text-sm text-left text-gray-700 dark:text-gray-200 cursor-pointer;
-            }
-
-            &-check {
-                @apply text-primary-600 text-xs w-4;
-            }
-
-            &-menu {
-                @apply p-1.5 text-gray-400 hover:text-gray-600 dark:hover:text-gray-200 rounded cursor-pointer opacity-0 transition-opacity;
-            }
-
-            &:hover &-menu {
-                @apply opacity-100;
-            }
-
-            &-system {
-                @apply p-1.5 text-gray-400 opacity-0;
-            }
-
-            &:hover &-system {
-                @apply p-1.5 text-gray-300 opacity-100;
-            }
-        }
-
-        &__submenu {
-            @apply absolute z-30 min-w-[11rem] rounded-lg bg-white dark:bg-gray-800 shadow-lg ring-1 ring-black/5 dark:ring-white/10 py-1;
-
-            &-item {
-                @apply flex items-center gap-2.5 w-full px-3 py-2 text-sm text-gray-700 dark:text-gray-200 hover:bg-gray-50 dark:hover:bg-gray-700 cursor-pointer;
-
-                i {
-                    @apply w-4 text-gray-400;
-                }
-
-                &--danger {
-                    @apply text-red-600 dark:text-red-400;
-
-                    i {
-                        @apply text-red-500;
-                    }
-                }
-            }
-        }
-
-        &__rename-dialog {
-            @apply w-80 max-w-[90vw] rounded-xl border-0 p-5 bg-white dark:bg-gray-800 shadow-2xl ring-1 ring-black/5 dark:ring-white/10;
-
-            &::backdrop {
-                @apply bg-gray-900/40;
-                backdrop-filter: blur(2px);
-            }
-        }
-
-        &__rename-form {
-            @apply flex flex-col gap-4;
-        }
-
-        &__rename-title {
-            @apply text-base font-semibold text-gray-900 dark:text-gray-100;
-        }
-
-        &__rename-label {
-            @apply flex flex-col gap-1.5 text-sm font-medium text-gray-700 dark:text-gray-300;
-        }
-
-        input&__rename-input {
-            @apply w-full rounded-lg border border-gray-300 dark:border-gray-600 bg-white dark:bg-gray-700 px-3 py-2 text-sm text-gray-900 dark:text-gray-100 shadow-sm placeholder:text-gray-400 focus:border-primary-500 focus:ring-2 focus:ring-primary-500 focus:outline-none;
-            border-radius: 0.5rem;
-        }
-
-        &__rename-actions {
-            @apply flex justify-end gap-2;
-        }
-
-        &__rename-btn {
-            @apply rounded-lg px-3 py-1.5 text-sm font-semibold shadow-sm focus:outline-none transition-colors;
-
-            &--secondary {
-                @apply bg-white dark:bg-gray-700 text-gray-900 dark:text-gray-100 ring-1 ring-inset ring-gray-300 dark:ring-gray-600 hover:bg-gray-50 dark:hover:bg-gray-600;
-            }
-
-            &--primary {
-                @apply bg-primary-600 text-white hover:bg-primary-500;
-            }
-        }
+.mensa-table__views {
+    @apply relative flex-none;
+}
+
+.mensa-table__views__trigger {
+    @apply h-full flex items-center gap-1.5 px-3 text-sm font-semibold text-gray-700 dark:text-gray-200 hover:bg-gray-50 dark:hover:bg-gray-700 whitespace-nowrap cursor-pointer transition-colors;
+}
+
+.mensa-table__views__trigger-icon {
+    @apply text-gray-500 dark:text-gray-400 text-xs;
+}
+
+.mensa-table__views__dropdown {
+    @apply absolute left-0 top-full z-20 mt-1 min-w-[12rem] rounded-lg bg-white dark:bg-gray-800 shadow-lg ring-1 ring-black/5 dark:ring-white/10 py-1;
+}
+
+.mensa-table__views__option {
+    @apply flex items-center justify-between px-1 hover:bg-gray-50 dark:hover:bg-gray-700;
+}
+
+.mensa-table__views__option-btn {
+    @apply flex items-center gap-2 flex-1 px-2 py-1.5 text-sm text-left text-gray-700 dark:text-gray-200 cursor-pointer;
+}
+
+.mensa-table__views__option-check {
+    @apply text-primary-600 text-xs w-4;
+}
+
+.mensa-table__views__option-menu {
+    @apply p-1.5 text-gray-400 hover:text-gray-600 dark:hover:text-gray-200 rounded cursor-pointer opacity-0 transition-opacity;
+}
+
+.mensa-table__views__option:hover .mensa-table__views__option-menu {
+    @apply opacity-100;
+}
+
+.mensa-table__views__option-system {
+    @apply p-1.5 text-gray-400 opacity-0;
+}
+
+.mensa-table__views__option:hover .mensa-table__views__option-system {
+    @apply p-1.5 text-gray-300 opacity-100;
+}
+
+.mensa-table__views__submenu {
+    @apply absolute z-30 min-w-[11rem] rounded-lg bg-white dark:bg-gray-800 shadow-lg ring-1 ring-black/5 dark:ring-white/10 py-1;
+}
+
+.mensa-table__views__submenu-item {
+    @apply flex items-center gap-2.5 w-full px-3 py-2 text-sm text-gray-700 dark:text-gray-200 hover:bg-gray-50 dark:hover:bg-gray-700 cursor-pointer;
+
+    i {
+        @apply w-4 text-gray-400;
     }
 }
 
+.mensa-table__views__submenu-item--danger {
+    @apply text-red-600 dark:text-red-400;
+
+    i {
+        @apply text-red-500;
+    }
+}
+
+.mensa-table__views__rename-dialog {
+    @apply w-80 max-w-[90vw] rounded-xl border-0 p-5 bg-white dark:bg-gray-800 shadow-2xl ring-1 ring-black/5 dark:ring-white/10;
+
+    &::backdrop {
+        @apply bg-gray-900/40;
+        backdrop-filter: blur(2px);
+    }
+}
+
+.mensa-table__views__rename-form {
+    @apply flex flex-col gap-4;
+}
+
+.mensa-table__views__rename-title {
+    @apply text-base font-semibold text-gray-900 dark:text-gray-100;
+}
+
+.mensa-table__views__rename-label {
+    @apply flex flex-col gap-1.5 text-sm font-medium text-gray-700 dark:text-gray-300;
+}
+
+input.mensa-table__views__rename-input {
+    @apply w-full rounded-lg border border-gray-300 dark:border-gray-600 bg-white dark:bg-gray-700 px-3 py-2 text-sm text-gray-900 dark:text-gray-100 shadow-sm placeholder:text-gray-400 focus:border-primary-500 focus:ring-2 focus:ring-primary-500 focus:outline-none;
+    border-radius: 0.5rem;
+}
+
+.mensa-table__views__rename-actions {
+    @apply flex justify-end gap-2;
+}
+
+.mensa-table__views__rename-btn {
+    @apply rounded-lg px-3 py-1.5 text-sm font-semibold shadow-sm focus:outline-none transition-colors;
+}
+
+.mensa-table__views__rename-btn--secondary {
+    @apply bg-white dark:bg-gray-700 text-gray-900 dark:text-gray-100 ring-1 ring-inset ring-gray-300 dark:ring-gray-600 hover:bg-gray-50 dark:hover:bg-gray-600;
+}
+
+.mensa-table__views__rename-btn--primary {
+    @apply bg-primary-600 text-white hover:bg-primary-500;
+}
+
 .tippy-box[data-theme~="mensa"] {
     @apply bg-gray-200 text-gray-800 dark:text-gray-400;
 }

data/app/javascript/mensa/controllers/application_controller.js

@@ -6,6 +6,12 @@ export default class ApplicationController extends Controller {
     this.element[this.identifier] = this
   }
 
+  // Turbo streams re-render parts of the table via Mensa's own controllers, so the key
+  // rendered on the page's table element is the only stable one.
+  get tableStorageKey() {
+    return this.element.closest('.mensa-table')?.dataset.mensaTableStorageKeyValue
+  }
+
   // Appends a member id to a collection URL while keeping its query string
   // (e.g. the table's params[...]) intact.
   memberUrl(collectionUrl, id) {

data/app/tables/mensa/base.rb

@@ -145,6 +145,8 @@ module Mensa
       path = original_view_context.mensa.table_path(name)
       query = {
         params: user_params || params,
+        filters: filters_param,
+        query: current_query,
         order: order_hash(order),
         turbo_frame_id: turbo_frame_id,
         table_view_id: table_view_id,
@@ -167,7 +169,13 @@ module Mensa
     # Key under which the browser persists this table's state (filters, order,
     # column order, ...). Tables built with different params get separate state.
     def storage_key
-      [name, Mensa::TableParams.digest(params)].compact.join(":")
+      context = original_view_context if @original_view_context || component
+      scope = if context.respond_to?(:controller_name) && context.respond_to?(:action_name)
+        "#{context.controller_name}_#{context.action_name}_#{name}"
+      else
+        name
+      end
+      [scope, Mensa::TableParams.digest(params)].compact.join(":")
     end
 
     def all_views
@@ -257,6 +265,13 @@ module Mensa
       current_aggregates.presence || ("" unless config[:aggregates].nil?)
     end
 
+    # Blank means "explicitly no filters", which overrides the view's default
+    def filters_param
+      return unless config.key?(:filters)
+
+      config[:filters].presence || ""
+    end
+
     private
 
     def ensure_internal_columns_for_joined_associations

data/app/tables/mensa/column.rb

@@ -22,6 +22,12 @@ module Mensa
 
     AGGREGATE_FUNCTIONS = %i[count sum min max].freeze
 
+    # The record method that gives the value: `method :to_s` names one,
+    # `method true` uses the column's name
+    def value_method
+      config[:method] == true ? name : config[:method].presence
+    end
+
     def sort_direction
       value = table.config.dig(:order, name)
       value.presence&.to_sym

data/app/tables/mensa/row.rb

@@ -9,17 +9,14 @@ module Mensa
       @record = record
     end
 
+    # A model method is only called when the column asks for one with
+    # `method`, otherwise the value is what was selected under the column's
+    # name, so a model method with the same name doesn't shadow it
     def value(column)
-      if column.attribute && record.respond_to?(column.attribute)
-        record.public_send(column.attribute)
-      elsif column.method && record.respond_to?(column.method)
-        record.public_send(column.method)
-      elsif record.respond_to?(column.name)
-        record.public_send(column.name)
-      elsif record.respond_to?(:[])
+      if column.value_method
+        record.public_send(column.value_method)
+      elsif record.has_attribute?(column.name)
         record[column.name]
-      else
-        "-"
       end
     end
 

data/lib/generators/mensa/tailwind_config_generator.rb

@@ -7,6 +7,8 @@ module Mensa
       desc "Configures tailwind.config.js and application.tailwindcss.css"
 
       def add_content_to_tailwind_config
+        return unless File.exist?(File.join(destination_root, "config/tailwind.config.js"))
+
         inject_into_file "config/tailwind.config.js", before: "],\n  theme: {" do
           "  // Mensa content\n" +
             %w[/app/views/**/* /app/helpers/**/* /app/controllers/**/* /app/components/**/* /app/javascript/**/*.js /app/assets/**/*.css].map { |path| "    \"#{Mensa::Engine.root}#{path}\"" }.join(",\n") +
@@ -15,6 +17,8 @@ module Mensa
       end
 
       def add_content_application_tailwind_css
+        return unless File.exist?(File.join(destination_root, "app/assets/stylesheets/application.tailwind.css"))
+
         inject_into_file "app/assets/stylesheets/application.tailwind.css", before: "@tailwind base;" do
           "@import '#{Mensa::Engine.root}/app/assets/stylesheets/mensa/application.css';\n"
         end

data/lib/mensa/verifier.rb

@@ -453,6 +453,7 @@ module Mensa
     def verify_columns
       @table.columns.each do |column|
         verify_column_select(column)
+        warn_empty_column(column) unless column.internal?
         verify_column_sort(column) if column.sortable? && !column.internal?
         verify_column_render(column) unless column.internal?
       end
@@ -460,7 +461,7 @@ module Mensa
 
     def verify_column_select(column)
       check(:columns, column.name, "select") do |c|
-        skip!("no SQL attribute, the value comes from #{column.method ? "method :#{column.method}" : "the record"}") if column.attribute.blank?
+        skip!("no SQL attribute, the value comes from #{column.value_method ? "method :#{column.value_method}" : "the scope"}") if column.attribute.blank?
 
         # What Mensa selects besides the column: the id and internal columns,
         # which preloads in the scope need
@@ -473,6 +474,25 @@ module Mensa
       end
     end
 
+    # A column only calls a model method when it asks for one with `method`,
+    # without one its value is what the scope selects under its name. When
+    # nothing is selected under it, and no render block shows something else,
+    # the column is always empty.
+    def warn_empty_column(column)
+      return if column.value_method || column.config[:render].present?
+
+      record = @rows&.first&.record
+      return if record.nil? || record.has_attribute?(column.name)
+
+      fix = if record.respond_to?(column.name)
+        "Fix: add `method true` to the column to show the model's ##{column.name}, or give it an `attribute`."
+      else
+        "Fix: give the column an `attribute`, select #{column.name} in the table's scope, or add a `method`."
+      end
+      warn!(:columns, column.name, "empty column",
+        "nothing is selected as #{column.name} and it has no `method` or `render`, so it is always empty.\n#{fix}")
+    end
+
     # The SQL type of an `attribute` decides which filter operators and values
     # fit it. Without `type`, Mensa treats it as text: it offers LIKE and
     # compares with text, which fails for e.g. a boolean expression.

data/lib/mensa/version.rb

@@ -1,3 +1,3 @@
 module Mensa
-  VERSION = "0.7.4"
+  VERSION = "0.8.1"
 end

data/lib/tasks/mensa_tasks.rake

@@ -14,7 +14,9 @@ namespace :mensa do
   end
 end
 
-if Rake::Task.task_defined?("tailwindcss:build")
+# tailwindcss-rails v4 picks up app/assets/tailwind/mensa/engine.css itself (via tailwindcss:engines),
+# so only hook in the v3 config generator when that task is absent.
+if Rake::Task.task_defined?("tailwindcss:build") && !Rake::Task.task_defined?("tailwindcss:engines")
   Rake::Task["tailwindcss:build"].enhance(["mensa:tailwindcss:config"])
   Rake::Task["tailwindcss:watch"].enhance(["mensa:tailwindcss:config"])
 end

data/mensa.gemspec

@@ -37,7 +37,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "pg", ">= 1.6"
   spec.add_dependency "view_component", ">=3"
 
-  spec.add_dependency "tailwindcss-rails", "~> 3.3"
+  spec.add_dependency "tailwindcss-rails", ">= 3.3", "< 5"
   spec.add_dependency "importmap-rails"
   spec.add_dependency "turbo-rails"
   spec.add_dependency "stimulus-rails"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mensa
 version: !ruby/object:Gem::Version
-  version: 0.7.4
+  version: 0.8.1
 platform: ruby
 authors:
 - Tom de Grunt
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-10-14 00:00:00.000000000 Z
+date: 2026-10-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -98,16 +98,22 @@ dependencies:
   name: tailwindcss-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.3'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.3'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5'
 - !ruby/object:Gem::Dependency
   name: importmap-rails
   requirement: !ruby/object:Gem::Requirement
@@ -182,6 +188,7 @@ files:
 - app/assets/config/mensa_manifest.js
 - app/assets/images/mensa/.keep
 - app/assets/stylesheets/mensa/application.css
+- app/assets/tailwind/mensa/engine.css
 - app/components/mensa/add_filter/component.css
 - app/components/mensa/add_filter/component.html.erb
 - app/components/mensa/add_filter/component.rb