mensa 0.2.4 → 0.2.5

data/app/tables/mensa/base.rb

@@ -2,11 +2,13 @@ module Mensa
   class Base
     include Pagy::Method
     include ConfigReaders
+
+    defined_by Mensa::Config::TableDsl
     include Scope
 
     attr_writer :original_view_context
     attr_accessor :component, :name, :table_view, :request
-    attr_reader :config, :params
+    attr_reader :params
 
     config_reader :model
     config_reader :link, call: false
@@ -15,7 +17,7 @@ module Mensa
     config_reader :supports_filters?
     config_reader :view_condensed?
     config_reader :view_condensed_toggle?
-    config_reader :view_columns_sorting?
+    config_reader :view_columns_ordering?
     config_reader :show_header?
     config_reader :exportable?
     config_reader :export_with_password?
@@ -55,7 +57,7 @@ module Mensa
     end
 
     def system_views
-      [Mensa::SystemView.new(:all, config: {name: I18n.t("mensa.views.all")}, table: self)] +
+      config[:views]&.key?(:default) ? [] : [Mensa::SystemView.new(:default, config: {name: I18n.t("mensa.views.default")}, table: self)] +
         (config[:views] || {}).keys.map { |view_name| Mensa::SystemView.new(view_name, config: config.dig(:views, view_name), table: self) }
     end
 
@@ -64,6 +66,11 @@ module Mensa
       columns.any?(&:filter?)
     end
 
+    # Returns the active filters
+    def active_filters
+      (config[:filters] || {}).map { |column_name, filter_config| Mensa::Filter.new(column: column(column_name), config: filter_config, table: self) }
+    end
+
     def actions?
       config[:actions].present?
     end
@@ -92,10 +99,6 @@ module Mensa
       views
     end
 
-    def active_filters
-      (config[:filters] || {}).map { |column_name, filter_config| Mensa::Filter.new(column: column(column_name), config: filter_config, table: self) }
-    end
-
     def table_id
       return @table_id if @table_id
 
@@ -105,13 +108,5 @@ module Mensa
     def original_view_context
       @original_view_context || component.original_view_context
     end
-
-    private
-
-    class << self
-      def definition(&)
-        @definition ||= Mensa::Config::TableDsl.new(name, &).config
-      end
-    end
   end
 end

data/app/tables/mensa/cell.rb

@@ -24,7 +24,7 @@ module Mensa
       if proc
         row.table.original_view_context.instance_exec(row.record, &proc)
       else
-        send("to_#{format}".to_sym)
+        send(:"to_#{format}")
       end
     end
 
@@ -33,15 +33,15 @@ module Mensa
     def to_html
       case value
       when NilClass
-        ''
+        ""
       when TrueClass
-        content_tag(:i, '', class: 'fa-solid fa-check')
+        content_tag(:i, "", class: "fa-solid fa-check")
       when FalseClass
-        content_tag(:i, '', class: 'fa-solid fa-xmark')
+        content_tag(:i, "", class: "fa-solid fa-xmark")
       when Date
-        respond_to?(:dt) ? dt(value) : value.strftime('%d.%m.%Y')
+        respond_to?(:dt) ? dt(value) : value.strftime("%d.%m.%Y")
       when Time, DateTime
-        respond_to?(:ln) ? ln(value) : value.strftime('%d-%m-%Y %H:%M:%S')
+        respond_to?(:ln) ? ln(value) : value.strftime("%d-%m-%Y %H:%M:%S")
       else
         column.sanitize? ? sanitize(value.to_s) : value.to_s.html_safe
       end

data/app/tables/mensa/column.rb

@@ -3,7 +3,10 @@
 module Mensa
   class Column
     include ConfigReaders
-    attr_reader :name, :table, :config
+
+    defined_by Mensa::Config::ColumnDsl
+
+    attr_reader :name, :table
 
     def initialize(name, config:, table:)
       @name = name
@@ -35,24 +38,20 @@ module Mensa
       return @attribute if @attribute
 
       @attribute = if config[:attribute].present?
-                     "#{config[:attribute]} AS #{name}"
-                   elsif table.model.column_names.include? name.to_s
-                     name.to_s
-                   else
-                     nil
-                   end
+        "#{config[:attribute]} AS #{name}"
+      elsif table.model.column_names.include? name.to_s
+        name.to_s
+      end
     end
 
     def attribute_for_condition
       return @attribute_for_condition if @attribute_for_condition
 
       @attribute_for_condition = if config[:attribute].present?
-                                   config[:attribute]
-                                 elsif table.model.column_names.include? name.to_s
-                                   name.to_s
-                                 else
-                                   nil
-                                 end
+        config[:attribute]
+      elsif table.model.column_names.include? name.to_s
+        name.to_s
+      end
     end
 
     # Returns true if the column supports filtering
@@ -63,7 +62,7 @@ module Mensa
     def filter
       return unless filter?
 
-      @filter ||= Mensa::Filter.new(column: self, config: table.config.dig(:filters, name) || {}, table: table)
+      @filter ||= Mensa::Filter.new(column: self, config: table.config.dig(:columns, name, :filter) || {}, table: table)
     end
 
     def human_name
@@ -75,19 +74,12 @@ module Mensa
     end
 
     def menu
-      Satis::Menus::Builder.build(:filter_menu, event: 'click') do |m|
+      Satis::Menus::Builder.build(:filter_menu, event: "click") do |m|
         if sortable?
-          m.item :sort_ascending, icon: 'fa-solid fa-arrow-up-short-wide'.freeze, link: table.path(order: { name => :asc }), link_attributes: { "data-turbo-frame": "_self" }
-          m.item :sort_descending, icon: 'fa-solid fa-arrow-down-wide-short'.freeze, link: table.path(order: { name => :asc }), link_attributes: { "data-turbo-frame": "_self" }
+          m.item :sort_ascending, icon: "fa-solid fa-arrow-up-short-wide", link: table.path(order: {name => :asc}), link_attributes: {"data-turbo-frame": "_self"}
+          m.item :sort_descending, icon: "fa-solid fa-arrow-down-wide-short", link: table.path(order: {name => :asc}), link_attributes: {"data-turbo-frame": "_self"}
         end
       end
     end
-
-    private
-    class << self
-      def definition(&)
-        @definition ||= Mensa::Config::ColumnDsl.new(self.name, &).config
-      end
-    end
   end
 end

data/app/tables/mensa/config/action_dsl.rb

@@ -4,7 +4,7 @@ module Mensa::Config
   class ActionDsl
     include DslLogic
 
-    option :title, default: ->() { name }
+    option :title, default: -> { name }
     option :icon
     option :show, default: ->(record) { true }
     option :link

data/app/tables/mensa/config/dsl_logic.rb

@@ -65,11 +65,11 @@ module Mensa::Config
       end
 
       ###
-      # Define a DSL hash
-      # by calling option :action, dsl: Mensa::ActionDsl
+      # Define a DSL that builds a hash
+      # by calling option :action, dsl_hash: Mensa::ActionDsl
       #
       def dsl_hash(option_name, klass, config_name:)
-        config_name = config_name || option_name.to_s.pluralize.to_sym
+        config_name ||= option_name.to_s.pluralize.to_sym
 
         @default_config ||= {}
         @default_config[option_name.to_sym] = {}
@@ -80,8 +80,12 @@ module Mensa::Config
         end
       end
 
+      ###
+      # Define a DSL that builds an array
+      # by calling option :action, dsl_array: Mensa::ActionDsl
+      #
       def dsl_array(option_name, klass, config_name: option_name.to_s.pluralize.to_sym)
-        config_name = config_name || option_name.to_s.pluralize.to_sym
+        config_name ||= option_name.to_s.pluralize.to_sym
 
         @default_config ||= {}
         @default_config[name.to_sym] = []

data/app/tables/mensa/config/table_dsl.rb

@@ -76,8 +76,11 @@ module Mensa::Config
     option :supports_custom_views, default: false
     option :supports_filters, default: true
     option :show_header, default: true
-    option :view_columns_sorting, default: true
+    # Whether the table allows to change column ordering
+    option :view_columns_ordering, default: true
+    # Whether to show a condensed view by default
     option :view_condensed, default: false
+    # Whether to show the toggle for condensed view
     option :view_condensed_toggle, default: true
 
     option :view, dsl_hash: Mensa::Config::ViewDsl

data/app/tables/mensa/config_readers.rb

@@ -2,12 +2,24 @@ module Mensa
   module ConfigReaders
     extend ActiveSupport::Concern
 
+    included do
+      attr_reader :config
+    end
+
     class_methods do
+      def defined_by(dsl_class)
+        define_singleton_method(:definition) do |&block|
+          @definition ||= dsl_class.new(name, &block).config
+        end
+      end
+
       # Set call to false to avoid immediate execution of Procs
-      def config_reader(name, call: true)
+      def config_reader(name, call: true, cast: nil)
         define_method name do
-          value = config[name.to_s.gsub("?", "").to_sym]
-          call == true && value.is_a?(Proc) ? instance_exec(&value) : value
+          value = config[name.to_s.delete("?").to_sym]
+          value = (call == true && value.is_a?(Proc)) ? instance_exec(&value) : value
+          value = value.send(cast) if cast
+          value
         end
       end
     end

data/app/tables/mensa/filter.rb

@@ -3,9 +3,12 @@
 module Mensa
   class Filter
     include ConfigReaders
-    attr_reader :column, :config, :table
 
-    config_reader :operator
+    defined_by Mensa::Config::FilterDsl
+
+    attr_reader :column, :table
+
+    config_reader :operator, cast: :to_sym
     config_reader :value
     config_reader :scope
 
@@ -29,32 +32,26 @@ module Mensa
       "#{column.human_name}: #{value}"
     end
 
-    def filter_scope(to_be_filtered_scope)
+    def filter_scope(record_scope)
       if scope
-        to_be_filtered_scope.instance_exec(normalize(value), &scope)
+        record_scope.instance_exec(normalize(value), &scope)
       else
         case operator
         when :matches
-          to_be_filtered_scope.where("#{column.attribute_for_condition} LIKE ?", "%#{normalize(value)}%")
+          record_scope.where("#{column.attribute_for_condition} LIKE ?", "%#{normalize(value)}%")
         when :equals
-          to_be_filtered_scope.where(column.attribute_for_condition => normalize(value))
+          record_scope.where(column.attribute_for_condition => normalize(value))
         else
           # Ignore unknown operators
-          to_be_filtered_scope
+          record_scope
         end
       end
     end
 
     private
 
-    class << self
-      def definition(&)
-        @definition ||= Mensa::Config::FilterDsl.new(self.name, &).config
-      end
-    end
-
     def normalize(query)
-      query.to_s.gsub(/\s(?![\&\!\|])/, '\\\\ ')
+      query.to_s.gsub(/\s(?![&!|])/, '\\\\ ')
     end
   end
 end

data/app/tables/mensa/row.rb

@@ -26,7 +26,7 @@ module Mensa
     def link_attributes
       return {} unless link
 
-      { href: link, data: { controller: "satis-link",  action: "click->satis-link#follow tap->satis-link#follow" } }
+      {href: link, data: {controller: "satis-link", action: "click->satis-link#follow tap->satis-link#follow"}}
     end
 
     def link

data/app/tables/mensa/scope.rb

@@ -45,7 +45,7 @@ module Mensa
       return @selected_scope if @selected_scope
 
       @selected_scope = ordered_scope
-      @selected_scope = @selected_scope.select([:id] + columns.map(&:attribute).compact)
+      @selected_scope = @selected_scope.select([:id] + columns.filter_map(&:attribute))
 
       @selected_scope
     end
@@ -71,8 +71,8 @@ module Mensa
     # Though this works, perhaps moving this in column(s) is nicer
     def order_hash(new_params = {})
       (params[:order] || config[:order]).merge(new_params.symbolize_keys)
-                                        .reject { |name, direction| direction.blank? }
-                                        .transform_values { |value| value.to_sym }
+        .compact_blank
+        .transform_values { |value| value.to_sym }
     end
   end
 end

data/app/views/mensa/tables/filters/show.turbo_stream.slim

@@ -1,8 +1,9 @@
 = turbo_stream.update params[:target] do
   = sts.form_for(Mensa::Tables::FiltersController::Filter.new, url: '#') do |f|
-    - if @column.filter.collection
-      = f.input :value, collection: @column.filter.collection, input_html: { "data-action"=> "keydown.esc->mensa-add-filter#reset keydown.enter->mensa-add-filter#filterValueEntered", autofocus: "autofocus" }, label: @column.human_name
-    - else
-      = f.input :value, input_html: { "data-action"=> "keydown.esc->mensa-add-filter#reset keydown.enter->mensa-add-filter#filterValueEntered", autofocus: "autofocus" }, label: @column.human_name
-  a.sts-table__add_filter__popover_container__clear
-    | Clear
+    = f.input :value, collection: @column.filter.collection, input_html: { "data-action"=> "keydown.esc->mensa-add-filter#reset keydown.enter->mensa-add-filter#filterValueEntered", autofocus: "autofocus", "data-mensa-add-filter-target" => "value" }, label: @column.human_name
+  button.text-xs.ring-gray-300.ring-inset.ring-1.rounded.px-1.py-0.5 Esc
+  span.text-xs.pl-1.pr-2
+    | reset
+  button.text-xs.ring-gray-300.ring-inset.ring-1.rounded.px-1.py-0.5 Enter
+  span.text-xs.pl-1.pr-2
+    | submit

data/app/views/mensa/tables/show.html.slim

@@ -1,2 +1,4 @@
+| Test
+button.text-xs Esc
 turbo-frame id=@table.table_id target="_top"
   = render Mensa::View::Component.new(@table)

data/app/views/mensa/tables/show.turbo_stream.slim

@@ -1,5 +1,5 @@
 = turbo_stream.update "filters-#{@table.table_id}" do
-  = render Mensa::FilterList::Component.new(table: @table)
+  = render Mensa::FilterPillList::Component.new(table: @table)
 
 = turbo_stream.update @table.table_id do
   = render Mensa::View::Component.new(@table)

data/bin/setup

@@ -58,7 +58,7 @@ FileUtils.chdir APP_ROOT do
   system! "bin/rails log:clear tmp:clear"
 
   puts "\n== Configuring tailwindcss =="
-  system! "bin/rails app:tailwindcss:config && pushd test/dummy && bin/rails tailwindcss:build && popd"
+  system! "pushd test/dummy && bin/rails tailwindcss:config && bin/rails tailwindcss:build && popd"
 
   puts "\n== Done, welcome to Mensa =="
   puts "To start the application, run 'bin/overmind s'"

data/config/locales/en.yml

@@ -8,4 +8,4 @@ en:
         cancel: Cancel
         save: Save
     views:
-      all: All
+      default: All

data/config/locales/nl.yml

@@ -8,4 +8,4 @@ nl:
         cancel: Annuleer
         save: Bewaar
     views:
-      all: Alles
+      default: Alles

data/lib/generators/mensa/tailwind_config_generator.rb

@@ -1,10 +1,10 @@
-require 'rails/generators/base'
+require "rails/generators/base"
 
 module Mensa
   module Generators
     class TailwindConfigGenerator < Rails::Generators::Base
-      source_root File.expand_path('../templates', __dir__)
-      desc 'Configures tailwind.config.js and application.tailwindcss.css'
+      source_root File.expand_path("../templates", __dir__)
+      desc "Configures tailwind.config.js and application.tailwindcss.css"
 
       def add_content_to_tailwind_config
         inject_into_file "config/tailwind.config.js", before: "],\n  theme: {" do

data/lib/generators/mensa/templates/config/initializers/mensa.rb

@@ -18,6 +18,6 @@ Mensa.setup do |config|
     control_bar_compress: "fa-solid fa-compress",
     control_bar_export: "fa-solid fa-file-export",
     search: "fa-solid fa-magnifying-glass",
-    filters_add_filter: "fa-solid fa-plus",
+    filters_add_filter: "fa-solid fa-plus"
   }
 end

data/lib/mensa/configuration.rb

@@ -41,7 +41,7 @@ module Mensa
       control_bar_compress: "fa-solid fa-compress",
       control_bar_export: "fa-solid fa-file-export",
       search: "fa-solid fa-magnifying-glass",
-      filters_add_filter: "fa-solid fa-plus",
+      filters_add_filter: "fa-solid fa-plus"
     }
     # PRO
     # option :icons, default: {
@@ -81,11 +81,10 @@ module Mensa
       yield(config)
     end
 
-    alias setup configure
+    alias_method :setup, :configure
 
     def reset_config!
       @config = Configuration.new
     end
   end
-
 end

data/lib/mensa/engine.rb

@@ -1,9 +1,9 @@
-require 'pagy'
-require 'satis'
-require 'textacular'
-require 'caxlsx_rails'
-require 'slim'
-require 'tailwindcss-rails'
+require "pagy"
+require "satis"
+require "textacular"
+require "caxlsx_rails"
+require "slim"
+require "tailwindcss-rails"
 require "importmap-rails"
 require "turbo-rails"
 require "stimulus-rails"
@@ -12,21 +12,21 @@ module Mensa
   class Engine < ::Rails::Engine
     isolate_namespace Mensa
 
-    initializer 'mensa.assets' do |app|
+    initializer "mensa.assets" do |app|
       app.config.assets.paths << root.join("app/javascript")
       app.config.assets.paths << root.join("app/components")
       app.config.assets.paths << Mensa::Engine.root.join("vendor/javascript")
       app.config.assets.precompile += %w[mensa_manifest]
     end
 
-    initializer 'mensa.importmap', before: "importmap" do |app|
+    initializer "mensa.importmap", before: "importmap" do |app|
       app.config.importmap.paths << root.join("config/importmap.rb")
       app.config.importmap.cache_sweepers << root.join("app/javascript")
       app.config.importmap.cache_sweepers << root.join("app/components")
       app.config.importmap.cache_sweepers << Mensa::Engine.root.join("vendor/javascript")
     end
 
-    initializer 'mensa.helper' do
+    initializer "mensa.helper" do
       Rails.application.reloader.to_prepare do
         ActiveSupport.on_load(:action_controller) do
           Satis.add_helper(:table, ::Mensa::Table::Component)

data/lib/mensa/version.rb

@@ -1,3 +1,3 @@
 module Mensa
-  VERSION = "0.2.4"
+  VERSION = "0.2.5"
 end

data/lib/mensa.rb

@@ -1,6 +1,6 @@
 require "mensa/version"
 require "mensa/engine"
-require 'mensa/configuration'
+require "mensa/configuration"
 require "importmap-rails"
 
 module Mensa
@@ -16,7 +16,7 @@ module Mensa
     def class_for_name(name)
       class_name = "#{name}_table".camelcase
       unless class_name.safe_constantize
-        module_class_name = name.to_s.split('_', 2).map(&:camelcase).join('::') + 'Table'
+        module_class_name = name.to_s.split("_", 2).map(&:camelcase).join("::") + "Table"
         class_name = module_class_name if module_class_name.safe_constantize
       end
       Kernel.const_get("::#{class_name}")

data/lib/tasks/mensa_tasks.rake

@@ -10,4 +10,4 @@ end
 if Rake::Task.task_defined?("tailwindcss:build")
   Rake::Task["tailwindcss:build"].enhance(["mensa:tailwindcss:config"])
   Rake::Task["tailwindcss:watch"].enhance(["mensa:tailwindcss:config"])
-end
+end

data/mensa.gemspec

@@ -23,7 +23,7 @@ Gem::Specification.new do |spec|
 
   spec.metadata["homepage_uri"] = spec.homepage
   spec.metadata["source_code_uri"] = "https://github.com/entdec/mensa"
-  spec.metadata["changelog_uri"] = "https://github.com/entdec/mensa/CHANGELOG"
+  spec.metadata["changelog_uri"] = "https://github.com/entdec/mensa/blob/main/CHANGELOG.md"
 
   spec.files = Dir.chdir(File.expand_path("..", __FILE__)) do
     `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mensa
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.2.5
 platform: ruby
 authors:
 - Tom de Grunt
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-11-12 00:00:00.000000000 Z
+date: 2025-11-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: caxlsx_rails
@@ -178,6 +178,8 @@ files:
 - ".gem_release.yml"
 - ".github/workflows/gem-push.yml"
 - ".gitignore"
+- ".rubocop.yml"
+- CHANGELOG.md
 - Gemfile
 - Gemfile.lock
 - MIT-LICENSE
@@ -198,11 +200,13 @@ files:
 - app/components/mensa/control_bar/component.css
 - app/components/mensa/control_bar/component.html.slim
 - app/components/mensa/control_bar/component.rb
-- app/components/mensa/filter/component_controller.js
-- app/components/mensa/filter_list/component.css
-- app/components/mensa/filter_list/component.html.slim
-- app/components/mensa/filter_list/component.rb
-- app/components/mensa/filter_list/component_controller.js
+- app/components/mensa/filter_pill/component.html.slim
+- app/components/mensa/filter_pill/component.rb
+- app/components/mensa/filter_pill/component_controller.js
+- app/components/mensa/filter_pill_list/component.css
+- app/components/mensa/filter_pill_list/component.html.slim
+- app/components/mensa/filter_pill_list/component.rb
+- app/components/mensa/filter_pill_list/component_controller.js
 - app/components/mensa/header/component.css
 - app/components/mensa/header/component.html.slim
 - app/components/mensa/header/component.rb
@@ -286,7 +290,6 @@ files:
 - mensa.gemspec
 - package-lock.json
 - package.json
-- rubocop.yml
 - vendor/javascript/@rails--request.js.js
 homepage: https://github.com/entdec/mensa
 licenses:
@@ -294,7 +297,7 @@ licenses:
 metadata:
   homepage_uri: https://github.com/entdec/mensa
   source_code_uri: https://github.com/entdec/mensa
-  changelog_uri: https://github.com/entdec/mensa/CHANGELOG
+  changelog_uri: https://github.com/entdec/mensa/blob/main/CHANGELOG.md
 post_install_message: |
   Mensa requires additional setup. Please run the following
   command to install the necessary files:

data/app/components/mensa/filter_list/component.html.slim

@@ -1,14 +0,0 @@
-.mensa-table__filters.hidden data-mensa-table-target="filterList"
-  .block
-    nav
-      .flex.space-x-2.overflow-none.whitespace-nowrap.scroll-p-0[aria-label="Tabs"]
-        / existing filters first
-        - table.active_filters.each do |filter|
-          .relative data-controller="mensa-filter" data-mensa-filter-column-name-value=filter.column.name data-mensa-filter-value-value=filter.value data-mensa-filter-operator-value=filter.operator
-            button.relative.w-full.cursor-default.rounded-md.bg-white.dark:bg-gray-800.py-1.5.pl-3.text-left.text-gray-900.dark:text-gray-400.shadow-sm.ring-1.ring-inset.ring-gray-300.dark:ring-gray-600.focus:outline-none.focus:ring-2.focus:ring-primary-600.sm:text-sm.sm:leading-6[type="button" aria-haspopup="listbox" aria-expanded="true" aria-labelledby="listbox-label"]
-              span.block.truncate.pr-6
-                = filter
-              span.pointer-events-none.absolute.inset-y-0.right-0.flex.items-center.pr-2
-                .fa.fal.fa-angle-down
-
-        = render Mensa::AddFilter::Component.new(table: table)

data/app/components/mensa/filter_list/component_controller.js

@@ -1,14 +0,0 @@
-import ApplicationController from 'mensa/controllers/application_controller'
-
-export default class FilterListComponentController extends ApplicationController {
-  static targets = [
-    'list',
-  ]
-  static values = {
-    supportsViews: Boolean
-  }
-
-  connect() {
-    super.connect()
-  }
-}